rmodbus 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1aea47814577228ffdc9f2cb1bba67bf52b5cdb76d8e911c8a06125ceb80b7ad
-  data.tar.gz: be1e6031671b722d4c96a510eeab66191d3c8a79e854c97d3e16cd7f242e38e3
+  metadata.gz: 025a947981907584989c025378c6ea0650afc8d102a05431fc084d1e9da84e4b
+  data.tar.gz: d7f722ccf020d283e0cc83ece81f640ce85b1c323391b7ab67e8cfa970504536
 SHA512:
-  metadata.gz: 392b5ad4164e0675bbbba1d1c62e5374a432e2c2e4a83e79cfa1a68cd05a4e3a64d9a4438bd49e073b2f1437849a14c3fc2face1139765985a4c8247ee2c862e
-  data.tar.gz: 95e198118db64019335403b4092f637b1e3cbe49f6a5303abb913bf3f3fbab2e2486b70f2a84d8fa6bb4fca47b0105f22ba5724d86d6ba162439de27ffac7032
+  metadata.gz: bf1c1cad9756deec4519ffb2f0a157d579a34c1f6a5189508e337432566997a6bfac5f1cd44ef58da8bf1805aa9b6d8dbe7d1efb5a64aa2c32a228191bfc4607
+  data.tar.gz: a2390510c7a066d7a5df9430dbc7d23706da4e5f0a8f3c9f5ccf7e410e53bdd6d1f88dc94bf1a7f9e301fd0aea323817e6a52879793595c1b6b091670998ffc4

data/lib/rmodbus/client/slave.rb

@@ -30,9 +30,9 @@ module ModBus
       #
       # @example
       #  coils[addr] => [1]
-      #  coils[addr1..addr2] => [1, 0, ..]
+      #  coils[addr1..addr2] => [1, 0, ..-1]
       #  coils[addr] = 0 => [0]
-      #  coils[addr1..addr2] = [1, 0, ..] => [1, 0, ..]
+      #  coils[addr1..addr2] = [1, 0, ..-1] => [1, 0, ..-1]
       #
       # @return [ReadWriteProxy] proxy object
       def coils
@@ -42,7 +42,7 @@ module ModBus
       # Read coils
       #
       # @example
-      #  read_coils(addr, ncoils) => [1, 0, ..]
+      #  read_coils(addr, ncoils) => [1, 0, ..-1]
       #
       # @param [Integer] addr address first coil
       # @param [Integer] ncoils number coils
@@ -103,7 +103,7 @@ module ModBus
       #
       # @example
       #  discrete_inputs[addr] => [1]
-      #  discrete_inputs[addr1..addr2] => [1, 0, ..]
+      #  discrete_inputs[addr1..addr2] => [1, 0, ..-1]
       #
       # @return [ReadOnlyProxy] proxy object
       def discrete_inputs
@@ -113,7 +113,7 @@ module ModBus
       # Read discrete inputs
       #
       # @example
-      #  read_discrete_inputs(addr, ninputs) => [1, 0, ..]
+      #  read_discrete_inputs(addr, ninputs) => [1, 0, ..-1]
       #
       # @param [Integer] addr address first input
       # @param[Integer] ninputs number inputs
@@ -130,7 +130,7 @@ module ModBus
       #
       # @example
       #  input_registers[addr] => [1]
-      #  input_registers[addr1..addr2] => [1, 0, ..]
+      #  input_registers[addr1..addr2] => [1, 0, ..-1]
       #
       # @return [ReadOnlyProxy] proxy object
       def input_registers
@@ -140,7 +140,7 @@ module ModBus
       # Read input registers
       #
       # @example
-      #  read_input_registers(1, 5) => [1, 0, ..]
+      #  read_input_registers(1, 5) => [1, 0, ..-1]
       #
       # @param [Integer] addr address first registers
       # @param [Integer] nregs number registers
@@ -157,9 +157,9 @@ module ModBus
       #
       # @example
       #  holding_registers[addr] => [123]
-      #  holding_registers[addr1..addr2] => [123, 234, ..]
+      #  holding_registers[addr1..addr2] => [123, 234, ..-1]
       #  holding_registers[addr] = 123 => 123
