From 8755a9bcda652373d75ba6b27f2e6805dd8d1b1f Mon Sep 17 00:00:00 2001 From: cschwinne Date: Tue, 30 Mar 2021 02:04:02 +0200 Subject: [PATCH] 0.12.0 Beta 5 (fixes #1837) --- .travis.yml.old | 43 ------------------- CHANGELOG.md | 6 +++ package.json | 2 +- platformio.ini | 14 +++--- .../platformio_override.ini.sample | 2 +- wled00/cfg.cpp | 10 ++--- wled00/html_other.h | 2 +- wled00/html_settings.h | 2 +- wled00/wled.h | 6 +-- 9 files changed, 24 insertions(+), 63 deletions(-) delete mode 100644 .travis.yml.old diff --git a/.travis.yml.old b/.travis.yml.old deleted file mode 100644 index 16b4f2c1..00000000 --- a/.travis.yml.old +++ /dev/null @@ -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 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index a2411cdb..3f6e2981 100644 --- 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" diff --git a/package.json b/package.json index a1bef2ef..66819538 100644 --- 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 index e5c6c161..ea5972ea 100644 --- 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 index 4b9fa955..cc39d65c 100644 --- 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 index 96f4bf42..435ef438 100644 --- 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 index e8b6b6bf..2c515a1a 100644 --- 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}

WLED Software Update

-Installed version: 0.12.0-b4
Download the latest binary: Download the latest binary:

diff --git a/wled00/html_settings.h b/wled00/html_settings.h index 91c48b4c..810d889d 100644 --- 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

Software Update


Enable ArduinoOTA:

About

WLED - version 0.12.0-b4


Contributors, dependencies and special thanks
A huge thank you to everyone who helped me create WLED!

diff --git a/wled00/wled.h b/wled00/wled.h index 42e9cd2c..2fe5a792 100644 --- 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!)