i2c 0.4.0 → 0.4.2.dev

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2254a2d32b8a0d9feb7e7718477e4bca157a521d
+  data.tar.gz: 918e34eca0c218eab8330efa1ee5b71426c91625
+SHA512:
+  metadata.gz: 453ebbf2217f1ca9e105c95cd188b1c9d08c311d7a913927312ca7aabfaed490c0836052076e07425f5709a9409430f75626d1d064e3e40c047a0f20b8980c00
+  data.tar.gz: fbd3cd2ea165014d405a781591f13c88b96bc018c9a31cc223bdac2490c8859dc4a1969b2902d85a2546fe4a133b22a00280fcdd2fbe5730c25eef827b774890

data/README.rdoc

@@ -1,30 +1,30 @@
-= I2C - Ruby I2C library 
+= I2C - Ruby I2C library
 
 == About
 
-Interface to Linux I2C (a.k.a. TWI) implementations. Right now targeted at the 
+Interface to Linux I2C (a.k.a. TWI) implementations. Right now targeted at the
 Raspberry Pi, but should work with any linux i2c-dev I2C-hardware.
 
 == Structure
 
-The library is split into two parts: 
-* A backend for accessing the I2C bus (right now only through the i2c-dev 
-   in Linux, other impementations are possible).
-* Drivers for I2C enabled ICs. 
+The library is split into two parts:
+* A backend for accessing the I2C bus (right now only through the i2c-dev
+in Linux, other impementations are possible).
+* Drivers for I2C enabled ICs.
 
 == Installation
 
 To use the i2c-dev backend it is necessary to load the "i2c-dev" linux
 kernel module. This is not done automatically even if the module for the
 underlying I2C-hardware is. To automatically load the i2c-dev driver on startup
-add it to /etc/modules. Also the device file (usually /dev/i2c-0) must be 
-user accessible. A working (at least on a RaspberryPi running Raspbian) udev 
+add it to /etc/modules. Also the device file (usually /dev/i2c-0) must be
+user accessible. A working (at least on a RaspberryPi running Raspbian) udev
 rule file is available (rules/88-i2c.rules) and can be installed to
 /etc/udev/rules.d/.
 
 == Backends
 
-The backends are instantiated through the #I2C::create method. depending 
+The backends are instantiated through the #I2C::create method. depending
 on the format of the passed bus descriptor the correct backend is invoked.
 
 Right now there is only a i2c-dev backend available
@@ -43,21 +43,21 @@ first I2c bus on the system.
 
 16 bit IO-Expander MCP23017 from Microchip. Provides a wiringpi-ruby compatible
 API and may therefore be used as a drop-in replacement for IO tasks on a
-Raspberry Pi. 
+Raspberry Pi.
 Datasheet: http://ww1.microchip.com/downloads/en/DeviceDoc/21952b.pdf
 
 === MCP23008
 
-8 bit IO-Expander MCP23008 from Microchip. Basically a small version of the 
-MCP23017. 
+8 bit IO-Expander MCP23008 from Microchip. Basically a small version of the
+MCP23017.
 Datasheet: http://ww1.microchip.com/downloads/en/DeviceDoc/21919e.pdf
 
 == Acknowledgements
 
