somfy_sdn 2.0.0 → 2.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/sdn/cli/mqtt.rb +272 -254
- data/lib/sdn/cli/mqtt/read.rb +124 -122
- data/lib/sdn/client.rb +6 -4
- data/lib/sdn/version.rb +1 -1
- metadata +11 -11
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: df44cc648ee7fa0079f6067deee6b8fa488c1cbdc31acc252d9803eb1a32cdf3
|
|
4
|
+
data.tar.gz: 17cda1e8629bc58d88cb202286a7d9b5bb4d88de28d3a9c133c669796b979c60
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7915001ae78047ac6e0669d2f362bcb165db06fe6ca29c8a155150c04093044abd9f158b89ee81c836dcece92114a60a39ca139f30317791f08bb99a132b5ad1
|
|
7
|
+
data.tar.gz: 7f97633393e8daeefdf9bafb8e12f4534e1c724939b161357543df808a630815ff34dc42af5fc172dc45d09101bf9bf4bccd24fb53cb181eebb37447287bd32e
|
data/lib/sdn/cli/mqtt.rb
CHANGED
|
@@ -40,6 +40,7 @@ module SDN
|
|
|
40
40
|
@auto_discover = auto_discover
|
|
41
41
|
@motors_found = true
|
|
42
42
|
|
|
43
|
+
clear_tree(@base_topic)
|
|
43
44
|
publish_basic_attributes
|
|
44
45
|
|
|
45
46
|
@sdn = Client.new(port)
|
|
@@ -50,7 +51,7 @@ module SDN
|
|
|
50
51
|
end
|
|
51
52
|
|
|
52
53
|
def publish(topic, value)
|
|
53
|
-
@mqtt.publish("#{@base_topic}/#{topic}", value, true,
|
|
54
|
+
@mqtt.publish("#{@base_topic}/#{topic}", value, retain: true, qos: 1)
|
|
54
55
|
end
|
|
55
56
|
|
|
56
57
|
def subscribe(topic)
|
|
@@ -67,207 +68,222 @@ module SDN
|
|
|
67
68
|
end
|
|
68
69
|
end
|
|
69
70
|
|
|
70
|
-
def
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
publish("FFFFFF/$name", "Broadcast")
|
|
77
|
-
publish("FFFFFF/$type", "sdn")
|
|
78
|
-
publish("FFFFFF/$properties", "discover")
|
|
79
|
-
|
|
80
|
-
publish("FFFFFF/discover/$name", "Trigger Motor Discovery")
|
|
81
|
-
publish("FFFFFF/discover/$datatype", "enum")
|
|
82
|
-
publish("FFFFFF/discover/$format", "discover")
|
|
83
|
-
publish("FFFFFF/discover/$settable", "true")
|
|
84
|
-
publish("FFFFFF/discover/$retained", "false")
|
|
85
|
-
|
|
86
|
-
subscribe("+/discover/set")
|
|
87
|
-
subscribe("+/label/set")
|
|
88
|
-
subscribe("+/control/set")
|
|
89
|
-
subscribe("+/jog-ms/set")
|
|
90
|
-
subscribe("+/jog-pulses/set")
|
|
91
|
-
subscribe("+/position-pulses/set")
|
|
92
|
-
subscribe("+/position-percent/set")
|
|
93
|
-
subscribe("+/ip/set")
|
|
94
|
-
subscribe("+/reset/set")
|
|
95
|
-
subscribe("+/direction/set")
|
|
96
|
-
subscribe("+/up-speed/set")
|
|
97
|
-
subscribe("+/down-speed/set")
|
|
98
|
-
subscribe("+/slow-speed/set")
|
|
99
|
-
subscribe("+/up-limit/set")
|
|
100
|
-
subscribe("+/down-limit/set")
|
|
101
|
-
subscribe("+/groups/set")
|
|
102
|
-
(1..16).each do |ip|
|
|
103
|
-
subscribe("+/ip#{ip}-pulses/set")
|
|
104
|
-
subscribe("+/ip#{ip}-percent/set")
|
|
71
|
+
def clear_tree(topic)
|
|
72
|
+
@mqtt.subscribe("#{topic}/#")
|
|
73
|
+
@mqtt.unsubscribe("#{topic}/#", wait_for_ack: true)
|
|
74
|
+
while !@mqtt.queue_empty?
|
|
75
|
+
topic, value = @mqtt.get
|
|
76
|
+
@mqtt.publish(topic, nil, retain: true)
|
|
105
77
|
end
|
|
78
|
+
end
|
|
106
79
|
|
|
107
|
-
|
|
80
|
+
def publish_basic_attributes
|
|
81
|
+
@mqtt.batch_publish do
|
|
82
|
+
publish("$homie", "v4.0.0")
|
|
83
|
+
publish("$name", "Somfy SDN Network")
|
|
84
|
+
publish("$state", "init")
|
|
85
|
+
publish("$nodes", "FFFFFF")
|
|
86
|
+
|
|
87
|
+
publish("FFFFFF/$name", "Broadcast")
|
|
88
|
+
publish("FFFFFF/$type", "sdn")
|
|
89
|
+
publish("FFFFFF/$properties", "discover")
|
|
90
|
+
|
|
91
|
+
publish("FFFFFF/discover/$name", "Trigger Motor Discovery")
|
|
92
|
+
publish("FFFFFF/discover/$datatype", "enum")
|
|
93
|
+
publish("FFFFFF/discover/$format", "discover")
|
|
94
|
+
publish("FFFFFF/discover/$settable", "true")
|
|
95
|
+
publish("FFFFFF/discover/$retained", "false")
|
|
96
|
+
|
|
97
|
+
subscribe("+/discover/set")
|
|
98
|
+
subscribe("+/label/set")
|
|
99
|
+
subscribe("+/control/set")
|
|
100
|
+
subscribe("+/jog-ms/set")
|
|
101
|
+
subscribe("+/jog-pulses/set")
|
|
102
|
+
subscribe("+/position-pulses/set")
|
|
103
|
+
subscribe("+/position-percent/set")
|
|
104
|
+
subscribe("+/ip/set")
|
|
105
|
+
subscribe("+/reset/set")
|
|
106
|
+
subscribe("+/direction/set")
|
|
107
|
+
subscribe("+/up-speed/set")
|
|
108
|
+
subscribe("+/down-speed/set")
|
|
109
|
+
subscribe("+/slow-speed/set")
|
|
110
|
+
subscribe("+/up-limit/set")
|
|
111
|
+
subscribe("+/down-limit/set")
|
|
112
|
+
subscribe("+/groups/set")
|
|
113
|
+
(1..16).each do |ip|
|
|
114
|
+
subscribe("+/ip#{ip}-pulses/set")
|
|
115
|
+
subscribe("+/ip#{ip}-percent/set")
|
|
116
|
+
end
|
|
117
|
+
|
|
118
|
+
publish("$state", "ready")
|
|
119
|
+
end
|
|
108
120
|
end
|
|
109
121
|
|
|
110
122
|
def publish_motor(addr, node_type)
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
123
|
+
motor = nil
|
|
124
|
+
|
|
125
|
+
@mqtt.batch_publish do
|
|
126
|
+
publish("#{addr}/$name", addr)
|
|
127
|
+
publish("#{addr}/$type", node_type.to_s)
|
|
128
|
+
properties = %w{
|
|
129
|
+
discover
|
|
130
|
+
label
|
|
131
|
+
state
|
|
132
|
+
control
|
|
133
|
+
jog-ms
|
|
134
|
+
jog-pulses
|
|
135
|
+
position-pulses
|
|
136
|
+
position-percent
|
|
137
|
+
ip
|
|
138
|
+
down-limit
|
|
139
|
+
groups
|
|
140
|
+
last-direction
|
|
141
|
+
} + (1..16).map { |ip| ["ip#{ip}-pulses", "ip#{ip}-percent"] }.flatten
|
|
142
|
+
|
|
143
|
+
unless node_type == :st50ilt2
|
|
144
|
+
properties.concat %w{
|
|
145
|
+
reset
|
|
146
|
+
last-action-source
|
|
147
|
+
last-action-cause
|
|
148
|
+
up-limit
|
|
149
|
+
direction
|
|
150
|
+
up-speed
|
|
151
|
+
down-speed
|
|
152
|
+
slow-speed
|
|
153
|
+
}
|
|
154
|
+
end
|
|
140
155
|
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
156
|
+
publish("#{addr}/$properties", properties.join(","))
|
|
157
|
+
|
|
158
|
+
publish("#{addr}/discover/$name", "Trigger Motor Discovery")
|
|
159
|
+
publish("#{addr}/discover/$datatype", "enum")
|
|
160
|
+
publish("#{addr}/discover/$format", "discover")
|
|
161
|
+
publish("#{addr}/discover/$settable", "true")
|
|
162
|
+
publish("#{addr}/discover/$retained", "false")
|
|
163
|
+
|
|
164
|
+
publish("#{addr}/label/$name", "Node label")
|
|
165
|
+
publish("#{addr}/label/$datatype", "string")
|
|
166
|
+
publish("#{addr}/label/$settable", "true")
|
|
167
|
+
|
|
168
|
+
publish("#{addr}/state/$name", "Current state of the motor")
|
|
169
|
+
publish("#{addr}/state/$datatype", "enum")
|
|
170
|
+
publish("#{addr}/state/$format", Message::PostMotorStatus::STATE.keys.join(','))
|
|
171
|
+
|
|
172
|
+
publish("#{addr}/control/$name", "Control motor")
|
|
173
|
+
publish("#{addr}/control/$datatype", "enum")
|
|
174
|
+
publish("#{addr}/control/$format", "up,down,stop,wink,next_ip,previous_ip,refresh")
|
|
175
|
+
publish("#{addr}/control/$settable", "true")
|
|
176
|
+
publish("#{addr}/control/$retained", "false")
|
|
177
|
+
|
|
178
|
+
publish("#{addr}/jog-ms/$name", "Jog motor by ms")
|
|
179
|
+
publish("#{addr}/jog-ms/$datatype", "integer")
|
|
180
|
+
publish("#{addr}/jog-ms/$format", "-65535:65535")
|
|
181
|
+
publish("#{addr}/jog-ms/$unit", "ms")
|
|
182
|
+
publish("#{addr}/jog-ms/$settable", "true")
|
|
183
|
+
publish("#{addr}/jog-ms/$retained", "false")
|
|
184
|
+
|
|
185
|
+
publish("#{addr}/jog-pulses/$name", "Jog motor by pulses")
|
|
186
|
+
publish("#{addr}/jog-pulses/$datatype", "integer")
|
|
187
|
+
publish("#{addr}/jog-pulses/$format", "-65535:65535")
|
|
188
|
+
publish("#{addr}/jog-pulses/$unit", "pulses")
|
|
189
|
+
publish("#{addr}/jog-pulses/$settable", "true")
|
|
190
|
+
publish("#{addr}/jog-pulses/$retained", "false")
|
|
191
|
+
|
|
192
|
+
publish("#{addr}/position-percent/$name", "Position (in %)")
|
|
193
|
+
publish("#{addr}/position-percent/$datatype", "integer")
|
|
194
|
+
publish("#{addr}/position-percent/$format", "0:100")
|
|
195
|
+
publish("#{addr}/position-percent/$unit", "%")
|
|
196
|
+
publish("#{addr}/position-percent/$settable", "true")
|
|
197
|
+
|
|
198
|
+
publish("#{addr}/position-pulses/$name", "Position from up limit (in pulses)")
|
|
199
|
+
publish("#{addr}/position-pulses/$datatype", "integer")
|
|
200
|
+
publish("#{addr}/position-pulses/$format", "0:65535")
|
|
201
|
+
publish("#{addr}/position-pulses/$unit", "pulses")
|
|
202
|
+
publish("#{addr}/position-pulses/$settable", "true")
|
|
203
|
+
|
|
204
|
+
publish("#{addr}/ip/$name", "Intermediate Position")
|
|
205
|
+
publish("#{addr}/ip/$datatype", "integer")
|
|
206
|
+
publish("#{addr}/ip/$format", "1:16")
|
|
207
|
+
publish("#{addr}/ip/$settable", "true")
|
|
208
|
+
publish("#{addr}/ip/$retained", "false") if node_type == :st50ilt2
|
|
209
|
+
|
|
210
|
+
publish("#{addr}/down-limit/$name", "Down limit")
|
|
211
|
+
publish("#{addr}/down-limit/$datatype", "integer")
|
|
212
|
+
publish("#{addr}/down-limit/$format", "0:65535")
|
|
213
|
+
publish("#{addr}/down-limit/$unit", "pulses")
|
|
214
|
+
publish("#{addr}/down-limit/$settable", "true")
|
|
215
|
+
|
|
216
|
+
publish("#{addr}/last-direction/$name", "Direction of last motion")
|
|
217
|
+
publish("#{addr}/last-direction/$datatype", "enum")
|
|
218
|
+
publish("#{addr}/last-direction/$format", Message::PostMotorStatus::DIRECTION.keys.join(','))
|
|
219
|
+
|
|
220
|
+
unless node_type == :st50ilt2
|
|
221
|
+
publish("#{addr}/reset/$name", "Recall factory settings")
|
|
222
|
+
publish("#{addr}/reset/$datatype", "enum")
|
|
223
|
+
publish("#{addr}/reset/$format", Message::SetFactoryDefault::RESET.keys.join(','))
|
|
224
|
+
publish("#{addr}/reset/$settable", "true")
|
|
225
|
+
publish("#{addr}/reset/$retained", "false")
|
|
226
|
+
|
|
227
|
+
publish("#{addr}/last-action-source/$name", "Source of last action")
|
|
228
|
+
publish("#{addr}/last-action-source/$datatype", "enum")
|
|
229
|
+
publish("#{addr}/last-action-source/$format", Message::PostMotorStatus::SOURCE.keys.join(','))
|
|
230
|
+
|
|
231
|
+
publish("#{addr}/last-action-cause/$name", "Cause of last action")
|
|
232
|
+
publish("#{addr}/last-action-cause/$datatype", "enum")
|
|
233
|
+
publish("#{addr}/last-action-cause/$format", Message::PostMotorStatus::CAUSE.keys.join(','))
|
|
234
|
+
|
|
235
|
+
publish("#{addr}/up-limit/$name", "Up limit (always = 0)")
|
|
236
|
+
publish("#{addr}/up-limit/$datatype", "integer")
|
|
237
|
+
publish("#{addr}/up-limit/$format", "0:65535")
|
|
238
|
+
publish("#{addr}/up-limit/$unit", "pulses")
|
|
239
|
+
publish("#{addr}/up-limit/$settable", "true")
|
|
240
|
+
|
|
241
|
+
publish("#{addr}/direction/$name", "Motor rotation direction")
|
|
242
|
+
publish("#{addr}/direction/$datatype", "enum")
|
|
243
|
+
publish("#{addr}/direction/$format", "standard,reversed")
|
|
244
|
+
publish("#{addr}/direction/$settable", "true")
|
|
245
|
+
|
|
246
|
+
publish("#{addr}/up-speed/$name", "Up speed")
|
|
247
|
+
publish("#{addr}/up-speed/$datatype", "integer")
|
|
248
|
+
publish("#{addr}/up-speed/$format", "6:28")
|
|
249
|
+
publish("#{addr}/up-speed/$unit", "RPM")
|
|
250
|
+
publish("#{addr}/up-speed/$settable", "true")
|
|
251
|
+
|
|
252
|
+
publish("#{addr}/down-speed/$name", "Down speed, always = Up speed")
|
|
253
|
+
publish("#{addr}/down-speed/$datatype", "integer")
|
|
254
|
+
publish("#{addr}/down-speed/$format", "6:28")
|
|
255
|
+
publish("#{addr}/down-speed/$unit", "RPM")
|
|
256
|
+
publish("#{addr}/down-speed/$settable", "true")
|
|
257
|
+
|
|
258
|
+
publish("#{addr}/slow-speed/$name", "Slow speed")
|
|
259
|
+
publish("#{addr}/slow-speed/$datatype", "integer")
|
|
260
|
+
publish("#{addr}/slow-speed/$format", "6:28")
|
|
261
|
+
publish("#{addr}/slow-speed/$unit", "RPM")
|
|
262
|
+
publish("#{addr}/slow-speed/$settable", "true")
|
|
263
|
+
end
|
|
249
264
|
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
265
|
+
publish("#{addr}/groups/$name", "Group Memberships (comma separated, address must start 0101xx)")
|
|
266
|
+
publish("#{addr}/groups/$datatype", "string")
|
|
267
|
+
publish("#{addr}/groups/$settable", "true")
|
|
268
|
+
|
|
269
|
+
(1..16).each do |ip|
|
|
270
|
+
publish("#{addr}/ip#{ip}-pulses/$name", "Intermediate Position #{ip}")
|
|
271
|
+
publish("#{addr}/ip#{ip}-pulses/$datatype", "integer")
|
|
272
|
+
publish("#{addr}/ip#{ip}-pulses/$format", "0:65535")
|
|
273
|
+
publish("#{addr}/ip#{ip}-pulses/$unit", "pulses")
|
|
274
|
+
publish("#{addr}/ip#{ip}-pulses/$settable", "true")
|
|
275
|
+
|
|
276
|
+
publish("#{addr}/ip#{ip}-percent/$name", "Intermediate Position #{ip}")
|
|
277
|
+
publish("#{addr}/ip#{ip}-percent/$datatype", "integer")
|
|
278
|
+
publish("#{addr}/ip#{ip}-percent/$format", "0:100")
|
|
279
|
+
publish("#{addr}/ip#{ip}-percent/$unit", "%")
|
|
280
|
+
publish("#{addr}/ip#{ip}-percent/$settable", "true")
|
|
281
|
+
end
|
|
267
282
|
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
283
|
+
motor = Motor.new(self, addr, node_type)
|
|
284
|
+
@motors[addr] = motor
|
|
285
|
+
publish("$nodes", (["FFFFFF"] + @motors.keys.sort + @groups.keys.sort).join(","))
|
|
286
|
+
end
|
|
271
287
|
|
|
272
288
|
sdn_addr = Message.parse_address(addr)
|
|
273
289
|
@mutex.synchronize do
|
|
@@ -302,66 +318,68 @@ module SDN
|
|
|
302
318
|
group = @groups[addr]
|
|
303
319
|
return group if group
|
|
304
320
|
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
321
|
+
@mqtt.batch_publish do
|
|
322
|
+
publish("#{addr}/$name", addr)
|
|
323
|
+
publish("#{addr}/$type", "Shade Group")
|
|
324
|
+
publish("#{addr}/$properties", "discover,control,jog-ms,jog-pulses,position-pulses,position-percent,ip,reset,state,last-direction,motors")
|
|
325
|
+
|
|
326
|
+
publish("#{addr}/discover/$name", "Trigger Motor Discovery")
|
|
327
|
+
publish("#{addr}/discover/$datatype", "enum")
|
|
328
|
+
publish("#{addr}/discover/$format", "discover")
|
|
329
|
+
publish("#{addr}/discover/$settable", "true")
|
|
330
|
+
publish("#{addr}/discover/$retained", "false")
|
|
331
|
+
|
|
332
|
+
publish("#{addr}/control/$name", "Control motors")
|
|
333
|
+
publish("#{addr}/control/$datatype", "enum")
|
|
334
|
+
publish("#{addr}/control/$format", "up,down,stop,wink,next_ip,previous_ip,refresh")
|
|
335
|
+
publish("#{addr}/control/$settable", "true")
|
|
336
|
+
publish("#{addr}/control/$retained", "false")
|
|
337
|
+
|
|
338
|
+
publish("#{addr}/jog-ms/$name", "Jog motors by ms")
|
|
339
|
+
publish("#{addr}/jog-ms/$datatype", "integer")
|
|
340
|
+
publish("#{addr}/jog-ms/$format", "-65535:65535")
|
|
341
|
+
publish("#{addr}/jog-ms/$unit", "ms")
|
|
342
|
+
publish("#{addr}/jog-ms/$settable", "true")
|
|
343
|
+
publish("#{addr}/jog-ms/$retained", "false")
|
|
344
|
+
|
|
345
|
+
publish("#{addr}/jog-pulses/$name", "Jog motors by pulses")
|
|
346
|
+
publish("#{addr}/jog-pulses/$datatype", "integer")
|
|
347
|
+
publish("#{addr}/jog-pulses/$format", "-65535:65535")
|
|
348
|
+
publish("#{addr}/jog-pulses/$unit", "pulses")
|
|
349
|
+
publish("#{addr}/jog-pulses/$settable", "true")
|
|
350
|
+
publish("#{addr}/jog-pulses/$retained", "false")
|
|
351
|
+
|
|
352
|
+
publish("#{addr}/position-pulses/$name", "Position from up limit (in pulses)")
|
|
353
|
+
publish("#{addr}/position-pulses/$datatype", "integer")
|
|
354
|
+
publish("#{addr}/position-pulses/$format", "0:65535")
|
|
355
|
+
publish("#{addr}/position-pulses/$unit", "pulses")
|
|
356
|
+
publish("#{addr}/position-pulses/$settable", "true")
|
|
357
|
+
|
|
358
|
+
publish("#{addr}/position-percent/$name", "Position (in %)")
|
|
359
|
+
publish("#{addr}/position-percent/$datatype", "integer")
|
|
360
|
+
publish("#{addr}/position-percent/$format", "0:100")
|
|
361
|
+
publish("#{addr}/position-percent/$unit", "%")
|
|
362
|
+
publish("#{addr}/position-percent/$settable", "true")
|
|
363
|
+
|
|
364
|
+
publish("#{addr}/ip/$name", "Intermediate Position")
|
|
365
|
+
publish("#{addr}/ip/$datatype", "integer")
|
|
366
|
+
publish("#{addr}/ip/$format", "1:16")
|
|
367
|
+
publish("#{addr}/ip/$settable", "true")
|
|
368
|
+
|
|
369
|
+
publish("#{addr}/state/$name", "State of the motors")
|
|
370
|
+
publish("#{addr}/state/$datatype", "enum")
|
|
371
|
+
publish("#{addr}/state/$format", Message::PostMotorStatus::STATE.keys.join(',') + ",mixed")
|
|
372
|
+
|
|
373
|
+
publish("#{addr}/last-direction/$name", "Direction of last motion")
|
|
374
|
+
publish("#{addr}/last-direction/$datatype", "enum")
|
|
375
|
+
publish("#{addr}/last-direction/$format", Message::PostMotorStatus::DIRECTION.keys.join(',') + ",mixed")
|
|
376
|
+
|
|
377
|
+
publish("#{addr}/motors/$name", "Comma separated motor addresses that are members of this group")
|
|
378
|
+
publish("#{addr}/motors/$datatype", "string")
|
|
379
|
+
|
|
380
|
+
group = @groups[addr] = Group.new(self, addr)
|
|
381
|
+
publish("$nodes", (["FFFFFF"] + @motors.keys.sort + @groups.keys.sort).join(","))
|
|
382
|
+
end
|
|
365
383
|
group
|
|
366
384
|
end
|
|
367
385
|
end
|
data/lib/sdn/cli/mqtt/read.rb
CHANGED
|
@@ -6,144 +6,146 @@ module SDN
|
|
|
6
6
|
loop do
|
|
7
7
|
begin
|
|
8
8
|
@sdn.receive do |message|
|
|
9
|
-
|
|
9
|
+
@mqtt.batch_publish do
|
|
10
|
+
SDN.logger.info "read #{message.inspect}"
|
|
10
11
|
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
end
|
|
18
|
-
|
|
19
|
-
follow_ups = []
|
|
20
|
-
case message
|
|
21
|
-
when Message::PostNodeLabel
|
|
22
|
-
if (motor.publish(:label, message.label))
|
|
23
|
-
publish("#{motor.addr}/$name", message.label)
|
|
12
|
+
src = Message.print_address(message.src)
|
|
13
|
+
# ignore the UAI Plus and ourselves
|
|
14
|
+
if src != '7F.7F.7F' && !Message.is_group_address?(message.src) && !(motor = @motors[src.gsub('.', '')])
|
|
15
|
+
SDN.logger.info "found new motor #{src}"
|
|
16
|
+
@motors_found = true
|
|
17
|
+
motor = publish_motor(src.gsub('.', ''), message.node_type)
|
|
24
18
|
end
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
if motor.
|
|
30
|
-
motor.
|
|
31
|
-
motor.publish(:state, :stopped)
|
|
32
|
-
else
|
|
33
|
-
motor.publish(:state, :running)
|
|
34
|
-
if motor.position_pulses && motor.position_pulses != message.position_pulses
|
|
35
|
-
motor.publish(:last_direction, motor.position_pulses < message.position_pulses ? :down : :up)
|
|
36
|
-
end
|
|
37
|
-
follow_ups << Message::ILT2::GetMotorPosition.new(message.src)
|
|
19
|
+
|
|
20
|
+
follow_ups = []
|
|
21
|
+
case message
|
|
22
|
+
when Message::PostNodeLabel
|
|
23
|
+
if (motor.publish(:label, message.label))
|
|
24
|
+
publish("#{motor.addr}/$name", message.label)
|
|
38
25
|
end
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
26
|
+
when Message::PostMotorPosition,
|
|
27
|
+
Message::ILT2::PostMotorPosition
|
|
28
|
+
if message.is_a?(Message::ILT2::PostMotorPosition)
|
|
29
|
+
# keep polling while it's still moving; check prior two positions
|
|
30
|
+
if motor.position_pulses == message.position_pulses &&
|
|
31
|
+
motor.last_position_pulses == message.position_pulses
|
|
32
|
+
motor.publish(:state, :stopped)
|
|
33
|
+
else
|
|
34
|
+
motor.publish(:state, :running)
|
|
35
|
+
if motor.position_pulses && motor.position_pulses != message.position_pulses
|
|
36
|
+
motor.publish(:last_direction, motor.position_pulses < message.position_pulses ? :down : :up)
|
|
37
|
+
end
|
|
38
|
+
follow_ups << Message::ILT2::GetMotorPosition.new(message.src)
|
|
39
|
+
end
|
|
40
|
+
motor.last_position_pulses = motor.position_pulses
|
|
41
|
+
ip = (1..16).find do |i|
|
|
42
|
+
# divide by 5 for some leniency
|
|
43
|
+
motor["ip#{i}_pulses"].to_i / 5 == message.position_pulses / 5
|
|
44
|
+
end
|
|
45
|
+
motor.publish(:ip, ip)
|
|
43
46
|
end
|
|
44
|
-
motor.publish(:
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
positions_pulses = group.motor_objects.map(&:position_pulses)
|
|
52
|
-
ips = group.motor_objects.map(&:ip)
|
|
47
|
+
motor.publish(:position_percent, message.position_percent)
|
|
48
|
+
motor.publish(:position_pulses, message.position_pulses)
|
|
49
|
+
motor.publish(:ip, message.ip) if message.respond_to?(:ip)
|
|
50
|
+
motor.group_objects.each do |group|
|
|
51
|
+
positions_percent = group.motor_objects.map(&:position_percent)
|
|
52
|
+
positions_pulses = group.motor_objects.map(&:position_pulses)
|
|
53
|
+
ips = group.motor_objects.map(&:ip)
|
|
53
54
|
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
55
|
+
position_percent = nil
|
|
56
|
+
# calculate an average, but only if we know a position for
|
|
57
|
+
# every shade
|
|
58
|
+
if !positions_percent.include?(:nil) && !positions_percent.include?(nil)
|
|
59
|
+
position_percent = positions_percent.inject(&:+) / positions_percent.length
|
|
60
|
+
end
|
|
60
61
|
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
62
|
+
position_pulses = nil
|
|
63
|
+
if !positions_pulses.include?(:nil) && !positions_pulses.include?(nil)
|
|
64
|
+
position_pulses = positions_pulses.inject(&:+) / positions_pulses.length
|
|
65
|
+
end
|
|
65
66
|
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
67
|
+
ip = nil
|
|
68
|
+
ip = ips.first if ips.uniq.length == 1
|
|
69
|
+
ip = nil if ip == :nil
|
|
69
70
|
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
71
|
+
group.publish(:position_percent, position_percent)
|
|
72
|
+
group.publish(:position_pulses, position_pulses)
|
|
73
|
+
group.publish(:ip, ip)
|
|
74
|
+
end
|
|
75
|
+
when Message::PostMotorStatus
|
|
76
|
+
if message.state == :running || motor.state == :running ||
|
|
77
|
+
# if it's explicitly stopped, but we didn't ask it to, it's probably
|
|
78
|
+
# changing directions so keep querying
|
|
79
|
+
(message.state == :stopped &&
|
|
80
|
+
message.last_action_cause == :explicit_command &&
|
|
81
|
+
!(motor.last_action == Message::Stop || motor.last_action.nil?))
|
|
82
|
+
follow_ups << Message::GetMotorStatus.new(message.src)
|
|
83
|
+
end
|
|
84
|
+
# this will do one more position request after it stopped
|
|
85
|
+
follow_ups << Message::GetMotorPosition.new(message.src)
|
|
86
|
+
motor.publish(:state, message.state)
|
|
87
|
+
motor.publish(:last_direction, message.last_direction)
|
|
88
|
+
motor.publish(:last_action_source, message.last_action_source)
|
|
89
|
+
motor.publish(:last_action_cause, message.last_action_cause)
|
|
90
|
+
motor.group_objects.each do |group|
|
|
91
|
+
states = group.motor_objects.map(&:state).uniq
|
|
92
|
+
state = states.length == 1 ? states.first : 'mixed'
|
|
93
|
+
group.publish(:state, state)
|
|
93
94
|
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
95
|
+
directions = group.motor_objects.map(&:last_direction).uniq
|
|
96
|
+
direction = directions.length == 1 ? directions.first : 'mixed'
|
|
97
|
+
group.publish(:last_direction, direction)
|
|
98
|
+
end
|
|
99
|
+
when Message::PostMotorLimits
|
|
100
|
+
motor.publish(:up_limit, message.up_limit)
|
|
101
|
+
motor.publish(:down_limit, message.down_limit)
|
|
102
|
+
when Message::ILT2::PostMotorSettings
|
|
103
|
+
motor.publish(:down_limit, message.limit)
|
|
104
|
+
when Message::PostMotorDirection
|
|
105
|
+
motor.publish(:direction, message.direction)
|
|
106
|
+
when Message::PostMotorRollingSpeed
|
|
107
|
+
motor.publish(:up_speed, message.up_speed)
|
|
108
|
+
motor.publish(:down_speed, message.down_speed)
|
|
109
|
+
motor.publish(:slow_speed, message.slow_speed)
|
|
110
|
+
when Message::PostMotorIP,
|
|
111
|
+
Message::ILT2::PostMotorIP
|
|
112
|
+
motor.publish(:"ip#{message.ip}_pulses", message.position_pulses)
|
|
113
|
+
if message.respond_to?(:position_percent)
|
|
114
|
+
motor.publish(:"ip#{message.ip}_percent", message.position_percent)
|
|
115
|
+
elsif motor.down_limit
|
|
116
|
+
motor.publish(:"ip#{message.ip}_percent", message.position_pulses.to_f / motor.down_limit * 100)
|
|
117
|
+
end
|
|
118
|
+
when Message::PostGroupAddr
|
|
119
|
+
motor.add_group(message.group_index, message.group_address)
|
|
116
120
|
end
|
|
117
|
-
when Message::PostGroupAddr
|
|
118
|
-
motor.add_group(message.group_index, message.group_address)
|
|
119
|
-
end
|
|
120
121
|
|
|
121
|
-
|
|
122
|
-
|
|
122
|
+
@mutex.synchronize do
|
|
123
|
+
prior_message_to_group = Message.is_group_address?(@prior_message&.message&.src) if @prior_message
|
|
123
124
|
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
125
|
+
correct_response = @response_pending && @prior_message&.message&.class&.expected_response?(message)
|
|
126
|
+
correct_response = false if !prior_message_to_group && message.src != @prior_message&.message&.dest
|
|
127
|
+
correct_response = false if prior_message_to_group && message.dest != @prior_message&.message&.src
|
|
127
128
|
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
129
|
+
if prior_message_to_group && correct_response
|
|
130
|
+
@pending_group_motors.delete(Message.print_address(message.src).gsub('.', ''))
|
|
131
|
+
correct_response = false unless @pending_group_motors.empty?
|
|
132
|
+
end
|
|
132
133
|
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
134
|
+
signal = correct_response || !follow_ups.empty?
|
|
135
|
+
@response_pending = @broadcast_pending if correct_response
|
|
136
|
+
follow_ups.each do |follow_up|
|
|
137
|
+
@queues[1].push(MessageAndRetries.new(follow_up, 5, 1)) unless @queues[1].any? { |mr| mr.message == follow_up }
|
|
138
|
+
end
|
|
139
|
+
@cond.signal if signal
|
|
137
140
|
end
|
|
138
|
-
|
|
141
|
+
rescue EOFError
|
|
142
|
+
SDN.logger.fatal "EOF reading"
|
|
143
|
+
exit 2
|
|
144
|
+
rescue MalformedMessage => e
|
|
145
|
+
SDN.logger.warn "ignoring malformed message: #{e}" unless e.to_s =~ /issing data/
|
|
146
|
+
rescue => e
|
|
147
|
+
SDN.logger.error "got garbage: #{e}; #{e.backtrace}"
|
|
139
148
|
end
|
|
140
|
-
rescue EOFError
|
|
141
|
-
SDN.logger.fatal "EOF reading"
|
|
142
|
-
exit 2
|
|
143
|
-
rescue MalformedMessage => e
|
|
144
|
-
SDN.logger.warn "ignoring malformed message: #{e}" unless e.to_s =~ /issing data/
|
|
145
|
-
rescue => e
|
|
146
|
-
SDN.logger.error "got garbage: #{e}; #{e.backtrace}"
|
|
147
149
|
end
|
|
148
150
|
end
|
|
149
151
|
end
|
data/lib/sdn/client.rb
CHANGED
|
@@ -9,10 +9,12 @@ module SDN
|
|
|
9
9
|
TCPSocket.new(uri.host, uri.port)
|
|
10
10
|
elsif uri.scheme == "telnet" || uri.scheme == "rfc2217"
|
|
11
11
|
require 'net/telnet/rfc2217'
|
|
12
|
-
Net::Telnet::RFC2217.new(
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
12
|
+
Net::Telnet::RFC2217.new(host: uri.host,
|
|
13
|
+
port: uri.port || 23,
|
|
14
|
+
baud: 4800,
|
|
15
|
+
data_bits: 8,
|
|
16
|
+
parity: :odd,
|
|
17
|
+
stop_bits: 1)
|
|
16
18
|
elsif port == "/dev/ptmx"
|
|
17
19
|
require 'pty'
|
|
18
20
|
io, slave = PTY.open
|
data/lib/sdn/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: somfy_sdn
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.
|
|
4
|
+
version: 2.1.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Cody Cutrer
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2021-02-
|
|
11
|
+
date: 2021-02-16 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
|
-
name: ccutrer-
|
|
14
|
+
name: ccutrer-mqtt
|
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
|
16
16
|
requirements:
|
|
17
17
|
- - "~>"
|
|
@@ -25,47 +25,47 @@ dependencies:
|
|
|
25
25
|
- !ruby/object:Gem::Version
|
|
26
26
|
version: '1.0'
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
|
-
name:
|
|
28
|
+
name: ccutrer-serialport
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
|
30
30
|
requirements:
|
|
31
31
|
- - "~>"
|
|
32
32
|
- !ruby/object:Gem::Version
|
|
33
|
-
version: '1.
|
|
33
|
+
version: '1.0'
|
|
34
34
|
type: :runtime
|
|
35
35
|
prerelease: false
|
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
|
37
37
|
requirements:
|
|
38
38
|
- - "~>"
|
|
39
39
|
- !ruby/object:Gem::Version
|
|
40
|
-
version: '1.
|
|
40
|
+
version: '1.0'
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
|
-
name:
|
|
42
|
+
name: curses
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
|
44
44
|
requirements:
|
|
45
45
|
- - "~>"
|
|
46
46
|
- !ruby/object:Gem::Version
|
|
47
|
-
version:
|
|
47
|
+
version: '1.4'
|
|
48
48
|
type: :runtime
|
|
49
49
|
prerelease: false
|
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
|
51
51
|
requirements:
|
|
52
52
|
- - "~>"
|
|
53
53
|
- !ruby/object:Gem::Version
|
|
54
|
-
version:
|
|
54
|
+
version: '1.4'
|
|
55
55
|
- !ruby/object:Gem::Dependency
|
|
56
56
|
name: net-telnet-rfc2217
|
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
|
58
58
|
requirements:
|
|
59
59
|
- - "~>"
|
|
60
60
|
- !ruby/object:Gem::Version
|
|
61
|
-
version:
|
|
61
|
+
version: '1.0'
|
|
62
62
|
type: :runtime
|
|
63
63
|
prerelease: false
|
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
|
65
65
|
requirements:
|
|
66
66
|
- - "~>"
|
|
67
67
|
- !ruby/object:Gem::Version
|
|
68
|
-
version:
|
|
68
|
+
version: '1.0'
|
|
69
69
|
- !ruby/object:Gem::Dependency
|
|
70
70
|
name: thor
|
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|