Getting on par with master.

2021-03-30 20:43:46 +02:00 · 2021-03-30 20:43:46 +02:00 · 5f17d30973
commit 5f17d30973
parent 6ace46eece
8 changed files with 18 additions and 55 deletions
--- a/.travis.yml.old
+++ b/.travis.yml.old
@ -1,43 +0,0 @@
-# Continuous Integration (CI) is the practice, in software
-# engineering, of merging all developer working copies with a shared mainline
-# several times a day < https://docs.platformio.org/page/ci/index.html >
-#
-# Documentation:
-#
-# * Travis CI Embedded Builds with PlatformIO
-#   < https://docs.travis-ci.com/user/integration/platformio/ >
-#
-# * PlatformIO integration with Travis CI
-#   < https://docs.platformio.org/page/ci/travis.html >
-#
-# * User Guide for `platformio ci` command
-#   < https://docs.platformio.org/page/userguide/cmd_ci.html >
-#
-#
-# Please choose one of the following templates (proposed below) and uncomment
-# it (remove "# " before each line) or use own configuration according to the
-# Travis CI documentation (see above).
-#
-# * Test the Travis config here:
-#   < https://config.travis-ci.com/explore >
-#
-
-language: python
-python:
-    # - "2.7"
-    - "3.5"
-os: linux
-cache:
-    bundler: true
-    ccache: true
-    directories:
-        - "~/.platformio"
-        - "~/.buildcache"
-env:
-    - PLATFORMIO_CI_SRC=wled00
-install:
-    - pip install -U platformio
-    - platformio update
-script:
-    # - platformio ci --project-conf=./platformio.ini
-    - platformio run
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,6 +2,12 @@

 ### Development versions between 0.11.1 and 0.12.0 releases

+#### Build 2103300
+
+-   Version bump to 0.12.0-b5 "Hikari"
+-   Update to core espressif32@3.2
+-   Fixed IR pin not configurable
+
 #### Build 2103290

 -   Version bump to 0.12.0-b4 "Hikari"
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "wled",
-  "version": "0.12.0-b4",
+  "version": "0.12.0-b5",
  "description": "Tools for WLED project",
  "main": "tools/cdata.js",
  "directories": {
--- a/platformio.ini
+++ b/platformio.ini
@ -259,7 +259,7 @@ build_flags = ${common.build_flags_esp8266} -D LEDPIN=1 -D WLED_DISABLE_INFRARED

 [env:esp32dev]
 board = esp32dev
-platform = espressif32@3.1.1
+platform = espressif32@3.2
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp32}
 lib_ignore =
@ -268,7 +268,7 @@ lib_ignore =

 [env:esp32_eth]
 board = esp32-poe
-platform = espressif32@3.1.1
+platform = espressif32@3.2
 upload_speed = 921600
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp32} -D RLYPIN=-1 -D WLED_USE_ETHERNET -D BTNPIN=-1
@ -346,7 +346,7 @@ build_flags = ${common.build_flags_esp8266} -D LEDPIN=12 -D IRPIN=-1 -D RLYPIN=2

 [env:custom32_TOUCHPIN_T0]
 board = esp32dev
-platform = espressif32@3.1.1
+platform = espressif32@3.2
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp32} -D TOUCHPIN=T0
 lib_ignore =
@ -355,7 +355,7 @@ lib_ignore =

 [env:wemos_shield_esp32]
 board = esp32dev
-platform = espressif32@3.1.1
+platform = espressif32@3.2
 upload_port = /dev/cu.SLAB_USBtoUART
 monitor_port = /dev/cu.SLAB_USBtoUART
 upload_speed = 460800
@ -372,7 +372,7 @@ build_flags = ${common.build_flags_esp32} -D LEDPIN=27 -D BTNPIN=39
 lib_ignore =
 	ESPAsyncTCP
 	ESPAsyncUDP
-platform = espressif32@3.1.1
+platform = espressif32@3.2

 [env:sp501e]
 board = esp_wroom_02
--- a/wled00/cfg.cpp
+++ b/wled00/cfg.cpp
@ -159,7 +159,7 @@ void deserializeConfig() {
  //int hw_btn_ins_0_type = hw_btn_ins_0["type"]; // 0

  #ifndef WLED_DISABLE_INFRARED
-  int hw_ir_pin = hw["ir"]["pin"]; // 4
+  int hw_ir_pin = hw["ir"]["pin"] | -1; // 4
  if (pinManager.allocatePin(hw_ir_pin,false)) {
    irPin = hw_ir_pin;
  } else {
--- a/wled00/html_other.h
+++ b/wled00/html_other.h
@ -42,7 +42,7 @@ function B(){window.history.back()}function U(){document.getElementById("uf").st
 .bt{background:#333;color:#fff;font-family:Verdana,sans-serif;border:.3ch solid #333;display:inline-block;font-size:20px;margin:8px;margin-top:12px}input[type=file]{font-size:16px}body{font-family:Verdana,sans-serif;text-align:center;background:#222;color:#fff;line-height:200%}#msg{display:none}
 </style></head><body><h2>WLED Software Update</h2><form method="POST" 
 action="/update" id="uf" enctype="multipart/form-data" onsubmit="U()">
-Installed version: 0.12.0-b4<br>Download the latest binary: <a 
+Installed version: 0.12.0-b5<br>Download the latest binary: <a 
 href="https://github.com/Aircoookie/WLED/releases" target="_blank"><img 
 src="https://img.shields.io/github/release/Aircoookie/WLED.svg?style=flat-square">
 </a><br><input type="file" class="bt" name="update" accept=".bin" required><br>
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@ -377,7 +377,7 @@ HTTP traffic is unencrypted. An attacker in the same network can intercept form
 <h3>Software Update</h3><button type="button" onclick="U()">Manual OTA Update
 </button><br>Enable ArduinoOTA: <input type="checkbox" name="AO"><br><h3>About
 </h3><a href="https://github.com/Aircoookie/WLED/" target="_blank">WLED</a>
- version 0.12.0-b4<br><br><a 
+ version 0.12.0-b5<br><br><a 
 href="https://github.com/Aircoookie/WLED/wiki/Contributors-and-credits" 
 target="_blank">Contributors, dependencies and special thanks</a><br>
 A huge thank you to everyone who helped me create WLED!<br><br>
--- a/wled00/wled.h
+++ b/wled00/wled.h
@ -3,12 +3,12 @@
 /*
   Main sketch, global variable declarations
   @title WLED project sketch
-   @version 0.12.0-b4
+   @version 0.12.0-b5
   @author Christian Schwinne
 */

 // version code in format yymmddb (b = daily build)
-#define VERSION 2103291
+#define VERSION 2103301

 //uncomment this if you have a "my_config.h" file you'd like to use
 //#define WLED_USE_MY_CONFIG
@ -168,7 +168,7 @@
 #endif

 // Global Variable definitions
-WLED_GLOBAL char versionString[] _INIT("0.12.0-b4");
+WLED_GLOBAL char versionString[] _INIT("0.12.0-b5");
 #define WLED_CODENAME "Hikari"

 // AP and OTA default passwords (for maximum security change them!)