Merge pull request #12 from jp112sdl/dev

Dev
jp112sdl · May 13, 2019 · 3fa53de · 3fa53de
2 parents 8215705 + 9284f6f
commit 3fa53de
Show file tree

Hide file tree

Showing 2 changed files with 160 additions and 99 deletions.
diff --git a/src/addon/firmware/rftypes/hb-uni-sen-cap-moist-t.xml b/src/addon/firmware/rftypes/hb-uni-sen-cap-moist-t.xml
@@ -33,9 +33,11 @@
           <logical type="boolean" />
           <physical type="integer" interface="internal" value_id="CONFIG_PENDING" />
         </parameter>
-        <parameter id="LOWBAT" operations="read,event" ui_flags="service">
-          <logical type="boolean" />
-          <physical type="integer" interface="internal" value_id="LOWBAT" />
+        <parameter id="LOWBAT" operations="read,event" ui_flags="service" control="NONE">
+            <logical type="boolean" />
+            <physical type="integer" interface="command" value_id="LOWBAT">
+               <event frame="MEASURE_EV_BAT" />
+            </physical>
         </parameter>
         <parameter id="RSSI_DEVICE" operations="read,event">
           <logical type="integer" />
@@ -55,62 +57,91 @@
         </parameter>                                           
       </paramset>
     </channel>
-    <channel autoregister="true" index="1" type="WEATHER" count_from_sysinfo="23.0:0.3">
-         <link_roles>
-            <source name="WEATHER_TH" />
-         </link_roles>
-         <paramset type="MASTER" id="hb_cap_moist_master">
-          <parameter id="CAP_MOIST_HIGH_VALUE">
-            <logical type="integer" min="0" max="1023" unit="" default="830" />              
-            <physical type="integer" interface="config" list="1" index="35.0" size="2" />
-          </parameter>                                                            
-          <parameter id="CAP_MOIST_LOW_VALUE">
-            <logical type="integer" min="0" max="1023" unit="" default="420" /> 
-            <physical type="integer" interface="config" list="1" index="37.0" size="2" />
-          </parameter>    
-          <parameter id="TEMPERATURE_OFFSET">                                
-            <logical type="float" min="-5.0" max="5.0" unit="K" default="0"/>                      
-            <physical type="integer" signed="true" interface="config" list="1" index="1" size="4"/>
-            <conversion type="float_integer_scale" factor="10"/>                                
-          </parameter>       
-         </paramset>
-         <paramset type="VALUES" id="hb_cap_moist_values">
-            <parameter id="HUMIDITY" operations="read,event">
-               <logical type="integer" min="0" max="100" unit="%" />
-               <physical type="integer" interface="command" value_id="HUMIDITY">
-                  <event frame="WEATHER_EVENT" />
-               </physical>
-               <description>
-                 <field id="AutoconfRoles" value="WEATHER" />
-               </description>
-            </parameter>
-            <parameter id="TEMPERATURE" operations="read,event">
-              <logical type="float" min="-150.0" max="150.0" unit="°C" />
-              <physical type="integer" interface="command" value_id="TEMPERATURE">
-                <event frame="WEATHER_EVENT" />
-              </physical>
-              <conversion type="float_integer_scale" factor="10.0" />
-              <description>
-                <field id="AutoconfRoles" value="WEATHER" />
-              </description>
-            </parameter>
-            <parameter id="OPERATING_VOLTAGE" operations="read,event" control="NONE">
-             <logical type="float" min="0.0" max="25.5" unit=" V"/>
-             <physical type="integer" interface="command" value_id="OPERATING_VOLTAGE">
-              <event frame="WEATHER_EVENT"/>
-             </physical>
-             <conversion type="float_integer_scale" factor="10"/>
-            </parameter>
-         </paramset>
-         <paramset type="LINK" id="hb_cap_moist_link" />
-      </channel>
+    <channel autoregister="true" index="1" type="WEATHER" count="1">
+     <link_roles>
+      <source name="WEATHER_TH" />
+     </link_roles>
+     <paramset type="MASTER" id="hb_cap_moist_master">
+      <parameter id="TEMPERATURE_OFFSET">                                
+       <logical type="float" min="-5.0" max="5.0" unit="K" default="0"/>                      
+       <physical type="integer" signed="true" interface="config" list="1" index="1" size="4"/>
+       <conversion type="float_integer_scale" factor="10"/>                                
+      </parameter>  
+     </paramset>
+     <paramset type="VALUES" id="hb_cap_moist_values">
+      <parameter id="TEMPERATURE" operations="read,event">
+       <logical type="float" min="-150.0" max="150.0" unit="°C" />
+       <physical type="integer" interface="command" value_id="TEMPERATURE">
+         <event frame="MEASURE_EVENT" />
+       </physical>
+       <conversion type="float_integer_scale" factor="10.0" />
+       <description>
+         <field id="AutoconfRoles" value="WEATHER" />
+       </description>
+      </parameter>
+      <parameter id="OPERATING_VOLTAGE" operations="read,event" control="NONE">
+       <logical type="float" min="0.0" max="25.5" unit=" V"/>
+       <physical type="integer" interface="command" value_id="OPERATING_VOLTAGE">
+        <event frame="MEASURE_EVENT"/>
+       </physical>
+       <conversion type="float_integer_scale" factor="10"/>
+      </parameter>
+     </paramset>
+    </channel>
+    <channel autoregister="true" index="2" type="WEATHER" count_from_sysinfo="23.0:0.3">
+     <paramset type="MASTER" id="hb_cap_moist_master">
+      <parameter id="CAP_MOIST_HIGH_VALUE">
+       <logical type="integer" min="0" max="1023" unit="" default="830" />              
+       <physical type="integer" interface="config" list="1" index="35.0" size="2" />
+      </parameter>                                                            
+      <parameter id="CAP_MOIST_LOW_VALUE">
+       <logical type="integer" min="0" max="1023" unit="" default="420" /> 
+       <physical type="integer" interface="config" list="1" index="37.0" size="2" />
+      </parameter>         
+     </paramset>
+     <paramset type="VALUES" id="hb_cap_moist_values">
+       <parameter id="HUMIDITY" operations="read,event">
+        <logical type="integer" min="0" max="100" unit="%" />
+         <physical type="integer" interface="command" value_id="HUMIDITY">
+          <event frame="MEASURE_EVENT" />
+         </physical>
+         <description>
+          <field id="AutoconfRoles" value="WEATHER" />
+         </description>
+       </parameter>
+     </paramset>
+     <paramset type="LINK" id="hb_cap_moist_link" />
+    </channel>
    </channels>
    <frames>
