modbus-cli 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d4a4f49cb1b960fd3a81c184dbd1e84d29dc78d
-  data.tar.gz: b35ddd07f62e4a52cba914312ca763241adc56b6
+  metadata.gz: 9bfc4ab5ae4c4ed48a369aaefccbee4b77de616a
+  data.tar.gz: 68b8ae930193f7e0496318ec397bde02c5ca4a97
 SHA512:
-  metadata.gz: 570c55b4ca6753936afea1613deb8b73bd5f7a24d4e5eba5f852340255397ecf6ac9f88df16eebe0ea6249b35a8d65245d465b0ed721023a0c2622394eafb3ba
-  data.tar.gz: ec1686f610240118875fe48d161cb8b77edc6281c84c31b8b310a934ac83142b36018a2b0ea6d941b1dd867af15798c5f3c58ddb21e985da71d9a071e6acd4cf
+  metadata.gz: 58f0b3fa331dc2c2862006cf09022a2b9cff0fbfbfc0713f6b86c1c225b0319937731aaa3364fe7b18ca8fdc09fc99ec69c51d2296ea096e0eb02da3ff6bb73b
+  data.tar.gz: a72aeef88e8c9117620826487e8ba55a865765ed5f633f2af9d58f07b6904730c4c965e3a0dfb323f7b2676a021ddd860f7dea55fcaa945becc6bf6b3e534960

data/lib/modbus-cli/commands_common.rb

@@ -84,6 +84,10 @@ module Modbus
         end
       end
 
+      def addr_area
+        address[:area]
+      end
+
 
       def schneider_match(address)
         schneider_match =  address.match /%M([FWD])?(\d+)/i
@@ -94,10 +98,13 @@ module Modbus
               result[:datatype] = :bit
             when 'W', 'w'
               result[:datatype] = :word
+              result[:area] = :holding_registers
             when 'F', 'f'
               result[:datatype] = :float
+              result[:area] = :holding_registers
             when 'D', 'd'
               result[:datatype] = :dword
+              result[:area] = :holding_registers
             end
           end
         end
@@ -109,9 +116,20 @@ module Modbus
           offset = address.to_i
           case offset
           when 1..99999
-            {:offset => offset - 1, :datatype => :bit, :format => :modicon}
+            { :offset => offset - 1,
+              :datatype => :bit,
+              :format => :modicon }
+          # 100001..199999 inputs are not supported
+          when 300001..399999
+            { :offset => offset - 300001,
+              :datatype => :word,
+              :format => :modicon,
+              :area => :input_registers }
           when 400001..499999
-            {:offset => offset - 400001, :datatype => :word, :format => :modicon}
+            { :offset => offset - 400001,
+              :datatype => :word,
+              :format => :modicon,
+              :area => :holding_registers }
           end
         end
       end

data/lib/modbus-cli/read_command.rb

@@ -110,7 +110,14 @@ module Modbus
 
       def read_data_words(sl)
         result = []
-        read_range.each_slice(MAX_READ_WORD_COUNT) {|slice| result += sl.read_holding_registers(slice.first, slice.count) }
+        read_range.each_slice(MAX_READ_WORD_COUNT) do |slice|
+          case addr_area
+          when :input_registers
+            result += sl.read_input_registers(slice.first, slice.count)
+          else # assume holding registers
+            result += sl.read_holding_registers(slice.first, slice.count)
+          end
+        end
         result
       end
 
@@ -155,7 +162,12 @@ module Modbus
           when :bit
             (addr + 1).to_s
           when :word, :int
-            (addr + 400001).to_s
+            case addr_area
+            when :input_registers
+              (addr + 300001).to_s
+            else # default :read_holding_registers
+              (addr + 400001).to_s
+            end
           end
         end
       end

data/lib/modbus-cli/version.rb

@@ -1,5 +1,5 @@
 module Modbus
   module Cli
-    VERSION = "0.0.11"
+    VERSION = "0.0.12"
   end
 end

data/spec/read_command_spec.rb

@@ -10,14 +10,19 @@ describe Modbus::Cli::ReadCommand do
     stub_tcpip
   end
 
-  it 'can read registers' do
+  it 'can read holding registers' do
     client, slave = standard_connect_helper '1.2.3.4', 502
     slave.should_receive(:read_holding_registers).with(100, 10).and_return((0..9).to_a)
     cmd.run %w(read 1.2.3.4 %MW100 10)
     stdout.should match(/^\s*%MW105\s*5$/)
   end
 
-
+  it 'can read input registers' do
+    client, slave = standard_connect_helper '1.2.3.4', 502
+    slave.should_receive(:read_input_registers).with(100, 10).and_return((0..9).to_a)
+    cmd.run %w(read 1.2.3.4 300101 10)
+    stdout.should match(/^\s*300106\s*5$/)
+  end
 
   it 'can read floating point numbers' do
     client, slave = standard_connect_helper '1.2.3.4', 502

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modbus-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Tallak Tveide
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmodbus