lxp-packet 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f690a3ff0e519ed9f0c68152117bfcd4ece48d2ffd67c32b83cd1b2bafc356b5
-  data.tar.gz: 4f35b9e46c92659e7bd5c366e3cc6bcbe9c4646e17278b6a8df3f7c3edb220a5
+  metadata.gz: 4fc4ef9aa204639ee245d39bba281bb3ec005013a7a7d3f16f975d5e31a6eca6
+  data.tar.gz: 9cb28af9771bf98ec9f793bf77785611337529b3514d7b8061d8ee53e234620a
 SHA512:
-  metadata.gz: d19df5ab0f0cbe0568c4f7277a1ea84c071f30a3c882cabc16464b0a6a1b2850d27deeb191e74920d5f6da7fb052fde8b89768a535117a369c1724b75cfc4ef4
-  data.tar.gz: 418b00400f1c147d45dccb5f0d74660baccd9a5a5d88fb81cd0e25c86115550f1609f1482d9ea8fca9f4f9ec56d86b6bd5654138d7d2561d8a9595dc0fb4f466
+  metadata.gz: cb39026d5d05f414ddfae9d1087646310fb52c1d5a9b59752472eaa69046e793697165b88153e4a03bb9372c562a331e3db4284b312c0164b810b4508d6f052d
+  data.tar.gz: 6bf3e09ff9a48c98c884f6bb45fe776cf15ca80dd6cac1445889c9a9cbb89d3b1631f9df9c18210a1c100af404e0ffbea000af695a767196a6c99ca0824ee1e4

data/CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- support 3 PV strings in `ReadInput1` and `ReadInput2`
+- support 3 phase power in `ReadInput1`
+- support `t_bat` key in `ReadInput2#to_h` (suspect this is Lead Acid only as mine is 0)
+- support `uptime` key in `ReadInput2#to_h`
+
+### Fixed
+
+- parsing of temperatures above 255C in ReadInput2
+
+
 ## [0.4.0] - 2020-04-07
 
 ### Added

data/lib/lxp/packet/read_input1.rb