-      #  holding_registers[addr1..addr2] = [234, 345, ..] => [234, 345, ..]
+      #  holding_registers[addr1..addr2] = [234, 345, ..-1] => [234, 345, ..-1]
       #
       # @return [ReadWriteProxy] proxy object
       def holding_registers
@@ -169,7 +169,7 @@ module ModBus
       # Read holding registers
       #
       # @example
-      #  read_holding_registers(1, 5) => [1, 0, ..]
+      #  read_holding_registers(1, 5) => [1, 0, ..-1]
       #
       # @param [Integer] addr address first registers
       # @param [Integer] nregs number registers
@@ -227,7 +227,7 @@ module ModBus
       # Read/write multiple holding registers
       #
       # @example
-      #  read_write_multiple_registers(1, 5, 1, [0xaa, 0]) => [1, 0, ..]
+      #  read_write_multiple_registers(1, 5, 1, [0xaa, 0]) => [1, 0, ..-1]
       #
       # @param [Integer] addr_r address first registers to read
       # @param [Integer] nregs number registers to read
@@ -286,7 +286,7 @@ module ModBus
         end
 
         check_response_mismatch(request, response) if raise_exception_on_mismatch
-        response[2..]
+        response[2..-1]
       end
       # rubocop:enable Layout/LineLength
 
@@ -294,7 +294,7 @@ module ModBus
 
       def check_response_mismatch(request, response)
         read_func = response.getbyte(0)
-        data = response[2..]
+        data = response[2..-1]
         # Mismatch functional code
         send_func = request.getbyte(0)
         msg = "Function code is mismatch (expected #{send_func}, got #{read_func})" if read_func != send_func

data/lib/rmodbus/rtu.rb

@@ -60,7 +60,7 @@ module ModBus
 
       loop do
         offset = 0
-        crc = msg[-2..].unpack1("S<")
+        crc = msg[-2..-1].unpack1("S<")
 
         # scan the bytestream for a valid CRC
         loop do
@@ -88,7 +88,7 @@ module ModBus
                 @last_req_timestamp = Time.now.to_f
               end
               log "Server RX discarding #{offset} bytes: #{logging_bytes(msg[0...offset])}" if offset != 0
-              log "Server RX (#{msg.size - offset} bytes): #{logging_bytes(msg[offset..])}"
+              log "Server RX (#{msg.size - offset} bytes): #{logging_bytes(msg[offset..-1])}"
               return [msg.getbyte(offset), msg.getbyte(offset + 1), params, msg[offset + 1..-3], is_response]
             end
           end
@@ -98,7 +98,7 @@ module ModBus
         msg.concat(read(io, 1))
         # maximum message size is 256, so that's as far as we have to
         # be able to see at once
-        msg = msg[1..] if msg.length > 256
+        msg = msg[1..-1] if msg.length > 256
       end
     end
 

data/lib/rmodbus/server.rb

@@ -98,11 +98,11 @@ module ModBus
       when 1, 2
         return nil unless res.length == res[1].ord + 2
 
-        res[2..].unpack_bits
+        res[2..-1].unpack_bits
       when 3, 4, 23
         return nil unless res.length == res[1].ord + 2
 
-        res[2..].unpack("n*")
+        res[2..-1].unpack("n*")
       when 5, 6, 15, 16
         return nil unless res.length == 5
 
@@ -254,7 +254,7 @@ module ModBus
       return nil if req.length < 12
 
       params = { read: parse_read_func(req, nil),
-                 write: parse_write_multiple_registers_func(req[4..]) }
+                 write: parse_write_multiple_registers_func(req[4..-1]) }
       return nil if params[:write].nil?
 
       params

data/lib/rmodbus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ModBus
-  VERSION = "2.1.2"
+  VERSION = "2.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmodbus
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - A.Timin, J. Sanders, K. Reynolds, F. Luizão, C. Cutrer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-20 00:00:00.000000000 Z
+date: 2024-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,48 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.11'
-- !ruby/object:Gem::Dependency
-  name: rubocop-inst
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: digest-crc
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="