Merge pull request #1 from jp112sdl/develop

Develop
jp112sdl · Jul 4, 2018 · e1a3d92 · e1a3d92
2 parents f740bfc + 8c03cda
commit e1a3d92
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/src/addon/VERSION b/src/addon/VERSION
@@ -1 +1 @@
-1.4
+1.5
diff --git a/src/addon/firmware/rftypes/hb-uni-sen-wea.xml b/src/addon/firmware/rftypes/hb-uni-sen-wea.xml
@@ -72,6 +72,10 @@
           <logical type="boolean" default="false"/>
           <physical type="integer" interface="config" list="1" index="5.0" size="1"/>
          </parameter>
+         <parameter id="Send Extra Message On Gust Threshold">
+           <logical type="integer" min="0" max="255" unit="km/h" default="0" /> 
+           <physical type="integer" interface="config" list="1" index="6.0" size="1" />
+         </parameter>   
       </paramset>
       <paramset type="VALUES" id="HB-UNI-Sen-WEA_values">
         <parameter id="TEMPERATURE" operations="read,event">
@@ -104,11 +108,11 @@
           </description>
         </parameter>
         <parameter id="LUX" operations="read,event">
-          <logical type="float" min="0.00" max="65535.00" unit="Lux" />
+          <logical type="float" min="0.00" max="200000.00" unit="Lux" />
           <physical type="integer" interface="command" value_id="LUX" no_init="true">
             <event frame="WEATHER_EVENT" />
           </physical>
-          <conversion type="float_integer_scale" factor="1.0" />
+          <conversion type="float_integer_scale" factor="10" />
         </parameter>
         <parameter id="RAIN_COUNTER" operations="read,event" control="NONE">
           <logical type="float" min="0.0" max="9666.265" unit="mm"/>
@@ -174,15 +178,15 @@
       <parameter type="integer" signed="true"  index="9"  size="1.7" param="TEMPERATURE" />
       <parameter type="integer" index="11.0" size="2.0" param="AIR_PRESSURE" />
       <parameter type="integer" index="13.0" size="1.0" param="HUMIDITY" />
-      <parameter type="integer" index="14.0" size="2.0" param="LUX" />
-      <parameter type="integer" index="16.0" size="1.7" param="RAIN_COUNTER"/>
-      <parameter type="integer" index="18.0" size="1.6" param="WIND_SPEED"/>
-      <parameter type="integer" index="18.6" size="0.2" param="WIND_DIRECTION_RANGE"/>
-      <parameter type="integer" index="20.0" size="1.0" param="WIND_DIRECTION"/>
-      <parameter type="integer" index="21.0" size="2.0" param="GUST_SPEED"/>
-      <parameter type="integer" index="23.0" size="0.4" param="UVINDEX"/>      
-      <parameter type="integer" index="23.4" size="0.4" param="LIGHTNING_DISTANCE"/>      
-      <parameter type="integer" index="24.0" size="2.0" param="LIGHTNING_COUNTER"/>      
+      <parameter type="integer" index="14.0" size="3.0" param="LUX" />
+      <parameter type="integer" index="17.0" size="1.7" param="RAIN_COUNTER"/>
+      <parameter type="integer" index="19.0" size="1.6" param="WIND_SPEED"/>
+      <parameter type="integer" index="19.6" size="0.2" param="WIND_DIRECTION_RANGE"/>
+      <parameter type="integer" index="21.0" size="1.0" param="WIND_DIRECTION"/>
+      <parameter type="integer" index="22.0" size="2.0" param="GUST_SPEED"/>
+      <parameter type="integer" index="24.0" size="0.4" param="UVINDEX"/>      
+      <parameter type="integer" index="24.4" size="0.4" param="LIGHTNING_DISTANCE"/>      
+      <parameter type="integer" index="25.0" size="1.0" param="LIGHTNING_COUNTER"/>      
     </frame>
   </frames>
   <paramset_defs></paramset_defs>