phaserunner 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2f46afec661bbb08bb41df2e8e68328fde4dc81
-  data.tar.gz: c3510f359bd9f0056cd60f952ae5034c8ba986f0
+  metadata.gz: 69d1fcab82cbcf7376f98edd6a0845f2c3b02333
+  data.tar.gz: cdc9c3378edd95be4303cb389263b6d726a5439c
 SHA512:
-  metadata.gz: 5c8b871c2747b949df465c823aa289e76bf33b941bea4833b8d1b503016bc10ddafeb3164b94e328c483437a66bac426300f02de424d1cb30dc1638cca68869a
-  data.tar.gz: a23c73c8500f3d30cec1708264629376d06ac14508a7c57f2bfcc0503004abc7ed8a4f5810ad5c296fd60cc1d76b888a2172863e19b7e2222ef57a2e478e5de7
+  metadata.gz: 0ef9f48828d7fd8925b55bd3498a495574f9b43bddf56741615115fa056463bcc45f70fa31f696dd1c8655623ddc79903d17029f2f6f1eaf1f31f29d0b2c0ae2
+  data.tar.gz: 9d28ca30e219a5db6786ef134c2a0696beb24182b7fecd35ae8591f867d2d4770b4cb805ca22f9e11ae275f2d2786d1a48469d2c421be8343b8aba0e67e3e91e

data/README.md

@@ -114,12 +114,12 @@ gem install phaserunner
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/rberger/rmodbus_cli.
+Bug reports and pull requests are welcome on GitHub at https://github.com/rberger/phaserunner.
 
 
 ### Code of Conduct in Contriubing
 
-This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the  [Contributor Code of Conduct](CODE_OF_CONDUCT.md).
+This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the  [Contributor Code of Conduct](CODE-OF-CONDUCT.md).
 
 ## Versioning
 

data/lib/phaserunner/modbus.rb

@@ -2,6 +2,14 @@ require 'rmodbus'
 require 'json'
 require 'asi_bod'
 
+# Add mechanism to convert Integers from modbus into signed integers
+class Integer
+  def to_signed(bits)
+    mask = (1 << (bits - 1))
+    (self & ~mask) - (self & mask)
+  end
+end
+
 module Phaserunner
   # Methods for communicating with the Modbus interface to the Phaserunner
   class Modbus
@@ -28,10 +36,7 @@ module Phaserunner
       dictionary_file: default_file_path,
       loop_count: :forever,
       quiet: false,
-      register_list: register_list,
-      registers_start_address: 258,
-      registers_count: 15,
-      registers_misc: [276, 277, 334]
+      register_list: register_list
     }
 
     attr_reader :tty
@@ -92,10 +97,36 @@ module Phaserunner
       end
     end
 
+    def read_scaled_range(start_address, count)
+      data = read_raw_range(start_address, count)
+      data.map.with_index do |val, index| 
+        address = index + start_address
+        if dict[address][:type] == "independent"
+          value = val.to_signed(16) / dict[address][:scale]
+          value
+        elsif dict[address][:type].downcase == "bit vector"
+          value = val.to_s(2)
+        else
+          value = val
+        end
+        value
+      end
+
+    end
     def range_address_header(start_address, count)
       end_address = start_address + count 
       (start_address...end_address).map do |address|
-        "#{dict[address][:name]} (#{dict[address][:units]})"
+        units = case dict[address][:type].downcase
+                when "bit vector"
+                  "Flags"
+                when "enum"
+                  "enum"
+                when "dependent"
+                  "Unscaled #{dict[address][:units]}"
+                else
+                  dict[address][:units]
+                end
+        "#{dict[address][:name]} (#{units})"
       end
     end
 
@@ -116,8 +147,8 @@ module Phaserunner
     # @return [Array<Integer>] List of the register values in the order requested
     def bulk_log_data(registers = register_list)
       registers.map do |reg|
-        read_raw_range(reg.start, reg.count)
-      end
+        read_scaled_range(reg.start, reg.count)
+      end.flatten
     end
 
     # Get the headers for the bulk_log data
@@ -126,7 +157,7 @@ module Phaserunner
     def bulk_log_header(registers = register_list)
       registers.map do |reg|
         range_address_header(reg.start, reg.count)
-      end
+      end.flatten
     end
   end
 end

data/lib/phaserunner/version.rb

@@ -1,3 +1,3 @@
 module Phaserunner
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phaserunner
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Robert J. Berger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-07 00:00:00.000000000 Z
+date: 2018-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli