add AutoDisable option for HB-UNI-Sen-DUMMY-BEACON-V2

jp112sdl · Nov 6, 2023 · 2152f37 · 2152f37
1 parent cacf626
commit 2152f37
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 11 deletions.
diff --git a/patchsource/www/config/stringtable_de.txt b/patchsource/www/config/stringtable_de.txt
@@ -288,6 +288,7 @@ FAN|ERROR=FAN_RPM_FAIL	${stringTableHBFanRpmFailure}
 FAN|LEVEL	${stringTableHbFanLevel}
 FAN|OLD_LEVEL	${stringTableHbFanOldLevel}
 FAN|RAMP_TIME	${stringTableHbFanRampTime}
+FD_AUTODISABLE	${stringTableFdAutoDisable}
 FD_BROADCAST	${stringTableFdBroadcast}
 FD_CYCLIC_TIMEOUT	${stringTableFdCyclicTimeout}
 FD_DEVICE_ID	${stringTableFdDeviceId}

diff --git a/patchsource/www/webui/js/lang/de/translate.lang.stringtable.js b/patchsource/www/webui/js/lang/de/translate.lang.stringtable.js
@@ -230,6 +230,7 @@ jQuery.extend(true,langJSON, {
     "stringTableFdSimulateDeviceTypeSensor" : "Sensor",
     "stringTableFdSimulateDeviceTypeActuator" : "Aktor",
     "stringTableFdSimulateDeviceType" : "Ger%e4tetyp",
+    "stringTableFdAutoDisable" : "Auto-Disable",
     "stringTableFdBroadcast" : "Broadcast",
     "stringTableFdSendEvery" : "sende alle",
     "stringTableFdSimulate" : "Simuliere Ger%e4t",

diff --git a/patchsource/www/webui/webui.js b/patchsource/www/webui/webui.js
@@ -4395,6 +4395,7 @@ elvST['CAPACITIVE_FILLING_LEVEL_SENSOR|TOF_DISTANCE_OFFSET'] = '${stringTableCap
 elvST['ERROR=CURRENTSENSOR_FAIL'] = '${stringTableHBCurrentSensorFailure}';
 elvST['ERROR=FAN_RPM_FAIL'] = '${stringTableHBFanRpmFailure}';
 elvST['ERROR=TEMP_SENSOR_FAIL'] = '${stringTableHBTempSensorFailure}';
+elvST['FD_AUTODISABLE'] = '${stringTableFdAutoDisable}';
 elvST['FD_BROADCAST'] = '${stringTableFdBroadcast}';
 elvST['FD_CYCLIC_TIMEOUT'] = '${stringTableFdCyclicTimeout}';
 elvST['FD_DEVICE_ID'] = '${stringTableFdDeviceId}';

diff --git a/src/addon/firmware/rftypes/hb-uni-sen-dummy-beacon-v2.xml b/src/addon/firmware/rftypes/hb-uni-sen-dummy-beacon-v2.xml
@@ -103,7 +103,11 @@
         <parameter id="FD_STATUS">
            <logical type="integer" min="0" max="255" default="0" unit="" />
            <physical type="integer" interface="config" list="1" index="8.0" size="1" />
-         </parameter> 
+         </parameter>
+        <parameter id="FD_AUTODISABLE">
+          <logical type="boolean" default="true"/>
+          <physical type="integer" interface="config" list="1" index="7.2" size="0.1"/>
+         </parameter>         
       </paramset> 
       <paramset type="VALUES" id="hb_dummydev_values">       
         <parameter id="STATE" operations="read,write,event" control="SWITCH.STATE">

diff --git a/src/addon/patch/common/stringtable_de.txt.patch b/src/addon/patch/common/stringtable_de.txt.patch
@@ -1,6 +1,6 @@
 --- ./patchsource/www/config/stringtable_de.txt.orig
 +++ ./patchsource/www/config/stringtable_de.txt
-@@ -275,6 +275,249 @@
+@@ -275,6 +275,250 @@
  CAPACITIVE_FILLING_LEVEL_SENSOR|CONTROLTEXT_CALC_FILLINGLEVEL	${stringTableCapacitiveFillingSensorTextCalcFillingLevel}
  CAPACITIVE_FILLING_LEVEL_SENSOR|CONTROLTEXT_FILLINGLEVEL	${stringTableCapacitiveFillingSensorTextFillingLevel}
  CAPACITIVE_FILLING_LEVEL_SENSOR|FILLING_LEVEL	${stringTableCapacitiveFillingSensorFillingLevel}
@@ -17,6 +17,7 @@
 +FAN|LEVEL	${stringTableHbFanLevel}
 +FAN|OLD_LEVEL	${stringTableHbFanOldLevel}
 +FAN|RAMP_TIME	${stringTableHbFanRampTime}
++FD_AUTODISABLE	${stringTableFdAutoDisable}
 +FD_BROADCAST	${stringTableFdBroadcast}
 +FD_CYCLIC_TIMEOUT	${stringTableFdCyclicTimeout}
 +FD_DEVICE_ID	${stringTableFdDeviceId}

diff --git a/src/addon/patch/common/translate.lang.stringtable.js.patch b/src/addon/patch/common/translate.lang.stringtable.js.patch
@@ -1,6 +1,6 @@
 --- ./patchsource/www/webui/js/lang/de/translate.lang.stringtable.js.orig
 +++ ./patchsource/www/webui/js/lang/de/translate.lang.stringtable.js
-@@ -109,6 +109,210 @@
+@@ -109,6 +109,211 @@
      "stringTableCharacteristicCrossfade" : "Crossfade",
      "stringTableCharacteristicDim2Hot" : "Dim2Hot",
      "stringTableCharacteristicDim2Warm" : "Dim2Warm",
@@ -125,6 +125,7 @@
 +    "stringTableFdSimulateDeviceTypeSensor" : "Sensor",
 +    "stringTableFdSimulateDeviceTypeActuator" : "Aktor",
 +    "stringTableFdSimulateDeviceType" : "Ger%e4tetyp",
++    "stringTableFdAutoDisable" : "Auto-Disable",
 +    "stringTableFdBroadcast" : "Broadcast",
 +    "stringTableFdSendEvery" : "sende alle",
 +    "stringTableFdSimulate" : "Simuliere Ger%e4t",

diff --git a/src/addon/patch/common/webui.js.patch b/src/addon/patch/common/webui.js.patch
@@ -553,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 +4389,224 @@
+@@ -3843,6 +4389,225 @@
  elvST['CAPACITIVE_FILLING_LEVEL_SENSOR|CASE_HIGH'] = '${stringTableCapacitiveFillingSensorCaseHeight}';
  elvST['CAPACITIVE_FILLING_LEVEL_SENSOR|CASE_LENGTH'] = '${stringTableCapacitiveFillingSensorCaseLength}';
  elvST['CAPACITIVE_FILLING_LEVEL_SENSOR|CASE_WIDTH'] = '${stringTableCapacitiveFillingSensorCaseWidth}';
@@ -563,6 +563,7 @@
 +elvST['ERROR=CURRENTSENSOR_FAIL'] = '${stringTableHBCurrentSensorFailure}';
 +elvST['ERROR=FAN_RPM_FAIL'] = '${stringTableHBFanRpmFailure}';
 +elvST['ERROR=TEMP_SENSOR_FAIL'] = '${stringTableHBTempSensorFailure}';
++elvST['FD_AUTODISABLE'] = '${stringTableFdAutoDisable}';
 +elvST['FD_BROADCAST'] = '${stringTableFdBroadcast}';
 +elvST['FD_CYCLIC_TIMEOUT'] = '${stringTableFdCyclicTimeout}';
 +elvST['FD_DEVICE_ID'] = '${stringTableFdDeviceId}';
@@ -778,7 +779,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 +14428,7 @@
+@@ -13664,7 +14429,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
@@ -787,7 +788,7 @@
      var jLine = jQuery("#textSelect_" + line),
      jCellFreeText = jQuery("#cellFreeText_"+line);
 
-@@ -13680,7 +14444,7 @@
+@@ -13680,7 +14445,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) {
@@ -796,7 +797,7 @@
        var jLine = jQuery("#textSelect_" + line),
        jPlaceHolder = jQuery("#placeHolder_"+line);
 
-@@ -13692,7 +14456,7 @@
+@@ -13692,7 +14457,7 @@
      }
    } else {
      jHeadFreeText.hide().css("display", "none");
@@ -805,7 +806,7 @@
        jQuery("#placeHolder_"+line).hide().css("display", "none");
      }
    }
