dredger-iot 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 701ad99dd1f271df310ba3dffbb3295084b54e64689f4d3ed77f9b6ab9e31df5
-  data.tar.gz: e9b5ba95c4d2af83b529e6f66af5c81fb83c43f3f679e89e894209661651f93e
+  metadata.gz: 20a13d73758a754dfef92919adab2c1bd3f7a22de71e523ebb5601ecd292d97f
+  data.tar.gz: 32d57b97d774f40cec842d1ef99b90c134687c6b7d418e60587dcfa77d8bd17b
 SHA512:
-  metadata.gz: 5362ae41f8f92d403809728857c139b00e3d8141e8f83725a3cc302eb7e7ace2c32b8bd7306fba5e83c2ee197e42c633b7beaeb9a84b9b77f1d95299e80aad1d
-  data.tar.gz: 220b5834cd302cef375c3922211c055788855d4b516b7260aa952d13fc312a3f9c028248863906e93a38badbd32839d2083783bb1431ba5fd1ada0b4df92bca5
+  metadata.gz: fdfd0dde86a514d2ffd829d9e74f4c834c7e8784257114f80a66321a6bc8b1e7d3329998197b6deabd5a31a19ee227eb28c56f9c28a84b8835e63b721e7ec082
+  data.tar.gz: 4921e4d495ee0d6d7b06f4f69912f2e80e1c5711b43af5eb8259d2331b46b0f036ad1cb89d23613d5b7857af4b612a2494bf09a38cdd0411b5423a95cb81fbec

data/bin/dredger

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'bundler/setup'
 require 'dredger/iot'
 require 'optparse'
 require 'json'
@@ -90,15 +89,17 @@ class DredgerCLI
 
   def list_sensors
     sensors = {
-      'dht22' => 'DHT22 - Temperature/Humidity (GPIO)',
+      'dht22' => 'DHT22 - Temperature/Humidity (GPIO) [requires C extension]',
       'bme280' => 'BME280 - Temperature/Humidity/Pressure (I2C)',
       'ds18b20' => 'DS18B20 - Waterproof Temperature (1-Wire)',
-      'bmp180' => 'BMP180 - Barometric Pressure/Temperature (I2C)',
-      'mcp9808' => 'MCP9808 - High-Accuracy Temperature (I2C)',
       'sht31' => 'SHT31 - Temperature/Humidity (I2C)',
       'bh1750' => 'BH1750 - Ambient Light (I2C)',
       'tsl2561' => 'TSL2561 - Ambient Light (I2C)',
-      'ina219' => 'INA219 - Bus Voltage/Current (I2C)'
+      'ina219' => 'INA219 - Bus Voltage/Current (I2C)',
+      'adxl345' => 'ADXL345 - 3-Axis Accelerometer (I2C)',
+      'scd30' => 'SCD30 - CO2/Temperature/Humidity (I2C)',
+      'yf_s201' => 'YF-S201 - Water Flow Meter (GPIO)',
+      'neo6m' => 'NEO-6M - GPS Module (UART/Serial)'
     }
 
     puts 'Available Sensors:'
@@ -168,6 +169,25 @@ class DredgerCLI
       shunt = @options[:ina219_shunt] || 0.1
       provider = Dredger::IoT::Sensors::INA219Provider.new(i2c_bus: i2c, shunt_resistance_ohms: shunt)
       Dredger::IoT::Sensors::INA219.new(i2c_addr: addr, provider: provider)
+    when 'adxl345'
+      addr = (args.shift || '0x53').to_i(16)
+      i2c = Dredger::IoT::Bus::Auto.i2c
+      provider = Dredger::IoT::Sensors::ADXL345Provider.new(i2c_bus: i2c)
+      Dredger::IoT::Sensors::ADXL345.new(i2c_addr: addr, provider: provider)
+    when 'scd30'
+      addr = (args.shift || '0x61').to_i(16)
+      i2c = Dredger::IoT::Bus::Auto.i2c
+      provider = Dredger::IoT::Sensors::SCD30Provider.new(i2c_bus: i2c)
+      Dredger::IoT::Sensors::SCD30.new(i2c_addr: addr, provider: provider)
+    when 'yf_s201'
+      pin = args.shift || 'P9_12'
+      gpio = Dredger::IoT::Bus::Auto.gpio
+      provider = Dredger::IoT::Sensors::YFS201Provider.new(gpio_bus: gpio)
+      Dredger::IoT::Sensors::YFS201.new(pin_label: pin, provider: provider)
+    when 'neo6m'
+      device = args.shift || '/dev/ttyAMA0'
+      provider = Dredger::IoT::Sensors::NEO6MProvider.new
+      Dredger::IoT::Sensors::NEO6M.new(device: device, provider: provider)
     else
       puts "Error: Unknown sensor type '#{type}'"
       exit 1
