add HB-UNI-Sen-PH-ORP

jp112sdl · Apr 24, 2021 · 475169a · 475169a
1 parent e66edbb
commit 475169a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/patchsource/www/config/stringtable_de.txt b/patchsource/www/config/stringtable_de.txt
@@ -357,6 +357,7 @@ HB_GENERIC|ERROR=FRAM_ERROR	${stringTableHbFramError}
 HB_GENERIC|ERROR=OAPC_ERROR	${stringTableHbOapcError}
 HB_GENERIC|HB_PH	${stringTableHbPh}
 HB_GENERIC|HB_ORP	${stringTableHbOrp}
+HB_GENERIC|HB_ORPOFFSET	${stringTableHbOrpOffset}
 HB_GENERIC|HB_RPM	${stringTableHbGenericRpm}
 HB_GENERIC|HB_RPM_ERRMIN	${stringTableHBRpmErrorMin}
 HB_GENERIC|INFO_MSG=HB_OPERATION_CALIBRATION	${stringTableHBOperationCalibration}

diff --git a/patchsource/www/webui/js/lang/de/translate.lang.stringtable.js b/patchsource/www/webui/js/lang/de/translate.lang.stringtable.js
@@ -158,6 +158,7 @@ jQuery.extend(true,langJSON, {
     "stringTableHBOperationNormal" : "Normalbetrieb",
     "stringTableHbPh" : "PH-Wert",
     "stringTableHbOrp" : "ORP-Wert",
+    "stringTableHbOrpOffset" : "ORP-Offset",
     "stringTableHBPFSAngleSensorFailure4" : "Fehler Magnetwinkelsensor<br/>Error-Code: 0x30",
     "stringTableHBPFSAngleSensorFailure3" : "Fehler Magnetwinkelsensor<br/>Error-Code: 0x28",
     "stringTableHBPFSAngleSensorFailure2" : "Fehler Magnetwinkelsensor<br/>Error-Code: 0x10",

diff --git a/src/addon/firmware/rftypes/hb-uni-sen-ph-orp.xml b/src/addon/firmware/rftypes/hb-uni-sen-ph-orp.xml
@@ -73,8 +73,12 @@
            <option id="3.0K" />
            <option id="3.5K" />
          </logical>
-         <physical type="integer" interface="config" list="1" index="1.0" size="1.0" />
+         <physical type="integer" interface="config" list="1" index="5.0" size="1.0" />
        </parameter>
+       <parameter id="HB_ORPOFFSET">                                
+        <logical type="integer" min="-1000" max="1000" unit="mV" default="0"/>                      
+        <physical type="integer" signed="true" interface="config" list="1" index="1" size="4"/>
+       </parameter>  
      </paramset>
      <paramset type="VALUES" id="HB-UNI-Sen-PH_values">
        <parameter id="HB_PH" operations="read,event" control="NONE">
@@ -85,11 +89,10 @@
          <conversion type="float_integer_scale" factor="100"/>
        </parameter>
        <parameter id="HB_ORP" operations="read,event" control="NONE">
-         <logical type="integer" min="0" max="2000" unit="mV"/>
+         <logical type="integer" min="-2000" max="2000" unit="mV"/>
          <physical type="integer" interface="command" value_id="HB_ORP" no_init="true">
            <event frame="MEASURE_EVENT"/>
          </physical>
-         <conversion type="float_integer_scale" factor="1.0"/>
        </parameter>
        <parameter id="TEMPERATURE" operations="read,event">
          <logical type="float" min="-40.0" max="80.0" unit="°C" />
@@ -115,7 +118,7 @@
     <frame id="MEASURE_EVENT" direction="from_device" event="true" fixed_channel="1" type="0x53">
        <parameter type="integer" signed="true" index="9.0" size="1.7" param="TEMPERATURE" />
        <parameter type="integer" index="11.0" size="2.0" param="HB_PH" />
-       <parameter type="integer" index="13.0" size="2.0" param="HB_ORP" />
+       <parameter type="integer" signed="true" index="13.0" size="2.0" param="HB_ORP" />
     </frame>
     <frame id="INFO_MSG_EVENT" direction="from_device" allowed_receivers="BROADCAST,CENTRAL,OTHER" event="true" type="0x10" subtype="6" subtype_index="9" fixed_channel="1">
       <parameter type="integer" index="12.1" size="0.3" param="INFO_MSG"/>

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,235 @@
+@@ -275,6 +275,236 @@
  CAPACITIVE_FILLING_LEVEL_SENSOR|CONTROLTEXT_CALC_FILLINGLEVEL	${stringTableCapacitiveFillingSensorTextCalcFillingLevel}
  CAPACITIVE_FILLING_LEVEL_SENSOR|CONTROLTEXT_FILLINGLEVEL	${stringTableCapacitiveFillingSensorTextFillingLevel}
  CAPACITIVE_FILLING_LEVEL_SENSOR|FILLING_LEVEL	${stringTableCapacitiveFillingSensorFillingLevel}
@@ -86,6 +86,7 @@
 +HB_GENERIC|ERROR=OAPC_ERROR	${stringTableHbOapcError}
 +HB_GENERIC|HB_PH	${stringTableHbPh}
 +HB_GENERIC|HB_ORP	${stringTableHbOrp}
++HB_GENERIC|HB_ORPOFFSET	${stringTableHbOrpOffset}
 +HB_GENERIC|HB_RPM	${stringTableHbGenericRpm}
 +HB_GENERIC|HB_RPM_ERRMIN	${stringTableHBRpmErrorMin}
 +HB_GENERIC|INFO_MSG=HB_OPERATION_CALIBRATION	${stringTableHBOperationCalibration}

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,200 @@
+@@ -109,6 +109,201 @@
      "stringTableCharacteristicCrossfade" : "Crossfade",
      "stringTableCharacteristicDim2Hot" : "Dim2Hot",
      "stringTableCharacteristicDim2Warm" : "Dim2Warm",
@@ -53,6 +53,7 @@
 +    "stringTableHBOperationNormal" : "Normalbetrieb",
 +    "stringTableHbPh" : "PH-Wert",
 +    "stringTableHbOrp" : "ORP-Wert",
++    "stringTableHbOrpOffset" : "ORP-Offset",
 +    "stringTableHBPFSAngleSensorFailure4" : "Fehler Magnetwinkelsensor<br/>Error-Code: 0x30",
 +    "stringTableHBPFSAngleSensorFailure3" : "Fehler Magnetwinkelsensor<br/>Error-Code: 0x28",
 +    "stringTableHBPFSAngleSensorFailure2" : "Fehler Magnetwinkelsensor<br/>Error-Code: 0x10",