xilight 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17fc14ee43f5badbb28219ee22a5cc54981034f74b63ecba76215fbba9d14158
-  data.tar.gz: a0237242c81acbe5d0c045c826193f4d1e22faf1c6e0d93e4ba234378dbc89b9
+  metadata.gz: 2ab05093b44f3a72e57dcfa63e649be1aa6bd5128b9eea259b2619c8accb50ba
+  data.tar.gz: d928c43a33666ccb9e572974e6a91594d9b9caf9ea50b05e9e6e2883f8b828a2
 SHA512:
-  metadata.gz: f76ca3da153d8491281e68a1f0dcd3d67459a126bbfdfa92ef4b8439453273ac2c0a7cd4c8b58860796d0ca37c3dc014db941fb5067a9f563082662fc77f3996
-  data.tar.gz: 00597cf9aa48c2374e240d9563f996e1096931d05a9c4beb2b29e83842a6114c78717233ee9fbac25efbdfad86b35e737e8fce04c3e1af7fe419ac02b43efa2b
+  metadata.gz: 5ef46150fb68761ea29b368507cb95c74b4cd86aa110b7fb659b043fede7afa9d5b77aa59c46c913f66b138145cffce38ed0c4579ad020818762e2f8506873b7
+  data.tar.gz: c0ba4f986549cd8fcb8961f24d04b2331746aecf27a8094dfc4119e978cbd73030c9b22f77dcc3d798ab2fd0bd2c325ecbf11dd245973ce255ff1deb660dc725

data/.ruby-version

@@ -0,0 +1 @@
+2.7.0

data/exe/yee

@@ -20,6 +20,14 @@ module Xilight
       {}
     end
 
+    def self.rgb_to_hex(r,g,b)
+      [r,g,b].map{|x| x.to_i.to_s(16).rjust(2, '0') }.join
+    end
+
+    def self.rgb_to_i(r,g,b)
+      rgb_to_hex(r,g,b).to_i(16)
+    end
+
     def self.get_light(index, name=nil, attempt: 0)
       lights = ::Xilight::CLI.config['yeelights']
       light_attribs = if name && name != ''
@@ -27,7 +35,7 @@ module Xilight
       else
         lights[index.to_i]
       end
-      light = ::Xilight::Yeelight.new(light_attribs.map{|k,v| [k.to_sym, v]}.to_h)
+      light = ::Xilight::Yeelight.new(**light_attribs.map{|k,v| [k.to_sym, v]}.to_h)
       unless light.available?
         self.discover
         get_light(index, name, attempt: 1) if attempt.zero?
@@ -108,8 +116,7 @@ module Xilight
 
         def call(r:, g:, b:, light: 0, name: nil, **)
           light =::Xilight::CLI.get_light(light, name)
-          as_hex = [r,g,b].map{|x| x.to_i.to_s(16).rjust(2, '0') }.join
-          light.rgb = as_hex.to_i(16)
+          light.rgb = ::Xilight::CLI.rgb_to_i(r,g,b)
         end
       end
 
@@ -145,7 +152,6 @@ module Xilight
         ]
 
         def call(brightness:, light: 0, name: nil, **)
-          binding.pry
           light =::Xilight::CLI.get_light(light, name)
           light.bright = brightness.to_i
         end
@@ -219,6 +225,44 @@ module Xilight
         end
       end
 
+      module ColorFlow
+        class On < Dry::CLI::Command
+          desc "Start ColorFlow"
+          option :light, desc: "ID/index of Yeelight to target", default: "0", aliases: ["-l"]
+          option :name, desc: "Name of Yeelight to target", default: nil, aliases: ["-n"]
+
+          example [
+            "on # start color flow on default/first light",
+            "on -n kitchen # start color flow on light with name 'kitchen'",
+            "on -l 3 # start color flow on light #3"
+          ]
+          def call(light: 0, name: nil, **)
+            light =::Xilight::CLI.get_light(light, name)
+            flow_expression = COLORS.values.first(12).each_slice(2).map(&:first).map do |(r,g,b)|
+              "1000,2,#{::Xilight::CLI.rgb_to_i(r,g,b)},100"
+            end.join(',')
+            light.start_cf(0, 1, flow_expression)
+          end
+        end
+
+        class Off < Dry::CLI::Command
+          desc "Stop ColorFlow"
+          option :light, desc: "ID/index of Yeelight to target", default: "0", aliases: ["-l"]
+          option :name, desc: "Name of Yeelight to target", default: nil, aliases: ["-n"]
+
+          example [
+            "off # start color flow on default/first light",
+            "off -n kitchen # start color flow on light with name 'kitchen'",
+            "off -l 3 # start color flow on light #3"
+          ]
+
+          def call(light: 0, name: nil, **)
+            light =::Xilight::CLI.get_light(light, name)
+            light.power = 'off'
+          end
+        end
+      end
+
       COLORS = {
         red: [255, 0, 0],
         orange: [255, 128, 0],
@@ -262,6 +306,11 @@ module Xilight
         end
       end
 
+      register "color_flow", aliases: ["cf"] do |prefix|
+        prefix.register "on", ColorFlow::On, aliases: ["o"]
+        prefix.register "off", ColorFlow::Off, aliases: ["x"]
+      end
+
       register "version",  Version, aliases: ["v", "-v", "--version"]
       register "discover", Discover, aliases: ["d"]
       register "rgb",      Rgb

data/lib/xilight.rb

@@ -126,8 +126,8 @@ module Xilight
     # This method is used to start a color flow. Color flow is a series of smart
     # LED visible state changes. It can be either brightness changing, color changing
     # or color temperature changing
-    def start_cf(count, action, flow_expression)
-      request({id: 9,method: 'set_power', params: [count,action,flow_expression]})
+    def start_cf(count=0, action=1, flow_expression="1000,2,2700,100,500,1,255,10,5000,7,0,0,500,2,5000,1")
+      request({id: 9, method: 'start_cf', params: [count,action,flow_expression]})
     end
 
     # This method is used to stop a running color flow.

data/lib/xilight/version.rb

@@ -1,3 +1,3 @@
 module Xilight
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xilight
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Wouter Coppieters
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-30 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -89,6 +89,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - README.md
@@ -117,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby Xiaomi Yeelight gem