add HB-UNI-Sen-POOL

jp112sdl · Apr 29, 2021 · 09ed543 · 09ed543
1 parent 49a95c7
commit 09ed543
Show file tree

Hide file tree

Showing 10 changed files with 838 additions and 9 deletions.
diff --git a/patchsource/www/config/stringtable_de.txt b/patchsource/www/config/stringtable_de.txt
@@ -333,6 +333,8 @@ HB_EP_SHOW_GRID	${stringTableHbEpShowGrid}
 HB_EP_SHOW_LINE	${stringTableHbEpShowLine}
 HB_EP_TEXT_BOLD	${stringTableHbEpTextBold}
 HB_EP_TEXT_COLORED	${stringTableHbEpTextColored}
+HB_FLOW_RATE	${stringTableHbFlowrate}
+HB_FLOWRATE_QFACTOR	${stringTableHbFlowrateQFactor}
 HB_GENERIC_DIST|BATTERY_VOLTAGE	${stringTableHbGenericDistBatteryVoltage}
 HB_GENERIC_DIST|DISTANCE	${stringTableHbGenericDistDistance}
 HB_GENERIC_DIST|DISTANCE_OFFSET	${stringTableHbGenericDistDistanceOffset}
@@ -468,6 +470,8 @@ SERVO|LEVEL	${stringTableHbServoLevel}
 SERVO|OLD_LEVEL	${stringTableHbServoOldLevel}
 SERVO|RAMP_TIME	${stringTableHbServoRampTime}
 SIGNAL_LED|HB_LED_COUNT	${stringTableHbLedCount}
+TEMPERATURE_OFFSET_1	${stringTableHbTemperatureOffset1}
+TEMPERATURE_OFFSET_2	${stringTableHbTemperatureOffset2}
 UNI_PRESSURE	${stringTableUniPressure}
 WEATHER|ANEMOMETER_CALIBRATION_FACTOR	${stringTableWeatherAnemometerCalibrationFactor}
 WEATHER|ANEMOMETER_RADIUS	${stringTableWeatherAnemometerRadius}

