axpert_rs232 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a55f87bf3885c55d1f3d8765a6692ad24cb23b6f
-  data.tar.gz: a428611424453e3d2822bf6a063ef5896551ac54
+  metadata.gz: 60d70ae8b654af6e6c01075786760ae0bdeaa415
+  data.tar.gz: 1dc9b6d89cd66fccbdbc1aeb8803043df60486a7
 SHA512:
-  metadata.gz: 61875ef2d1849dfb505269808f3451e4632e84f9abeaafb53acf4571c98eaebd0cb3f7a1d1a9e701861deeda3013ab3e8cdb6323a05945cd7d9580378a60133f
-  data.tar.gz: 001c759d71bb3b6ab3a286204ba7a97bfa672868bba935b664c636c371e5399e2f906df17f8863e330ff077a947daaacbb8cb7ba2f2a316569e49cf475ca68d7
+  metadata.gz: 6378823b19402f22e0a0677fd96c3e000f88aca25102f60ab2dc46f1f7a57818b86b0ba85d6fc7fac348950ecb89dba30043bb6cf71eb423ae1db8164876d271
+  data.tar.gz: bf1209ae0f494ace81ea289287f680631220c3b53329bfa7ea642b8ce1278d42307879c8e7fc9f67fd43d9c0972b827ff36ecfc6538d3172e8eeee54a87bf8e1

data/lib/axpert_commands.rb

