lightwaverf 0.6.6 → 0.7

data/app/views/_graphs.ejs

@@ -1,6 +1,6 @@
-<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
-<script type="text/javascript" src="https://www.google.com/jsapi"></script>
-<script type="text/javascript">
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
+<script src="//www.google.com/jsapi"></script>
+<script>
   var gauge, gauge_data, gauge_options;
   google.load( 'visualization', '1.0', { packages: [ 'corechart', 'gauge', 'annotatedtimeline' ] } );
   google.setOnLoadCallback( function ( ) {
@@ -9,39 +9,35 @@
     energy_data.addColumn( 'number', 'Electricity used' );
     energy_data.addColumn( 'string', 'title1' );
     energy_data.addColumn( 'string', 'text1' );
-    if (!Array.prototype.map) {
-      Array.prototype.map = function(callback, thisArg) {
+    if ( ! Array.prototype.map ) { // polyfill
+      Array.prototype.map = function( callback, thisArg ) {
         var T, A, k;
-        if (this == null) {
-          throw new TypeError(" this is null or not defined");
-        }
+        if ( this == null ) throw new TypeError( 'this is null or not defined' );
         var O = Object(this);
         var len = O.length >>> 0;
-        if (typeof callback !== "function") {
-          throw new TypeError(callback + " is not a function");
-        }
-        if (thisArg) {
-          T = thisArg;
-        }
-        A = new Array(len);
+        if ( typeof callback !== 'function' ) throw new TypeError( callback + ' is not a function' );
+        if ( thisArg ) T = thisArg;
+        A = new Array( len );
         k = 0;
-        while(k < len) {
+        while ( k < len ) {
           var kValue, mappedValue;
-          if (k in O) {
+          if ( k in O ) {
             kValue = O[ k ];
             mappedValue = callback.call(T, kValue, k, O);
             A[ k ] = mappedValue;
           }
-          k++;
+          k ++;
         }
         return A;
       };      
     }
-    var raw_data = <%- summary %>;
-    var start_date = raw_data[0][0];
-    energy_data.addRows( raw_data.map( function ( e ) {
-      if ( e[0] !== start_date ) e[0] += start_date;
-      e[0] = new Date( 1000 * e[0] ); // as it is now a timestamp
+    var rawData = <%- summary %>;
+    // var startDate = rawData[0][0];
+    var i = 0;
+    energy_data.addRows( rawData.map( function ( e ) {
+      ++ i;
+      // if ( e[0] !== startDate ) e[0] += startDate;
+      e[0] = new Date( e[0] * 1000 ); // as it is now a timestamp
       e[1] = e[1] * 10;
       e[2] = e[2] || '';
       e[3] = e[3] || '';
@@ -49,9 +45,8 @@
     } ));
     var chart = new google.visualization.AnnotatedTimeLine( document.getElementById( 'energy_chart' ));
     chart.draw( energy_data, { displayAnnotations: true, title: '24 hours electricity usage' } );
-  
     gauge = new google.visualization.Gauge( document.getElementById( 'gauge_div' ));
-    gauge_data = google.visualization.arrayToDataTable( [ ["Label", "Value"], ["Electric", raw_data.pop[1] ] ] );
+    gauge_data = google.visualization.arrayToDataTable( [[ 'Label', 'Value' ], [ 'Electric', rawData.pop[ 1 ]]] );
     gauge_options = {
       width: '200',
       height: '200',
@@ -64,7 +59,7 @@
     gauge.draw( gauge_data, gauge_options );
   } );
   $( function ( ) {
-    var key = 'foo';
+    var key = ''; // @todo prompt for an pi key and save it in local storage like https://github.com/pauly/robot-butler does
     $('dt a').click( function ( ) {
       $(this).parent( ).next('dd').slideDown( );
       return false;

data/bin/lightwaverf

@@ -1,32 +1,37 @@
 #!/usr/bin/ruby
 require 'lightwaverf'
+obj = LightWaveRF.new
 case ARGV[0]
   when 'help'
-    puts LightWaveRF.new.help
+    puts obj.help
+  when 'initlink'
+    puts obj.firmware ARGV[1]
+  when 'firmware'
+    puts obj.firmware ARGV[1]
   when 'timezone'
-    puts LightWaveRF.new.timezone ARGV[1]
+    puts obj.timezone ARGV[1]
   when 'configure'
-    puts LightWaveRF.new.configure
+    puts obj.configure ARGV[1]
   when 'sequence'
-    puts LightWaveRF.new.sequence ARGV[1], ARGV[2]
+    puts obj.sequence ARGV[1], ARGV[2]
   when 'mood'
-    puts LightWaveRF.new.mood ARGV[1], ARGV[2], ARGV[3]
+    puts obj.mood ARGV[1], ARGV[2], ARGV[3]
   when 'learnmood'
-    puts LightWaveRF.new.learnmood ARGV[1], ARGV[2], ARGV[3]
+    puts obj.learnmood ARGV[1], ARGV[2], ARGV[3]
   when 'energy'
-    puts LightWaveRF.new.energy ARGV[1], ARGV[2], ARGV[3]
+    puts obj.energy ARGV[1], ARGV[2], ARGV[3]
   when 'update_timers'
-    puts LightWaveRF.new.update_timers ARGV[1], ARGV[2], ARGV[3]
+    puts obj.update_timers ARGV[1], ARGV[2], ARGV[3]
   when 'timer'
-    puts LightWaveRF.new.run_timers ARGV[1], ARGV[2]
+    puts obj.run_timers ARGV[1], ARGV[2]
   when 'run_timers'
-    puts LightWaveRF.new.run_timers ARGV[1], ARGV[2]
+    puts obj.run_timers ARGV[1], ARGV[2]
   when 'update'
-    puts LightWaveRF.new.update_config ARGV[1], ARGV[2]
+    puts obj.update_config ARGV[1], ARGV[2]
   when 'web'
-    puts LightWaveRF.new.build_web_page ARGV[1]
+    puts obj.build_web_page ARGV[1]
   when 'summarise'
-    puts LightWaveRF.new.summarise ARGV[1], ARGV[2]
+    puts obj.summarise ARGV[1], ARGV[2]
   else
-    LightWaveRF.new.send ARGV[0], ARGV[1], ARGV[2], ARGV[3]
+    obj.send ARGV[0], ARGV[1], ARGV[2], ARGV[3]
 end

data/bin/lightwaverf-config-json

@@ -1,4 +1,6 @@
 #!/usr/bin/ruby
 require 'lightwaverf'
+config = LightWaveRF.new.get_config
+config['spreadsheet']['password'] = nil
+puts JSON.generate config
 require 'json'
-puts JSON.generate LightWaveRF.new.get_config

data/lib/lightwaverf.rb

@@ -22,9 +22,10 @@ class LightWaveRF
   @config_file = nil
   @log_file = nil
   @summary_file = nil
-  @log_timer_file = nil
+  @timer_log_file = nil
   @config = nil
   @timers = nil
+  @time = nil
 
   # Display usage info
   def usage room = nil
@@ -40,6 +41,12 @@ class LightWaveRF
     config
   end
 
+  # For debug timing, why is this so slow?
+  def time label = nil
+    @time = @time || Time.now
+    label.to_s + ' (' + ( Time.now - @time ).to_s + ')'
+  end
+
   # Display help
   def help
     help = self.usage + "\n"
@@ -53,19 +60,15 @@ class LightWaveRF
   # Configure, build config file. Interactive command line stuff
   #
   # Arguments:
-  #   debug: (Boolean
+  #   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'] + '). Optional!'
+    puts 'What is the ip address of your wifi link? (currently "' + self.get_config['host'].to_s + '"). Enter a blank line to broadcast UDP commands (ok to just hit enter here).'
+    host = STDIN.gets.chomp
+    config['host'] = host if ! host.to_s.empty?
+    puts 'What is the address of your google calendar? (currently "' + self.get_config['calendar'].to_s + '"). Optional (ok to just hit enter here).'
     calendar = STDIN.gets.chomp
-    if ! calendar.to_s.empty?
-      config['calendar'] = calendar
-    end
+    config['calendar'] = calendar if ! calendar.to_s.empty?
     device = 'x'
     while ! device.to_s.empty?
       puts 'Enter the name of a room and its devices, space separated. For example "lounge light socket tv". Enter a blank line to finish.'
@@ -77,6 +80,9 @@ class LightWaveRF
           found = false
           config['room'].each do | room |
             if room['name'] == new_room
+              parts.map! do | device |
+                { 'name' => device, 'type' => 'O' }
+              end
               room['device'] = parts
               found = true
             end
@@ -85,12 +91,13 @@ class LightWaveRF
           if ! found
             config['room'].push 'name' => new_room, 'device' => parts, 'mood' => nil
           end
-          debug and ( p 'added ' + parts.to_s + ' to ' + new_room )
+          debug and ( p 'added ' + parts.to_s + ' to ' + new_room.to_s )
         end
       end
     end
     debug and ( p 'end of configure, config is now ' + config.to_s )
-    self.put_config config
+    file = self.put_config config
+    'Saved config file ' + file
   end
 
   # Config file setter
@@ -136,7 +143,7 @@ class LightWaveRF
     end
     unless message.nil?
       File.open( self.get_timer_log_file, 'a' ) do | f |
-        f.write("\n" + Time.now.to_s + ' - ' + message + ' - ' + ( result ? 'SUCCESS!' : 'FAILED!' ))
+        f.write( "\n" + Time.now.to_s + ' - ' + message + ' - ' + ( result ? 'SUCCESS!' : 'FAILED!' ))
       end
     end
   end
@@ -164,10 +171,12 @@ class LightWaveRF
     end
   end
 
-  def put_config config = { 'room' => [ { 'name' => 'our', 'device' => [ 'light', 'lights' ] } ] }
+  # Write the config file
+  def put_config config = { 'room' => [ { 'name' => 'our', 'device' => [ 'light' => { 'name' => 'light' }, 'lights' => { 'name' => 'lights' } ] } ] }
     File.open( self.get_config_file, 'w' ) do | handle |
       handle.write YAML.dump( config )
     end
+    self.get_config_file
   end
 
   # Get the config file, create it if it does not exist
@@ -179,15 +188,15 @@ class LightWaveRF
       end
       @config = YAML.load_file self.get_config_file
       # fix where update made names and devices into arrays
-      if @config['room']
-        @config['room'].map! do | room |
-          room['name'] = room['name'].kind_of?( Array ) ? room['name'][0] : room['name']
-          room['device'].map! do | device |
-            device = device.kind_of?( Array ) ? device[0] : device
-          end
-          room
-        end
-      end
+      # if @config['room']
+      #   @config['room'].map! do | room |
+      #     room['name'] = room['name'].kind_of?( Array ) ? room['name'][0] : room['name']
+      #     room['device'].map! do | device |
+      #       device = device.kind_of?( Array ) ? device[0] : device
+      #     end
+      #     room
+      #   end
+      # end
     end
     @config
   end
@@ -209,9 +218,7 @@ class LightWaveRF
     # Login to LightWaveRF Host server
     uri = URI.parse 'https://lightwaverfhost.co.uk/manager/index.php'
     http = Net::HTTP.new uri.host, uri.port
-    if uri.scheme == 'https'
-        http.use_ssl = true
-    end
+    http.use_ssl = true if uri.scheme == 'https'
     data = 'pin=' + pin + '&email=' + email
     headers = { 'Content-Type'=> 'application/x-www-form-urlencoded' }
     resp, data = http.post uri.request_uri, data, headers
@@ -262,7 +269,7 @@ class LightWaveRF
           #   o: All Off
           deviceStatusIndex = roomIndex * 10 + deviceIndex
           if variables['gDeviceStatus'] and variables['gDeviceStatus'][deviceStatusIndex] and variables['gDeviceStatus'][deviceStatusIndex][0] != 'I'
-            roomDevices << deviceName
+            roomDevices << { 'name' => deviceName, 'type' => variables['gDeviceStatus'][deviceStatusIndex][0] }
           end
         end
         # Create a hash of the active room and active devices and add to rooms array
@@ -298,18 +305,19 @@ class LightWaveRF
   end
 
   # Get a cleaned up version of the rooms and devices from the config file
-  def self.get_rooms config = { 'room' => [ ]}, debug = false
+  def self.get_rooms config = { 'room' => [ ] }, debug = false
     rooms = { }
     r = 1
     config['room'].each do | room |
-      debug and ( puts room['name'] + ' = R' + r.to_s )
+      room = room.first if room.is_a? Array
       rooms[room['name']] = { 'id' => 'R' + r.to_s, 'name' => room['name'], 'device' => { }, 'mood' => { }, 'learnmood' => { }}
       d = 1
       unless room['device'].nil?
         room['device'].each do | device |
-          # @todo possibly need to complicate this to get a device name back in here
-          debug and ( puts ' - ' + device + ' = D' + d.to_s )
-          rooms[room['name']]['device'][device] = 'D' + d.to_s
+          device = device.first if device.is_a? Array
+          device = { 'name' => device } if device.is_a? String
+          device['id'] = 'D' + d.to_s
+          rooms[room['name']]['device'][device['name']] = device
           d += 1
         end
       end
@@ -374,9 +382,10 @@ class LightWaveRF
   #   state: (String)
   def command room, device, state
     # @todo get the device name in here...
+    device = device.to_s
     # 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'
+      '666,!' + room['id'] + room['device'][device]['id'] + state + '|Turn ' + room['name'] + ' ' + device + '|' + state + ' via @pauly'
     else
       '666,!' + room['id'] + state + '|Turn ' + room['name'] + '|' + state + ' via @pauly'
     end
@@ -390,11 +399,9 @@ class LightWaveRF
   # 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")
+    command = '666,!FzP' + ( Time.now.gmt_offset/60/60 ).to_s
+    data = self.raw command, true, debug
+    return data == "666,OK\r\n"
   end
 
   # Turn one of your devices on or off or all devices in a room off
@@ -411,9 +418,11 @@ class LightWaveRF
   #   device: (String)
   #   state: (String)
   def send room = nil, device = nil, state = 'on', debug = false
+    debug and ( p self.time 'send' )
     success = false
     debug and ( p 'Executing send on device: ' + device + ' in room: ' + room + ' with state: ' + state )
     rooms = self.class.get_rooms self.get_config, debug
+    debug and ( p self.time 'got rooms' )
 
     unless rooms[room] and state
       debug and ( p 'Missing room (' + room.to_s + ') or state (' + state.to_s + ')' );
@@ -432,9 +441,9 @@ class LightWaveRF
       elsif device and rooms[room]['device'][device]
         state = self.class.get_state state
         command = self.command rooms[room], device, state
-        debug and ( p 'command is ' + command )
+        debug and ( p self.time 'command is ' + command )
         data = self.raw command
-        debug and ( p 'response is ' + data )
+        debug and ( p self.time 'response is ' + data.to_s )
         success = true
       else
         STDERR.puts self.usage( room );
@@ -482,15 +491,14 @@ class LightWaveRF
   #   mood: (String)
   def mood room = nil, mood = nil, debug = false
     success = false
-    debug and (p 'Executing mood: ' + mood + ' in room: ' + room)
-    #debug and ( puts 'config is ' + self.get_config.to_s )
+    debug and ( p 'Executing mood: ' + mood + ' in room: ' + room )
     rooms = self.class.get_rooms self.get_config
     # support for setting a mood in all rooms (recursive)
     if room == 'all'
-      debug and ( p "Processing all rooms..." )
+      debug and ( p 'Processing all rooms...' )
       rooms.each do | config, each_room |
         room = each_room['name']
-        debug and ( p "Room is: " + room )
+        debug and ( p 'Room is: ' + room )
         success = self.mood room, mood, debug
         sleep 1
       end
@@ -508,8 +516,8 @@ class LightWaveRF
           state = mood[3..-1]
           debug and (p 'Selected state is: ' + state)
           rooms[room]['device'].each do | device |
-            p 'Processing device: ' + device[0]
-            self.send room, device[0], state, debug
+            p 'Processing device: ' + device[0].to_s
+            self.send room, device[0]['name'], state, debug
             sleep 1
           end
           success = true
@@ -530,8 +538,7 @@ class LightWaveRF
   #   room: (String)
   #   mood: (String)
   def learnmood room = nil, mood = nil, debug = false
-    debug and (p 'Learning mood: ' + mood)
-    #debug and ( puts 'config is ' + self.get_config.to_s )
+    debug and ( p 'Learning mood: ' + mood )
     rooms = self.class.get_rooms self.get_config
     if rooms[room] and mood and rooms[room]['learnmood'][mood]
       command = self.command rooms[room], nil, rooms[room]['learnmood'][mood]
@@ -542,10 +549,9 @@ class LightWaveRF
     end
   end
 
-  def energy title = nil, note = nil, debug = false
-    debug and note and ( p 'energy: ' + note )
-    data = self.raw '666,@?'
-    debug and ( p data )
+  def energy title = nil, text = nil, debug = false
+    debug and text and ( p 'energy: ' + text )
+    data = self.raw '666,@?', true
     # /W=(?<usage>\d+),(?<max>\d+),(?<today>\d+),(?<yesterday>\d+)/.match data # ruby 1.9 only?
     match = /W=(\d+),(\d+),(\d+),(\d+)/.match data
     debug and ( p match )
@@ -558,8 +564,38 @@ class LightWaveRF
         }
       }
       data['timestamp'] = Time.now.to_s
-      if note
-        data['message']['annotation'] = { 'title' => title.to_s, 'text' => note.to_s }
+      if text
+        data['message']['annotation'] = { 'title' => title.to_s, 'text' => text.to_s }
+      end
+
+      if text
+        if self.get_config['spreadsheet']
+          spreadsheet = self.get_config['spreadsheet']['url']
+          match = /key=([\w-]+)/.match spreadsheet
+          debug and ( p match )
+          if match
+            spreadsheet = match[1]
+          end
+          debug and ( p 'spreadsheet is ' + spreadsheet )
+          if spreadsheet
+            require 'google_drive'
+            session = GoogleDrive.login self.get_config['spreadsheet']['username'], self.get_config['spreadsheet']['password']
+            ws = session.spreadsheet_by_key( spreadsheet ).worksheets[0]
+            rows = ws.num_rows
+            debug and ( p rows.to_s + ' rows in ' + spreadsheet )
+            row = rows + 1
+            ws[ row, 1 ] = data['timestamp']
+            ws[ row, 2 ] = data['message']['usage']
+            ws[ row, 3 ] = data['message']['max']
+            ws[ row, 4 ] = data['message']['today']
+            ws[ row, 5 ] = data['message']['annotation']['title']
+            ws[ row, 6 ] = data['message']['annotation']['text']
+            ws.save( )
+          end
+        else
+          debug and ( p 'no spreadsheet in your config file...' )
+        end
+
       end
       debug and ( p data )
       begin
@@ -567,13 +603,7 @@ class LightWaveRF
           f.write( data.to_json + "\n" )
         end
         file = self.get_summary_file.gsub 'summary', 'daily'
-        json = self.class.get_contents file
-        begin
-          data['message']['history'] = JSON.parse json
-        rescue => e
-          data['message']['error'] = 'error parsing ' + file + '; ' + e.to_s
-          data['message']['history_json'] = json
-        end
+        data['message']['history'] = self.class.get_json file
         data['message']
       rescue
         puts 'error writing to log'
@@ -581,37 +611,49 @@ class LightWaveRF
     end
   end
 
-  def raw command
+  def raw command, listen = false, debug = false
+    debug and ( p self.time + ' ' + __method__.to_s + ' ' + command )
     response = nil
     # Get host address or broadcast address
     host = self.get_config['host'] || '255.255.255.255'
+    debug and ( p self.time 'got ' + host )
     # Create socket
     listener = UDPSocket.new
+    debug and ( p self.time 'got listener' )
     # Add broadcast socket options if necessary
-    if (host == '255.255.255.255')
-      listener.setsockopt(Socket::SOL_SOCKET, Socket::SO_BROADCAST, true)
+    if host == '255.255.255.255'
+      listener.setsockopt Socket::SOL_SOCKET, Socket::SO_BROADCAST, true
     end
     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"
+      if listen
+        # 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
       end
       # Broadcast command to server
-      listener.send(command, 0, host, 9760)
+      debug and ( p self.time 'sending...' )
+      listener.send command, 0, host, 9760
+      debug and ( p self.time 'sent' )
       # Receive response
-      if ! response
+      if listen and ! response
+        debug and ( p self.time 'receiving...' )
         response, addr = listener.recvfrom 200
+        debug and ( p self.time 'received' )
       end
+      debug and ( p self.time 'closing...' )
       listener.close
+      debug and ( p self.time 'closed' )
     end
+    debug and ( puts '[Info - LightWaveRF] ' + __method__.to_s + ': response is ' + response.to_s )
     response
   end
 
   def update_timers past = 60, future = 1440, debug = false
     p '----------------'
-    p "Updating timers..."
+    p 'Updating timers...'
 
     # determine the window to query
     now = Time.new
@@ -983,15 +1025,16 @@ class LightWaveRF
         p 'Executing sequence. Sequence: ' + event['state']
         result = self.sequence event['state'], debug
       else
-        p 'Executing device. Room: ' + event['room'] + ', Device: ' + event['device'] + ', State: ' + event['state']
-        result = self.send event['room'], event['device'], event['state'], debug
+        p 'Executing device. Room: ' + event['room'] + ', Device: ' + event['device'].to_s + ', State: ' + event['state']
+        # result = self.send event['room'], event['device']['name'], event['state'], debug
+        result = self.send event['room'], event['device'].to_s, event['state'], debug # is this right?
       end
       sleep 1
-      triggered << [ event['room'], event['device'], event['state'] ]
+      triggered << [ event['room'], event['device'].to_s, event['state'] ]
       if event['annotate']
         annotate = true
       end
-      self.log_timer_event event['type'], event['room'], event['device'], event['state'], result
+      self.log_timer_event event['type'], event['room'], event['device'].to_s, event['state'], result
     end
 
     # update energy log
@@ -1053,7 +1096,7 @@ class LightWaveRF
       Sample page generated #{date} with <code>lightwaverf web</code>.
       Check out <a href="https://github.com/pauly/lightwaverf">the new simplified repo</a> for details
       or <a href="https://rubygems.org/gems/lightwaverf">gem install lightwaverf && lightwaverf web</a>...
-      <br />@todo make a decent, useful, simple, configurable web page...
+      <br />@todo merge this with <a href="https://github.com/pauly/robot-butler">robot butler</a>...
     end
     help = list
     html = <<-end
@@ -1105,20 +1148,29 @@ class LightWaveRF
     daily = self.class.get_json file
     start_date = 0
     d = nil
+    last = nil
+    prev = nil
     File.open( self.get_log_file, 'r' ).each_line do | line |
-      line = JSON.parse line
-      if line and line['timestamp']
+      begin
+        line = JSON.parse line
+      rescue
+        line = nil
+      end
+      if line and line['timestamp'] and ( last != line['message']['usage'] )
         new_line = []
         d = line['timestamp'][2..3] + line['timestamp'][5..6] + line['timestamp'][8..9] # compact version of date
         ts = Time.parse( line['timestamp'] ).strftime '%s'
         ts = ts.to_i
-        if start_date > 0
-          ts = ts - start_date
-        else
-          start_date = ts
+        ts = ts - start_date
+        if start_date == 0
+          # start_date = ts # can't get this delta working
         end
         new_line << ts
-        new_line << line['message']['usage'].to_i / 10
+        smoothedUsage = line['message']['usage'].to_i
+        if last && prev
+          smoothedUsage = ( smoothedUsage + last + prev ) / 3 # average of last 3 readings
+        end
+        new_line << smoothedUsage / 10
         if line['message']['annotation'] and line['message']['annotation']['title'] and line['message']['annotation']['text']
           new_line << line['message']['annotation']['title']
           new_line << line['message']['annotation']['text']
@@ -1128,6 +1180,8 @@ class LightWaveRF
           daily[d] = line['message']
           daily[d].delete 'usage'
         end
+        prev = last
+        last = line['message']['usage'].to_i
       end
     end
     debug and ( puts 'got ' + data.length.to_s + ' lines in the log' )
@@ -1141,7 +1195,8 @@ class LightWaveRF
     end
     summary_file = self.get_summary_file
     File.open( summary_file, 'w' ) do |file|
-      file.write data.to_s
+      # file.write data.to_s
+      file.write( JSON.pretty_generate( data ))
     end
     # @todo fix the daily stats, every night it reverts to the minimum value because the timezones are different
     # so 1am on the wifi-link looks midnight on the server
@@ -1153,4 +1208,9 @@ class LightWaveRF
     end
   end
 
+  # http://lightwaverfcommunity.org.uk/forums/topic/link-no-longer-responding-to-udp-commands-any-advice/page/4/#post-16098
+  def firmware debug = true
+    self.raw '666,!F*p', true, debug
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lightwaverf
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: '0.7'
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -47,7 +47,8 @@ dependencies:
         version: '0'
 description: ! "    Interact with lightwaverf wifi-link from code or the command line.\n
   \   Control your lights, heating, sockets, sprinkler etc.\n    Also use a google
-  calendar, for timers, log energy usage, and build a website.\n"
+  calendar, for timers, log energy usage, and build a website.\n    And now optionally
+  logging to a google doc too.\n"
 email: pauly@clarkeology.com
 executables:
 - lightwaverf