-      <frame id="WEATHER_EVENT" direction="from_device" event="true" fixed_channel="1" type="0x70">
-         <parameter type="integer" index="10.0" size="1.0" param="HUMIDITY" />
-         <parameter type="integer" signed="true" index="11.0" size="2.0" param="TEMPERATURE" />
-         <parameter type="integer" index="13.0" size="1.0" param="OPERATING_VOLTAGE"/>
-      </frame>  
+     <frame id="MEASURE_EVENT" direction="from_device" event="true" type="0x53" channel_field="10.0:0.6">
+      <parameter type="integer" signed="true" index="11.0" size="2.0" param="TEMPERATURE"/>
+      <parameter type="integer" index="13.0" size="1.0" param="OPERATING_VOLTAGE"/>
+     </frame>
+     <frame id="MEASURE_EVENT" direction="from_device" event="true" type="0x53" channel_field="14.0:0.6">
+       <parameter type="integer" index="15.0" size="1.0" param="HUMIDITY"/>
+     </frame>
+     <frame id="MEASURE_EVENT" direction="from_device" event="true" type="0x53" channel_field="16.0:0.6">
+       <parameter type="integer" index="17.0" size="1.0" param="HUMIDITY"/>
+     </frame>
+     <frame id="MEASURE_EVENT" direction="from_device" event="true" type="0x53" channel_field="18.0:0.6">
+       <parameter type="integer" index="19.0" size="1.0" param="HUMIDITY"/>
+     </frame>
+     <frame id="MEASURE_EVENT" direction="from_device" event="true" type="0x53" channel_field="20.0:0.6">
+       <parameter type="integer" index="21.0" size="1.0" param="HUMIDITY"/>
+     </frame>
+     <frame id="MEASURE_EVENT" direction="from_device" event="true" type="0x53" channel_field="22.0:0.6">
+       <parameter type="integer" index="23.0" size="1.0" param="HUMIDITY"/>
+     </frame>
+     <frame id="MEASURE_EVENT" direction="from_device" event="true" type="0x53" channel_field="24.0:0.6">
+       <parameter type="integer" index="25.0" size="1.0" param="HUMIDITY"/>
+     </frame>
+     <frame id="MEASURE_EVENT" direction="from_device" event="true" type="0x53" channel_field="26.0:0.6">
+       <parameter type="integer" index="27.0" size="1.0" param="HUMIDITY"/>
+     </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" />
+     </frame>
    </frames>
   <paramset_defs />
 </device>
