milight-v6 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5e7c03ca492bd7f803408e17d36df53b078bd9ac
-  data.tar.gz: d0e7adb41c0bc5ff1c649ca93c69849addd86e8d
+SHA256:
+  metadata.gz: b43dde6c8b92454a3ebb63b83678cc709d959f3cd2aab090e4b52bc5e6ad4202
+  data.tar.gz: 2565cbe4cfc87572d8eb73393f3dc5459b9e6894c8ab0f2f081ac1e42c5c2937
 SHA512:
-  metadata.gz: f2480b71b8e1e6c31d7d41dd14052d856d5dfbe8f473e2250fdd533b2a404b096831e86601f6e9d520b69dc805e3fd73c2b93b80b83a5362fca6588efd135ad9
-  data.tar.gz: aa7c8814f18470f8623358b9d5366770159564a982c8f58e9ca2a0d14c558f87cc6e90e9c210d9f1b8979212cfa1d7d9f005c5e884b29ec4f4879df920391f20
+  metadata.gz: 7fbfbc54f039ea09e879c72b8b6dd450633bbf3f91ba98f9cdaa9c93f44b0da7a510b1bcd6fc37120d2b01e3ecb3d7bc9fd468d102108355abd16e6936edc99b
+  data.tar.gz: 6d7faba2778786f8b5942837cc211e53d1fab2547a1cd7fd822431b6e993031ae4105a52968d1dea766ead271f49e904ee11d195a95634477fdcfd2580138db9

data/.rubocop.yml

@@ -1,9 +1,8 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
   DisplayCopNames: true
   DisplayStyleGuide: true
   Exclude:
-    - 'lib/milight/v6/api/version.rb'
     - 'vendor/**/*'
 
 Metrics/BlockLength:
@@ -13,10 +12,10 @@ Metrics/BlockLength:
 Metrics/LineLength:
   Enabled: false
 
-Style/ConditionalAssignment:
+Metrics/MethodLength:
   Enabled: false
 
-Style/Documentation:
+Style/ConditionalAssignment:
   Enabled: false
 
 Style/For:

data/.travis.yml

@@ -1,10 +1,11 @@
-language: ruby
 sudo: false
+language: ruby
 cache: bundler
 before_install:
   - gem update --system
-  - gem install bundler
 rvm:
-  - 2.3.8
-  - 2.4.5
-  - 2.5.3
+  - 2.4.10
+  - 2.5.9
+  - 2.6.7
+  - 2.7.3
+  - 3.0.1

data/Gemfile.lock

@@ -1,32 +1,32 @@
 PATH
   remote: .
   specs:
-    milight-v6 (0.1.1)
+    milight-v6 (0.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.3.0)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     parallel (1.12.1)
     parser (2.4.0.2)
       ast (~> 2.3)
     powerpack (0.1.1)
     rainbow (3.0.0)
-    rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rake (13.0.3)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
     rubocop (0.52.1)
       parallel (~> 1.10)
       parser (>= 2.4.0.2, < 3.0)
@@ -35,17 +35,17 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
-    unicode-display_width (1.3.0)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.0)
   milight-v6!
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   rubocop (~> 0.52.1)
 
 BUNDLED WITH
-   1.16.1
+   2.2.15

data/README.md

