Skip to content

Commit

Permalink
Merge pull request #2 from jp112sdl/dev_hb-uni-sen-wea_rain_detection
Browse files Browse the repository at this point in the history
Dev hb_uni_sen_wea rain detection
  • Loading branch information
jp112sdl authored Jul 12, 2018
2 parents 9f7f6f8 + 0b48d7f commit 25fbb98
Show file tree
Hide file tree
Showing 4 changed files with 207 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/addon/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.7
1.8
2 changes: 1 addition & 1 deletion src/addon/firmware/rftypes/hb-uni-sen-wea.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<device version="2" rx_modes="CONFIG,WAKEUP,LAZY_CONFIG" cyclic_timeout="14800">
<supported_types>
<type name="HB-UNI-Sen-WEA" id="HB-UNI-Sen-WEA">
<parameter index="9.0" size="1.0" cond_op="GE" const_value="0x11"/>
<parameter index="9.0" size="1.0" cond_op="EQ" const_value="0x11"/>
<parameter index="10.0" size="2.0" const_value="0xF1D0" />
</type>
</supported_types>
Expand Down
201 changes: 201 additions & 0 deletions src/addon/firmware/rftypes/hb-uni-sen-wea_ge_v12.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<device version="2" rx_modes="CONFIG,WAKEUP,LAZY_CONFIG" cyclic_timeout="14800">
<supported_types>
<type name="HB-UNI-Sen-WEA" id="HB-UNI-Sen-WEA">
<parameter index="9.0" size="1.0" cond_op="GE" const_value="0x12"/>
<parameter index="10.0" size="2.0" const_value="0xF1D0" />
</type>
</supported_types>
<paramset type="MASTER" id="hm_uni_sen_dev_master">
<parameter id="Sendeintervall">
<logical type="integer" min="10" max="3600" default="60" unit="s" />
<physical type="integer" interface="config" list="0" index="32" size="2" />
</parameter>
<parameter id="HBWEA_ALTITUDE">
<logical type="integer" min="0" max="10000" default="0" unit="m" />
<physical type="integer" interface="config" list="0" index="34" size="2" />
</parameter>
</paramset>
<channels>
<channel index="0" type="MAINTENANCE" ui_flags="internal" class="maintenance" count="1">
<paramset type="MASTER" id="maint_ch_master" />
<paramset type="VALUES" id="maint_ch_values">
<parameter id="UNREACH" operations="read,event" ui_flags="service">
<logical type="boolean" />
<physical type="integer" interface="internal" value_id="UNREACH" />
</parameter>
<parameter id="STICKY_UNREACH" operations="read,write,event" ui_flags="service,sticky">
<logical type="boolean" />
<physical type="integer" interface="internal" value_id="STICKY_UNREACH" />
</parameter>
<parameter id="CONFIG_PENDING" operations="read,event" ui_flags="service">
<logical type="boolean" />
<physical type="integer" interface="internal" value_id="CONFIG_PENDING" />
</parameter>
<parameter id="RSSI_DEVICE" operations="read,event">
<logical type="integer" />
<physical type="integer" interface="internal" value_id="RSSI_DEVICE" />
</parameter>
<parameter id="RSSI_PEER" operations="read,event">
<logical type="integer" />
<physical type="integer" interface="internal" value_id="RSSI_PEER" />
</parameter>
<parameter id="DEVICE_IN_BOOTLOADER" operations="read,event" ui_flags="service">
<logical type="boolean" />
<physical type="integer" interface="internal" value_id="DEVICE_IN_BOOTLOADER" />
</parameter>
<parameter id="UPDATE_PENDING" operations="read,event" ui_flags="service">
<logical type="boolean" />
<physical type="integer" interface="internal" value_id="UPDATE_PENDING" />
</parameter>
</paramset>
</channel>
<channel index="1" type="WEATHER" autoregister="true">
<link_roles>
<source name="WEATHER_CS" />
</link_roles>
<paramset type="MASTER" id="HB-UNI-Sen-WEA_master">
<parameter id="ANEMOMETER_RADIUS">
<logical type="float" min="0" max="25.5" unit="cm" default="6.5" />
<physical type="integer" interface="config" list="1" index="1.0" size="1" />
<conversion type="float_integer_scale" factor="10.0" />
</parameter>
<parameter id="ANEMOMETER_CALIBRATION_FACTOR">
<logical type="float" min="0" max="1000.0" unit="" default="1.0" />
<physical type="integer" interface="config" list="1" index="2.0" size="2" />
<conversion type="float_integer_scale" factor="10.0" />
</parameter>
<parameter id="LD_CAPACITOR">
<logical type="integer" min="0" max="120" default="80" unit="pF" />
<physical type="integer" interface="config" list="1" index="4.0" size="1" />
</parameter>
<parameter id="LD_DISTURBER_DETECTION">
<logical type="boolean" default="false"/>
<physical type="integer" interface="config" list="1" index="5.0" size="1"/>
</parameter>
<parameter id="GUST_THRESHOLD_EXTRA_MESSAGE">
<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">
<logical type="float" min="-50.0" max="120.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="AIR_PRESSURE" operations="read,event">
<logical type="float" min="500.0" max="1100.0" unit="hPa" />
<physical type="integer" interface="command" value_id="AIR_PRESSURE">
<event frame="WEATHER_EVENT" />
</physical>
<conversion type="float_integer_scale" factor="10.0" />
<description>
<field id="AutoconfRoles" value="WEATHER" />
</description>
</parameter>
<parameter id="HUMIDITY" operations="read,event">
<logical type="integer" min="1" max="99" unit="%" />
<physical type="integer" interface="command" value_id="HUMIDITY">
<event frame="WEATHER_EVENT" />
</physical>
<description>
<field id="AutoconfRoles" value="WEATHER" />
</description>
</parameter>
<parameter id="LUX" operations="read,event">
<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="10" />
</parameter>
<parameter id="RAINING" operations="read,event">
<logical type="boolean"/>
<physical type="integer" interface="command" value_id="RAINING" no_init="true">
<event frame="WEATHER_EVENT"/>
</physical>
</parameter>
<parameter id="RAIN_COUNTER" operations="read,event" control="NONE">
<logical type="float" min="0.0" max="9666.265" unit="mm"/>
<physical type="integer" interface="command" value_id="RAIN_COUNTER" no_init="true">
<event frame="WEATHER_EVENT"/>
</physical>
<conversion type="float_integer_scale" factor="1.0"/>
</parameter>
<parameter id="WIND_SPEED" operations="read,event">
<logical type="float" min="0.0" max="1638.3" unit="km/h"/>
<physical type="integer" interface="command" value_id="WIND_SPEED" no_init="true">
<event frame="WEATHER_EVENT"/>
</physical>
<conversion type="float_integer_scale" factor="10.0"/>
</parameter>
<parameter id="WIND_DIRECTION" operations="read,event">
<logical type="integer" min="0" max="355" unit="degree"/>
<physical type="integer" interface="command" value_id="WIND_DIRECTION" no_init="true">
<event frame="WEATHER_EVENT"/>
</physical>
<conversion type="integer_integer_scale" div="3"/>
</parameter>
<parameter id="WIND_DIRECTION_RANGE" operations="read,event">
<logical type="integer" min="0" max="67" unit="degree"/>
<physical type="integer" interface="command" value_id="WIND_DIRECTION_RANGE" no_init="true">
<event frame="WEATHER_EVENT"/>
</physical>
<conversion type="integer_integer_scale" div="45" mul="2"/>
</parameter>
<parameter id="GUST_SPEED" operations="read,event">
<logical type="float" min="0.0" max="1638.3" unit="km/h"/>
<physical type="integer" interface="command" value_id="GUST_SPEED" no_init="true">
<event frame="WEATHER_EVENT"/>
</physical>
<conversion type="float_integer_scale" factor="10.0"/>
</parameter>
<parameter id="UVINDEX" operations="read,event">
<logical type="integer" min="0" max="11" unit="">
</logical>
<physical type="integer" interface="command" value_id="UVINDEX" no_init="true">
<event frame="WEATHER_EVENT" />
</physical>
</parameter>
<parameter id="LIGHTNING_COUNTER" operations="read,event">
<logical type="integer" min="0" max="65535" unit=""/>
<physical type="integer" interface="command" value_id="LIGHTNING_COUNTER" no_init="true">
<event frame="WEATHER_EVENT"/>
</physical>
</parameter>
<parameter id="LIGHTNING_DISTANCE" operations="read,event">
<logical type="integer" min="0" max="45" unit="km"/>
<physical type="integer" interface="command" value_id="LIGHTNING_DISTANCE" no_init="true">
<event frame="WEATHER_EVENT"/>
</physical>
<conversion type="integer_integer_scale" div="3"/>
</parameter>
</paramset>
<paramset type="LINK" id="HB-UNI-Sen-WEA_link"></paramset>
</channel>
</channels>
<frames>
<frame id="WEATHER_EVENT" direction="from_device" event="true" fixed_channel="1" type="0x70">
<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="3.0" param="LUX" />
<parameter type="integer" index="17.7" size="0.1" param="RAINING"/>
<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>
</device>
6 changes: 4 additions & 2 deletions src/addon/uninstall_hb-uni-sen-wea
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
DEVICE="HB-UNI-Sen-WEA"
DEVICE_IMG=hb-uni-sen-wea.png
DEVICE_THUMB=hb-uni-sen-wea_thumb.png
FIRMWARE_FILE_1=hb-uni-sen-wea.xml
FIRMWARE_FILE_2=hb-uni-sen-wea_le_v10.xml
FIRMWARE_FILE_1=hb-uni-sen-wea_le_v10.xml
FIRMWARE_FILE_2=hb-uni-sen-wea.xml
FIRMWARE_FILE_3=hb-uni-sen-wea_ge_v12.xml

devdescrFile="/www/config/devdescr/DEVDB.tcl"
devdescrSearch="$DEVICE {{50 \/config\/img\/devices\/50\/$DEVICE_THUMB} {250 \/config\/img\/devices\/250\/$DEVICE_IMG}} "
Expand Down Expand Up @@ -108,5 +109,6 @@ fi

rm -f $FIRMWARE_FILE_1
rm -f $FIRMWARE_FILE_2
rm -f $FIRMWARE_FILE_3
rm -f /www/config/img/devices/250/$DEVICE_IMG
rm -f /www/config/img/devices/50/$DEVICE_THUMB

0 comments on commit 25fbb98

Please sign in to comment.