@@ -8,44 +8,68 @@ class LXP
       # Decode the data and return a hash of values in this input packet
       def to_h
         {
-          status: @data[15],
+          # 0 = static 1
+          # 1 = R_INPUT
+          # 2..12 = serial
+          # 13/14 = length
 
-          v_bat: Utils.int(@data[23, 2], :lsb) / 10.0, # V
+          status: Utils.int(@data[15, 2]),
+
+          # 17-22 all observed zeroes (v_pv, v_pv_2, v_pv_3 ?)
+
+          v_bat: Utils.int(@data[23, 2]) / 10.0, # V
           soc: @data[25], # %
+          # 26 used for anything?
+
+          # observed [0, 47] => 12032 or 0x2F00
+          _unknown_i1_28: @data[28],
+          _unknown_i1_27_28: Utils.int(@data[27, 2]),
 
-          # 26..28 ?
+          p_pv: Utils.int(@data[29, 2]) +
+            Utils.int(@data[31, 2]) +
+            Utils.int(@data[33, 2]), # W
+          p_pv_1: Utils.int(@data[29, 2]), # W
+          p_pv_2: Utils.int(@data[31, 2]), # W
+          p_pv_3: Utils.int(@data[33, 2]), # W
+          p_charge: Utils.int(@data[35, 2]), # W
+          p_discharge: Utils.int(@data[37, 2]), # W
+          v_ac_r: Utils.int(@data[39, 2]) / 10.0, # V
+          v_ac_s: Utils.int(@data[41, 2]) / 10.0, # V
+          v_ac_t: Utils.int(@data[43, 2]) / 10.0, # V
+          f_ac: Utils.int(@data[45, 2]) / 100.0, # Hz
 
-          p_pv: Utils.int(@data[29, 2], :lsb), # W
-          p_charge: Utils.int(@data[35, 2], :lsb), # W
-          p_discharge: Utils.int(@data[37, 2], :lsb), # W
-          v_acr: Utils.int(@data[39, 2], :lsb) / 10.0, # V
-          f_ac: Utils.int(@data[45, 2], :lsb) / 100.0, # Hz
+          p_inv: Utils.int(@data[47, 2]), # W
+          p_rec: Utils.int(@data[49, 2]), # W
 
-          p_inv: Utils.int(@data[47, 2], :lsb), # W
-          p_rec: Utils.int(@data[49, 2], :lsb), # W
+          _unknown_i1_51_52: Utils.int(@data[51, 2]),
 
-          # 51..54 ?
+          pf: Utils.int(@data[53, 2]) / 1000.0, # Hz
 
-          v_eps: Utils.int(@data[55, 2], :lsb) / 10.0, # V
-          f_eps: Utils.int(@data[61, 2], :lsb) / 100.0, # Hz
+          v_eps_r: Utils.int(@data[55, 2]) / 10.0, # V
+          v_eps_s: Utils.int(@data[57, 2]) / 10.0, # V
+          v_eps_t: Utils.int(@data[59, 2]) / 10.0, # V
+          f_eps: Utils.int(@data[61, 2]) / 100.0, # Hz
 
           # peps and seps in 63..66?
 
-          p_to_grid: Utils.int(@data[67, 2], :lsb), # W
-          p_to_user: Utils.int(@data[69, 2], :lsb), # W
-
-          e_pv_day: Utils.int(@data[71, 2], :lsb) / 10.0, # kWh
-          # 73..76 ?
-          e_inv_day: Utils.int(@data[77, 2], :lsb) / 10.0, # kWh
-          e_rec_day: Utils.int(@data[79, 2], :lsb) / 10.0, # kWh
-          e_chg_day: Utils.int(@data[81, 2], :lsb) / 10.0, # kWh
-          e_dischg_day: Utils.int(@data[83, 2], :lsb) / 10.0, # kWh
-          e_eps_day: Utils.int(@data[85, 2], :lsb) / 10.0, # kWh
-          e_to_grid_day: Utils.int(@data[87, 2], :lsb) / 10.0, # kWh
-          e_to_user_day: Utils.int(@data[89, 2], :lsb) / 10.0, # kWh
-
-          v_bus_1: Utils.int(@data[91, 2], :lsb) / 10.0, # V
-          v_bus_2: Utils.int(@data[93, 2], :lsb) / 10.0 # V
+          p_to_grid: Utils.int(@data[67, 2]), # W
+          p_to_user: Utils.int(@data[69, 2]), # W
+
+          e_pv_day: (Utils.int(@data[71, 2]) +
+                     Utils.int(@data[73, 2]) + Utils.int(@data[75, 2])) / 10.0, # kWh
+          e_pv_1_day: Utils.int(@data[71, 2]) / 10.0, # kWh
+          e_pv_2_day: Utils.int(@data[73, 2]) / 10.0, # kWh
+          e_pv_3_day: Utils.int(@data[75, 2]) / 10.0, # kWh
+          e_inv_day: Utils.int(@data[77, 2]) / 10.0, # kWh
+          e_rec_day: Utils.int(@data[79, 2]) / 10.0, # kWh
+          e_chg_day: Utils.int(@data[81, 2]) / 10.0, # kWh
+          e_dischg_day: Utils.int(@data[83, 2]) / 10.0, # kWh
+          e_eps_day: Utils.int(@data[85, 2]) / 10.0, # kWh
+          e_to_grid_day: Utils.int(@data[87, 2]) / 10.0, # kWh
+          e_to_user_day: Utils.int(@data[89, 2]) / 10.0, # kWh
+
+          v_bus_1: Utils.int(@data[91, 2]) / 10.0, # V
+          v_bus_2: Utils.int(@data[93, 2]) / 10.0 # V
         }
       end
     end

data/lib/lxp/packet/read_input2.rb