diff --git a/src/addon/firmware/rftypes/hb-uni-sen-cap-moist.xml b/src/addon/firmware/rftypes/hb-uni-sen-cap-moist.xml
@@ -33,9 +33,11 @@
           <logical type="boolean" />
           <physical type="integer" interface="internal" value_id="CONFIG_PENDING" />
         </parameter>
-        <parameter id="LOWBAT" operations="read,event" ui_flags="service">
-          <logical type="boolean" />
-          <physical type="integer" interface="internal" value_id="LOWBAT" />
+        <parameter id="LOWBAT" operations="read,event" ui_flags="service" control="NONE">
+            <logical type="boolean" />
+            <physical type="integer" interface="command" value_id="LOWBAT">
+               <event frame="MEASURE_EV_BAT" />
+            </physical>
         </parameter>
         <parameter id="RSSI_DEVICE" operations="read,event">
           <logical type="integer" />
@@ -55,47 +57,75 @@
         </parameter>                                           
       </paramset>
     </channel>
-    <channel autoregister="true" index="1" type="WEATHER" count_from_sysinfo="23.0:0.3">
-         <link_roles>
-            <source name="WEATHER_TH" />
-         </link_roles>
-         <paramset type="MASTER" id="hb_cap_moist_master">
-          <parameter id="CAP_MOIST_HIGH_VALUE">
-              <logical type="integer" min="0" max="1023" unit="" default="830" />              
-              <physical type="integer" interface="config" list="1" index="35.0" size="2" />
-            </parameter>                                                            
-            <parameter id="CAP_MOIST_LOW_VALUE">
-              <logical type="integer" min="0" max="1023" unit="" default="420" /> 
-              <physical type="integer" interface="config" list="1" index="37.0" size="2" />
-            </parameter>         
-         </paramset>
-         <paramset type="VALUES" id="hb_cap_moist_values">
-            <parameter id="HUMIDITY" operations="read,event">
-               <logical type="integer" min="0" max="100" unit="%" />
-               <physical type="integer" interface="command" value_id="HUMIDITY">
-                  <event frame="WEATHER_EVENT" />
-               </physical>
-               <description>
-                  <field id="AutoconfRoles" value="WEATHER" />
-               </description>
-            </parameter>
-            <parameter id="OPERATING_VOLTAGE" operations="read,event" control="NONE">
-             <logical type="float" min="0.0" max="25.5" unit=" V"/>
-             <physical type="integer" interface="command" value_id="OPERATING_VOLTAGE">
-              <event frame="WEATHER_EVENT"/>
-             </physical>
-             <conversion type="float_integer_scale" factor="10"/>
-            </parameter>
-         </paramset>
-         <paramset type="LINK" id="hb_cap_moist_link" />
-      </channel>
-
+    <channel autoregister="true" index="1" type="WEATHER" count="1">
+     <link_roles>
+      <source name="WEATHER_TH" />
+     </link_roles>
+     <paramset type="MASTER" id="hb_cap_moist_master">
+     </paramset>
+     <paramset type="VALUES" id="hb_cap_moist_values">
+      <parameter id="OPERATING_VOLTAGE" operations="read,event" control="NONE">
+       <logical type="float" min="0.0" max="25.5" unit=" V"/>
+       <physical type="integer" interface="command" value_id="OPERATING_VOLTAGE">
+        <event frame="MEASURE_EVENT"/>
+       </physical>
+       <conversion type="float_integer_scale" factor="10"/>
+      </parameter>
+     </paramset>
+    </channel>
+    <channel autoregister="true" index="2" type="WEATHER" count_from_sysinfo="23.0:0.3">
+     <paramset type="MASTER" id="hb_cap_moist_master">
+      <parameter id="CAP_MOIST_HIGH_VALUE">
+       <logical type="integer" min="0" max="1023" unit="" default="830" />              
+       <physical type="integer" interface="config" list="1" index="35.0" size="2" />
+      </parameter>                                                            
+      <parameter id="CAP_MOIST_LOW_VALUE">
+       <logical type="integer" min="0" max="1023" unit="" default="420" /> 
+       <physical type="integer" interface="config" list="1" index="37.0" size="2" />
+      </parameter>         
+     </paramset>
+     <paramset type="VALUES" id="hb_cap_moist_values">
+       <parameter id="HUMIDITY" operations="read,event">
+        <logical type="integer" min="0" max="100" unit="%" />
+         <physical type="integer" interface="command" value_id="HUMIDITY">
+          <event frame="MEASURE_EVENT" />
+         </physical>
+         <description>
+          <field id="AutoconfRoles" value="WEATHER" />
+         </description>
+       </parameter>
+     </paramset>
+     <paramset type="LINK" id="hb_cap_moist_link" />
+    </channel>
    </channels>
    <frames>