@@ -4,7 +4,10 @@
 [![Build Status](https://travis-ci.org/ppostma/milight-v6-api.svg?branch=master)](https://travis-ci.org/ppostma/milight-v6-api)
 [![Code Climate](https://codeclimate.com/github/ppostma/milight-v6-api/badges/gpa.svg)](https://codeclimate.com/github/ppostma/milight-v6-api)
 
-This gem provides a Ruby API for the Milight Wifi Bridge (or Wifi iBOX controller) version 6.
+This gem provides a Ruby API for the Mi-Light Wifi Bridge using protocol version 6.
+
+Supported devices are the Mi-Light WiFi iBox models 1 and 2. The [esp8266_milight_hub](https://github.com/sidoh/esp8266_milight_hub) should also work, but I haven't tested this yet.
+The bridges sold under the brand MiBoxer (such as model WL-Box1) are not supported by this gem.
 
 ## Installation
 
@@ -24,20 +27,46 @@ Or install it yourself as:
 
 ## Usage
 
+### Connecting to a Mi-Light controller
+
+Connect to a Mi-Light controller by creating an instance of `Milight::V6::Controller` and supplying the IP address of the Mi-Light Wifi Bridge. If you don't know the IP address, you can use the class method `search` to discover devices on the local network.
+
 ```ruby
 require "milight/v6"
 
 controller = Milight::V6::Controller.new("192.168.178.33")
+
+controllers = Milight::V6::Controller.search
+```
+
+### Sending commands
+
+First select what you want control: the bridge lamp, a specific zone or all zones. Then you can start sending commands. See [Milight::V6::All](lib/milight/v6/all.rb), [Milight::V6::Bridge](lib/milight/v6/bridge.rb) and [Milight::V6::Zone](lib/milight/v6/zone.rb) for the supported commands.
+
+Some examples:
+
+```ruby
 controller.zone(1).on
 
-controller.zone(2).warm_light.brightness(70).on
+controller.zone(2).on
+controller.zone(2).warm_light.brightness(70)
 
-controller.zone(3).hue(Milight::V6::Color::BLUE).saturation(10).on
+controller.zone(3).on
+controller.zone(3).hue(Milight::V6::Color::BLUE).saturation(10)
+
+controller.bridge.on
+controller.bridge.brightness(50)
 
 controller.all.off
 ```
 
-See `Milight::V6::All` and `Milight::V6::Zone` for all supported commands.
+The commands will be sent with an interval of 100ms, to prevent commands being dropped by the controller. You can change or disable this by setting the `wait` parameter when creating an instance of `Milight::V6::Controller`, for example:
+
+```ruby
+controller = Milight::V6::Controller.new("192.168.178.33", wait: false)  # don't delay commands
+
+controller = Milight::V6::Controller.new("192.168.178.33", wait: 0.05)   # delay commands for 50 ms
+```
 
 ## Command line
 
@@ -45,9 +74,12 @@ A command line tool is included which can be used to control the lights.
 
 Usage: milight <host> <command> [zone]
 
-Supported commands: on, off, link, unlink
+Supported commands: search, on, off, link, unlink
+
+Examples:
 
 ```bash
+$ milight search               # search for devices
 $ milight 192.168.178.33 on 1  # turn on lights for zone 1
 $ milight 192.168.178.33 off   # turn off lights for all zones
 ```

data/bin/milight

@@ -3,30 +3,45 @@
 
 require "milight/v6"
 
-if ARGV.length < 2
-  puts "Usage: #{$PROGRAM_NAME} <host> <command> [zone]"
-  exit 1
-end
-
 host = ARGV.shift
-command = ARGV.shift
-zone = ARGV.shift
 
-controller = Milight::V6::Controller.new(host)
+if host == "search"
+  controllers = Milight::V6::Controller.search
 
-if zone.nil?
-  lights = controller.all
+  if !controllers.empty?
+    controllers.each { |c| puts c.to_s }
+  else
+    puts "No Mi-Light devices found."
+  end
 else
-  lights = controller.zone(zone.to_i)
-end
+  if ARGV.empty?
+    puts "Usage: #{$PROGRAM_NAME} <host> <command> [zone]"
+    puts "       #{$PROGRAM_NAME} search"
+    exit 1
+  end
+
+  command = ARGV.shift
+  zone = ARGV.shift
+
+  controller = Milight::V6::Controller.new(host)
+
+  case zone
+  when nil
+    lights = controller.all
+  when "bridge"
+    lights = controller.bridge
+  else
+    lights = controller.zone(zone.to_i)
+  end
 
-case command
-when "link"
-  lights.link
-when "unlink"
-  lights.unlink
-when "off"
-  lights.off
-when "on"
-  lights.on
+  case command
+  when "link"
+    lights.link
+  when "unlink"
+    lights.unlink
+  when "off"
+    lights.off
+  when "on"
+    lights.on
+  end
 end

data/lib/milight/v6/all.rb

@@ -2,6 +2,7 @@
 
 module Milight
   module V6
+    # Commands for lamps in all zones.
     class All
       def initialize(command)
         @command = command
@@ -9,64 +10,68 @@ module Milight
 
       # Switch the lights on.
       def on
-        @command.on(0)
+        @command.execute(0, [0x31, 0x00, 0x00, 0x08, 0x04, 0x01, 0x00, 0x00, 0x00])
 
         self
       end
 
       # Switch the lights off.
       def off
-        @command.off(0)
+        @command.execute(0, [0x31, 0x00, 0x00, 0x08, 0x04, 0x02, 0x00, 0x00, 0x00])
 
         self
       end
 
       # Enable night light mode.
       def night_light
-        @command.night_light(0)
+        @command.execute(0, [0x31, 0x00, 0x00, 0x08, 0x04, 0x05, 0x00, 0x00, 0x00])
 
         self
       end
 
-      # Set brightness, value: 0% to 100%
+      # Set brightness, value: 0% to 100%.
       def brightness(value)
-        @command.brightness(0, value)
+        raise ArgumentError, "Please supply a brightness value between 0-100." if value.negative? || value > 100
+
+        @command.execute(0, [0x31, 0x00, 0x00, 0x08, 0x03, value, 0x00, 0x00, 0x00])
 
         self
       end
 
       # Set color temperature, value: 0 = 2700K, 100 = 6500K.
       def temperature(value)
-        @command.temperature(0, value)
+        raise ArgumentError, "Please supply a temperature value between 0-100 (2700K to 6500K)." if value.negative? || value > 100
+
+        @command.execute(0, [0x31, 0x00, 0x00, 0x08, 0x05, value, 0x00, 0x00, 0x00])
 
         self
       end
 
       # Set color temperature to warm light (2700K).
       def warm_light
-        @command.temperature(0, 0)
-
-        self
+        temperature(0)
       end
 
       # Set color temperature to white (cool) light (6500K).
       def white_light
-        @command.temperature(0, 100)
-
-        self
+        temperature(100)
       end
 
       # Set the hue, value: 0 to 255 (red).
       # See Milight::V6::Color for predefined colors.
       def hue(value)
-        @command.hue(0, value)
+        raise ArgumentError, "Please supply a hue value between 0-255." if value.negative? || value > 255
+
+        @command.execute(0, [0x31, 0x00, 0x00, 0x08, 0x01, value, value, value, value])
 
         self
       end
 
       # Set the saturation, value: 0% to 100%.
       def saturation(value)
-        @command.saturation(0, value)
+        raise ArgumentError, "Please supply a saturation value between 0-100." if value.negative? || value > 100
+
+        @command.execute(0, [0x31, 0x00, 0x00, 0x08, 0x02, value, 0x00, 0x00, 0x00])
 
         self
       end

data/lib/milight/v6/bridge.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Milight
+  module V6
+    # Commands for the bridge lamp (iBox model 1).
+    class Bridge
+      def initialize(command)
+        @command = command
+      end
+
+      # Switch the light on.
+      def on
+        @command.execute(1, [0x31, 0x00, 0x00, 0x00, 0x03, 0x03, 0x00, 0x00, 0x00])
+
+        self
+      end
+
+      # Switch the light off.
+      def off
+        @command.execute(1, [0x31, 0x00, 0x00, 0x00, 0x03, 0x04, 0x00, 0x00, 0x00])
+
+        self
+      end
+
+      # Set brightness, value: 0% to 100%.
+      def brightness(value)
+        raise ArgumentError, "Please supply a brightness value between 0-100." if value.negative? || value > 100
+
+        @command.execute(1, [0x31, 0x00, 0x00, 0x00, 0x02, value, 0x00, 0x00, 0x00])
+
+        self
+      end
+
+      # Set color to white light.
+      def white_light
+        @command.execute(1, [0x31, 0x00, 0x00, 0x00, 0x03, 0x05, 0x00, 0x00, 0x00])
+
+        self
+      end
+
+      # Set the hue, value: 0 to 255 (red).
+      # See Milight::V6::Color for predefined colors.
+      def hue(value)
+        raise ArgumentError, "Please supply a hue value between 0-255." if value.negative? || value > 255
+
+        @command.execute(1, [0x31, 0x00, 0x00, 0x00, 0x01, value, value, value, value])
+
+        self
+      end
+
+      # Wait before continuing to next command.
+      def wait(seconds)
+        sleep(seconds)
+
+        self
+      end
+    end
+  end
+end

data/lib/milight/v6/command.rb

@@ -7,59 +7,19 @@ module Milight
   module V6
     # see https://github.com/Fantasmos/LimitlessLED-DevAPI
     class Command
-      def initialize(host, port = 5987)
-        @socket = Milight::V6::Socket.new(host, port)
+      attr_accessor :wait
 
-        bridge_session
-      end
-
-      def link(zone_id)
-        execute(zone_id, [0x3D, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00])
-      end
-
-      def unlink(zone_id)
-        execute(zone_id, [0x3E, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00])
-      end
-
-      def on(zone_id)
-        execute(zone_id, [0x31, 0x00, 0x00, 0x08, 0x04, 0x01, 0x00, 0x00, 0x00])
-      end
-
-      def off(zone_id)
-        execute(zone_id, [0x31, 0x00, 0x00, 0x08, 0x04, 0x02, 0x00, 0x00, 0x00])
-      end
-
-      def night_light(zone_id)
-        execute(zone_id, [0x31, 0x00, 0x00, 0x08, 0x04, 0x05, 0x00, 0x00, 0x00])
-      end
-
-      def brightness(zone_id, value)
-        raise ArgumentError, "Please supply a brightness value between 0-100." if value.negative? || value > 100
-
-        execute(zone_id, [0x31, 0x00, 0x00, 0x08, 0x03, value, 0x00, 0x00, 0x00])
-      end
-
-      def temperature(zone_id, value)
-        raise ArgumentError, "Please supply a temperature value between 0-100 (2700K to 6500K)." if value.negative? || value > 100
-
-        execute(zone_id, [0x31, 0x00, 0x00, 0x08, 0x05, value, 0x00, 0x00, 0x00])
-      end
-
-      def hue(zone_id, value)
-        raise ArgumentError, "Please supply a hue value between 0-255." if value.negative? || value > 255
-
-        execute(zone_id, [0x31, 0x00, 0x00, 0x08, 0x01, value, value, value, value])
-      end
-
-      def saturation(zone_id, value)
-        raise ArgumentError, "Please supply a saturation value between 0-100." if value.negative? || value > 100
-
-        execute(zone_id, [0x31, 0x00, 0x00, 0x08, 0x02, value, 0x00, 0x00, 0x00])
+      def initialize(socket, wait:)
+        @socket = socket
+        @wait = wait
+        @last_time = 0
       end
 
       def execute(zone_id, command)
         raise ArgumentError, "Please supply a zone ID between 1-4." if zone_id.negative? || zone_id > 4
 
+        bridge_session
+
         # UDP Hex Send Format: 80 00 00 00 11 {WifiBridgeSessionID1} {WifiBridgeSessionID2} 00 {SequenceNumber} 00 {COMMAND} {ZONE NUMBER} 00 {Checksum}
         request = [0x80, 0x00, 0x00, 0x00, 0x11, @session_id1, @session_id2, 0x00, next_sequence_number, 0x00]
 
@@ -69,22 +29,25 @@ module Milight
         request << 0x00
         request << calculate_checksum(request)
 
-        @socket.send_bytes(request)
-        @socket.receive_bytes
+        send_delayed(request)
       end
 
       private
 
       def bridge_session
+        return if !@session_id1.nil? || !@session_id2.nil?
+
         # UDP.SEND hex bytes: 20 00 00 00 16 02 62 3A D5 ED A3 01 AE 08 2D 46 61 41 A7 F6 DC AF (D3 E6) 00 00 1E <-- Send this to the ip address of the wifi bridge v6
         request = [0x20, 0x00, 0x00, 0x00, 0x16, 0x02, 0x62, 0x3A, 0xD5,
                    0xED, 0xA3, 0x01, 0xAE, 0x08, 0x2D, 0x46, 0x61, 0x41,
                    0xA7, 0xF6, 0xDC, 0xAF, 0xD3, 0xE6, 0x00, 0x00, 0x1E]
 
         @socket.send_bytes(request)
-        response = @socket.receive_bytes
+        response, _address = @socket.receive_bytes
 
-        raise Exception, "Could not establish session with Wifi bridge." unless response
+        raise Exception, "Could not establish session with Wifi bridge." if response.nil?
+
+        record_last_time
 
         @session_id1 = response[19]
         @session_id2 = response[20]
@@ -106,6 +69,33 @@ module Milight
 
         checksum & 0xFF
       end
+
+      # Delay execution of commands to prevent commands being dropped by the controller.
+      def send_delayed(request)
+        delay_command
+
+        @socket.send_bytes(request)
+        @socket.receive_bytes
+
+        record_last_time
+      end
+
+      def delay_command
+        return unless @wait
+
+        interval = current_time - @last_time
+        sleep(@wait - interval) if interval < @wait
+      end
+
+      def record_last_time
+        return unless @wait
+
+        @last_time = current_time
+      end
+
+      def current_time
+        Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      end
     end
   end
 end

data/lib/milight/v6/controller.rb

@@ -1,14 +1,20 @@
 # frozen_string_literal: true
 
 require "milight/v6/command"
+require "milight/v6/discover"
 require "milight/v6/all"
+require "milight/v6/bridge"
 require "milight/v6/zone"
 
 module Milight
   module V6
+    # Controller for the Mi-Light WiFi iBox.
     class Controller
-      def initialize(host, port = 5987)
-        @command = Milight::V6::Command.new(host, port)
+      extend Milight::V6::Discover
+
+      def initialize(host = "<broadcast>", port = 5987, wait: 0.1)
+        @socket = Milight::V6::Socket.new(host, port)
+        @command = Milight::V6::Command.new(@socket, wait: wait)
       end
 
       # Select all zones.
@@ -20,6 +26,15 @@ module Milight
       def zone(zone_id)
         Milight::V6::Zone.new(@command, zone_id)
       end
+
+      # Select the bridge lamp.
+      def bridge
+        Milight::V6::Bridge.new(@command)
+      end
+
+      def to_s
+        "Mi-Light Wifi iBox Controller. IP address: #{@socket.host}"
+      end
     end
   end
 end

data/lib/milight/v6/discover.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require "milight/v6/controller"
+require "milight/v6/socket"
+
+module Milight
+  module V6
+    # Search for Mi-Light devices.
+    module Discover
+      AUTH_TOKEN = [0x39, 0x38, 0x35, 0x62, 0x31, 0x35, 0x37, 0x62, 0x66, 0x36, 0x66,
+                    0x63, 0x34, 0x33, 0x33, 0x36, 0x38, 0x61, 0x36, 0x33, 0x34, 0x36,
+                    0x37, 0x65, 0x61, 0x33, 0x62, 0x31, 0x39, 0x64, 0x30, 0x64].freeze
+
+      def search
+        socket = Milight::V6::Socket.new("<broadcast>", 5987)
+
+        bytes =  [0x10, 0x00, 0x00, 0x00, 0x24, 0x02, 0xEE, 0x3E, 0x02] + AUTH_TOKEN
+        socket.send_bytes(bytes)
+
+        controllers = []
+
+        loop do
+          bytes, address = socket.receive_bytes
+          break if bytes.nil?
+
+          token = bytes[14, AUTH_TOKEN.length]
+          controllers << Milight::V6::Controller.new(address) if token == AUTH_TOKEN
+        end
+
+        socket.close
+
+        controllers
+      end
+    end
+  end
+end

data/lib/milight/v6/socket.rb

@@ -5,41 +5,65 @@ require "socket"
 
 module Milight
   module V6
+    # Send and receive UDP packets.
     class Socket
       READ_TIMEOUT = 5
 
-      def initialize(host, port)
-        @socket = UDPSocket.new
-        @socket.connect(host, port)
+      attr_reader :host, :port
 
-        @logger = Logger.new(STDOUT)
-        @logger.level = Logger::INFO if ENV["MILIGHT_DEBUG"] != "1"
+      def initialize(host, port)
+        @host = host
+        @port = port
       end
 
       def send_bytes(bytes)
-        @logger.debug("Sending: #{format_bytes_as_hex(bytes)}")
+        logger.debug("Sending: #{format_bytes_as_hex(bytes)}")
 
-        @socket.send(bytes.pack('C*'), 0)
+        socket.send(bytes.pack('C*'), 0, @host, @port)
       end
 
       def receive_bytes
-        response = @socket.recvfrom_nonblock(128).first
+        response, address = socket.recvfrom_nonblock(128)
         bytes = response.unpack('C*')
 
-        @logger.debug("Received: #{format_bytes_as_hex(bytes)}")
+        logger.debug("Received: #{format_bytes_as_hex(bytes)}")
 
-        bytes
+        [bytes, address.last]
       rescue IO::WaitReadable
-        ready = IO.select([@socket], nil, nil, READ_TIMEOUT)
+        ready = IO.select([socket], nil, nil, READ_TIMEOUT)
         retry if ready
 
-        return false
+        return nil
+      end
+
+      def close
+        socket.close
       end
 
       private
 
+      def socket
+        @socket ||= begin
+          socket = UDPSocket.new
+
+          if @host == "<broadcast>" || @host == "255.255.255.255"
+            socket.setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_BROADCAST, true)
+          end
+
+          socket
+        end
+      end
+
+      def logger
+        @logger ||= begin
+          logger = Logger.new(STDOUT)
+          logger.level = Logger::INFO if ENV["MILIGHT_DEBUG"] != "1"
+          logger
+        end
+      end
+
       def format_bytes_as_hex(bytes)
-        bytes.map { |s| format("0x%02X", s) }
+        bytes.map { |s| format("0x%02X", s) }.join(", ")
       end
     end
   end

data/lib/milight/v6/version.rb

@@ -2,6 +2,6 @@
 
 module Milight
   module V6
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/lib/milight/v6/zone.rb

@@ -2,6 +2,7 @@
 
 module Milight
   module V6
+    # Commands for lamps in a specific zone.
     class Zone
       attr_reader :zone_id
 
@@ -12,78 +13,82 @@ module Milight
 
       # Link/sync light bulbs.
       def link
-        @command.link(zone_id)
+        @command.execute(zone_id, [0x3D, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00])
 
         self
       end
 
       # Unlink/clear light bulbs.
       def unlink
-        @command.unlink(zone_id)
+        @command.execute(zone_id, [0x3E, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00])
 
         self
       end
 
       # Switch the lights on.
       def on
-        @command.on(zone_id)
+        @command.execute(zone_id, [0x31, 0x00, 0x00, 0x08, 0x04, 0x01, 0x00, 0x00, 0x00])
 
         self
       end
 
       # Switch the lights off.
       def off
-        @command.off(zone_id)
+        @command.execute(zone_id, [0x31, 0x00, 0x00, 0x08, 0x04, 0x02, 0x00, 0x00, 0x00])
 
         self
       end
 
       # Enable night light mode.
       def night_light
-        @command.night_light(zone_id)
+        @command.execute(zone_id, [0x31, 0x00, 0x00, 0x08, 0x04, 0x05, 0x00, 0x00, 0x00])
 
         self
       end
 
-      # Set brightness, value: 0% to 100%
+      # Set brightness, value: 0% to 100%.
       def brightness(value)
-        @command.brightness(zone_id, value)
+        raise ArgumentError, "Please supply a brightness value between 0-100." if value.negative? || value > 100
+
+        @command.execute(zone_id, [0x31, 0x00, 0x00, 0x08, 0x03, value, 0x00, 0x00, 0x00])
 
         self
       end
 
       # Set color temperature, value: 0 = 2700K, 100 = 6500K.
       def temperature(value)
-        @command.temperature(zone_id, value)
+        raise ArgumentError, "Please supply a temperature value between 0-100 (2700K to 6500K)." if value.negative? || value > 100
+
+        @command.execute(zone_id, [0x31, 0x00, 0x00, 0x08, 0x05, value, 0x00, 0x00, 0x00])
 
         self
       end
 
       # Set color temperature to warm light (2700K).
       def warm_light
-        @command.temperature(zone_id, 0)
-
-        self
+        temperature(0)
       end
 
       # Set color temperature to white (cool) light (6500K).
       def white_light
-        @command.temperature(zone_id, 100)
-
-        self
+        temperature(100)
       end
 
       # Set the hue, value: 0 to 255 (red).
       # See Milight::V6::Color for predefined colors.
       def hue(value)
-        @command.hue(zone_id, value)
+        raise ArgumentError, "Please supply a hue value between 0-255." if value.negative? || value > 255
+
+        @command.execute(zone_id, [0x31, 0x00, 0x00, 0x08, 0x01, value, value, value, value])
 
         self
       end
 
       # Set the saturation, value: 0% to 100%.
       def saturation(value)
-        @command.saturation(zone_id, value)
+        raise ArgumentError, "Please supply a saturation value between 0-100." if value.negative? || value > 100
+
+        @command.execute(zone_id, [0x31, 0x00, 0x00, 0x08, 0x02, value, 0x00, 0x00, 0x00])
 
         self
       end

data/milight-v6.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = ["milight"]
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: milight-v6
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Peter Postma
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-01 00:00:00.000000000 Z
+date: 2021-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -75,9 +75,11 @@ files:
 - bin/setup
 - lib/milight/v6.rb
 - lib/milight/v6/all.rb
+- lib/milight/v6/bridge.rb
 - lib/milight/v6/color.rb
 - lib/milight/v6/command.rb
 - lib/milight/v6/controller.rb
+- lib/milight/v6/discover.rb
 - lib/milight/v6/exception.rb
 - lib/milight/v6/socket.rb
 - lib/milight/v6/version.rb
@@ -87,7 +89,7 @@ homepage: https://github.com/ppostma/milight-v6-api
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -102,9 +104,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Ruby API for the Milight Wifi Bridge v6
 test_files: []