can_messenger 1.1.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a3eb889a0115b86ec0c286505b92919e55271f7c95e5423ee7216bd49587237
-  data.tar.gz: 97806e21ddccdcd8815219de47ed0ba0f6acad5182b878db7b2b19b1aa9cde95
+  metadata.gz: d47c9c4b19c40337cb6b58f380e9a3f07554144a14d23ef4c2589060fd25942e
+  data.tar.gz: 66f58f8fab19fb73ab5124e4036313459ae032282bdd07613dc6156ef86a1379
 SHA512:
-  metadata.gz: 61c5455b82b6b707885d0babaaea5643b3e0587f4389850dd51aa5956587ca2ea25a040136d075c5d8a01590e8ab9abf445dd1d34b77b0c8556958cefffe8bbe
-  data.tar.gz: 0ec5d24c6612c889f472b201037b533b0ac612a7826dfbc2d45ed218f5f6600d0d8e366c0ce90dd04c28d2c421450af28832bac1984223c0da12b512e3b4ff94
+  metadata.gz: a55c719faf6f813ff4aef9004b4b32065297773498bf92291019002520b43c940e304fa5a0244635f42c9152ab3729cbeaa8534d809b2790878ebc9ef9a00244
+  data.tar.gz: '014168fa0419b78aa966c4d1d9a415c2e8e70650323df2c1a4328354099ffacf038cd52ef1c1fc371334e312a91538e985b7ec98727863739aa70c88e449d4d3'

data/README.md

@@ -11,18 +11,6 @@
 
 ## Installation
 
-Ensure you have `SocketCAN` available on your system. Typically on Linux (e.g., Debian/Ubuntu), you install SocketCAN support with:
-
-```bash
-sudo apt-get install net-tools iproute2
-```
-
-Then bring up your CAN interface (e.g., `can0`) using `ip` commands or a tool like `can-utils` (though this gem no longer depends on `cansend`):
-
-```bash
-sudo ip link set can0 up type can bitrate 500000
-```
-
 To install `can_messenger`, add it to your application's Gemfile:
 
 ```ruby
@@ -63,13 +51,19 @@ messenger.send_can_message(id: 0x123, data: [0xDE, 0xAD, 0xBE, 0xEF])
 
 > **Note:** Under the hood, the gem now writes CAN frames to a raw socket instead of calling `cansend`. No external dependencies are required beyond raw-socket permissions.
 
+If you need to send an extended CAN frame (29-bit ID), set extended_id: true. The gem then sets the Extended Frame Format (EFF) bit automatically:
+
+```ruby
+messenger.send_can_message(id: 0x123456, data: [0x01, 0x02, 0x03], extended_id: true)
+```
+
 ### Receiving CAN Messages
 
 To listen for incoming messages, set up a listener:
 
 ```ruby
