use native CURRENT

jp112sdl · Jul 26, 2020 · b180291 · b180291
1 parent c33ab56
commit b180291
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 21 deletions.
diff --git a/src/addon/firmware/rftypes/hb-uni-sen-current.xml b/src/addon/firmware/rftypes/hb-uni-sen-current.xml
@@ -131,9 +131,9 @@
       </paramset>
 
       <paramset type="VALUES" id="HB-UNI-Sen-CURRENT_values">
-       <parameter id="HB_CURRENT" operations="read,event" control="NONE">
+       <parameter id="CURRENT" operations="read,event" control="NONE">
          <logical type="float" min="0.0" max="655.25" unit="A"/>
-         <physical type="integer" interface="command" value_id="HB_CURRENT" no_init="true">
+         <physical type="integer" interface="command" value_id="CURRENT" no_init="true">
            <event frame="MEASURE_EVENT"/>
          </physical>
          <conversion type="float_integer_scale" factor="100"/>
@@ -173,27 +173,27 @@
      </frame>
      <frame id="MEASURE_EVENT" direction="from_device" event="true" type="0x53" channel_field="10.0:0.6">
        <parameter type="integer" index="10.7" size="0.1" param="ERROR" />
-       <parameter type="integer" index="11.0" size="2.0" param="HB_CURRENT"/>
+       <parameter type="integer" index="11.0" size="2.0" param="CURRENT"/>
      </frame>
      <frame id="MEASURE_EVENT" direction="from_device" event="true" type="0x53" channel_field="13.0:0.6">
        <parameter type="integer" index="13.7" size="0.1" param="ERROR" />
-       <parameter type="integer" index="14.0" size="2.0" param="HB_CURRENT"/>
+       <parameter type="integer" index="14.0" size="2.0" param="CURRENT"/>
      </frame>
      <frame id="MEASURE_EVENT" direction="from_device" event="true" type="0x53" channel_field="16.0:0.6">
        <parameter type="integer" index="16.7" size="0.1" param="ERROR" />
-       <parameter type="integer" index="17.0" size="2.0" param="HB_CURRENT"/>
+       <parameter type="integer" index="17.0" size="2.0" param="CURRENT"/>
      </frame>
      <frame id="MEASURE_EVENT" direction="from_device" event="true" type="0x53" channel_field="19.0:0.6">
        <parameter type="integer" index="18.7" size="0.1" param="ERROR" />
-       <parameter type="integer" index="19.0" size="2.0" param="HB_CURRENT"/>
+       <parameter type="integer" index="19.0" size="2.0" param="CURRENT"/>
      </frame>
      <frame id="MEASURE_EVENT" direction="from_device" event="true" type="0x53" channel_field="22.0:0.6">
        <parameter type="integer" index="22.7" size="0.1" param="ERROR" />
-       <parameter type="integer" index="23.0" size="2.0" param="HB_CURRENT"/>
+       <parameter type="integer" index="23.0" size="2.0" param="CURRENT"/>
      </frame>
      <frame id="MEASURE_EVENT" direction="from_device" event="true" type="0x53" channel_field="25.0:0.6">
        <parameter type="integer" index="25.7" size="0.1" param="ERROR" />
-       <parameter type="integer" index="26.0" size="2.0" param="HB_CURRENT"/>
+       <parameter type="integer" index="26.0" size="2.0" param="CURRENT"/>
      </frame>
      <frame id="MEASURE_EV_BAT" direction="from_device" event="true" type="0x53" fixed_channel="*">
        <parameter type="integer" index="9.7" size="0.1" param="LOWBAT" />

diff --git a/src/addon/install_hb-uni-sen-current b/src/addon/install_hb-uni-sen-current
@@ -33,8 +33,8 @@ fi
 
 webuiSearchBegin="elvST[[:space:]]*=[[:space:]]*new Array();"
 
