axpert_rs232 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: feaf14c95a0bb048162f2de460083f56e1564c9a
-  data.tar.gz: 124bfdfe33531983e742cff13ce5883ca8163d9f
+  metadata.gz: a54fab8227bba54bc259b6f3a70c0cb68dc743c5
+  data.tar.gz: c0d3ee2125751022a2081a63acb0b66429064872
 SHA512:
-  metadata.gz: 4f69247e57e69cd8bee76208639a0fbd55f94743d85b9282fe7f1a300bbc289e85a6c2ae4859d3e55ab5d2417922a88712bd85465d88ff99b85af690bb53e0a7
-  data.tar.gz: cd36a586e15a3f5421abf9260b63bcd5c7d35c0499876bf6b3adcf57212d635792d766d2f8bd1cefc281ff07f6e93465eaac4d6595f19822135302f09e3ed5b7
+  metadata.gz: af93589884350570a72090645722128917e62c78a6ac1dfaad45a3f17a4820548b9acd281b2359ebb0077a6ce002a1721e5f45fdb82dac59794d76fa7abca971
+  data.tar.gz: 8f7c3d21859b22d17539555d8105121cabdeb71fe21df02e003c171c4f36df76711d05d6a4209b31da470ed0a852011dc85b5bf3d443054e0f07277adc3f8e6b

data/lib/axpert_commands.rb

@@ -17,7 +17,7 @@ module AxpertCommands
   # Returns:
   #    # An Integer specifying the protocol ID
   #    30 # Example
-  PROTOCOL_ID = OP.new(command: 'QPI', parser: lambda { |r| Integer(r.data[3..-1]) })
+  PROTOCOL_ID = OP.new(command: 'QPI', parser: lambda { |r| Integer(r.data[3..-1], 10) })
 
   ##
   # Device serial number
@@ -61,20 +61,20 @@ module AxpertCommands
       output_voltage: Float(r[2]),
       output_frequency: Float(r[3]),
       output_current: Float(r[4]),
-      output_va: Integer(r[5]),
-      output_watts: Integer(r[6]),
+      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[10]),
       battery_float_charge_voltage: Float(r[11]),
       battery_type: ::AxpertConstants::BATTERY_TYPE[r[12]],
-      maximum_ac_charge_current: Integer(r[13]),
-      maximum_charge_current: Integer(r[14]),
+      maximum_ac_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]],
       charger_source_priority: CONS::CHARGER_SOURCE_PRIORITY[r[17]],
-      maximum_parallel_units: Integer(r[18]),
+      maximum_parallel_units: Integer(r[18], 10),
       device_type: CONS::DEVICE_TYPE[r[19]],
       device_topology: CONS::DEVICE_TOPOLOGY[r[20]],
       output_mode: CONS::OUTPUT_MODE[r[21]],
@@ -119,18 +119,18 @@ module AxpertCommands
       grid_frequency: Float(r[1]),
       output_voltage: Float(r[2]),
       output_frequency: Float(r[3]),
-      output_va: Integer(r[4]),
-      output_watts: Integer(r[5]),
-      output_load_percent: Integer(r[6]),
-      dc_bus_voltage: Integer(r[7]),
+      output_va: Integer(r[4], 10),
+      output_watts: Integer(r[5], 10),
+      output_load_percent: Integer(r[6], 10),
+      dc_bus_voltage: Integer(r[7], 10),
       battery_voltage: Float(r[8]),
       battery_charge_current: Float(r[9]),
-      battery_capacity_remaining: Integer(r[10]),
-      inverter_heatsink_celsius_temperature: Integer(r[11]),
-      pv_battery_input_current: Integer(r[12]),
+      battery_capacity_remaining: Integer(r[10], 10),
+      inverter_heatsink_celsius_temperature: 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]),
-      battery_discharge_current: Integer(r[15]),
+      battery_discharge_current: Integer(r[15], 10),
       add_sbu_priority_version: status[0],
       configuration_changed: status[1],
       solar_charge_controller_firmware_changed: status[2],
@@ -206,12 +206,12 @@ module AxpertCommands
     r = r.data[1..-1].split(' ')
     { output_voltage: Float(r[0]),
       output_frequency: Float(r[1]),
-      maximum_ac_charge_current: Integer(r[2]),
+      maximum_ac_charge_current: Integer(r[2], 10),
       battery_under_voltage: Float(r[3]),
       battery_float_charge_voltage: Float(r[4]),
       battery_bulk_charge_voltage: Float(r[5]),
       battery_recharge_voltage: Float(r[6]),
-      maximum_charge_current: Integer(r[7]),
+      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]],
       charger_source_priority: CONS::CHARGER_SOURCE_PRIORITY[r[10]],
@@ -237,7 +237,7 @@ module AxpertCommands
   # Returns:
   #    [10, 20, 30] # => Array of Integers, example given
   ACCEPTED_CHARGE_CURRENT_VALUES = OP.new(command: 'QMCHGCR', parser: lambda do |r|
-    r.data[1..-1].split(' ').map { |s| Integer(s) }
+    r.data[1..-1].split(' ').map { |s| Integer(s, 10) }
   end)
 
   ##
@@ -246,7 +246,7 @@ module AxpertCommands
   # Returns:
   #    [10, 20, 30] # => Array of Integers, example given
   ACCEPTED_UTILITY_CHARGE_CURRENT_VALUES = OP.new(command: 'QMUCHGCR', parser: lambda do |r|
-    r.data[1..-1].split(' ').map { |s| Integer(s) }
+    r.data[1..-1].split(' ').map { |s| Integer(s, 10) }
   end)
 
   ##
@@ -275,7 +275,7 @@ module AxpertCommands
   # Returns:
   #    # A Hash containing parallel device status information
   #    { grid_voltage: 230.5, grid_current: 11.2, .. }
-  PARALLEL_DEVICE_STATUS = OP.new(command: lambda { |i = 0| "QPGS#{Integer(i)}" }, parser: lambda do |r|
+  PARALLEL_DEVICE_STATUS = OP.new(command: lambda { |i = 0| "QPGS#{Integer(i, 10)}" }, parser: lambda do |r|
     r = r.data[1..-1].split(' ')
     status = r[19].chars
     { parallel_number_exists: Boolean(r[0]),
@@ -286,30 +286,30 @@ module AxpertCommands
       grid_frequency: Float(r[5]),
       output_voltage: Float(r[6]),
       output_frequency: Float(r[7]),
-      output_va: Integer(r[8]),
-      output_watts: Integer(r[9]),
-      load_percentage: Integer(r[10]),
+      output_va: Integer(r[8], 10),
+      output_watts: Integer(r[9], 10),
+      load_percentage: Integer(r[10], 10),
       battery_voltage: Float(r[11]),
-      battery_charge_current: Integer(r[12]),
-      battery_capacity: Integer(r[13]),
+      battery_charge_current: Integer(r[12], 10),
+      battery_capacity: Integer(r[13], 10),
       pv_input_voltage: Float(r[14]),
-      total_charge_current: Integer(r[15]),
-      total_output_va:  Integer(r[16]),
-      total_output_watt:  Integer(r[17]),
-      total_load_percentage: Integer(r[18]),
+      total_charge_current: Integer(r[15], 10),
+      total_output_va:  Integer(r[16], 10),
+      total_output_watt:  Integer(r[17], 10),
+      total_load_percentage: Integer(r[18], 10),
       solar_charge_controller_enabled: Boolean(status[0]),
       charging_from_utility: Boolean(status[1]),
       charging_from_solar_charge_controller: Boolean(status[2]),
-      battery_status: [:normal, :under, :open][Integer("#{status[3]}#{status[4]}")],
+      battery_status: [:normal, :under, :open][Integer("#{status[3]}#{status[4]}", 10)],
       line_status_ok: !Boolean(status[5]),
       load_on: Boolean(status[6]),
       configuration_changed: Boolean(status[7]),
       output_mode:  CONS::OUTPUT_MODE[r[20]],
       charger_source_priority: CONS::CHARGER_SOURCE_PRIORITY[r[21]],
-      maximum_charge_current: Integer(r[22]),
-      device_maximum_charge_current: Integer(r[23]),
-      pv_input_current: Integer(r[24]),
-      battery_discharge_current: Integer(r[25]) }
+      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) }
   end)
 
   ##
@@ -329,7 +329,7 @@ module AxpertCommands
   # Returns:
   #    # A Boolean indicating if the frequency was set succesfully
   #    true # Example
-  SET_OUTPUT_FREQUENCY = OP.new(command: lambda { |input| "F#{Integer(input).to_s.rjust(2, '0')}" }, error_on_nak: false, parser: lambda { |r| (r.data == '(ACK') })
+  SET_OUTPUT_FREQUENCY = OP.new(command: lambda { |input| "F#{Integer(input, 10).to_s.rjust(2, '0')}" }, error_on_nak: false, parser: lambda { |r| (r.data == '(ACK') })
 
   ##
   # Set device output source priority
@@ -380,7 +380,7 @@ module AxpertCommands
   #    true # Example
   SET_CHARGER_SOURCE_PRIORITY = OP.new(command: lambda do |mode, parallel_machine_number = nil|
     if parallel_machine_number.nil?
-      "PPCP#{Integer(parallel_machine_number).to_s}#{CONS::CHARGER_SOURCE_PRIORITY.key(mode).to_s.rjust(2, '0')}"
+      "PPCP#{Integer(parallel_machine_number, 10).to_s}#{CONS::CHARGER_SOURCE_PRIORITY.key(mode).to_s.rjust(2, '0')}"
     else
       "PCP#{CONS::CHARGER_SOURCE_PRIORITY.key(mode).to_s.rjust(2, '0')}"
     end
@@ -481,11 +481,11 @@ module AxpertCommands
   #    # A Boolean indicating if the maximum charging current was set successfully
   #    true # Example
   SET_MAXIMUM_CHARGING_CURRENT = OP.new(command: lambda do |current, parallel_machine_number = 0|
-    current = Integer(current)
+    current = Integer(current, 10)
     if (current >= 100)
-      "MNCHGC#{Integer(parallel_machine_number).to_s}#{current.to_s.rjust(3, '0')}"
+      "MNCHGC#{Integer(parallel_machine_number, 10).to_s}#{current.to_s.rjust(3, '0')}"
     else
-      "MCHGC#{Integer(parallel_machine_number).to_s}#{current.to_s.rjust(2, '0')}"
+      "MCHGC#{Integer(parallel_machine_number, 10).to_s}#{current.to_s.rjust(2, '0')}"
     end
   end, error_on_nak: false, parser: lambda { |r| (r.data == '(ACK') })
 
@@ -503,7 +503,7 @@ module AxpertCommands
   #    # A Boolean indicating if the maximum charging current for utility was set successfully
   #    true # Example
   SET_MAXIMUM_UTILITY_CHARGING_CURRENT = OP.new(command: lambda do |current, parallel_machine_number = 0|
-    "MUCHGC#{Integer(parallel_machine_number).to_s}#{Integer(current).to_s.rjust(2, '0')}"
+    "MUCHGC#{Integer(parallel_machine_number, 10).to_s}#{Integer(current, 10).to_s.rjust(2, '0')}"
   end, error_on_nak: false, parser: lambda { |r| (r.data == '(ACK') })
 
   ##
@@ -520,7 +520,7 @@ module AxpertCommands
   #    # A Boolean indicating if the parallel output mode was set successfully
   #    true # Example
   SET_OUTPUT_MODE = OP.new(command: lambda do |mode, parallel_machine_number = 0|
-   "POPM#{CONS::OUTPUT_MODE.key(mode)}#{Integer(parallel_machine_number).to_s}"
+   "POPM#{CONS::OUTPUT_MODE.key(mode)}#{Integer(parallel_machine_number, 10).to_s}"
   end, error_on_nak: false, parser: lambda { |r| (r.data == '(ACK') })
 
   require 'axpert_constants'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: axpert_rs232
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Johan van der Vyver
@@ -33,7 +33,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='