@@ -8,18 +8,37 @@ class LXP
       # Decode the data and return a hash of values in this input packet
       def to_h
         {
-          e_pv_all: Utils.int(@data[15, 4], :lsb) / 10.0, # kWh
-          e_inv_all: Utils.int(@data[27, 4], :lsb) / 10.0, # kWh
-          e_rec_all: Utils.int(@data[31, 4], :lsb) / 10.0, # kWh
-          e_chg_all: Utils.int(@data[35, 4], :lsb) / 10.0, # kWh
-          e_dischg_all: Utils.int(@data[39, 4], :lsb) / 10.0, # kWh
-          e_eps_all: Utils.int(@data[43, 4], :lsb) / 10.0, # kWh
-          e_to_grid_all: Utils.int(@data[47, 4], :lsb) / 10.0, # kWh
-          e_to_user_all: Utils.int(@data[51, 4], :lsb) / 10.0, # kWh
+          # 0 = static 1
+          # 1 = R_INPUT
+          # 2..12 = serial
+          # 13/14 = length
 
-          t_inner: Utils.int(@data[62, 2], :msb),
-          t_rad_1: Utils.int(@data[64, 2], :msb),
-          t_rad_2: Utils.int(@data[66, 2], :msb)
+          e_pv_all: (Utils.int(@data[15, 4]) +
+                     Utils.int(@data[19, 4]) +
+                     Utils.int(@data[23, 4])) / 10.0, # kWh
+          e_pv_1_all: Utils.int(@data[15, 4]) / 10.0, # kWh
+          e_pv_2_all: Utils.int(@data[19, 4]) / 10.0, # kWh
+          e_pv_3_all: Utils.int(@data[23, 4]) / 10.0, # kWh
+          e_inv_all: Utils.int(@data[27, 4]) / 10.0, # kWh
+          e_rec_all: Utils.int(@data[31, 4]) / 10.0, # kWh
+          e_chg_all: Utils.int(@data[35, 4]) / 10.0, # kWh
+          e_dischg_all: Utils.int(@data[39, 4]) / 10.0, # kWh
+          e_eps_all: Utils.int(@data[43, 4]) / 10.0, # kWh
+          e_to_grid_all: Utils.int(@data[47, 4]) / 10.0, # kWh
+          e_to_user_all: Utils.int(@data[51, 4]) / 10.0, # kWh
+
+          # 55 .. 62?
+          #   fault code? 4 bytes?
+          #   warning code? 4 bytes?
+
+          t_inner: Utils.int(@data[63, 2]),
+          t_rad_1: Utils.int(@data[65, 2]),
+          t_rad_2: Utils.int(@data[67, 2]),
+          t_bat: Utils.int(@data[69, 2]),
+
+          # 71..72 ?
+
+          uptime: Utils.int(@data[73, 4]) # seconds
         }
       end
     end

data/lib/lxp/packet/read_input3.rb

@@ -8,11 +8,20 @@ class LXP
       # Decode the data and return a hash of values in this input packet
       def to_h
         {
-          max_chg_curr: Utils.int(@data[17, 2], :lsb) / 100.0, # A
-          max_dischg_curr: Utils.int(@data[19, 2], :lsb) / 100.0, # A
-          charge_volt_ref: Utils.int(@data[21, 2], :lsb) / 10.0, # V
-          dischg_cut_volt: Utils.int(@data[23, 2], :lsb) / 10.0, # V
+          # 0 = static 1
+          # 1 = R_INPUT
+          # 2..12 = serial
+          # 13/14 = length
 
+          # 15..16? .. (observed: 10)
+
+          max_chg_curr: Utils.int(@data[17, 2]) / 100.0, # A
+          max_dischg_curr: Utils.int(@data[19, 2]) / 100.0, # A
+          charge_volt_ref: Utils.int(@data[21, 2]) / 10.0, # V
+          dischg_cut_volt: Utils.int(@data[23, 2]) / 10.0, # V
+
+          # are these actually 2 bytes as well?
+          # never seen data in them so its hard to tell.
           bat_status_0: @data[25],
           bat_status_1: @data[27],
           bat_status_2: @data[29],
@@ -24,6 +33,9 @@ class LXP
           bat_status_8: @data[41],
           bat_status_9: @data[43],
           bat_status_inv: @data[45]
+
+          # 47/48 = battery count? seen a 6 but unconfirmed it changes
+          # when battery count does.. TODO..
         }
       end
     end

data/lib/lxp/utils.rb

@@ -4,16 +4,14 @@ class LXP
   module Utils
     module_function
 
-    def int(bytes, order = :lsb)
-      bytes = bytes.reverse if order == :msb
-
+    def int(bytes)
       bytes.each_with_index.map do |b, idx|
         b << (idx * 8)
       end.inject(:|)
     end
 