-The low-level IO (mainly in i2c-dev.rb) was extracted from Ruby-I2C 
-(http://rubyforge.org/projects/i2c/) by Jonas Bähr <jonas.baehr@fs.ei.tum.de> 
+The low-level IO (mainly in i2c-dev.rb) was extracted from Ruby-I2C
+(http://rubyforge.org/projects/i2c/) by Jonas Bähr <jonas.baehr@fs.ei.tum.de>
 
-=== Contributions 
+=== Contributions
 * [Gaëtan Duchaussois](https://github.com/gaetronik) I2C::Dev.read_byte.
 
 === Bugfixes
@@ -67,6 +67,6 @@ The low-level IO (mainly in i2c-dev.rb) was extracted from Ruby-I2C
 
 This code may be used under the terms of the GNU General Public Licence, Version 2.
 
+Copyright (c) 2018 David Bailey <davidbailey.2889@gmail.com>
 Copyright (c) 2012 Christoph Anderegg <christoph@christoph-anderegg.ch>
 Copyright (c) 2008 Jonas Bähr <jonas.baehr@fs.ei.tum.de>
-

data/lib/i2c/backends/i2c-dev.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-# I2C - Linux i2c-dev backend. 
+# I2C - Linux i2c-dev backend.
 #
 # Copyright (c) 2012 Christoph Anderegg <christoph@christoph-anderegg.ch>
-# Copyright (c) 2008 Jonas Bähr, jonas.baehr@fs.ei.tum.de 
+# Copyright (c) 2008 Jonas Bähr, jonas.baehr@fs.ei.tum.de
 # This file may be distributed under the terms of the GNU General Public
 # License Version 2.
 #
@@ -18,43 +18,82 @@ module I2C
       @instances[device_path]
     end
 
-    # sends every param, begining with +params[0]+
+	 attr_reader :comsMutex
+
+	 # this tries to lock the coms mutex, unless already held,
+    # then sends every param, begining with +params[0]+
     # If the current param is a Fixnum, it is treated as one byte.
-    # If the param is a String, this string will be send byte by byte.
+    # If the param is a String, this string will be sent byte by byte.
     # You can use Array#pack to create a string from an array
-    # For Fixnum there is a convinient function to_short which transforms
+    # For Fixnum there is a convenient function to_short which transforms
     # the number to a string this way: 12345.to_short == [12345].pack("s")
     def write(address, *params)
-      data = String.new
-      data.force_encoding("US-ASCII")
-      params.each do |value|
-        data << value
-      end
-      @device.ioctl(I2C_SLAVE, address)
-      @device.syswrite(data)
+		if(@comsMutex.owned?)
+		 	keepLock = true;
+		else
+			@comsMutex.lock;
+		end
+
+		setup_device(address);
+		raw_write(params);
+
+		@comsMutex.unlock() unless keepLock;
     end
 
-    # this sends *params as the write function and then tries to read
+	 # this tries to lock the coms mutex (unless already held),
+    # then sends *params, if given, and then tries to read
     # +size+ bytes. The result is a String which can be treated with
     # String#unpack afterwards
     def read(address, size, *params)
-      ret = ""
-      write(address, *params)
-      ret = @device.sysread(size)
-      return ret
+		 if(@comsMutex.owned?)
+			 keepLock = true;
+		 else
+			 @comsMutex.lock;
+		 end
+
+		setup_device(address);
+		raw_write(params) unless params.empty?
+		result = raw_read(size);
+
+		@comsMutex.unlock() unless keepLock;
+		return result;
     end
-    
+
     # Read a byte from the current address. Return a one char String which
     # can be treated with String#unpack
     def read_byte(address)
-      ret=""
-      @device.ioctl(I2C_SLAVE,address)
-      ret=@device.sysread(1)
-      return ret
+   	read(address, 1);
     end
-    
+
     private
+	 # Set up @device for a I2C communication to address
+	 def setup_device(address)
+		 @device.ioctl(I2C_SLAVE, address);
+	 end
+
+	 # Read size bytes from @device, if possible. Raise an error otherwise
+	 def raw_read(size)
+		 return @device.sysread(size)
+	 end
+
+	 # Write "params" to @device, unrolling them first should they be an array.
+	 # params should be a string, formatted with Array.pack as explained for write()
+	 def raw_write(params)
+		 data = String.new();
+		 data.force_encoding("US-ASCII")
+
+		 if(params.is_a? Array)
+			 params.each do |i| data << i; end
+		 else
+			 data << params;
+		 end
+
+		 @device.syswrite(data);
+	 end
+
     def initialize(device_path)
+		@comsMutex = Mutex.new();
+
       @device = File.new(device_path, 'r+')
       # change the sys* functions of the file object to meet our requirements
       class << @device
@@ -62,7 +101,7 @@ module I2C
         def syswrite(var)
           begin
             syswrite_orig var
-          rescue Errno::EREMOTEIO
+          rescue Errno::EREMOTEIO, Errno::EIO
             raise AckError, "No acknowledge received"
           end
         end
@@ -70,7 +109,7 @@ module I2C
         def sysread(var)
           begin
             sysread_orig var
-          rescue Errno::EREMOTEIO
+          rescue Errno::EREMOTEIO, Errno::EIO
             raise AckError, "No acknowledge received"
           end
         end

data/lib/i2c/drivers/mcp230xx.rb

@@ -53,7 +53,7 @@ module I2C
         
         @iodir = Array.new
         max_port_no.times { @iodir << 0xFF } # Direction is input initially
-        @device.write(@address, port_count, iodir[0], @iodir)
+        @device.write(@address, port_count, iodir[0], *@iodir)
         
         @data = Array.new
         max_port_no.times { @data << 0xFF }

metadata

@@ -1,53 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: i2c
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 0.4.2.dev
 platform: ruby
 authors:
 - Christoph Anderegg
+- David Bailey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2018-06-12 00:00:00.000000000 Z
 dependencies: []
 description: Interface to I2C (aka TWI) implementations. Also provides abstractions
   for some I2c-devices. Created with the Raspberry Pi in mind.
-email: christoph@christoph-anderegg.ch
+email:
+- davidbailey.2889@gmail.com
+- christoph@christoph-anderegg.ch
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
+- README.rdoc
 - lib/i2c.rb
-- lib/i2c/i2c.rb
 - lib/i2c/backends/i2c-dev.rb
 - lib/i2c/drivers/mcp230xx.rb
-- test//mcp230xx_spec.rb
+- lib/i2c/i2c.rb
 - rules/88-i2c.rules
-- README.rdoc
+- test//mcp230xx_spec.rb
 homepage: https://github.com/andec/i2c
-licenses: []
+licenses:
+- GPL-3.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.6.14.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: I2C access library (for Linux).
 test_files: []