Merge branch 'Version_2.2' of https://github.com/fredlcore/BSB_LAN in…

…to Version_2.2
fredlcore · Oct 12, 2023 · 69527d9 · 69527d9
2 parents 7989e18 + e52d00e
commit 69527d9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/platformio-esp32.yaml b/.github/workflows/platformio-esp32.yaml
@@ -44,4 +44,4 @@ jobs:
         cp BSB_LAN/BSB_LAN_custom_defs.h.default BSB_LAN/BSB_LAN_custom_defs.h
 
     - name: Run PlatformIO CI
-      run: platformio ci --project-option="platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-upstream" --project-option="platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git" --board=esp32-evb ./BSB_LAN
+      run: platformio ci --project-option="platform = https://github.com/platformio/platform-espressif32.git" --board=esp32-evb ./BSB_LAN
diff --git a/BSB_LAN/BSB_LAN_custom_defs.h.default b/BSB_LAN/BSB_LAN_custom_defs.h.default
@@ -3792,12 +3792,6 @@ const char ENUM700[] PROGMEM_LATEST = {
 "\x03 " ENUM700_03_TEXT
 };
 
-const char ENUM701[] PROGMEM_LATEST = {
-"\x00 " ENUM701_00_TEXT "\0"
-"\x01 " ENUM701_01_TEXT "\0"
-"\x02 " ENUM701_02_TEXT
-};
-
 // Parameters 702 and 703 are virtual Weishaupt parameters based on one and the same command ID, using new data type VT_CUSTOM_ENUM
 
 const char ENUM702[] PROGMEM_LATEST = {
@@ -8445,8 +8439,8 @@ PROGMEM_LATE const cmd_t cmdtbl[]={
 {0x053D1361,  VT_ENUM,          2501,  STR2501,  sizeof(ENUM2501),     ENUM2501,     FL_OEM,       DEV_ALL}, // Durchflussmessung
 {0x053D0FEA,  VT_ONOFF,         2502,  STR2500,  sizeof(ENUM2502),     ENUM2502,     DEFAULT_FLAG, DEV_ALL}, // Baxi Luna Platinum+ Durchfl'schalter Abschaltung
 {0x053D1B92,  VT_SECONDS_SHORT2,2503,  STR2503,  0,                    NULL,         FL_OEM,       DEV_ALL}, // Wartezeit Schalter
-{0x053D1AE1,  VT_LITERPERMIN,   2505,  STR2505,  0,                    NULL,         FL_OEM,       DEV_ALL}, // Schwelle Durchflussdetektion
 {0x053D0FE8,  VT_SECONDS_SHORT5,2504,  STR2504,  0,                    NULL,         DEFAULT_FLAG, DEV_ALL}, // Baxi Luna Platinum+ Min Einschaltzeit Schalter
+{0x053D1AE1,  VT_LITERPERMIN,   2505,  STR2505,  0,                    NULL,         FL_OEM,       DEV_ALL}, // Schwelle Durchflussdetektion
 {0x053D1ADE,  VT_LPM_SHORT,     2509,  STR2509,  0,                    NULL,         FL_OEM,       DEV_ALL}, // Schaltdiff Durchfl'det Zus'br
 {0x0D3D1121,  VT_TEMP,          2510,  STR2510,  0,                    NULL,         DEFAULT_FLAG, DEV_ALL}, // Baxi Luna Platinum+ Schnellabschaltung Temp'grad (Bug in Baxi Luna: 0.8 shown twice)
 {0x0D3D1122,  VT_SECONDS_SHORT, 2511,  STR2511,  0,                    NULL,         DEFAULT_FLAG, DEV_ALL}, // Baxi Luna Platinum+ Schnellabschalt Überw'zeit

diff --git a/BSB_LAN/BSB_LAN_defs.h b/BSB_LAN/BSB_LAN_defs.h
@@ -1056,6 +1056,12 @@ const char ENUM_LOGGER_MODE[] PROGMEM_LATEST = {
 
 };
 
+// Keep this for legacy parameter lists
+const char ENUM701[] PROGMEM_LATEST = {
+"\x01 " ENUM648_01_TEXT "\0"
+"\x02 " ENUM700_03_TEXT
+};
+
 // PPS Betriebsart
 const char ENUM15000[] PROGMEM_LATEST = {
 "\x00 " ENUM15000_00_TEXT "\0"