add HB-GD-Sw1-THP-TS

jp112sdl · Aug 20, 2021 · 6b799b7 · 6b799b7
1 parent 1615d42
commit 6b799b7
Show file tree

Hide file tree

Showing 11 changed files with 743 additions and 10 deletions.
diff --git a/patchsource/www/config/stringtable_de.txt b/patchsource/www/config/stringtable_de.txt
@@ -481,6 +481,7 @@ SIGNAL_LED|HB_LED_COUNT	${stringTableHbLedCount}
 TEMPERATURE_OFFSET_1	${stringTableHbTemperatureOffset1}
 TEMPERATURE_OFFSET_2	${stringTableHbTemperatureOffset2}
 UNI_PRESSURE	${stringTableUniPressure}
+WEATHER|HUMIDITY_OFFSET	${stringTableHbHumidityOffset}
 WEATHER|ANEMOMETER_CALIBRATION_FACTOR	${stringTableWeatherAnemometerCalibrationFactor}
 WEATHER|ANEMOMETER_RADIUS	${stringTableWeatherAnemometerRadius}
 WEATHER|BATTERY_VOLTAGE	${stringTableWeatherBatteryVoltage}

diff --git a/patchsource/www/webui/js/lang/de/translate.lang.stringtable.js b/patchsource/www/webui/js/lang/de/translate.lang.stringtable.js
@@ -308,6 +308,7 @@ jQuery.extend(true,langJSON, {
     "stringTableHbActiveHsvColor" : "Beleuchtung Betrieb",
     "stringTableHbTemperatureOffset1" : "Temperatur-Offset Sensor 1",
     "stringTableHbTemperatureOffset2" : "Temperatur-Offset Sensor 2",
+    "stringTableHbHumidityOffset" : "Luftfeuchte-Offset",
     "stringTableHbFlowrate" : "Durchflussrate",
     "stringTableHbFlowrateQFactor" : "Flow-Sensor Q-Faktor",
     "stringTableJPWNDCTRLRunningTimeBottomTop" : "Fahrzeit von vollst%E4ndiger Kippstellung nach geschlossen",

diff --git a/patchsource/www/webui/js/lang/en/translate.lang.stringtable.js b/patchsource/www/webui/js/lang/en/translate.lang.stringtable.js
@@ -135,6 +135,7 @@ jQuery.extend(true,langJSON, {
     "stringTableWeatherGustSpeed" : "Gust-Speed",
     "stringTableHbWeaTransmitInterval" : "Transmit Interval",
     "stringTableHbWeaAltitude" : "Height Above Sea Level",
+    "stringTableHbHumidityOffset" : "humidity offset",
     "stringTableCharacteristicHalfConstant" : "half/constant power",
     "stringTableCharacteristicLevelLimit" : "Level limitation",
     "stringTableCharacteristicLinSquareType" : "Output characteristic",

diff --git a/patchsource/www/webui/webui.js b/patchsource/www/webui/webui.js
@@ -160,6 +160,12 @@ DEV_DESCRIPTION['HB-UNI-Sen-WEA']='universeller Wetterdatensensor';
 DEV_PATHS['HB-UNI-Sen-WEA'] = new Object();
 DEV_PATHS['HB-UNI-Sen-WEA']['50'] = '/config/img/devices/50/hb-uni-sen-wea_thumb.png';
 DEV_PATHS['HB-UNI-Sen-WEA']['250'] = '/config/img/devices/250/hb-uni-sen-wea.png';
+DEV_HIGHLIGHT['HB-GD-Sw1-THP-TS'] = new Object();
+DEV_LIST.push('HB-GD-Sw1-THP-TS');
+DEV_DESCRIPTION['HB-GD-Sw1-THP-TS']='Garagentor-Aktor, Kontaktschnittstelle und T/H/P-Daten';
+DEV_PATHS['HB-GD-Sw1-THP-TS'] = new Object();
+DEV_PATHS['HB-GD-Sw1-THP-TS']['50'] = '/config/img/devices/50/hb-gd-sw1-thp-ts_thumb.png';
+DEV_PATHS['HB-GD-Sw1-THP-TS']['250'] = '/config/img/devices/250/hb-gd-sw1-thp-ts.png';
 DEV_HIGHLIGHT['HB-UNI-Sen-VOLT'] = new Object();
 DEV_LIST.push('HB-UNI-Sen-VOLT');
 DEV_DESCRIPTION['HB-UNI-Sen-VOLT']='universeller Spannungsmesser';
@@ -4552,6 +4558,7 @@ elvST['JPWNDCTRL|REFERENCE_RUN_COUNTER'] = '${stringTableBlindRefRunCounter}';
 elvST['SIGNAL_LED|HB_LED_COUNT'] = '${stringTableHbLedCount}';
 elvST['TEMPERATURE_OFFSET_1'] = '${stringTableHbTemperatureOffset1}';
 elvST['TEMPERATURE_OFFSET_2'] = '${stringTableHbTemperatureOffset2}';
+elvST['WEATHER|HUMIDITY_OFFSET'] = '${stringTableHbHumidityOffset}';
 elvST['WEATHER|ANEMOMETER_CALIBRATION_FACTOR'] = '${stringTableWeatherAnemometerCalibrationFactor}';
 elvST['WEATHER|ANEMOMETER_RADIUS'] = '${stringTableWeatherAnemometerRadius}';
 elvST['WEATHER|CAP_MOIST_HIGH_VALUE'] = '${stringTableHbCapMoistHighValue}';

diff --git a/src/addon/devdb.csv b/src/addon/devdb.csv
@@ -5,6 +5,7 @@ HB-DIS-EP-42BW-MAINS;hb-dis-ep-42bw-mains
 HB-DIS-EP-75BW;hb-dis-ep-75bw
 HB-DIS-EP-75BW-MAINS;hb-dis-ep-75bw-mains
 HB-ES-PMSw1-USB;hb-es-pmsw1-usb
+HB-GD-Sw1-THP-TS;hb-gd-sw1-thp-ts
 HB-IBUT-8;hb-ibut-8
 HB-IR-Rcv-RC;hb-ir-rcv-rc
 HB-LC-Bl1-FM-BAT;7_hm-lc-bl1-fm

diff --git a/src/addon/firmware/rftypes/hb-gd-sw1-thp-ts.xml b/src/addon/firmware/rftypes/hb-gd-sw1-thp-ts.xml
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,248 @@
+@@ -275,6 +275,249 @@
  CAPACITIVE_FILLING_LEVEL_SENSOR|CONTROLTEXT_CALC_FILLINGLEVEL	${stringTableCapacitiveFillingSensorTextCalcFillingLevel}
  CAPACITIVE_FILLING_LEVEL_SENSOR|CONTROLTEXT_FILLINGLEVEL	${stringTableCapacitiveFillingSensorTextFillingLevel}
  CAPACITIVE_FILLING_LEVEL_SENSOR|FILLING_LEVEL	${stringTableCapacitiveFillingSensorFillingLevel}
@@ -210,6 +210,7 @@
 +TEMPERATURE_OFFSET_1	${stringTableHbTemperatureOffset1}
 +TEMPERATURE_OFFSET_2	${stringTableHbTemperatureOffset2}
 +UNI_PRESSURE	${stringTableUniPressure}
++WEATHER|HUMIDITY_OFFSET	${stringTableHbHumidityOffset}
 +WEATHER|ANEMOMETER_CALIBRATION_FACTOR	${stringTableWeatherAnemometerCalibrationFactor}
 +WEATHER|ANEMOMETER_RADIUS	${stringTableWeatherAnemometerRadius}
 +WEATHER|BATTERY_VOLTAGE	${stringTableWeatherBatteryVoltage}

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,209 @@
+@@ -109,6 +109,210 @@
      "stringTableCharacteristicCrossfade" : "Crossfade",
      "stringTableCharacteristicDim2Hot" : "Dim2Hot",
      "stringTableCharacteristicDim2Warm" : "Dim2Warm",
@@ -203,6 +203,7 @@
 +    "stringTableHbActiveHsvColor" : "Beleuchtung Betrieb",
 +    "stringTableHbTemperatureOffset1" : "Temperatur-Offset Sensor 1",
 +    "stringTableHbTemperatureOffset2" : "Temperatur-Offset Sensor 2",
++    "stringTableHbHumidityOffset" : "Luftfeuchte-Offset",
 +    "stringTableHbFlowrate" : "Durchflussrate",
 +    "stringTableHbFlowrateQFactor" : "Flow-Sensor Q-Faktor",
 +    "stringTableJPWNDCTRLRunningTimeBottomTop" : "Fahrzeit von vollst%E4ndiger Kippstellung nach geschlossen",

diff --git 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,522 @@
+@@ -88,6 +88,528 @@
  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";
@@ -76,6 +76,12 @@
 +DEV_PATHS['HB-UNI-Sen-WEA'] = new Object();
 +DEV_PATHS['HB-UNI-Sen-WEA']['50'] = '/config/img/devices/50/hb-uni-sen-wea_thumb.png';
 +DEV_PATHS['HB-UNI-Sen-WEA']['250'] = '/config/img/devices/250/hb-uni-sen-wea.png';
++DEV_HIGHLIGHT['HB-GD-Sw1-THP-TS'] = new Object();
++DEV_LIST.push('HB-GD-Sw1-THP-TS');
++DEV_DESCRIPTION['HB-GD-Sw1-THP-TS']='Garagentor-Aktor, Kontaktschnittstelle und T/H/P-Daten';
++DEV_PATHS['HB-GD-Sw1-THP-TS'] = new Object();
++DEV_PATHS['HB-GD-Sw1-THP-TS']['50'] = '/config/img/devices/50/hb-gd-sw1-thp-ts_thumb.png';
++DEV_PATHS['HB-GD-Sw1-THP-TS']['250'] = '/config/img/devices/250/hb-gd-sw1-thp-ts.png';
 +DEV_HIGHLIGHT['HB-UNI-Sen-VOLT'] = new Object();
 +DEV_LIST.push('HB-UNI-Sen-VOLT');
 +DEV_DESCRIPTION['HB-UNI-Sen-VOLT']='universeller Spannungsmesser';
@@ -523,7 +529,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 +4359,223 @@
+@@ -3843,6 +4365,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}';
@@ -720,6 +726,7 @@
 +elvST['SIGNAL_LED|HB_LED_COUNT'] = '${stringTableHbLedCount}';
 +elvST['TEMPERATURE_OFFSET_1'] = '${stringTableHbTemperatureOffset1}';
 +elvST['TEMPERATURE_OFFSET_2'] = '${stringTableHbTemperatureOffset2}';
++elvST['WEATHER|HUMIDITY_OFFSET'] = '${stringTableHbHumidityOffset}';
 +elvST['WEATHER|ANEMOMETER_CALIBRATION_FACTOR'] = '${stringTableWeatherAnemometerCalibrationFactor}';
 +elvST['WEATHER|ANEMOMETER_RADIUS'] = '${stringTableWeatherAnemometerRadius}';
 +elvST['WEATHER|CAP_MOIST_HIGH_VALUE'] = '${stringTableHbCapMoistHighValue}';
@@ -747,7 +754,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 +14397,7 @@
+@@ -13664,7 +14404,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
@@ -756,7 +763,7 @@
      var jLine = jQuery("#textSelect_" + line),
      jCellFreeText = jQuery("#cellFreeText_"+line);
 
-@@ -13680,7 +14413,7 @@
+@@ -13680,7 +14420,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) {
@@ -765,7 +772,7 @@
        var jLine = jQuery("#textSelect_" + line),
        jPlaceHolder = jQuery("#placeHolder_"+line);
 
-@@ -13692,7 +14425,7 @@
+@@ -13692,7 +14432,7 @@
      }
    } else {
      jHeadFreeText.hide().css("display", "none");
@@ -774,7 +781,7 @@
        jQuery("#placeHolder_"+line).hide().css("display", "none");
      }
    }