-    def int_complement(bytes, order = :lsb)
-      r = int(bytes, order)
+    def int_complement(bytes)
+      r = int(bytes)
       r -= 0x10000 if r & 0x8000 == 0x8000
       r
     end

data/lib/lxp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class LXP
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/spec/parser_spec.rb

@@ -74,7 +74,30 @@ RSpec.describe LXP::Packet::Parser do
 
     describe '#to_h' do
       subject { packet.to_h }
-      it { is_expected.to eq status: 16, v_bat: 49.7, soc: 95, p_pv: 0, p_charge: 0, p_discharge: 633, v_acr: 247.6, f_ac: 50.1, p_inv: 569, p_rec: 0, v_eps: 247.6, f_eps: 50.1, p_to_grid: 0, p_to_user: 0, e_pv_day: 22.1, e_inv_day: 4.2, e_rec_day: 7.3, e_chg_day: 8.6, e_dischg_day: 5.2, e_eps_day: 0.0, e_to_grid_day: 3.6, e_to_user_day: 0.2, v_bus_1: 375.6, v_bus_2: 299.7 }
+      it { is_expected.to eq _unknown_i1_28: 47, _unknown_i1_27_28: 12_032, _unknown_i1_51_52: 227, status: 16, v_bat: 49.7, soc: 95, p_pv: 0, p_pv_1: 0, p_pv_2: 0, p_pv_3: 0, p_charge: 0, p_discharge: 633, v_ac_r: 247.6, v_ac_s: 0.1, v_ac_t: 0.0, f_ac: 50.1, p_inv: 569, p_rec: 0, pf: 1.0, v_eps_r: 247.6, v_eps_s: 281.6, v_eps_t: 2875.2, f_eps: 50.1, p_to_grid: 0, p_to_user: 0, e_pv_day: 22.1, e_pv_1_day: 22.1, e_pv_2_day: 0.0, e_pv_3_day: 0.0, e_inv_day: 4.2, e_rec_day: 7.3, e_chg_day: 8.6, e_dischg_day: 5.2, e_eps_day: 0.0, e_to_grid_day: 3.6, e_to_user_day: 0.2, v_bus_1: 375.6, v_bus_2: 299.7 }
+    end
+  end
+
+  context 'ReadInput2 data' do
+    let(:input) { [161, 26, 2, 0, 111, 0, 1, 194, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 97, 0, 1, 4, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 40, 0, 80, 83, 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 179, 38, 0, 0, 43, 45, 0, 0, 105, 51, 0, 0, 44, 47, 0, 0, 0, 0, 0, 0, 95, 5, 0, 0, 63, 46, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 0, 36, 0, 37, 0, 0, 0, 0, 0, 35, 136, 224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 188, 199] }
+
+    it { is_expected.to be_a LXP::Packet::ReadInput2 }
+
+    it 'has the correct attributes' do
+      expect(packet).to have_attributes register: 40,
+                                        values: [83, 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 179, 38, 0, 0, 43, 45, 0, 0, 105, 51, 0, 0, 44, 47, 0, 0, 0, 0, 0, 0, 95, 5, 0, 0, 63, 46, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 0, 36, 0, 37, 0, 0, 0, 0, 0, 35, 136, 224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+                                        protocol: 2,
+                                        packet_length: 111, data_length: 97,
+                                        tcp_function: LXP::Packet::TcpFunctions::TRANSLATED_DATA,
+                                        device_function: LXP::Packet::DeviceFunctions::READ_INPUT,
+                                        inverter_serial: 'XXXXXXXXXX',
+                                        datalog_serial: 'cccccccccc',
+                                        bytes: input
+    end
+
+    describe '#to_h' do
+      subject { packet.to_h }
+      it { is_expected.to eq e_chg_all: 1316.1, e_dischg_all: 1207.6, e_eps_all: 0.0, e_inv_all: 990.7, e_pv_all: 1774.7, e_pv_1_all: 1774.7, e_pv_2_all: 0.0, e_pv_3_all: 0.0, e_rec_all: 1156.3, e_to_grid_all: 137.5, e_to_user_all: 1183.9, t_bat: 0, t_inner: 48, t_rad_1: 36, t_rad_2: 37, uptime: 14_714_915 }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lxp-packet
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Chris Elsworth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-07 00:00:00.000000000 Z
+date: 2020-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler