somfy_sdn 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 541526d413e48d3a6d60db5758a5f2ac92cfa1a397420c29221488f3993e0ae2
-  data.tar.gz: d758f5f0cab2a0fbb6defecadb752f2342c031f209771f26ddf81003a361d649
+  metadata.gz: c9d3b292843473f2020321bca2d00cef41b0a1374cf9df8a5f99e8c3f699dfb0
+  data.tar.gz: eb2cb0abbbcff66897e815ce8e97928af0b9dd598d464efe12b99bee3ed646d1
 SHA512:
-  metadata.gz: ea35c9e9d4700af4da7971bbee10dafa9a3303ae17e554d3d905daebd59c07796ec8b260750a6337deb1c00edf03607ac885316fbcc9535a0a820a94fa991550
-  data.tar.gz: be63bab6a4ba6b727d3b2e242c1fbd6453130367272978e15ac439ce92bdc3bfcede6cbd5c63235355753c2fde986ea7e1287bc4ce6321f357b5953eee97d789
+  metadata.gz: 48a69e210eaccaf15de99cd35b499547208b9a05bd30ed2796617b34dbbabaf9d2f11be87e09dd6dce7a5a618d5e5232d6420a6903c4c007f6ce3bba9ac214ab
+  data.tar.gz: fe5e5215cb3f870b1b36e926546260234cd4dbbce2985b77cdc2bfaac4c89c9672ef0a05748726a1e4869ef6b73fa6c839dfce8a3b9ff2cbd67926c20062c892

data/lib/sdn/cli/mqtt/group.rb

@@ -3,7 +3,15 @@
 module SDN
   module CLI
     class MQTT
-      Group = Struct.new(:bridge, :addr, :position_percent, :position_pulses, :ip, :last_direction, :state, :motors) do
+      Group = Struct.new(:bridge,
+                         :addr,
+                         :position_percent,
+                         :position_pulses,
+                         :ip,
+                         :last_direction,
+                         :state,
+                         :hass_state,
+                         :motors) do
         def initialize(*)
           members.each { |k| self[k] = :nil }
           super

data/lib/sdn/cli/mqtt/read.rb

@@ -103,6 +103,20 @@ module SDN
                     directions = group.motor_objects.map(&:last_direction).uniq
                     direction = (directions.length == 1) ? directions.first : "mixed"
                     group.publish(:last_direction, direction)
+
+                    positions = group.motor_objects.map(&:position_percent).uniq
+                    position = (positions.length == 1) ? positions.first : 50
+
+                    hass_state = if state == :running
+                                   (direction == :down) ? :closing : :opening
+                                 elsif position.zero?
+                                   :open
+                                 elsif position == 100
+                                   :closed
+                                 else
+                                   :stopped
+                                 end
+                    group.publish(:hass_state, hass_state)
                   end
                 when Message::PostMotorLimits
                   motor.publish(:up_limit, message.up_limit)

data/lib/sdn/cli/mqtt.rb

@@ -207,6 +207,7 @@ module SDN
           publish("#{addr}/discover/$format", "discover")
           publish("#{addr}/discover/$settable", "true")
           publish("#{addr}/discover/$retained", "false")