@@ -56,20 +56,20 @@ module AxpertCommands
   #    { grid_voltage: 230.5, grid_current: 11.2, .. }
   DEVICE_RATING = OP.new(command: 'QPIRI', parser: lambda do |r|
     r = r.data[1..-1].split(' ')
-    { grid_voltage: Float(r[0]),
-      grid_current: Float(r[1]),
+    { utility_voltage: Float(r[0]),
+      utility_current: Float(r[1]),
       output_voltage: Float(r[2]),
       output_frequency: Float(r[3]),
       output_current: Float(r[4]),
       output_va: Integer(r[5], 10),
       output_watts: Integer(r[6], 10),
       battery_voltage: Float(r[7]),
-      battery_recharge_voltage: Float(r[8]),
-      battery_under_voltage: Float(r[9]),
+      battery_bulk_charge_voltage: Float(r[8]),
+      battery_cutoff_voltage: Float(r[9]),
       battery_bulk_charge_voltage: Float(r[10]),
       battery_float_charge_voltage: Float(r[11]),
       battery_type: ::AxpertConstants::BATTERY_TYPE[r[12]],
-      maximum_ac_charge_current: Integer(r[13], 10),
+      maximum_utility_charge_current: Integer(r[13], 10),
       maximum_charge_current: Integer(r[14], 10),
       input_voltage_sensitivity: CONS::INPUT_VOLTAGE_SENSITIVITY[r[15]],
       output_source_priority: CONS::OUTPUT_SOURCE_PRIORITY[r[16]],
@@ -78,7 +78,7 @@ module AxpertCommands
       device_type: CONS::DEVICE_TYPE[r[19]],
       device_topology: CONS::DEVICE_TOPOLOGY[r[20]],
       output_mode: CONS::OUTPUT_MODE[r[21]],
-      battery_redischarge_voltage: Float(r[22]),
+      battery_float_charge_voltage: Float(r[22]),
       pv_parallel_ok_mode: CONS::PV_PARALLEL_OK_MODE[r[23]],
       pv_power_balance_mode: CONS::PV_POWER_BALANCE_MODE[r[24]] }
   end)
@@ -115,8 +115,8 @@ module AxpertCommands
   DEVICE_STATUS = OP.new(command: 'QPIGS', parser: lambda do |r|
     r = r.data[1..-1].split(' ')
     status = r[16].chars.map { |c| Boolean(c) }
-    { grid_voltage: Float(r[0]),
-      grid_frequency: Float(r[1]),
+    { utility_voltage: Float(r[0]),
+      utility_frequency: Float(r[1]),
       output_voltage: Float(r[2]),
       output_frequency: Float(r[3]),
       output_va: Integer(r[4], 10),
@@ -126,7 +126,7 @@ module AxpertCommands
       battery_voltage: Float(r[8]),
       battery_charge_current: Float(r[9]),
       battery_capacity_remaining: Integer(r[10], 10),
-      inverter_heatsink_celsius_temperature: Integer(r[11], 10),
+      inverter_temperature_celsius: Integer(r[11], 10),
       pv_battery_input_current: Integer(r[12], 10),
       pv_input_voltage: Float(r[13]),
       solar_charge_controller_battery_voltage: Float(r[14]),
@@ -166,7 +166,7 @@ module AxpertCommands
     errors << parse.yield('Bus voltage is too high', :fault) if r[2]
     errors << parse.yield('Bus voltage is too low', :fault) if r[3]
     errors << parse.yield('Bus soft start failed ', :fault) if r[4]
-    errors << parse.yield('LINE_FAIL', :warning) if r[5]
+    errors << parse.yield('Utility input failure', :warning) if r[5]
     errors << parse.yield('Output short circuited', :warning) if r[6]
     errors << parse.yield('Inverter voltage too low', :fault) if r[7]
     errors << parse.yield('Output voltage is too high', :fault) if r[8]
@@ -207,10 +207,10 @@ module AxpertCommands
     { output_voltage: Float(r[0]),
       output_frequency: Float(r[1]),
       maximum_ac_charge_current: Integer(r[2], 10),
-      battery_under_voltage: Float(r[3]),
+      battery_cutoff_voltage: Float(r[3]),
       battery_float_charge_voltage: Float(r[4]),
       battery_bulk_charge_voltage: Float(r[5]),
-      battery_recharge_voltage: Float(r[6]),
+      battery_bulk_charge_voltage: Float(r[6]),
       maximum_charge_current: Integer(r[7], 10),
       input_voltage_sensitivity: CONS::INPUT_VOLTAGE_SENSITIVITY[r[8]],
       output_source_priority: CONS::OUTPUT_SOURCE_PRIORITY[r[9]],
@@ -226,7 +226,7 @@ module AxpertCommands
       enable_bypass_to_utility_on_overload: Boolean(r[19]),
       enable_lcd_timeout_escape_to_default_page: Boolean(r[20]),
       output_mode: CONS::OUTPUT_MODE[r[21]],
-      battery_redischarge_voltage: Float(r[22]),
+      battery_float_charge_voltage: Float(r[22]),
       pv_parallel_ok_mode: CONS::PV_PARALLEL_OK_MODE[r[23]],
       pv_power_balance_mode: CONS::PV_POWER_BALANCE_MODE[r[24]] }
   end)
@@ -282,8 +282,8 @@ module AxpertCommands
       serial_number: r[1],
       device_mode: CONS::DEVICE_MODE[r[2]],
       fault_code: CONS::FAULT_CODE[r[3]],
-      grid_voltage: Float(r[4]),
-      grid_frequency: Float(r[5]),
+      utility_voltage: Float(r[4]),
+      utility_frequency: Float(r[5]),
       output_voltage: Float(r[6]),
       output_frequency: Float(r[7]),
       output_va: Integer(r[8], 10),
@@ -309,7 +309,7 @@ module AxpertCommands
       maximum_charge_current: Integer(r[22], 10),
       device_maximum_charge_current: Integer(r[23], 10),
       pv_input_current: Integer(r[24], 10),
-      battery_discharge_current: Integer(r[25], 10) }
+      battery_redischarge_voltage: Integer(r[25], 10) }
   end)
 
   ##

data/lib/voltronic_device_operation.rb

@@ -28,7 +28,7 @@ class VoltronicDeviceOperation
     end
 
     @read_timeout = Integer(input.fetch(:serial_read_timeout_seconds, 2))
-    @write_timeout = Integer(input.fetch(:serial_write_timeout_seconds, 2))
+    @retry_timeout = Integer(input.fetch(:serial_retry_timeout_milliseconds, 50))
 
     @termination_character = begin
       parse = input.fetch(:serial_termination_character, "\r").to_s
@@ -51,8 +51,8 @@ class VoltronicDeviceOperation
       while(true)
         ch = serial.getc # Retrieve a single character from Serial port
         if ch.nil?
-          raise ::IOError.new("IO read timeout reached, giving up") if (Time.now.to_i > read_timeout)
-          sleep 0.1 # 100ms pause before polling again
+          raise ::IOError.new("Read timeout reached on serial port, giving up") if (Time.now.to_i > read_timeout)
+          sleep (@retry_timeout/1000.0) # Pause before polling again
           next
         end
         parse += ch

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: axpert_rs232
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Johan van der Vyver