@@ -201,7 +221,7 @@ class DredgerCLI
           sensor_type: r.sensor_type,
           value: r.value,
           unit: r.unit,
-          timestamp: r.timestamp.iso8601
+          timestamp: r.recorded_at.iso8601
         }
       end
       puts JSON.pretty_generate(data)
@@ -289,11 +309,11 @@ class DredgerCLI
 
     puts
     puts 'Recommendations:'
-    puts "  sudo apt-get install gpiod i2c-tools"
-    puts "  sudo usermod -a -G gpio $USER  # for GPIO access"
-    puts "  sudo usermod -a -G i2c $USER   # for I2C access"
-    puts "  sudo modprobe i2c-dev"
-    puts "  sudo modprobe w1-gpio; sudo modprobe w1-therm"
+    puts '  sudo apt-get install gpiod i2c-tools'
+    puts '  sudo usermod -a -G gpio $USER  # for GPIO access'
+    puts '  sudo usermod -a -G i2c $USER   # for I2C access'
+    puts '  sudo modprobe i2c-dev'
+    puts '  sudo modprobe w1-gpio; sudo modprobe w1-therm'
   end
 
   def check_device_node(path, desc)

data/lib/dredger/iot/bus/gpio.rb

@@ -21,6 +21,10 @@ module Dredger
           @backend.read(pin_label)
         end
 
+        def close
+          @backend.close if @backend.respond_to?(:close)
+        end
+
         # Simulation backend for tests/development
         class Simulation
           def initialize

data/lib/dredger/iot/bus/gpio_label_adapter.rb

@@ -24,6 +24,10 @@ module Dredger
           @backend.read(resolve(pin))
         end
 
+        def close
+          @backend.close if @backend.respond_to?(:close)
+        end
+
         private
 
         # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity

data/lib/dredger/iot/bus/i2c.rb

@@ -19,6 +19,10 @@ module Dredger
           @backend.read(addr, length, register: register)
         end
 
+        def close
+          @backend.close if @backend.respond_to?(:close)
+        end
+
         # Simulation backend keeps a per-address register map
         class Simulation
           def initialize

data/lib/dredger/iot/pins/beaglebone.rb

@@ -5,13 +5,7 @@ module Dredger
     module Pins
       # Beaglebone header label mapping placeholder.
       class Beaglebone