+
           @mqtt.publish_hass_button("discover",
                                     command_topic: "#{@base_topic}/#{addr}/discover/set",
                                     device: hass_device,
@@ -583,6 +584,14 @@ module SDN
         return group if group
 
         @mqtt.batch_publish do
+          hass_device = {
+            identifiers: addr,
+            model: "Shade Group",
+            name: addr,
+            via_device: @device_id
+          }
+          node_id = "#{@device_id}_#{addr}"
+
           publish("#{addr}/$name", addr)
           publish("#{addr}/$type", "Shade Group")
           publish("#{addr}/$properties",
@@ -595,12 +604,53 @@ module SDN
           publish("#{addr}/discover/$settable", "true")
           publish("#{addr}/discover/$retained", "false")
 
+          @mqtt.publish_hass_button("discover",
+                                    command_topic: "#{@base_topic}/#{addr}/discover/set",
+                                    device: hass_device,
+                                    icon: "mdi:search-add",
+                                    name: "Rediscover",
+                                    node_id: node_id,
+                                    object_id: "discover",
+                                    payload_press: "true",
+                                    unique_id: "#{node_id}_discover")
+
           publish("#{addr}/control/$name", "Control motors")
           publish("#{addr}/control/$datatype", "enum")
           publish("#{addr}/control/$format", "up,down,stop,wink,next_ip,previous_ip,refresh")
           publish("#{addr}/control/$settable", "true")
           publish("#{addr}/control/$retained", "false")
 
+          @mqtt.publish_hass_cover("group",
+                                   command_topic: "#{@base_topic}/#{addr}/control/set",
+                                   device: hass_device,
+                                   icon: "mdi:roller-shade",
+                                   name: "Group",
+                                   node_id: node_id,
+                                   payload_close: "down",
+                                   payload_open: "up",
+                                   payload_stop: "stop",
+                                   position_open: 0,
+                                   position_closed: 100,
+                                   position_topic: "#{@base_topic}/#{addr}/position-percent",
+                                   set_position_topic: "#{@base_topic}/#{addr}/position-percent/set",
+                                   state_topic: "#{@base_topic}/#{addr}/hass-state",
+                                   unique_id: "#{node_id}_group")
+          {
+            Wink: "mdi:emoticon-wink",
+            Next_IP: "mdi:skip-next",
+            Previous_IP: "mdi:skip-previous",
+            Refresh: "mdi:refresh"
+          }.each do |command, icon|
+            @mqtt.publish_hass_button(command.to_s.downcase,
+                                      command_topic: "#{@base_topic}/#{addr}/control/set",
+                                      device: hass_device,
+                                      icon: icon,
+                                      name: command.to_s.sub("_", " "),
+                                      node_id: node_id,
+                                      payload_press: command.to_s.downcase,
+                                      unique_id: "#{node_id}_#{command.to_s.downcase}")
+          end
+
           publish("#{addr}/jog-ms/$name", "Jog motors by ms")
           publish("#{addr}/jog-ms/$datatype", "integer")
           publish("#{addr}/jog-ms/$format", "-65535:65535")
@@ -621,6 +671,20 @@ module SDN
           publish("#{addr}/position-pulses/$unit", "pulses")
           publish("#{addr}/position-pulses/$settable", "true")
 
+          @mqtt.publish_hass_number("position-pulses",
+                                    command_topic: "#{@base_topic}/#{addr}/position-pulses/set",
+                                    device: hass_device,
+                                    enabled_by_default: false,
+                                    max: 65_536,
+                                    min: 0,
+                                    name: "Position (Pulses)",
+                                    node_id: node_id,
+                                    object_id: "position-pulses",
+                                    state_topic: "#{@base_topic}/#{addr}/position-pulses",
+                                    step: 10,
+                                    unit_of_measurement: "pulses",
+                                    unique_id: "#{node_id}_position-pulses")
+
           publish("#{addr}/position-percent/$name", "Position (in %)")
           publish("#{addr}/position-percent/$datatype", "integer")
           publish("#{addr}/position-percent/$format", "0:100")
@@ -632,6 +696,18 @@ module SDN
           publish("#{addr}/ip/$format", "1:16")
           publish("#{addr}/ip/$settable", "true")
 
+          @mqtt.publish_hass_number("ip",
+                                    command_topic: "#{@base_topic}/#{addr}/ip/set",
+                                    device: hass_device,
+                                    name: "Intermediate Position",
+                                    max: 16,
+                                    min: 0,
+                                    node_id: node_id,
+                                    object_id: "ip",
+                                    payload_reset: "",
+                                    state_topic: "#{@base_topic}/#{addr}/ip",
+                                    unique_id: "#{node_id}_ip")
+
           publish("#{addr}/state/$name", "State of the motors")
           publish("#{addr}/state/$datatype", "enum")
           publish("#{addr}/state/$format", "#{Message::PostMotorStatus::STATE.keys.join(",")},mixed")

data/lib/sdn/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SDN
-  VERSION = "2.3.1"
+  VERSION = "2.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: somfy_sdn
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Cody Cutrer