-webuiInsertParam="HB_GENERIC|HB_CURRENT"
-webuiInsertValue="stringTableHBCurrent"
+webuiInsertParam="HB_GENERIC|CURRENT"
+webuiInsertValue="stringTablePowerMeterCurrent"
 webuiInsert="\n"
 webuiInsert="${webuiInsert}elvST['$webuiInsertParam'] = '\${$webuiInsertValue}';"
 if [ -z "`cat $webuiFile | grep \"$webuiInsertParam\"`" ]; then
@@ -93,8 +93,8 @@ fi
 ### Edit stringtable_de.txt ###
 stringtable_deFile="/www/config/stringtable_de.txt"
 
-stringtable_deInsert="HB_GENERIC|HB_CURRENT\t\${stringTableHBCurrent}"
-if [ -z "`cat $stringtable_deFile | grep \"HB_GENERIC|HB_CURRENT"`" ]; then
+stringtable_deInsert="HB_GENERIC|CURRENT\t\${stringTablePowerMeterCurrent}"
+if [ -z "`cat $stringtable_deFile | grep \"HB_GENERIC|CURRENT"`" ]; then
     echo -e $stringtable_deInsert >> $stringtable_deFile
 fi
 
@@ -142,11 +142,6 @@ if [ -z "`cat $translate_deFile | grep \"stringTableHBMeasureInterval\"`" ]; the
 	sed -i "s/\($translate_deSearch\)/\1$translate_deInsert/g" $translate_deFile
 fi
 
-translate_deInsert="\n    \"stringTableHBCurrent\" : \"Stromst%E4rke\","
-if [ -z "`cat $translate_deFile | grep \"stringTableHBCurrent\"`" ]; then
-	sed -i "s/\($translate_deSearch\)/\1$translate_deInsert/g" $translate_deFile
-fi
-
 translate_deInsert="\n    \"stringTableHBConditionCheckAverage\" : \"Pr%fcfung auf Grenzwerte\","
 if [ -z "`cat $translate_deFile | grep \"stringTableHBConditionCheckAverage\"`" ]; then
 	sed -i "s/\($translate_deSearch\)/\1$translate_deInsert/g" $translate_deFile

diff --git a/src/addon/uninstall_hb-uni-sen-current b/src/addon/uninstall_hb-uni-sen-current
@@ -11,7 +11,7 @@ sed -i "s/\($devdescrSearch\)//g" $devdescrFile
 
 webuiFile="/www/webui/webui.js"
 sed -i "/\($DEVICE\)/d" $webuiFile
-webuiSearch="HB_GENERIC|HB_CURRENT"
+webuiSearch="HB_GENERIC|CURRENT"
 sed -i "/\($webuiSearch\)/d" $webuiFile
 webuiSearch="HB_SAMPLE_TIME"
 sed -i "/\($webuiSearch\)/d" $webuiFile
@@ -27,7 +27,7 @@ webuiSearch="CURRENTSENSOR_FAIL"
 sed -i "/\($webuiSearch\)/d" $webuiFile
 
 stringtable_deFile="/www/config/stringtable_de.txt"
-stringtable_deSearch="HB_GENERIC|HB_CURRENT"
+stringtable_deSearch="HB_GENERIC|CURRENT"
 sed -i "/\($stringtable_deSearch\)/d" $stringtable_deFile
 stringtable_deSearch="HB_SAMPLE_TIME"
 sed -i "/\($stringtable_deSearch\)/d" $stringtable_deFile
@@ -43,8 +43,6 @@ stringtable_deSearch="CURRENTSENSOR_FAIL"
 sed -i "/\($stringtable_deSearch\)/d" $stringtable_deFile
 
 translate_deFile="/www/webui/js/lang/de/translate.lang.stringtable.js"
-translate_deSearch="stringTableHBCurrent"
-sed -i "/\(${translate_deSearch}\)/d" $translate_deFile
 translate_deSearch="stringTableHBSampleTime"
 sed -i "/\(${translate_deSearch}\)/d" $translate_deFile
 translate_deSearch="stringTableHBMeasureInterval"