-@@ -23560,6 +24324,24 @@
+@@ -23560,6 +24325,24 @@
          this.setWidth(400);
          this.setFile( "/pages/msg/setOUCFMMode.htm" );
          break;
@@ -830,7 +831,7 @@
          case ID_SET_STATUS_DISPLAY:
          this.setTitle( translateKey("dialogEnterValue") /*"Wert eingeben" */);
          this.addToPostBody( 'string type = "'+this.type+'";' );
-@@ -24363,6 +25145,9 @@
+@@ -24363,6 +25146,9 @@
  ID_AUTO_LOGIN_CONFIG     = 1018;
  ID_PROGRAM_CHOOSER       = 1019;
  ID_EDIT_SYSVAR           = 1021;
@@ -840,7 +841,7 @@
  ID_CHOOSE_LED            = 1022;
  ID_SET_OUCFM_MODE        = 1023;
  ID_SET_STATUS_DISPLAY    = 1024;
-@@ -36863,7 +37648,15 @@
+@@ -36863,7 +37649,15 @@
        SetParameters ($F('global_iface'), channel_address, 'CHANNEL_'+i);
        actions++;
      }

diff --git a/src/addon/www/config/easymodes/hb_dummybeacon_ch_master.tcl b/src/addon/www/config/easymodes/hb_dummybeacon_ch_master.tcl
@@ -178,7 +178,14 @@ proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
     append HTML_PARAMS(separate_1) "<td class=\"j_sens_param_$chn stringtable_value\">\${stringTableFdBroadcast}</td>"
     append HTML_PARAMS(separate_1) "<td class=\"j_sens_param_$chn\">[getCheckBox '$param' $ps($param) $chn $paramCount]</td>"
   append HTML_PARAMS(separate_1) "</tr>"
-
+
+  incr paramCount
+  set param "FD_AUTODISABLE"
+  append HTML_PARAMS(separate_1) "<tr class=\"j_param_$chn\">"
+    append HTML_PARAMS(separate_1) "<td class=\"j_param_$chn stringtable_value\">\${stringTableFdAutoDisable}</td>"
+    append HTML_PARAMS(separate_1) "<td class=\"j_param_$chn\">[getCheckBox '$param' $ps($param) $chn $paramCount]</td>"
+  append HTML_PARAMS(separate_1) "</tr>"
+
   append HTML_PARAMS(separate_1) "</table>"
 
   puts "<script type=\"text/javascript\">init($chn);</script>"