Skip to content

Commit 7abe576

Browse files
jp112sdljp112sdl
committed
add HB-RC-4-Dis-TH
1 parent d92ff51 commit 7abe576

File tree

8 files changed

+449
-5
lines changed

8 files changed

+449
-5
lines changed

‎patchsource/www/config/ic_common.tcl

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1080,6 +1080,7 @@ proc cmd_link_paramset2 {iface address pps_descr pps ps_type {pnr 0}} {
10801080
set hbDis75BWMainsIdentifier "HB-DIS-EP-75BW-MAINS"
10811081
set hbRc12EpcIdentifier "HB-RC-12-EP-C"
10821082
set hbRc12EpBwIdentifier "HB-RC-12-EP-BW"
1083+
set hbRc4DisThIdentifier "HB-RC-4-Dis-TH"
10831084

10841085
if { ! [catch { array set ch_descr [xmlrpc $iface_url($iface) getDeviceDescription [list string $address]] } ] } then {
10851086
set channel_type $ch_descr(TYPE)
@@ -1169,11 +1170,22 @@ proc cmd_link_paramset2 {iface address pps_descr pps ps_type {pnr 0}} {
11691170
"STRING" {
11701171
# Prüfen, ob es sich um einen Text-Parameter des Gerätes vom Typ 'HM Wireless Status Display' handelt.
11711172
# In diesem Fall wird dem Texteingabefeld eine fortlaufende Nr. vorangestellt.
1172-
if {$param_id != "TEXTLINE_1" && $param_id != "TEXTLINE_2" && $param_id != "HBTEXTLINE_1" && $param_id != "HBTEXTLINE_2" && $param_id != "HBTEXTLINE_3" && $param_id != "HBTEXTLINE_4"} {
1173+
if {$param_id != "TEXTLINE_1" && $param_id != "TEXTLINE_2" && $param_id != "HBTEXTLINE_1" && $param_id != "HBTEXTLINE_2" && $param_id != "HBTEXTLINE_3" && $param_id != "HBTEXTLINE_4" && $param_id != "HBTEXTLINE_UPPER" && $param_id != "HBTEXTLINE_LOWER" && $param_id != "HB_HEADERLINE"} {
11731174
append s "<td><input type=\"text\" name=\"$param_id\" value=\"$value\" $id $access /></td>"
11741175
} else {
11751176
puts "<script type=\"text/javascript\">load_JSFunc('/config/easymodes/MASTER_LANG/KEY_4Dis.js');</script>"
11761177
set helpText [getStatusDisplayHelp]
1178+
if {($parent_type == $hbRc4DisThIdentifier)} then {
1179+
if {$param_id == "HB_HEADERLINE"} {
1180+
append s "<td><input type=\"text\" name=\"$param_id\" maxlength=\"10\" onblur=\"encodeStringStatusDisplay('$idval', true);\" value=\"$value\" $id $access /></td>"
1181+
}
1182+
if {$param_id == "HBTEXTLINE_UPPER"} {
1183+
append s "<td><input type=\"text\" name=\"$param_id\" maxlength=\"10\" onblur=\"encodeStringStatusDisplay('$idval', true);\" value=\"$value\" $id $access /></td>"
1184+
}
1185+
if {$param_id == "HBTEXTLINE_LOWER"} {
1186+
append s "<td><input type=\"text\" name=\"$param_id\" maxlength=\"10\" onblur=\"encodeStringStatusDisplay('$idval', true);\" value=\"$value\" $id $access /></td>"
1187+
}
1188+
} else {
11771189
if {($parent_type == $hbRc12EpcIdentifier) || ($parent_type == $hbRc12EpBwIdentifier)} then {
11781190
if {$param_id == "TEXTLINE_1"} {
11791191
append s "<td><input type=\"text\" name=\"$param_id\" maxlength=\"10\" onblur=\"encodeStringStatusDisplay('$idval', true);\" value=\"$value\" $id $access /></td>"
@@ -1234,6 +1246,7 @@ proc cmd_link_paramset2 {iface address pps_descr pps ps_type {pnr 0}} {
12341246
append s "<td><img src=\"/ise/img/help.png\"/ size=\"24\" width=\"24\" onclick=\"MessageBox.show(translateKey('dialogHelpTitle'), '$helpText', '', 450, 375) ;\"></td>"
12351247
}
12361248
}
1249+
}
12371250
}
12381251
}
12391252
}

‎src/addon/firmware/rftypes/hb-rc-4-dis-th.xml

Lines changed: 237 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,237 @@
1+
<?xml version="1.0" encoding="ISO-8859-1"?>
2+
<device version="1" rx_modes="CONFIG,WAKEUP,LAZY_CONFIG" peering_sysinfo_expect_channel="false" supports_aes="true">
3+
<supported_types>
4+
<type name="HB RemoteControl with Display and Temperature measurement" id="HB-RC-4-Dis-TH" priority="2">
5+
<parameter index="9.0" size="1.0" cond_op="E" const_value="0x10"/>
6+
<parameter index="10.0" size="2.0" const_value="0xf32f"/>
7+
</type>
8+
</supported_types>
9+
<paramset type="MASTER" id="remote_dev_master">
10+
<parameter id="LOW_BAT_LIMIT">
11+
<logical type="float" min="1.0" max="5.0" default="2.4" unit="V"/>
12+
<physical type="integer" interface="config" list="0" index="18" size="1"/>
13+
<conversion type="float_integer_scale" factor="10"/>
14+
</parameter>
15+
<parameter id="HB_DISPLAYTIMEOUT">
16+
<logical type="integer" min="1" max="255" default="10" unit="s"/>
17+
<physical type="integer" interface="config" list="0" index="14.0" size="1.0"/>
18+
</parameter>
19+
</paramset>
20+
<channels>
21+
<channel index="0" type="MAINTENANCE" ui_flags="internal" class="maintenance" count="1">
22+
<paramset type="MASTER" id="maint_ch_master"/>
23+
<paramset type="VALUES" id="maint_ch_values">
24+
<parameter id="UNREACH" operations="read,event" ui_flags="service">
25+
<logical type="boolean"/>
26+
<physical type="integer" interface="internal" value_id="UNREACH"/>
27+
</parameter>
28+
<parameter id="STICKY_UNREACH" operations="read,write,event" ui_flags="service,sticky">
29+
<logical type="boolean"/>
30+
<physical type="integer" interface="internal" value_id="STICKY_UNREACH"/>
31+
</parameter>
32+
<parameter id="CONFIG_PENDING" operations="read,event" ui_flags="service">
33+
<logical type="boolean"/>
34+
<physical type="integer" interface="internal" value_id="CONFIG_PENDING"/>
35+
</parameter>
36+
<parameter id="LOWBAT" operations="read,event" ui_flags="service">
37+
<logical type="boolean"/>
38+
<physical type="integer" interface="internal" value_id="LOWBAT"/>
39+
</parameter>
40+
<parameter id="AES_KEY" operations="read" ui_flags="invisible">
41+
<logical type="integer" min="0" max="127"/>
42+
<physical type="integer" interface="internal" value_id="AES_KEY"/>
43+
</parameter>
44+
<parameter id="RSSI_DEVICE" operations="read,event">
45+
<logical type="integer"/>
46+
<physical type="integer" interface="internal" value_id="RSSI_DEVICE"/>
47+
</parameter>
48+
<parameter id="RSSI_PEER" operations="read,event">
49+
<logical type="integer"/>
50+
<physical type="integer" interface="internal" value_id="RSSI_PEER"/>
51+
</parameter>
52+
</paramset>
53+
</channel>
54+
<channel autoregister="true" index="1" type="KEY" count="4" pair_function="BA" function="A" paired="true" aes_default="false">
55+
<link_roles>
56+
<source name="SWITCH"/>
57+
<source name="KEYMATIC"/>
58+
<source name="WINMATIC"/>
59+
<source name="REMOTECONTROL_RECEIVER"/>
60+
</link_roles>
61+
<paramset type="MASTER" id="remote_ch_master">
62+
<subset ref="key_paramset"/>
63+
</paramset>
64+
<paramset type="VALUES" id="remote_ch_values">
65+
<subset ref="key_valueset"/>
66+
</paramset>
67+
<paramset type="LINK" id="remote_ch_link">
68+
<subset ref="key_linkset"/>
69+
</paramset>
70+
</channel>
71+
<channel autoregister="true" index="5" type="WEATHER" count="1">
72+
<link_roles>
73+
<source name="WEATHER_TH" />
74+
</link_roles>
75+
<paramset type="MASTER" id="ash550_ch_master" >
76+
<parameter id="HBWEA_TRANSMIT_INTERVAL">
77+
<logical type="integer" min="10" max="3600" default="60" unit="s" />
78+
<physical type="integer" interface="config" list="1" index="32" size="2" />
79+
</parameter>
80+
<parameter id="TEMPERATURE_OFFSET">
81+
<logical type="float" min="-5.0" max="5.0" unit="K" default="0"/>
82+
<physical type="integer" signed="true" interface="config" list="1" index="1" size="1"/>
83+
<conversion type="float_integer_scale" factor="10"/>
84+
</parameter>
85+
<parameter id="HB_HUMIDITY_OFFSET">
86+
<logical type="integer" min="-5" max="5" unit="%" default="0"/>
87+
<physical type="integer" signed="true" interface="config" list="1" index="2" size="1"/>
88+
</parameter>
89+
</paramset>
90+
<paramset type="VALUES" id="ash550_ch_values">
91+
<parameter id="TEMPERATURE" operations="read,event">
92+
<logical type="float" min="-40.0" max="80.0" unit="°C" />
93+
<physical type="integer" interface="command" value_id="TEMPERATURE">
94+
<event frame="WEATHER_EVENT" />
95+
</physical>
96+
<conversion type="float_integer_scale" factor="10.0" />
97+
<description>
98+
<field id="AutoconfRoles" value="WEATHER" />
99+
</description>
100+
</parameter>
101+
<parameter id="HUMIDITY" operations="read,event">
102+
<logical type="integer" min="0" max="99" unit="%" />
103+
<physical type="integer" interface="command" value_id="HUMIDITY">
104+
<event frame="WEATHER_EVENT" />
105+
</physical>
106+
<description>
107+
<field id="AutoconfRoles" value="WEATHER" />
108+
</description>
109+
</parameter>
110+
<parameter id="BATTERY_VOLTAGE" operations="read,event" control="NONE">
111+
<logical type="float" min="0.0" max="25.5" unit="V"/>
112+
<physical type="integer" interface="command" value_id="BATTERY_VOLTAGE" no_init="true">
113+
<event frame="WEATHER_EVENT"/>
114+
</physical>
115+
<conversion type="float_integer_scale" factor="10"/>
116+
</parameter>
117+
</paramset>
118+
<paramset type="LINK" id="ash550_ch_link" />
119+
</channel>
120+
</channels>
121+
<frames>
122+
<frame id="WEATHER_EVENT" direction="from_device" event="true" fixed_channel="5" type="0x70">
123+
<parameter type="integer" signed="true" index="9.0" size="1.7" param="TEMPERATURE" />
124+
<parameter type="integer" index="11.0" size="1.0" param="HUMIDITY" />
125+
<parameter type="integer" index="12.0" size="1.0" param="BATTERY_VOLTAGE"/>
126+
</frame>
127+
<frame id="KEY_EVENT_SHORT" direction="from_device" allowed_receivers="CENTRAL,BROADCAST,OTHER" event="true" type="0x40" channel_field="9:0.6">
128+
<parameter type="integer" index="9.6" size="0.1" const_value="0"/>
129+
<parameter type="integer" index="10.0" size="1.0" param="COUNTER"/>
130+
<parameter type="integer" index="10.0" size="1.0" param="TEST_COUNTER"/>
131+
</frame>
132+
<frame id="KEY_EVENT_LONG" direction="from_device" allowed_receivers="CENTRAL,BROADCAST,OTHER" event="true" type="0x40" channel_field="9:0.6">
133+
<parameter type="integer" index="9.6" size="0.1" const_value="1"/>
134+
<parameter type="integer" index="10.0" size="1.0" param="COUNTER"/>
135+
<parameter type="integer" index="10.0" size="1.0" param="TEST_COUNTER"/>
136+
</frame>
137+
<frame id="KEY_EVENT_LONG_BIDI" direction="from_device" allowed_receivers="CENTRAL,BROADCAST,OTHER" event="true" type="0x40" channel_field="9:0.6">
138+
<parameter type="integer" index="1.5" size="0.1" const_value="1"/>
139+
<parameter type="integer" index="9.6" size="0.1" const_value="1"/>
140+
<parameter type="integer" index="10.0" size="1.0" param="COUNTER"/>
141+
<parameter type="integer" index="10.0" size="1.0" param="TEST_COUNTER"/>
142+
</frame>
143+
<frame id="KEY_SIM_SHORT" direction="from_device" type="0x40" channel_field="9:0.6">
144+
<parameter type="integer" index="9.6" size="0.1" const_value="0"/>
145+
<parameter type="integer" index="9.7" size="0.1" const_value="0"/>
146+
<parameter type="integer" index="10.0" size="1.0" param="SIM_COUNTER"/>
147+
</frame>
148+
<frame id="KEY_SIM_LONG" direction="from_device" type="0x40" channel_field="9:0.6">
149+
<parameter type="integer" index="9.6" size="0.1" const_value="1"/>
150+
<parameter type="integer" index="9.7" size="0.1" const_value="0"/>
151+
<parameter type="integer" index="10.0" size="1.0" param="SIM_COUNTER"/>
152+
</frame>
153+
</frames>
154+
<paramset_defs>
155+
<paramset id="key_valueset">
156+
<parameter id="PRESS_SHORT" operations="write,event" loopback="true" control="BUTTON.SHORT" burst_suppression="0">
157+
<logical type="action"/>
158+
<physical type="integer" interface="command" value_id="COUNTER">
159+
<event frame="KEY_EVENT_SHORT" auth_violate_policy="reject"/>
160+
<set request="KEY_SIM_SHORT"/>
161+
</physical>
162+
<conversion type="action_key_counter" sim_counter="SIM_COUNTER"/>
163+
</parameter>
164+
<parameter id="PRESS_LONG" operations="write,event" loopback="true" control="BUTTON.LONG">
165+
<logical type="action"/>
166+
<physical type="integer" interface="command" value_id="COUNTER">
167+
<event frame="KEY_EVENT_LONG" auth_violate_policy="reject"/>
168+
<set request="KEY_SIM_LONG"/>
169+
</physical>
170+
<conversion type="action_key_counter" sim_counter="SIM_COUNTER"/>
171+
</parameter>
172+
<parameter id="PRESS_LONG_RELEASE" operations="event" ui_flags="internal" burst_suppression="0">
173+
<logical type="action"/>
174+
<physical type="integer" interface="command" value_id="COUNTER">
175+
<event frame="KEY_EVENT_LONG_BIDI" auth_violate_policy="reject"/>
176+
</physical>
177+
</parameter>
178+
<parameter id="PRESS_CONT" operations="event" ui_flags="internal" burst_suppression="0">
179+
<logical type="action"/>
180+
<physical type="integer" interface="command" value_id="COUNTER">
181+
<event frame="KEY_EVENT_LONG" auth_violate_policy="reject"/>
182+
</physical>
183+
<conversion type="action_key_same_counter" sim_counter="SIM_CONT_COUNTER"/>
184+
</parameter>
185+
<parameter id="INSTALL_TEST" operations="event" ui_flags="internal">
186+
<logical type="action"/>
187+
<physical type="integer" interface="command" value_id="TEST_COUNTER">
188+
<event frame="KEY_EVENT_SHORT"/>
189+
<event frame="KEY_EVENT_LONG"/>
190+
</physical>
191+
</parameter>
192+
</paramset>
193+
<paramset id="key_paramset">
194+
<parameter id="LONG_PRESS_TIME">
195+
<logical type="float" min="0.3" max="1.8" default="0.4" unit="s"/>
196+
<physical type="integer" interface="config" list="1" index="4.4" size="0.4"/>
197+
<conversion type="float_integer_scale" factor="10" offset="-0.3"/>
198+
</parameter>
199+
<parameter id="DBL_PRESS_TIME">
200+
<logical type="float" min="0.0" max="1.5" default="0.0" unit="s"/>
201+
<physical type="integer" interface="config" list="1" index="9.0" size="0.4"/>
202+
<conversion type="float_integer_scale" factor="10" offset="0.0"/>
203+
</parameter>
204+
<parameter id="AES_ACTIVE" ui_flags="internal">
205+
<logical type="boolean" default="false"/>
206+
<physical type="boolean" interface="internal" value_id="AES"/>
207+
</parameter>
208+
<parameter id="HB_EP_SHOW_HEADER">
209+
<logical type="boolean" default="false"/>
210+
<physical type="integer" interface="config" list="1" index="144.0" size="0.1"/>
211+
</parameter>
212+
<parameter id="HB_HEADERLINE">
213+
<logical type="string"/>
214+
<physical type="string" interface="config_string" list="1" index="54" size="10"/>
215+
</parameter>
216+
<parameter id="HBTEXTLINE_UPPER">
217+
<logical type="string"/>
218+
<physical type="string" interface="config_string" list="1" index="70" size="10"/>
219+
</parameter>
220+
<parameter id="HBTEXTLINE_LOWER">
221+
<logical type="string"/>
222+
<physical type="string" interface="config_string" list="1" index="86" size="10"/>
223+
</parameter>
224+
</paramset>
225+
<paramset id="key_linkset">
226+
<parameter id="PEER_NEEDS_BURST">
227+
<logical type="boolean" default="false"/>
228+
<physical type="integer" interface="config" list="4" index="1.0" size="0.1"/>
229+
</parameter>
230+
<parameter id="EXPECT_AES">
231+
<logical type="boolean" default="false"/>
232+
<physical type="integer" interface="config" list="4" index="1.7" size="0.1"/>
233+
</parameter>
234+
<enforce id="EXPECT_AES" value="$PEER.AES"/>
235+
</paramset>
236+
</paramset_defs>
237+
</device>

0 commit comments

Comments
 (0)