0.12.0 Beta 5 (fixes #1837)

Aircoookie · Mar 30, 2021 · 8755a9b · 8755a9b
1 parent 4a1ecc7
commit 8755a9b
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 63 deletions.
diff --git a/.travis.yml.old b/.travis.yml.old
diff --git 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 [email protected]
+-   Fixed IR pin not configurable
+
 #### Build 2103290
 
 -   Version bump to 0.12.0-b4 "Hikari"

diff --git 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": {

diff --git 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
@@ -387,7 +387,7 @@ build_flags = ${common.build_flags_esp8266} -D USE_WS2801
 
 [env:custom32_LEDPIN_16]
 board = esp32dev
-platform = espressif32@3.1.1
+platform = espressif32@3.2
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp32} -D LEDPIN=16 -D RLYPIN=19
 lib_ignore =
@@ -396,7 +396,7 @@ lib_ignore =
 
 [env:custom32_APA102]
 board = esp32dev
-platform = espressif32@3.1.1
+platform = espressif32@3.2
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags_esp32} -D USE_APA102
 lib_ignore =
@@ -405,7 +405,7 @@ lib_ignore =
 
 [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 =
@@ -414,7 +414,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
@@ -431,7 +431,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

diff --git a/usermods/usermod_v2_rotary_encoder_ui/platformio_override.ini.sample b/usermods/usermod_v2_rotary_encoder_ui/platformio_override.ini.sample
@@ -4,7 +4,7 @@ default_envs = d1_mini
 
 [env:esp32dev]
 board = esp32dev
-platform = espressif32@3.1.1
+platform = espressif32@3.2
 build_unflags = ${common.build_unflags}
 build_flags =
     ${common.build_flags_esp32} 

diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp
@@ -154,7 +154,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 {
@@ -488,11 +488,9 @@ void serializeConfig() {
   hw_btn_ins_0_macros.add(macroDoublePress);
 
   #ifndef WLED_DISABLE_INFRARED
-  if (irPin>=0) {
-    JsonObject hw_ir = hw.createNestedObject("ir");
-    hw_ir["pin"] = irPin;
-    hw_ir[F("type")] = irEnabled;              // the byte 'irEnabled' does contain the IR-Remote Type ( 0=disabled )
-  }
+  JsonObject hw_ir = hw.createNestedObject("ir");
+  hw_ir["pin"] = irPin;
+  hw_ir[F("type")] = irEnabled;              // the byte 'irEnabled' does contain the IR-Remote Type ( 0=disabled )
   #endif
 
   JsonObject hw_relay = hw.createNestedObject(F("relay"));

diff --git 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>

diff --git a/wled00/html_settings.h b/wled00/html_settings.h
@@ -375,7 +375,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>

diff --git 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 2103290
+#define VERSION 2103300
 
 //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!)