-@@ -23560,6 +24293,24 @@
+@@ -23560,6 +24300,24 @@
          this.setWidth(400);
          this.setFile( "/pages/msg/setOUCFMMode.htm" );
          break;
@@ -799,7 +806,7 @@
          case ID_SET_STATUS_DISPLAY:
          this.setTitle( translateKey("dialogEnterValue") /*"Wert eingeben" */);
          this.addToPostBody( 'string type = "'+this.type+'";' );
-@@ -24363,6 +25114,9 @@
+@@ -24363,6 +25121,9 @@
  ID_AUTO_LOGIN_CONFIG     = 1018;
  ID_PROGRAM_CHOOSER       = 1019;
  ID_EDIT_SYSVAR           = 1021;
@@ -809,7 +816,7 @@
  ID_CHOOSE_LED            = 1022;
  ID_SET_OUCFM_MODE        = 1023;
  ID_SET_STATUS_DISPLAY    = 1024;
-@@ -36863,7 +37617,15 @@
+@@ -36863,7 +37624,15 @@
        SetParameters ($F('global_iface'), channel_address, 'CHANNEL_'+i);
        actions++;
      }

diff --git a/src/addon/www/config/img/devices/250/hb-gd-sw1-thp-ts.png b/src/addon/www/config/img/devices/250/hb-gd-sw1-thp-ts.png
diff --git a/src/addon/www/config/img/devices/50/hb-gd-sw1-thp-ts_thumb.png b/src/addon/www/config/img/devices/50/hb-gd-sw1-thp-ts_thumb.png