green_eye_monitor 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09b0535de2863db3b5f87effe6df03574c05e175
-  data.tar.gz: 1ed78d617dd877f19d8290e50154fa467fa51135
+  metadata.gz: 1cb9382f227f92a98dcc439bc7176ef5c4003147
+  data.tar.gz: 0f4d9dc2d207d4553a535670a3b0fc9f7ee80366
 SHA512:
-  metadata.gz: 016f16ef7c22fa7cf21f091c8f99f26f8d03235e3f279e1b2a11a8965a354bddaca570c5b83d68b1a6cab6d991bc33bc0dd2d6cd0dfe70dc0b9975bb0683350b
-  data.tar.gz: 39d715c5f09ec09f91eea866f7b0ff5c98b5b7ad072197a62a8751f8119231e64e0a7627fbe17ef993f7f562c24fc17f19f1a2968c5ca97daea026dec6919f8b
+  metadata.gz: 695e3d2ea31df523c48057939184afd5abd2382fae5d3ac22f145ef34c26fb1111ce3f6c555dfbbccc3655a612bde5bd542d611164c063b4140d97f6170dcd5d
+  data.tar.gz: 31d1778a2c5977ea7da9858fdcecf3949fd5ff5556298e53de48a085553b8f64d218749e4d9e488137ab7225ede4fbd4f5f80a1c9141a97139e9662e0c936c67

data/.gitignore

@@ -4,3 +4,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+# 0.0.3 (20160515)
+
+* Add functionality to derive watts based on previous packet (@johnf)
+* Add table output to sample script
+
 # 0.0.2 (20160515)
 
 * Add command line serial port switch (@johnf)

data/exe/green_eye_monitor

@@ -6,6 +6,7 @@ require 'green_eye_monitor/client'
 
 require 'slop'
 require 'awesome_print'
+require 'terminal-table'
 
 opts = Slop.parse do |o|
   o.bool '-d', '--debug', 'enable debug mode'
@@ -18,11 +19,6 @@ end
 
 client = GreenEyeMonitor::Client.new(:baud => 115_200, :serial_port => opts[:port], :debug => opts[:debug])
 
-# client.packet_format = :bin48_net_time
-# client.enable_realtime
-
-# exit
-
 puts '# Direct'
 puts "Serial: #{client.serial}"
 puts "Hertz: #{client.hertz}"
@@ -40,17 +36,32 @@ puts
 puts '# Bin32 Net Format'
 client.packet_format = :bin32_net
 data = client.send_one_packet
+sleep(2)
+data = client.send_one_packet(data)
 
 # ap data.snapshot
 puts "Serial: #{data.serial_number}"
 puts "Voltage: #{data.voltage}"
-puts
-puts "ABS Watt Seconds #{data.abs_watt_seconds[0, 5]}"
-puts "Polarised Watt Seconds #{data.polarised_watt_seconds[0, 5]}"
-puts "Current: #{data.current[0, 5]}"
-
 puts "Seconds: #{data.seconds}"
 puts "Pulse: #{data.pulse}"
 puts "Temperature: #{data.temperature}"
+puts
+
+rows = []
+# rows << ['ABS Watt Seconds'] + data.abs_watt_seconds
+# rows << ['Polarised Watt Seconds'] + data.polarised_watt_seconds
+rows << ['ABS Watts'] + data.abs_watts
+rows << ['VA'] + data.va
+rows << ['Polarised Watts'] + data.polarised_watts
+rows << ['Current'] + data.current
+rows.each {|row| row.slice!(15..28)}
+headings = [''] + (1..15).to_a + (30..32).to_a
+puts Terminal::Table.new(:rows => rows, :headings => headings)
+puts
+
+puts "ABS Total: #{data.abs_watts.to_a[0..14].inject(:+)} vs #{data.abs_watts.to_a[28..31].inject(:+)}"
+puts "Polarised Total: #{data.polarised_watts.to_a[0..24].inject(:+)} vs #{data.polarised_watts.to_a[28..31].inject(:+)}"
+puts "VA Total: #{data.va.to_a[0..14].inject(:+)} vs #{data.va.to_a[28..31].inject(:+)}"
+puts "Current Total: #{data.current.to_a[0..14].inject(:+)} vs #{data.current.to_a[28..31].inject(:+)}"
 
 # client.shell

data/green_eye_monitor.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'bindata'
   spec.add_dependency 'slop'
   spec.add_dependency 'awesome_print'
+  spec.add_dependency 'terminal-table'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/lib/green_eye_monitor/client.rb

