lightwaverf 0.3.0 → 0.3.2

data/bin/lightwaverf

@@ -3,6 +3,8 @@ require 'lightwaverf'
 case ARGV[0]
   when 'help'
     puts LightWaveRF.new.help
+  when 'timezone'
+    puts LightWaveRF.new.timezone ARGV[1]
   when 'configure'
     puts LightWaveRF.new.configure
   when 'sequence'

data/lib/lightwaverf.rb

@@ -24,27 +24,29 @@ class LightWaveRF
     help += "\n\nso to turn on " + room + " " + device + " type \"lightwaverf " + room + " " + device + " on\"\n"
   end
 
-  # Configure, build config file
-  def configure
-    config = { 'host' => self.get_config['host'], 'calendar' => self.get_config['calendar'] }
-    puts 'What is the ip address of your wifi link? (' + self.get_config['host'] + ')'
+  # Configure, build config file. Interactive command line stuff
+  #
+  # Arguments:
+  #   debug: (Boolean
+  def configure debug = false
+    config = self.get_config
+    puts 'What is the ip address of your wifi link? (' + self.get_config['host'] + '). Enter a blank line to broadcast UDP commands.'
     host = STDIN.gets.chomp
     if ! host.to_s.empty?
       config['host'] = host
     end
-    puts 'What is the address of your google calendar? (' + self.get_config['calendar'] + ')'
+    puts 'What is the address of your google calendar? (' + self.get_config['calendar'] + '). Optional!'
     calendar = STDIN.gets.chomp
     if ! calendar.to_s.empty?
       config['calendar'] = calendar
     end
     device = 'x'
     while ! device.to_s.empty?
-      puts 'Give me the name of a room and its devices, space separated. For example "lounge light socket tv". Just hit enter to finish.'
+      puts 'Enter the name of a room and its devices, space separated. For example "lounge light socket tv". Enter a blank line to finish.'
       if device = STDIN.gets.chomp
         parts = device.split ' '
         if !parts[0].to_s.empty? and !parts[1].to_s.empty?
           new_room = parts.shift
-          puts 'got ' + device + ' todo: to split this up... new room is ' + new_room
           if ! config['room']
             config['room'] = [ ]
           end
@@ -54,15 +56,16 @@ class LightWaveRF
               room['device'] = parts
               found = true
             end
-            p 'so now room is ' + room.to_s
+            debug and ( p 'so now room is ' + room.to_s )
           end
           if ! found
             config['room'].push 'name' => new_room, 'device' => parts
           end
+          debug and ( p 'added ' + parts.to_s + ' to ' + new_room )
         end
       end
     end
-    puts 'end of configure, config is now ' + config.to_s
+    debug and ( p 'end of configure, config is now ' + config.to_s )
     self.put_config config
   end
 
@@ -81,7 +84,7 @@ class LightWaveRF
     @log_file || File.expand_path('~') + '/lightwaverf.log'
   end
 
-  def put_config config = { 'host' => '192.168.1.64', 'room' => [ { 'name' => 'our', 'device' => [ 'light', 'lights' ] } ] }
+  def put_config config = { 'room' => [ { 'name' => 'our', 'device' => [ 'light', 'lights' ] } ] }
     puts 'put_config got ' + config.to_s
     puts 'so writing ' + YAML.dump( config )
     File.open( self.get_config_file, 'w' ) do | handle |
@@ -217,6 +220,7 @@ class LightWaveRF
   # Example:
   #   >> LightWaveRF.new.state 'on' # 'F1'
   #   >> LightWaveRF.new.state 'off' # 'F0'
+  #   >> LightWaveRF.new.state 'alloff' # 'Fa'
   #
   # Arguments:
   #   state: (String)
@@ -227,6 +231,8 @@ class LightWaveRF
     case state
       when 'off'
         state = 'F0'
+      when 'alloff'
+        state = 'Fa'
       when 'on'
         state = 'F1'
       when 1..100
@@ -250,13 +256,34 @@ class LightWaveRF
   #   state: (String)
   def command room, device, state
     # @todo get the device name in here...
-   '666,!' + room['id'] + room['device'][device] + state + '|' + room['name'] + ' ' + device + ' ' + state + '|via @pauly'
+    # Command structure is <transaction number>,<Command>|<Action>|<State><cr>
+    if room and device and !device.empty? and state
+      '666,!' + room['id'] + room['device'][device] + state + '|Turn ' + room['name'] + ' ' + device + '|' + state + ' via @pauly'
+    else
+      '666,!' + room['id'] + state + '|Turn ' + room['name'] + '|' + state + ' via @pauly'
+    end      
   end
 
-  # Turn one of your devices on or off
+  # Set the Time Zone on the LightWaveRF WiFi Link
+  #
+  # Example:
+  #   >> LightWaveRF.new.timezone
+  #
+  # Arguments:
+  #   debug: (Boolean)
+  def timezone debug = false
+    command = '666,!FzP' + (Time.now.gmt_offset/60/60).to_s
+    debug and ( puts '[Info - LightWaveRF] timezone: command is ' + command )
+    data = self.raw command
+    debug and ( puts '[Info - LightWaveRF] timezone: response is ' + data )
+    return (data == "666,OK\r\n")
+  end
+  
+  # Turn one of your devices on or off or all devices in a room off
   #
   # Example:
   #   >> LightWaveRF.new.send 'our', 'light', 'on'
+  #   >> LightWaveRF.new.send 'our', '', 'off'
   #
   # Arguments:
   #   room: (String)
@@ -265,8 +292,9 @@ class LightWaveRF
   def send room = nil, device = nil, state = 'on', debug = false
     debug and ( puts 'config is ' + self.get_config.to_s )
     rooms = self.class.get_rooms self.get_config, debug
+    state = 'alloff' if (device.empty? and state == 'off')
     state = self.class.get_state state
-    if rooms[room] and device and state and rooms[room]['device'][device]
+    if rooms[room] and state and (state == 'Fa' || (device and rooms[room]['device'][device]))
       command = self.command rooms[room], device, state
       debug and ( p 'command is ' + command )
       data = self.raw command
@@ -318,15 +346,27 @@ class LightWaveRF
 
   def raw command
     response = nil
-    begin
-      listener = UDPSocket.new
-      listener.bind '0.0.0.0', 9761
-    rescue
-      response = "can't bind to listen for a reply"
+    # Get host address or broadcast address
+    host = self.get_config['host'] || '255.255.255.255'
+    # Create socket 
+    listener = UDPSocket.new
+    # Add broadcast socket options if necessary
+    if (host == '255.255.255.255')
+      listener.setsockopt(Socket::SOL_SOCKET, Socket::SO_BROADCAST, true)
     end
-    UDPSocket.new.send command, 0, self.get_config['host'], 9760
-    if ! response
-      response, addr = listener.recvfrom 200
+    if listener
+      # Bind socket to listen for response
+      begin
+        listener.bind '0.0.0.0',9761
+      rescue
+        response = "can't bind to listen for a reply"
+      end
+      # Broadcast command to server
+      listener.send(command, 0, host, 9760)
+      # Receive response
+      if ! response
+        response, addr = listener.recvfrom 200
+      end
       listener.close
     end
     response

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lightwaverf
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-03-09 00:00:00.000000000 Z
 dependencies: []
 description: Interact with lightwaverf wifi link from code or the command line. Control
   your lights, heating, sockets etc. Also set up timers using a google calendar and