-      <frame id="WEATHER_EVENT" direction="from_device" event="true" channel_field="12" type="0x70">
-         <parameter type="integer" index="11.0" size="1.0" param="HUMIDITY" />
-         <parameter type="integer" index="13.0" size="1.0" param="OPERATING_VOLTAGE"/>
-      </frame>  
+     <frame id="MEASURE_EVENT" direction="from_device" event="true" type="0x53" channel_field="10.0:0.6">
+      <parameter type="integer" index="11.0" size="1.0" param="OPERATING_VOLTAGE"/>
+     </frame>
+     <frame id="MEASURE_EVENT" direction="from_device" event="true" type="0x53" channel_field="12.0:0.6">
+       <parameter type="integer" index="13.0" size="1.0" param="HUMIDITY"/>
+     </frame>
+     <frame id="MEASURE_EVENT" direction="from_device" event="true" type="0x53" channel_field="14.0:0.6">
+       <parameter type="integer" index="15.0" size="1.0" param="HUMIDITY"/>
+     </frame>
+     <frame id="MEASURE_EVENT" direction="from_device" event="true" type="0x53" channel_field="16.0:0.6">
+       <parameter type="integer" index="17.0" size="1.0" param="HUMIDITY"/>
+     </frame>
+     <frame id="MEASURE_EVENT" direction="from_device" event="true" type="0x53" channel_field="18.0:0.6">
+       <parameter type="integer" index="19.0" size="1.0" param="HUMIDITY"/>
+     </frame>
+     <frame id="MEASURE_EVENT" direction="from_device" event="true" type="0x53" channel_field="20.0:0.6">
+       <parameter type="integer" index="21.0" size="1.0" param="HUMIDITY"/>
+     </frame>
+     <frame id="MEASURE_EVENT" direction="from_device" event="true" type="0x53" channel_field="22.0:0.6">
+       <parameter type="integer" index="23.0" size="1.0" param="HUMIDITY"/>
+     </frame>
+     <frame id="MEASURE_EVENT" direction="from_device" event="true" type="0x53" channel_field="24.0:0.6">
+       <parameter type="integer" index="25.0" size="1.0" param="HUMIDITY"/>
+     </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" />
+     </frame>
    </frames>
   <paramset_defs />
 </device>