@@ -193,7 +193,7 @@ module GreenEyeMonitor
     end
 
     # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength
-    def send_one_packet
+    def send_one_packet(old_packet = nil)
       pf = packet_format
       raise(Errors::NotImplemented, "Unimplemented packet format: #{pf}") unless IMPLEMENTED_FORMATS.include?(pf)
 
@@ -204,19 +204,19 @@ module GreenEyeMonitor
         read(:expect => /^.*<EOP>$/, :wait => true)
       when :bin48_net_time
         packet = read(:length => 625, :wait => true)
-        Packet::Bin48NetTime.read(StringIO.new(packet))
+        Packet::Bin48NetTime.read(StringIO.new(packet), old_packet)
       when :bin48_net
         packet = read(:length => 619, :wait => true)
-        Packet::Bin48Net.read(StringIO.new(packet))
+        Packet::Bin48Net.read(StringIO.new(packet), old_packet)
       when :bin48_abs
         packet = read(:length => 379, :wait => true)
-        Packet::Bin48Abs.read(StringIO.new(packet))
+        Packet::Bin48Abs.read(StringIO.new(packet), old_packet)
       when :bin32_net
         packet = read(:length => 429, :wait => true)
-        Packet::Bin32Net.read(StringIO.new(packet))
+        Packet::Bin32Net.read(StringIO.new(packet), old_packet)
       when :bin32_abs
         packet = read(:length => 269, :wait => true)
-        Packet::Bin32Abs.read(StringIO.new(packet))
+        Packet::Bin32Abs.read(StringIO.new(packet), old_packet)
       end
     end
     # rubocop:enable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength

data/lib/green_eye_monitor/packet/bin_net_base.rb

@@ -3,6 +3,15 @@ require 'bindata'
 module GreenEyeMonitor
   module Packet
     class BinNetBase < BinData::Record
+      attr_accessor :old_record
+
+      def self.read(data, old_record = nil)
+        packet = super(data)
+        packet.old_record = old_record
+
+        packet
+      end
+
       uint8 :header_a, :asserted_value => 0xFE
       uint8 :header_b, :asserted_value => 0xFF
       uint8 :header_c, :asserted_value => :version
@@ -38,13 +47,6 @@ module GreenEyeMonitor
 
       uint8 :checksum, :assert => lambda { calc_checksum(value) }
 
-      def calc_checksum(checksum)
-        calculated_checksum = (to_binary_s.bytes.inject(0, :+) - checksum) & 0xFF
-
-        # TODO: why are we off by one?
-        checksum == calculated_checksum + 1
-      end
-
       def voltage
         raw_voltage / 10.0
       end
@@ -60,6 +62,57 @@ module GreenEyeMonitor
       def serial_number
         format('%03d%05d', device_id, serial)
       end
+
+      def va
+        current.map { |c| (c * voltage).to_i }
+      end
+
+      def abs_watts
+        if old_record
+          derive_watts(old_record.abs_watt_seconds, abs_watt_seconds, old_record.seconds, seconds)
+        else
+          [0] * abs_watt_seconds.size
+        end
+      end
+
+      def polarised_watts
+        if old_record
+          derive_watts(old_record.polarised_watt_seconds, polarised_watt_seconds, old_record.seconds, seconds)
+        else
+          [0] * abs_watt_seconds.size
+        end
+      end
+
+      private
+
+      def calc_checksum(checksum)
+        calculated_checksum = (to_binary_s.bytes.inject(0, :+) - checksum) & 0xFF
+
+        # TODO: why are we off by one?
+        checksum == calculated_checksum + 1
+      end
+
+      def derive_watts(prev_ws_values, curr_ws_values, prev_sec, cur_sec)
+        if prev_sec > cur_sec
+          sec_diff = 256^3 - prev_sec
+          sec_diff += cur_sec
+        else
+          sec_diff = cur_sec - prev_sec
+        end
+
+        prev_ws_values.zip(curr_ws_values).map do |prev_ws, curr_ws|
+          if prev_ws > curr_ws
+            ws_diff = 256^5 - prev_ws
+            ws_diff += curr_ws
+          else
+            ws_diff = curr_ws - prev_ws
+          end
+
+          watts = ws_diff / sec_diff
+
+          watts
+        end
+      end
     end
   end
 end

data/lib/green_eye_monitor/version.rb

@@ -1,3 +1,3 @@
 module GreenEyeMonitor
-  VERSION = '0.0.2'.freeze
+  VERSION = '0.0.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: green_eye_monitor
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - John Ferlito
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement