axpert_rs232 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a54fab8227bba54bc259b6f3a70c0cb68dc743c5
-  data.tar.gz: c0d3ee2125751022a2081a63acb0b66429064872
+  metadata.gz: a55f87bf3885c55d1f3d8765a6692ad24cb23b6f
+  data.tar.gz: a428611424453e3d2822bf6a063ef5896551ac54
 SHA512:
-  metadata.gz: af93589884350570a72090645722128917e62c78a6ac1dfaad45a3f17a4820548b9acd281b2359ebb0077a6ce002a1721e5f45fdb82dac59794d76fa7abca971
-  data.tar.gz: 8f7c3d21859b22d17539555d8105121cabdeb71fe21df02e003c171c4f36df76711d05d6a4209b31da470ed0a852011dc85b5bf3d443054e0f07277adc3f8e6b
+  metadata.gz: 61875ef2d1849dfb505269808f3451e4632e84f9abeaafb53acf4571c98eaebd0cb3f7a1d1a9e701861deeda3013ab3e8cdb6323a05945cd7d9580378a60133f
+  data.tar.gz: 001c759d71bb3b6ab3a286204ba7a97bfa672868bba935b664c636c371e5399e2f906df17f8863e330ff077a947daaacbb8cb7ba2f2a316569e49cf475ca68d7

data/lib/axpert_commands.rb

@@ -275,9 +275,9 @@ 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, 10)}" }, parser: lambda do |r|
+  PARALLEL_DEVICE_STATUS = OP.new(command: lambda { |i = 0| "QPGS#{Integer(i)}" }, parser: lambda do |r|
     r = r.data[1..-1].split(' ')
-    status = r[19].chars
+    status = r[19].chars.to_a
     { parallel_number_exists: Boolean(r[0]),
       serial_number: r[1],
       device_mode: CONS::DEVICE_MODE[r[2]],
@@ -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, 10).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).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, 10).to_s}#{CONS::CHARGER_SOURCE_PRIORITY.key(mode).to_s.rjust(2, '0')}"
+      "PPCP#{Integer(parallel_machine_number).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, 10)
+    current = Integer(current)
     if (current >= 100)
-      "MNCHGC#{Integer(parallel_machine_number, 10).to_s}#{current.to_s.rjust(3, '0')}"
+      "MNCHGC#{Integer(parallel_machine_number).to_s}#{current.to_s.rjust(3, '0')}"
     else
-      "MCHGC#{Integer(parallel_machine_number, 10).to_s}#{current.to_s.rjust(2, '0')}"
+      "MCHGC#{Integer(parallel_machine_number).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, 10).to_s}#{Integer(current, 10).to_s.rjust(2, '0')}"
+    "MUCHGC#{Integer(parallel_machine_number).to_s}#{Integer(current).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, 10).to_s}"
+   "POPM#{CONS::OUTPUT_MODE.key(mode)}#{Integer(parallel_machine_number).to_s}"
   end, error_on_nak: false, parser: lambda { |r| (r.data == '(ACK') })
 
   require 'axpert_constants'

data/lib/voltronic_device_operation.rb

@@ -42,7 +42,7 @@ class VoltronicDeviceOperation
   ##
   # Issue a command to the device and parse the output result
   def issue_command(serial, *args)
-    serial.read_timeout = -1 # Prevent locking on serial
+    serial.read_timeout = -1 rescue nil # Prevent locking on serial
 
     serial.write(command(*args).bytes)
     result = begin
@@ -51,12 +51,12 @@ 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
           next
         end
         parse += ch
         break if (@termination_character == ch)
-        raise ::IOError.new("IO read timeout reached, giving up") if (Time.now.to_i > read_timeout)
       end
       parse
     end

metadata

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