diff --git a/patchsource/www/webui/js/lang/de/translate.lang.stringtable.js b/patchsource/www/webui/js/lang/de/translate.lang.stringtable.js
@@ -304,6 +304,10 @@ jQuery.extend(true,langJSON, {
     "stringTableHbTouchedBrightness" : "Helligkeit aktiv  ",
     "stringTableHbProgramHsvColor" : "Beleuchtung Setup",
     "stringTableHbActiveHsvColor" : "Beleuchtung Betrieb",
+    "stringTableHbTemperatureOffset1" : "Temperatur-Offset Sensor 1",
+    "stringTableHbTemperatureOffset2" : "Temperatur-Offset Sensor 2",
+    "stringTableHbFlowrate" : "Durchflussrate",
+    "stringTableHbFlowrateQFactor" : "Flow-Sensor Q-Faktor",
     "stringTableCharacteristicHalfConstant" : "halbe/konstante Leistung",
     "stringTableCharacteristicLevelLimit" : "Pegelbegrenzung",
     "stringTableCharacteristicLinSquareType" : "Ausgangskennlinie",

diff --git a/patchsource/www/webui/webui.js b/patchsource/www/webui/webui.js
@@ -226,6 +226,12 @@ DEV_DESCRIPTION['HB-UNI-Sen-PH-ORP']='universeller PH- u. ORP-Sensor';
 DEV_PATHS['HB-UNI-Sen-PH-ORP'] = new Object();
 DEV_PATHS['HB-UNI-Sen-PH-ORP']['50'] = '/config/img/devices/50/hb-uni-sen-ph-orp_thumb.png';
 DEV_PATHS['HB-UNI-Sen-PH-ORP']['250'] = '/config/img/devices/250/hb-uni-sen-ph-orp.png';
+DEV_HIGHLIGHT['HB-UNI-Sen-POOL'] = new Object();
+DEV_LIST.push('HB-UNI-Sen-POOL');
+DEV_DESCRIPTION['HB-UNI-Sen-POOL']='Pool Multidevice';
+DEV_PATHS['HB-UNI-Sen-POOL'] = new Object();
+DEV_PATHS['HB-UNI-Sen-POOL']['50'] = '/config/img/devices/50/hb-uni-sen-pool_thumb.png';
+DEV_PATHS['HB-UNI-Sen-POOL']['250'] = '/config/img/devices/250/hb-uni-sen-pool.png';
 DEV_HIGHLIGHT['HB-UNI-Sen-PF-SC'] = new Object();
 DEV_LIST.push('HB-UNI-Sen-PF-SC');
 DEV_DESCRIPTION['HB-UNI-Sen-PF-SC']='Tierklappensensor';
@@ -4374,6 +4380,8 @@ elvST['HB_EP_SHOW_HEADER'] = '${stringTableHbEpShowHeader}';
 elvST['HB_EP_SHOW_LINE'] = '${stringTableHbEpShowLine}';
 elvST['HB_EP_TEXT_BOLD'] = '${stringTableHbEpTextBold}';
 elvST['HB_EP_TEXT_COLORED'] = '${stringTableHbEpTextColored}';
+elvST['HB_FLOWRATE'] = '${stringTableHbFlowrate}';
+elvST['HB_FLOWRATE_QFACTOR'] = '${stringTableHbFlowrateQFactor}';
 elvST['HB_GENERIC_DIST|DISTANCE_OFFSET'] = '${stringTableHbGenericDistDistanceOffset}';
 elvST['HB_GENERIC_DIST|SENSOR_TYPE'] = '${stringTableHbGenericDistSensorType}';
 elvST['HB_GENERIC_DIST|TOF_DISTANCE_OFFSET'] = '${stringTableHbGenericDistTofDistanceOffset}';
@@ -4496,6 +4504,8 @@ elvST['RF_TX_POWER=TX_MID'] = '${stringTableRfTxPowerMid}';
 elvST['SERVO_MOVE0'] = '${stringTableHbServoMove0}';
 elvST['SERVO_STAY'] = '${stringTableHbServoStay}';
 elvST['SIGNAL_LED|HB_LED_COUNT'] = '${stringTableHbLedCount}';
+elvST['TEMPERATURE_OFFSET_1'] = '${stringTableHbTemperatureOffset1}';
+elvST['TEMPERATURE_OFFSET_2'] = '${stringTableHbTemperatureOffset2}';
 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
@@ -51,6 +51,7 @@ HB-UNI-Sen-PC-WM;hb-uni-sen-pc-wm
 HB-UNI-Sen-PF-SC;hb-uni-sen-pf-sc
 HB-UNI-Sen-PH;hb-uni-sen-ph
 HB-UNI-Sen-PH-ORP;hb-uni-sen-ph-orp
+HB-UNI-Sen-POOL;hb-uni-sen-pool
 HB-UNI-Sen-PRESS;hb-uni-sen-press
 HB-UNI-Sen-PRESS-SC;hb-uni-sen-press
 HB-UNI-Sen-RFID-RC;hb-uni-sen-rfid-rc

diff --git a/src/addon/firmware/rftypes/hb-uni-sen-pool.xml b/src/addon/firmware/rftypes/hb-uni-sen-pool.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,236 @@
+@@ -275,6 +275,240 @@
  CAPACITIVE_FILLING_LEVEL_SENSOR|CONTROLTEXT_CALC_FILLINGLEVEL	${stringTableCapacitiveFillingSensorTextCalcFillingLevel}
  CAPACITIVE_FILLING_LEVEL_SENSOR|CONTROLTEXT_FILLINGLEVEL	${stringTableCapacitiveFillingSensorTextFillingLevel}
  CAPACITIVE_FILLING_LEVEL_SENSOR|FILLING_LEVEL	${stringTableCapacitiveFillingSensorFillingLevel}
@@ -62,6 +62,8 @@
 +HB_EP_SHOW_LINE	${stringTableHbEpShowLine}
 +HB_EP_TEXT_BOLD	${stringTableHbEpTextBold}
 +HB_EP_TEXT_COLORED	${stringTableHbEpTextColored}
++HB_FLOW_RATE	${stringTableHbFlowrate}
++HB_FLOWRATE_QFACTOR	${stringTableHbFlowrateQFactor}
 +HB_GENERIC_DIST|BATTERY_VOLTAGE	${stringTableHbGenericDistBatteryVoltage}
 +HB_GENERIC_DIST|DISTANCE	${stringTableHbGenericDistDistance}
 +HB_GENERIC_DIST|DISTANCE_OFFSET	${stringTableHbGenericDistDistanceOffset}
@@ -197,6 +199,8 @@
 +SERVO|OLD_LEVEL	${stringTableHbServoOldLevel}
 +SERVO|RAMP_TIME	${stringTableHbServoRampTime}
 +SIGNAL_LED|HB_LED_COUNT	${stringTableHbLedCount}
++TEMPERATURE_OFFSET_1	${stringTableHbTemperatureOffset1}
++TEMPERATURE_OFFSET_2	${stringTableHbTemperatureOffset2}
 +UNI_PRESSURE	${stringTableUniPressure}
 +WEATHER|ANEMOMETER_CALIBRATION_FACTOR	${stringTableWeatherAnemometerCalibrationFactor}
 +WEATHER|ANEMOMETER_RADIUS	${stringTableWeatherAnemometerRadius}

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,201 @@
+@@ -109,6 +109,205 @@
      "stringTableCharacteristicCrossfade" : "Crossfade",
      "stringTableCharacteristicDim2Hot" : "Dim2Hot",
      "stringTableCharacteristicDim2Warm" : "Dim2Warm",
@@ -199,6 +199,10 @@
 +    "stringTableHbTouchedBrightness" : "Helligkeit aktiv  ",
 +    "stringTableHbProgramHsvColor" : "Beleuchtung Setup",
 +    "stringTableHbActiveHsvColor" : "Beleuchtung Betrieb",
++    "stringTableHbTemperatureOffset1" : "Temperatur-Offset Sensor 1",
++    "stringTableHbTemperatureOffset2" : "Temperatur-Offset Sensor 2",
++    "stringTableHbFlowrate" : "Durchflussrate",
++    "stringTableHbFlowrateQFactor" : "Flow-Sensor Q-Faktor",
      "stringTableCharacteristicHalfConstant" : "halbe/konstante Leistung",
      "stringTableCharacteristicLevelLimit" : "Pegelbegrenzung",
      "stringTableCharacteristicLinSquareType" : "Ausgangskennlinie",
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,472 @@
+@@ -88,6 +88,484 @@
  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";
@@ -142,6 +142,12 @@
 +DEV_PATHS['HB-UNI-Sen-PH-ORP'] = new Object();
 +DEV_PATHS['HB-UNI-Sen-PH-ORP']['50'] = '/config/img/devices/50/hb-uni-sen-ph-orp_thumb.png';
 +DEV_PATHS['HB-UNI-Sen-PH-ORP']['250'] = '/config/img/devices/250/hb-uni-sen-ph-orp.png';
++DEV_HIGHLIGHT['HB-UNI-Sen-POOL'] = new Object();
++DEV_LIST.push('HB-UNI-Sen-POOL');
++DEV_DESCRIPTION['HB-UNI-Sen-POOL']='Pool Multidevice';
++DEV_PATHS['HB-UNI-Sen-POOL'] = new Object();
++DEV_PATHS['HB-UNI-Sen-POOL']['50'] = '/config/img/devices/50/hb-uni-sen-pool_thumb.png';
++DEV_PATHS['HB-UNI-Sen-POOL']['250'] = '/config/img/devices/250/hb-uni-sen-pool.png';
 +DEV_HIGHLIGHT['HB-UNI-Sen-PF-SC'] = new Object();
 +DEV_LIST.push('HB-UNI-Sen-PF-SC');
 +DEV_DESCRIPTION['HB-UNI-Sen-PF-SC']='Tierklappensensor';
@@ -479,7 +485,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 +4309,211 @@
+@@ -3843,6 +4321,215 @@
  elvST['CAPACITIVE_FILLING_LEVEL_SENSOR|CASE_HIGH'] = '${stringTableCapacitiveFillingSensorCaseHeight}';
  elvST['CAPACITIVE_FILLING_LEVEL_SENSOR|CASE_LENGTH'] = '${stringTableCapacitiveFillingSensorCaseLength}';
  elvST['CAPACITIVE_FILLING_LEVEL_SENSOR|CASE_WIDTH'] = '${stringTableCapacitiveFillingSensorCaseWidth}';
@@ -542,6 +548,8 @@
 +elvST['HB_EP_SHOW_LINE'] = '${stringTableHbEpShowLine}';
 +elvST['HB_EP_TEXT_BOLD'] = '${stringTableHbEpTextBold}';
 +elvST['HB_EP_TEXT_COLORED'] = '${stringTableHbEpTextColored}';
++elvST['HB_FLOWRATE'] = '${stringTableHbFlowrate}';
++elvST['HB_FLOWRATE_QFACTOR'] = '${stringTableHbFlowrateQFactor}';
 +elvST['HB_GENERIC_DIST|DISTANCE_OFFSET'] = '${stringTableHbGenericDistDistanceOffset}';
 +elvST['HB_GENERIC_DIST|SENSOR_TYPE'] = '${stringTableHbGenericDistSensorType}';
 +elvST['HB_GENERIC_DIST|TOF_DISTANCE_OFFSET'] = '${stringTableHbGenericDistTofDistanceOffset}';
@@ -664,6 +672,8 @@
 +elvST['SERVO_MOVE0'] = '${stringTableHbServoMove0}';
 +elvST['SERVO_STAY'] = '${stringTableHbServoStay}';
 +elvST['SIGNAL_LED|HB_LED_COUNT'] = '${stringTableHbLedCount}';
++elvST['TEMPERATURE_OFFSET_1'] = '${stringTableHbTemperatureOffset1}';
++elvST['TEMPERATURE_OFFSET_2'] = '${stringTableHbTemperatureOffset2}';
 +elvST['WEATHER|ANEMOMETER_CALIBRATION_FACTOR'] = '${stringTableWeatherAnemometerCalibrationFactor}';
 +elvST['WEATHER|ANEMOMETER_RADIUS'] = '${stringTableWeatherAnemometerRadius}';
 +elvST['WEATHER|CAP_MOIST_HIGH_VALUE'] = '${stringTableHbCapMoistHighValue}';
@@ -691,7 +701,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 +14335,7 @@
+@@ -13664,7 +14351,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
@@ -700,7 +710,7 @@
      var jLine = jQuery("#textSelect_" + line),
      jCellFreeText = jQuery("#cellFreeText_"+line);
 
-@@ -13680,7 +14351,7 @@
+@@ -13680,7 +14367,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) {
@@ -709,7 +719,7 @@
        var jLine = jQuery("#textSelect_" + line),
        jPlaceHolder = jQuery("#placeHolder_"+line);
 
-@@ -13692,7 +14363,7 @@
+@@ -13692,7 +14379,7 @@
      }
    } else {
      jHeadFreeText.hide().css("display", "none");
@@ -718,7 +728,7 @@
        jQuery("#placeHolder_"+line).hide().css("display", "none");
      }
    }
-@@ -23560,6 +24231,18 @@
+@@ -23560,6 +24247,18 @@
          this.setWidth(400);
          this.setFile( "/pages/msg/setOUCFMMode.htm" );
          break;
@@ -737,7 +747,7 @@
          case ID_SET_STATUS_DISPLAY:
          this.setTitle( translateKey("dialogEnterValue") /*"Wert eingeben" */);
          this.addToPostBody( 'string type = "'+this.type+'";' );
-@@ -24363,6 +25046,8 @@
+@@ -24363,6 +25062,8 @@
  ID_AUTO_LOGIN_CONFIG     = 1018;
  ID_PROGRAM_CHOOSER       = 1019;
  ID_EDIT_SYSVAR           = 1021;

diff --git a/src/addon/www/config/img/devices/250/hb-uni-sen-pool.png b/src/addon/www/config/img/devices/250/hb-uni-sen-pool.png
diff --git a/src/addon/www/config/img/devices/50/hb-uni-sen-pool_thumb.png b/src/addon/www/config/img/devices/50/hb-uni-sen-pool_thumb.png