From 3905e5358a3420c12ed13a8cf4d272b443a4e116 Mon Sep 17 00:00:00 2001 From: Vito Tai Date: Fri, 15 Dec 2023 19:29:14 +0800 Subject: [PATCH] remove glycol build --- README.md | 2 ++ htmljs/src/config.tmpl.html | 11 +++++++++++ htmljs/src/js/shared.js | 2 +- platformio.ini | 15 ++------------- src/Config.h | 2 +- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 2550f67f..4e42c03e 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,8 @@ You will need to run the hardware setup procedure after upgrading to v2.4 from p * 4.3.1 * Auto list device list on page open * Advanced settings for control constants. + * Glycol as an option. No more dedicated Glycol build. + * Update Filemanager. * 4.3 * update ESP32 framework to 5.4.0 * update ESP8266 framework to 4.2.0 diff --git a/htmljs/src/config.tmpl.html b/htmljs/src/config.tmpl.html index 1fccb5a9..b1da44b1 100644 --- a/htmljs/src/config.tmpl.html +++ b/htmljs/src/config.tmpl.html @@ -49,6 +49,17 @@
+
+
+ Glycol Chilling +
+
+ + +
+
+ +
<%= config_title %> diff --git a/htmljs/src/js/shared.js b/htmljs/src/js/shared.js index c4f6a50c..49de63ed 100644 --- a/htmljs/src/js/shared.js +++ b/htmljs/src/js/shared.js @@ -1,4 +1,4 @@ -var JSVERSION = "4.3"; +var JSVERSION = "4.3.1"; function s_ajax(b) { var c = new XMLHttpRequest(); diff --git a/platformio.ini b/platformio.ini index 15db78b4..77836f7b 100644 --- a/platformio.ini +++ b/platformio.ini @@ -10,8 +10,8 @@ [platformio] #sonoff OTA no longer supported, classic interface no longer supported -#default_envs = esp32, esp32-oled, esp8266, esp8266-oled, esp8266-glycol, esp8266-tw, esp8266-spanish, esp8266-portuguese-br, esp8266-slovak, esp8266-ispindel, esp8266-it, esp8266-norwegian, thorrax, sonoff, sonoff-esp8285, d1pro, sonoff-am2301 -default_envs = esp32 +default_envs = esp32, esp32-oled, esp8266, esp8266-oled, esp8266-tw, esp8266-spanish, esp8266-portuguese-br, esp8266-slovak, esp8266-ispindel, esp8266-it, esp8266-norwegian, thorrax, sonoff, sonoff-esp8285, d1pro, sonoff-am2301 +#default_envs = esp32-dev #default_envs = esp8266-dev #default_envs = esp8266 @@ -185,17 +185,6 @@ build_flags = -Wl,-Tesp8266.flash.4m2m.ld lib_deps = ${common_env_data.lib_deps_external_esp8266} -[env:esp8266-glycol] -;not yet working -platform = ${common_env_data.esp8266_framework} -board = d1_mini -framework = arduino -lib_extra_dirs = ${common_env_data.esp8266_lib} -build_flags = -Wl,-Tesp8266.flash.4m2m.ld - -DEnableGlycolSupport=true - -lib_deps = ${common_env_data.lib_deps_external_esp8266} - [env:esp8266-spanish] platform = ${common_env_data.esp8266_framework} diff --git a/src/Config.h b/src/Config.h index db1fefa1..ed1e8573 100644 --- a/src/Config.h +++ b/src/Config.h @@ -317,7 +317,7 @@ #define FS_EEPROM true #endif -#define BPL_VERSION "4.3" +#define BPL_VERSION "4.3.1" #ifndef MORE_PINS_CONFIGURATION