From 3419b0230be742b20ea978b56c6d3e37e7925c04 Mon Sep 17 00:00:00 2001 From: jp112sdl Date: Sat, 14 May 2022 12:32:55 +0200 Subject: [PATCH] add HB-LC-Sw1-FM --- README.md | 4 +- patchsource/www/config/ic_linkpeerlist.cgi | 1 + patchsource/www/webui/webui.js | 6 + src/addon/devdb.csv | 1 + src/addon/firmware/rftypes/hb-lc-sw1-fm.xml | 650 ++++++++++++++++++ .../patch/common/ic_linkpeerlist.cgi.patch | 3 +- src/addon/patch/common/webui.js.patch | 22 +- 7 files changed, 677 insertions(+), 10 deletions(-) create mode 100644 src/addon/firmware/rftypes/hb-lc-sw1-fm.xml diff --git a/README.md b/README.md index 70bb18d7..6750b789 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,8 @@ _Bitte etwas Geduld haben - je nach Geschwindigkeit der SD Karte kann die Instal | | [HB-LC-Dim5PWM-CV](https://github.com/pa-pa/AskSinPP/tree/master/examples/stm32/HB-LC-Dim5PWM-CV) | 5-Kanal PWM Dimmer (STM32) | ⚡️ | | | [HB-LC-Sw1PBU-FM](https://github.com/jp112sdl/Beispiel_AskSinPP/tree/master/examples/HB-LC-Sw1PBU-FM) | alternative Firmware für den
HM-LC-Sw1PBU-FM (getrennte Taster-/Relais-Kanäle) | ⚡️ | | | [HB-LC-Sw2PBU-FM](https://github.com/jp112sdl/Beispiel_AskSinPP/tree/master/examples/HB-LC-Sw2PBU-FM) | alternative Firmware für den
HM-LC-Sw2PBU-FM (getrennte Taster-/Relais-Kanäle) | ⚡️ | -| | [HB-LC-Sw2-FM](https://github.com/stan23/HB-LC-Sw2-FM) | alternative Firmware für den
HM-LC-Sw2-FM (getrennte Taster-/Relais-Kanäle) special thx to [stan23](https://github.com/stan23)! | ⚡️ | +| | [HB-LC-Sw1-FM](https://github.com/stan23/HB-LC-SwX-FM) | alternative Firmware für den
HM-LC-Sw1-FM (getrennter Taster-/Relais-Kanal) special thx to [stan23](https://github.com/stan23)! | ⚡️ | +| | [HB-LC-Sw2-FM](https://github.com/stan23/HB-LC-SwX-FM) | alternative Firmware für den
HM-LC-Sw2-FM (getrennte Taster-/Relais-Kanäle) special thx to [stan23](https://github.com/stan23)! | ⚡️ | | | [HB-LC-Sw3-LIDL](https://github.com/jp112sdl/Beispiel_AskSinPP/tree/master/examples/HB-LC-Sw3-LIDL) | Umbau LIDL 3fach Steckdosenleiste | ⚡️ | | | [HB-LC-SwX-TP](https://github.com/jp112sdl/HB-LC-SwX-TP) | 1-/2-/4-fach Aktor mit Zeitprofil| ⚡️ | | | [HB-OU-AF-SEN-TEMP](https://github.com/jp112sdl/HB-OU-AF-SEN-TEMP) | (Kamin) Luftklappensteuerung und Temperatursensor | ⚡️ | @@ -198,6 +199,7 @@ _Bitte etwas Geduld haben - je nach Geschwindigkeit der SD Karte kann die Instal |F3 FE | HB-UNI-Sen-DUMMY-BEACON-V2 | |F3 FF | HB-UNI-Sen-DUMMY-BEACON | |_F5 01_ | _HB-LC-Sw2-FM_ | +|_F5 02_ | _HB-LC-Sw1-FM_ | |_F5 11_ | _HB-LC-Dim5PWM-CV_ | |F6 A9 | [HB-CDL-6](https://github.com/trilu2000/HB-CDL-6) | |F9 D6 | HB-UNI-Sen-DIST-US | diff --git a/patchsource/www/config/ic_linkpeerlist.cgi b/patchsource/www/config/ic_linkpeerlist.cgi index 2c9a98be..1487319f 100755 --- a/patchsource/www/config/ic_linkpeerlist.cgi +++ b/patchsource/www/config/ic_linkpeerlist.cgi @@ -325,6 +325,7 @@ proc put_tablebody {} { ([string equal -nocase "HB-LC-Sw1PBU-FM" $devType] == 1) || ([string equal -nocase "HB-LC-Sw2PBU-FM" $devType] == 1) || ([string equal -nocase "HB-LC-Bl1PBU-FM" $devType] == 1) || + ([string equal -nocase "HB-LC-Sw1-FM" $devType] == 1) || ([string equal -nocase "HB-LC-Sw2-FM" $devType] == 1) || ([string match -nocase "HB-UNI-SenAct-4-4-SC*" $devType] == 1) || ([string match -nocase "HB-UNI-SenAct-8-8-SC*" $devType] == 1) diff --git a/patchsource/www/webui/webui.js b/patchsource/www/webui/webui.js index ccf8c309..efd77f83 100755 --- a/patchsource/www/webui/webui.js +++ b/patchsource/www/webui/webui.js @@ -532,6 +532,12 @@ DEV_DESCRIPTION['HB-LC-Sw2PBU-FM']='HM-LC-Sw2PBU-FM mit alternativer FW'; DEV_PATHS['HB-LC-Sw2PBU-FM'] = new Object(); DEV_PATHS['HB-LC-Sw2PBU-FM']['50'] = '/config/img/devices/50/PushButton-2ch-wm_thumb.png'; DEV_PATHS['HB-LC-Sw2PBU-FM']['250'] = '/config/img/devices/250/PushButton-2ch-wm.png'; +DEV_HIGHLIGHT['HB-LC-Sw1-FM'] = new Object(); +DEV_LIST.push('HB-LC-Sw1-FM'); +DEV_DESCRIPTION['HB-LC-Sw1-FM']='HM-LC-Sw1-FM mit alternativer FW'; +DEV_PATHS['HB-LC-Sw1-FM'] = new Object(); +DEV_PATHS['HB-LC-Sw1-FM']['50'] = '/config/img/devices/50/4_hm-lc-sw1-fm_thumb.png'; +DEV_PATHS['HB-LC-Sw1-FM']['250'] = '/config/img/devices/250/4_hm-lc-sw1-fm.png'; DEV_HIGHLIGHT['HB-LC-Sw2-FM'] = new Object(); DEV_LIST.push('HB-LC-Sw2-FM'); DEV_DESCRIPTION['HB-LC-Sw2-FM']='HM-LC-Sw2-FM mit alternativer FW'; diff --git a/src/addon/devdb.csv b/src/addon/devdb.csv index 0d8a992a..0f48c8be 100644 --- a/src/addon/devdb.csv +++ b/src/addon/devdb.csv @@ -15,6 +15,7 @@ HB-LC-Bl1PBU-FM;PushButton-2ch-wm HB-LC-Bl2-RD;hb-lc-bl2-rd HB-LC-Dim5PWM-CV;114_hm-lc-dim1t-fm-lf HB-LC-Sw1PBU-FM;PushButton-2ch-wm +HB-LC-Sw1-FM;4_hm-lc-sw1-fm HB-LC-Sw2-FM;5_hm-lc-sw2-fm HB-LC-Sw2PBU-FM;PushButton-2ch-wm HB-LC-Sw12-FM;hb-lc-sw12-fm diff --git a/src/addon/firmware/rftypes/hb-lc-sw1-fm.xml b/src/addon/firmware/rftypes/hb-lc-sw1-fm.xml new file mode 100644 index 00000000..f4df8cfd --- /dev/null +++ b/src/addon/firmware/rftypes/hb-lc-sw1-fm.xml @@ -0,0 +1,650 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/addon/patch/common/ic_linkpeerlist.cgi.patch b/src/addon/patch/common/ic_linkpeerlist.cgi.patch index 31cc2626..342dfc60 100644 --- a/src/addon/patch/common/ic_linkpeerlist.cgi.patch +++ b/src/addon/patch/common/ic_linkpeerlist.cgi.patch @@ -1,6 +1,6 @@ --- ./patchsource/www/config/ic_linkpeerlist.cgi.orig +++ ./patchsource/www/config/ic_linkpeerlist.cgi -@@ -319,6 +319,27 @@ +@@ -319,6 +319,28 @@ set hideBtnDelete 1 } } @@ -10,6 +10,7 @@ + ([string equal -nocase "HB-LC-Sw1PBU-FM" $devType] == 1) || + ([string equal -nocase "HB-LC-Sw2PBU-FM" $devType] == 1) || + ([string equal -nocase "HB-LC-Bl1PBU-FM" $devType] == 1) || ++ ([string equal -nocase "HB-LC-Sw1-FM" $devType] == 1) || + ([string equal -nocase "HB-LC-Sw2-FM" $devType] == 1) || + ([string match -nocase "HB-UNI-SenAct-4-4-SC*" $devType] == 1) || + ([string match -nocase "HB-UNI-SenAct-8-8-SC*" $devType] == 1) diff --git a/src/addon/patch/common/webui.js.patch b/src/addon/patch/common/webui.js.patch index a968d8a9..d571cdbb 100644 --- a/src/addon/patch/common/webui.js.patch +++ b/src/addon/patch/common/webui.js.patch @@ -1,6 +1,6 @@ --- ./patchsource/www/webui/webui.js.orig +++ ./patchsource/www/webui/webui.js -@@ -88,6 +88,546 @@ +@@ -88,6 +88,552 @@ DEV_PATHS["HM-RC-4-3"] = new Object(); DEV_PATHS["HM-RC-4-3"]["50"] = "/config/img/devices/50/84_hm-rc-4-x_thumb.png"; DEV_PATHS["HM-RC-4-3"]["250"] = "/config/img/devices/250/84_hm-rc-4-3.png"; @@ -448,6 +448,12 @@ +DEV_PATHS['HB-LC-Sw2PBU-FM'] = new Object(); +DEV_PATHS['HB-LC-Sw2PBU-FM']['50'] = '/config/img/devices/50/PushButton-2ch-wm_thumb.png'; +DEV_PATHS['HB-LC-Sw2PBU-FM']['250'] = '/config/img/devices/250/PushButton-2ch-wm.png'; ++DEV_HIGHLIGHT['HB-LC-Sw1-FM'] = new Object(); ++DEV_LIST.push('HB-LC-Sw1-FM'); ++DEV_DESCRIPTION['HB-LC-Sw1-FM']='HM-LC-Sw1-FM mit alternativer FW'; ++DEV_PATHS['HB-LC-Sw1-FM'] = new Object(); ++DEV_PATHS['HB-LC-Sw1-FM']['50'] = '/config/img/devices/50/4_hm-lc-sw1-fm_thumb.png'; ++DEV_PATHS['HB-LC-Sw1-FM']['250'] = '/config/img/devices/250/4_hm-lc-sw1-fm.png'; +DEV_HIGHLIGHT['HB-LC-Sw2-FM'] = new Object(); +DEV_LIST.push('HB-LC-Sw2-FM'); +DEV_DESCRIPTION['HB-LC-Sw2-FM']='HM-LC-Sw2-FM mit alternativer FW'; @@ -547,7 +553,7 @@ DEV_HIGHLIGHT["HM-RC-4-3"] = new Object(); DEV_HIGHLIGHT["HM-RC-4-3"]["arrow_part1"] = [6, 0.312, 0.288, 0.416, 0.288, 0.012]; DEV_HIGHLIGHT["HM-RC-4-3"]["arrow_part2"] = [6, 0.312, 0.288, 0.352, 0.248, 0.012]; -@@ -3843,6 +4383,224 @@ +@@ -3843,6 +4389,224 @@ elvST['CAPACITIVE_FILLING_LEVEL_SENSOR|CASE_HIGH'] = '${stringTableCapacitiveFillingSensorCaseHeight}'; elvST['CAPACITIVE_FILLING_LEVEL_SENSOR|CASE_LENGTH'] = '${stringTableCapacitiveFillingSensorCaseLength}'; elvST['CAPACITIVE_FILLING_LEVEL_SENSOR|CASE_WIDTH'] = '${stringTableCapacitiveFillingSensorCaseWidth}'; @@ -772,7 +778,7 @@ elvST['CAPACITIVE_FILLING_LEVEL_SENSOR|CONTROLTEXT_CALC_FILLINGLEVEL'] = '${stringTableCapacitiveFillingSensorTextCalcFillingLevel}'; elvST['CAPACITIVE_FILLING_LEVEL_SENSOR|CONTROLTEXT_FILLINGLEVEL'] = '${stringTableCapacitiveFillingSensorTextFillingLevel}'; elvST['CAPACITIVE_FILLING_LEVEL_SENSOR|FILLING_LEVEL'] = '${stringTableCapacitiveFillingSensorFillingLevel}'; -@@ -13664,7 +14422,7 @@ +@@ -13664,7 +14428,7 @@ // Check each line if the free text mode is active. // If yes switch on the appropriate text input field // and set the variable freeTextActive to true @@ -781,7 +787,7 @@ var jLine = jQuery("#textSelect_" + line), jCellFreeText = jQuery("#cellFreeText_"+line); -@@ -13680,7 +14438,7 @@ +@@ -13680,7 +14444,7 @@ // If at least one line has an active free text mode // we have to activate the placeholder for the other lines and the header (color and icon are moving up) if (freeTextActive) { @@ -790,7 +796,7 @@ var jLine = jQuery("#textSelect_" + line), jPlaceHolder = jQuery("#placeHolder_"+line); -@@ -13692,7 +14450,7 @@ +@@ -13692,7 +14456,7 @@ } } else { jHeadFreeText.hide().css("display", "none"); @@ -799,7 +805,7 @@ jQuery("#placeHolder_"+line).hide().css("display", "none"); } } -@@ -23560,6 +24318,24 @@ +@@ -23560,6 +24324,24 @@ this.setWidth(400); this.setFile( "/pages/msg/setOUCFMMode.htm" ); break; @@ -824,7 +830,7 @@ case ID_SET_STATUS_DISPLAY: this.setTitle( translateKey("dialogEnterValue") /*"Wert eingeben" */); this.addToPostBody( 'string type = "'+this.type+'";' ); -@@ -24363,6 +25139,9 @@ +@@ -24363,6 +25145,9 @@ ID_AUTO_LOGIN_CONFIG = 1018; ID_PROGRAM_CHOOSER = 1019; ID_EDIT_SYSVAR = 1021; @@ -834,7 +840,7 @@ ID_CHOOSE_LED = 1022; ID_SET_OUCFM_MODE = 1023; ID_SET_STATUS_DISPLAY = 1024; -@@ -36863,7 +37642,15 @@ +@@ -36863,7 +37648,15 @@ SetParameters ($F('global_iface'), channel_address, 'CHANNEL_'+i); actions++; }