-        # Provides validation and PinRef objects.
-        # Chip:line resolution is done at runtime by the agent or a backend.
-        PinRef = Struct.new(:label, :chip, :line, keyword_init: true) do
-          def to_s
-            chip && line ? "#{label}(chip#{chip}:#{line})" : label.to_s
-          end
-        end
+        PinRef = Pins::PinRef
 
         KNOWN_LABELS = (
           (0..46).map { |n| "P8_#{n}" } + (0..46).map { |n| "P9_#{n}" }

data/lib/dredger/iot/pins/raspberry_pi.rb

@@ -8,11 +8,7 @@ module Dredger
       # - GPIO17, BCM17
       # - PIN11 (a.k.a. BOARD11)
       class RaspberryPi
-        PinRef = Struct.new(:label, :chip, :line, keyword_init: true) do
-          def to_s
-            chip && line ? "#{label}(chip#{chip}:#{line})" : label.to_s
-          end
-        end
+        PinRef = Pins::PinRef
 
         # Subset of BOARD pin to BCM mapping for common usable GPIOs on 40-pin header
         BOARD_TO_BCM = {

data/lib/dredger/iot/pins.rb

@@ -1,4 +1,16 @@
 # frozen_string_literal: true
 
+module Dredger
+  module IoT
+    module Pins
+      PinRef = Struct.new(:label, :chip, :line, keyword_init: true) do
+        def to_s
+          chip && line ? "#{label}(chip#{chip}:#{line})" : label.to_s
+        end
+      end
+    end
+  end
+end
+
 require_relative 'pins/beaglebone'
 require_relative 'pins/raspberry_pi'

data/lib/dredger/iot/sensors/adxl345.rb

@@ -8,7 +8,7 @@ module Dredger
       # Uses a provider interface to allow simulation in tests and hardware backends in production.
       class ADXL345 < BaseSensor
         # provider must respond to :read_measurements(i2c_addr) -> { x_g:, y_g:, z_g: }
-        def initialize(i2c_addr: 0x53, provider:, metadata: {})
+        def initialize(provider:, i2c_addr: 0x53, metadata: {})
           super(metadata: metadata)
           @i2c_addr = i2c_addr
           @provider = provider

data/lib/dredger/iot/sensors/adxl345_provider.rb

@@ -33,6 +33,7 @@ module Dredger
           @i2c = i2c_bus
           @range = range
           @scale_factor = calculate_scale_factor(range)
+          @configured = false
         end
 
         # Read acceleration measurements from the ADXL345 at the given I2C address.
@@ -43,7 +44,10 @@ module Dredger
           raise IOError, "ADXL345 not found (devid=0x#{dev_id.to_s(16)})" unless dev_id == DEVID_EXPECTED
 
           # Configure sensor (one-time setup)
-          configure_sensor(addr)
+          unless @configured
+            configure_sensor(addr)
+            @configured = true
+          end
 
           # Read 6 bytes of acceleration data (X, Y, Z as 16-bit signed integers)
           raw = @i2c.read(addr, 6, register: DATAX0_REG)

data/lib/dredger/iot/sensors/dht22_provider.rb

@@ -64,14 +64,9 @@ module Dredger
         # This is a stub - real implementation requires precise timing.
         # In production, consider using a kernel driver or hardware peripheral.
         def read_40_bits(_pin_label)
-          # Placeholder: return simulated data for now
-          # Real implementation would read GPIO with microsecond timing
-          # For each bit: wait for low->high transition, measure high duration
-          # If high > 40us, bit=1; else bit=0
-          warn 'DHT22Provider: bit-banging not fully implemented, returning stub data'
-          # humidity=65.2% => 0x028C, temp=31.4°C => 0x013A
-          # checksum = (0x02 + 0x8C + 0x01 + 0x3A) & 0xFF = 0xC9
-          [0x02, 0x8C, 0x01, 0x3A, 0xC9]
+          raise NotImplementedError,
+                'DHT22 bit-banging requires microsecond timing not achievable in pure Ruby. ' \
+                'Use a C extension, kernel driver (e.g., dht11 kernel module), or hardware peripheral.'
         end
       end
     end

data/lib/dredger/iot/sensors/ds18b20_provider.rb

@@ -23,7 +23,13 @@ module Dredger
         # Read temperature from DS18B20 sensor.
         # device_id: device address (e.g., "28-0000056789ab")
         # Returns temperature in Celsius as Float
+        VALID_DEVICE_ID = /\A28-[0-9a-f]+\z/
+
         def read_temperature(device_id)
+          unless device_id.match?(VALID_DEVICE_ID)
+            raise ArgumentError, "Invalid DS18B20 device_id: #{device_id}. Expected format: 28-xxxxxxxxxxxx"
+          end
+
           device_path = File.join(@base_path, device_id, 'w1_slave')
           raise IOError, "DS18B20 device not found: #{device_id}" unless File.exist?(device_path)
 

data/lib/dredger/iot/sensors/neo6m.rb

@@ -8,7 +8,7 @@ module Dredger
       # Uses a provider interface to allow simulation in tests and hardware backends in production.
       class NEO6M < BaseSensor
         # provider must respond to :read_position(device) -> { latitude:, longitude:, altitude:, speed:, satellites: }
-        def initialize(device: '/dev/ttyAMA0', provider:, metadata: {})
+        def initialize(provider:, device: '/dev/ttyAMA0', metadata: {})
           super(metadata: metadata)
           @device = device
           @provider = provider

data/lib/dredger/iot/sensors/neo6m_provider.rb

@@ -45,9 +45,9 @@ module Dredger
               line = read_line(serial, @timeout)
               next unless line
 
-              if line.start_with?('$GPGGA') || line.start_with?('$GNGGA')
+              if line.start_with?('$GPGGA', '$GNGGA')
                 gga_data = parse_gga(line)
-              elsif line.start_with?('$GPRMC') || line.start_with?('$GNRMC')
+              elsif line.start_with?('$GPRMC', '$GNRMC')
                 rmc_data = parse_rmc(line)
               end
             end
@@ -125,7 +125,7 @@ module Dredger
           degree_digits = coord_str.length >= 5 && coord_str[4] == '.' ? 2 : 3
 
           degrees = coord_str[0, degree_digits].to_f
-          minutes = coord_str[degree_digits..-1].to_f
+          minutes = coord_str[degree_digits..].to_f
 
           decimal_degrees = degrees + (minutes / 60.0)
 

data/lib/dredger/iot/sensors/scd30.rb

@@ -8,7 +8,7 @@ module Dredger
       # Uses a provider interface to allow simulation in tests and hardware backends in production.
       class SCD30 < BaseSensor
         # provider must respond to :read_measurements(i2c_addr) -> { co2_ppm:, temperature_c:, humidity: }
-        def initialize(i2c_addr: 0x61, provider:, metadata: {})
+        def initialize(provider:, i2c_addr: 0x61, metadata: {})
           super(metadata: metadata)
           @i2c_addr = i2c_addr
           @provider = provider

data/lib/dredger/iot/sensors/scd30_provider.rb

@@ -87,7 +87,7 @@ module Dredger
             sleep(0.01)
             status = @i2c.read(addr, 3)
             # Data ready when bit 0 of word is 1
-            data_ready = (status[1] & 0x01) == 1
+            data_ready = status[1].allbits?(0x01)
             return if data_ready
 
             raise IOError, 'SCD30 data ready timeout' if Time.now - start_time > timeout
@@ -130,7 +130,7 @@ module Dredger
           data.each do |byte|
             crc ^= byte
             8.times do
-              crc = (crc & 0x80) != 0 ? ((crc << 1) ^ 0x31) : (crc << 1)
+              crc = crc.anybits?(0x80) ? ((crc << 1) ^ 0x31) : (crc << 1)
               crc &= 0xFF
             end
           end

data/lib/dredger/iot/sensors/yf_s201_provider.rb

@@ -66,14 +66,12 @@ module Dredger
           # For production, use hardware interrupts or kernel GPIO edge detection
           while Time.now - start_time < duration
             current_state = @gpio.read(pin_label)
-            
+
             # Detect rising edge (0 -> 1 transition)
-            if current_state == 1 && last_state == 0
-              pulses += 1
-            end
-            
+            pulses += 1 if current_state == 1 && last_state.zero?
+
             last_state = current_state
-            
+
             # Small sleep to reduce CPU usage
             # Trade-off: Higher sleep = lower CPU, but may miss pulses
             # For accurate counting, use interrupts instead

data/lib/dredger/iot/version.rb

@@ -2,6 +2,6 @@
 
 module Dredger
   module IoT
-    VERSION = '0.3.0'
+    VERSION = '0.3.2'
   end
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dredger-iot
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - The Mad Botter INC
+autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -26,7 +27,8 @@ dependencies:
 description: |
   Dredger-IoT provides FFI-based GPIO and I2C access for embedded Linux systems like Beaglebone Black.
   Features include: libgpiod GPIO backend, Linux i2c-dev I2C backend, simulation backends for testing,
-  sensor drivers (DHT22, BME280, DS18B20, BMP180, MCP9808), Beaglebone pin label mapping, and
+  sensor drivers (BME280, DS18B20, SHT31, BH1750, TSL2561, INA219, ADXL345, SCD30, YF-S201, NEO-6M),
+  Beaglebone and Raspberry Pi pin label mapping, and
   scheduling utilities for periodic polling and exponential backoff.
 email:
 - opensource@themadbotter.com
@@ -91,7 +93,7 @@ metadata:
   documentation_uri: https://github.com/TheMadBotterINC/dredger-iot/blob/master/README.md
   rubygems_mfa_required: 'true'
   keywords: iot, embedded, linux, gpio, i2c, beaglebone, raspberry-pi, hardware, sensors,
-    dht22, bme280, ds18b20, bmp180, mcp9808, libgpiod, automation
+    bme280, ds18b20, sht31, bh1750, tsl2561, ina219, adxl345, scd30, libgpiod, automation
 post_install_message: "\n    ═══════════════════════════════════════════════════════════════════\n
   \                                                                  \n                      _______________
   \                             \n                     |  DREDGER-IoT  |                            \n
@@ -106,13 +108,13 @@ post_install_message: "\n    ═════════════════
   \  |                    \n              |_____________________________|                    \n
   \        ~~~       \\                 //          ~~~            \n                    \\_______________//
   \                         \n    ═══════════════════════════════════════════════════════════════════\nHardware
-  Integration for Embedded Linux v0.3.0\n    ═══════════════════════════════════════════════════════════════════\n\n
+  Integration for Embedded Linux v0.3.2\n    ═══════════════════════════════════════════════════════════════════\n\n
   \   \U0001F389 Thanks for installing!\n\n    \U0001F4DA Hardware Setup (kernel modules
   & permissions):\n       https://github.com/TheMadBotterINC/dredger-iot#hardware-setup\n\n
   \   \U0001F680 Quick Start:\n       require 'dredger/iot'\n       gpio = Dredger::IoT::Bus::Auto.gpio\n
   \      i2c  = Dredger::IoT::Bus::Auto.i2c\n\n    \U0001F4A1 Supported Sensors:\n
-  \      DHT22, BME280, DS18B20, BMP180, MCP9808\n\n    \U0001F4D6 Full Documentation:\n
-  \      https://github.com/TheMadBotterINC/dredger-iot\n\n"
+  \      BME280, DS18B20, SHT31, INA219, ADXL345, SCD30, and more\n\n    \U0001F4D6
+  Full Documentation:\n       https://github.com/TheMadBotterINC/dredger-iot\n\n"
 rdoc_options: []
 require_paths:
 - lib
@@ -127,7 +129,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: Generic hardware integration for embedded Linux (GPIO, I2C) with sensor drivers.
 test_files: []