-messenger.start_listening do |message|
-  puts "Received: ID=#{message[:id]}, Data=#{message[:data]}"
+messenger.start_listening do |msg|
+  puts "Received ID=0x#{msg[:id].to_s(16)}, Extended=#{msg[:extended]}, Data=#{msg[:data]}"
 end
 ```
 

data/lib/can_messenger/messenger.rb

@@ -15,7 +15,7 @@ module CanMessenger
   #   messenger.start_listening do |message|
   #     puts "Received: ID=#{message[:id]}, Data=#{message[:data].map { |b| '0x%02X' % b }}"
   #   end
-  class Messenger
+  class Messenger # rubocop:disable Metrics/ClassLength
     FRAME_SIZE = 16
     MIN_FRAME_SIZE = 8
     TIMEOUT = [1, 0].pack("l_2")
@@ -38,11 +38,13 @@ module CanMessenger
     # @param [Integer] id The CAN ID of the message (up to 29 bits for extended IDs).
     # @param [Array<Integer>] data The data bytes of the CAN message (0 to 8 bytes).
     # @return [void]
-    def send_can_message(id:, data:)
+    def send_can_message(id:, data:, extended_id: false)
       with_socket do |socket|
-        frame = build_can_frame(id: id, data: data)
+        frame = build_can_frame(id: id, data: data, extended_id: extended_id)
         socket.write(frame)
       end
+    rescue ArgumentError
+      raise
     rescue StandardError => e
       @logger.error("Error sending CAN message (ID: #{id}): #{e}")
     end
@@ -63,6 +65,8 @@ module CanMessenger
     def start_listening(filter: nil, &block)
       return @logger.error("No block provided to handle messages.") unless block_given?
 
+      @listening = true
+
       with_socket do |socket|
         @logger.info("Started listening on #{@interface_name}")
         process_message(socket, filter, &block) while @listening
@@ -111,13 +115,16 @@ module CanMessenger
     # @param id [Integer] the CAN ID
     # @param data [Array<Integer>] up to 8 bytes
     # @return [String] a 16-byte string representing a classic CAN frame
-    def build_can_frame(id:, data:)
+    def build_can_frame(id:, data:, extended_id: false)
       raise ArgumentError, "CAN data cannot exceed 8 bytes" if data.size > 8
 
-      # Apply 29-bit mask if extended ID is used
+      # Mask the ID to 29 bits
       can_id = id & 0x1FFFFFFF
 
-      # Pack the ID as 4 bytes in big-endian or little-endian
+      # If extended_id == true, set bit 31 (CAN_EFF_FLAG)
+      can_id |= 0x80000000 if extended_id
+
+      # Pack the 4‐byte ID (big-endian or little-endian)
       id_bytes = @endianness == :big ? [can_id].pack("L>") : [can_id].pack("V")
 
       # 1 byte for DLC, then 3 bytes of padding
@@ -126,7 +133,7 @@ module CanMessenger
       # Up to 8 data bytes, pad with 0 if fewer
       payload = data.pack("C*").ljust(8, "\x00")
 
-      # Total 16 bytes
+      # Total 16 bytes (4 for ID, 1 for DLC, 3 padding, 8 data)
       id_bytes + dlc_and_pad + payload
     end
 
@@ -166,25 +173,40 @@ module CanMessenger
     #
     # @param [String] frame
     # @return [Hash, nil]
-    def parse_frame(frame:)
+    def parse_frame(frame:) # rubocop:disable Metrics/MethodLength
       return nil unless frame && frame.size >= MIN_FRAME_SIZE
 
-      # Big-endian ID in bytes [0..3]
-      id = unpack_frame_id(frame: frame)
+      raw_id = unpack_frame_id(frame: frame)
+
+      # Determine if EFF bit is set
+      extended = raw_id.anybits?(0x80000000)
+      # or raw_id.anybits?(0x80000000) if your Ruby version supports `Integer#anybits?`
+
+      # Now mask off everything except the lower 29 bits
+      id = raw_id & 0x1FFFFFFF
 
       # DLC is the lower 4 bits of byte 4
       data_length = frame[4].ord & 0x0F
 
-      # Data follows at byte index 8, up to data_length bytes
-      data = (frame[MIN_FRAME_SIZE, data_length].unpack("C*") if frame.size >= MIN_FRAME_SIZE + data_length)
-      { id: id, data: data }
+      # Extract data
+      data = if frame.size >= MIN_FRAME_SIZE + data_length
+               frame[MIN_FRAME_SIZE, data_length].unpack("C*")
+             else
+               []
+             end
+
+      { id: id, data: data, extended: extended }
     rescue StandardError => e
       @logger.error("Error parsing CAN frame: #{e}")
       nil
     end
 
     def unpack_frame_id(frame:)
-      @endianness == :big ? frame[0..3].unpack1("L>") & 0x1FFFFFFF : frame[0..3].unpack1("V") & 0x1FFFFFFF
+      if @endianness == :big
+        frame[0..3].unpack1("L>")
+      else
+        frame[0..3].unpack1("V")
+      end
     end
 
     # Checks whether the given message ID matches the specified filter.

data/lib/can_messenger/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CanMessenger
-  VERSION = "1.1.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: can_messenger
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.1
 platform: ruby
 authors:
 - fk1018
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-11 00:00:00.000000000 Z
+date: 2025-06-05 00:00:00.000000000 Z
 dependencies: []
 description: CanMessenger provides an interface to send and receive messages over
   the CAN bus, useful for applications requiring CAN communication in Ruby.