i2c-devices 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 545b2f935babca05be80d95a4e6090ae7c6bc716
-  data.tar.gz: cf85f13b1ca3bd7ffbc256ab34fd552cc74227b9
+  metadata.gz: 246d5743687852c69c063e4bdcb689320446ce70
+  data.tar.gz: ca1a2ca228efb4273a950b5f6cf75f54c4abb2d7
 SHA512:
-  metadata.gz: b2fbfb0e4ecaccfc4659c792cc1e31ffd3fba4583f35be37343840ed0b388bf4629b43642c8258b7f1c8ccbc8ceb0269358bcfaa5ccff659d14a227fab0421db
-  data.tar.gz: e847ef178a80c01a434fa8a3932bfe6dfc360d9e553876371a9d66d754ca20e82be6b70fc3fa24c3d55ddd39f5e26f760c5a37e46af2e6de2dcb500fb43f9652
+  metadata.gz: a5275d90cca868f5529428dcc26498883a61979b36e35ff7306086665a3df190cdffb8cb46204f8668cdfd833264ab67229a23a7fc368c3983feb38481444c5a
+  data.tar.gz: c1526218e9e11d57affcc896dbe0f747e1ccdc7d7ba69e1fc4c629eb41e0bcdd90531fb58d4d4c32935713b7feca3b42fdd51b69e0a281c49d85886fdc892705

data/ChangeLog

@@ -1,3 +1,11 @@
+2015-08-14  SATOH Hiroh <cho45@lowreal.net>
+
+	* 0.0.5:
+	[MOD] i2cget acceprt nil as param (by hotchpotch)
+	[ADD] add device HDC1000 (by hotchpotch)
+	[FIX] fix device AQM0802a (by hotchpotch)
+
+
 2014-02-20  SATOH Hiroh <cho45@lowreal.net>
 
 	* 0.0.1: initial release

data/README.md

@@ -27,7 +27,7 @@ or pre-defiend device driver class:
 ```
 require "i2c/device/acm1602ni"
 
-lcd = ACM1602NI.new
+lcd = I2CDevice::ACM1602NI.new
 
 lcd.put_line(0, "0123456789ABCDEF")
 ```
@@ -39,7 +39,7 @@ with driver class
 require "i2c/device/mpl115a2"
 require "i2c/driver/i2c-dev"
 
-mpl = MPL115A2.new(driver: I2CDevice::Driver::I2CDev.new("/dev/i2c-0"))
+mpl = I2CDevice::MPL115A2.new(driver: I2CDevice::Driver::I2CDev.new("/dev/i2c-0"))
 p mpl.calculate_hPa
 ```
 
@@ -49,7 +49,7 @@ or GPIO backend driver (this is very slow)
 require "i2c/device/mpl115a2"
 require "i2c/driver/gpio"
 
-mpl = MPL115A2.new(driver: I2CDevice::Driver::GPIO.new(
+mpl = I2CDevice::MPL115A2.new(driver: I2CDevice::Driver::GPIO.new(
 	sda: 23, # pin 16 in raspberry pi
 	scl: 24, # pin 18 in raspberry pi
 ))

data/lib/i2c.rb

@@ -1,6 +1,6 @@
 # Generic abstract class for I2C manipulation.
 class I2CDevice
-	VERSION = "0.0.4"
+	VERSION = "0.0.5"
 
 	# Super class of all of this library.
 	class I2CException < Exception; end

data/lib/i2c/device/aqm0802.rb

@@ -53,6 +53,18 @@ class I2CDevice::AQM0802A < I2CDevice::HD44780
 		i2cset(0, 0b00100000 | (dl<<4) | (n<<3) | (f<<2) | (is))
 		sleep 37e-6
 	end
-end
-
 
+	def put_line(line, str, force=false)
+		str.force_encoding(Encoding::BINARY)
+		str.gsub!(/#{MAP.keys.join('|')}/, MAP)
+		str = "%- 8s" % str
+		if force || str != @lines[line]
+			# set ddram address
+			set_ddram_address(line<<6) # line is 0 or 1
+			sleep 60e-6
+			i2cset(0b01000000, *str.unpack("C*"))
+			sleep 60e-6
+		end
+		@lines[line] = str
+	end
+end

data/lib/i2c/device/hdc1000.rb

@@ -0,0 +1,42 @@
+# coding: utf-8
+
+require "i2c"
+
+# http://www.ti.com/product/HDC1000
+# A Digital humidity/temperature sensor
+
+class I2CDevice::HDC1000 < I2CDevice
+	def initialize(args = {})
+		args = {
+			address: 0x40
+		}.merge(args)
+		super args
+		configuration
+	end
+
+	def configuration
+		i2cset(
+			0x02, # Configuration register
+			0x10, # TRES 14bit
+			0x00  # HRES 14bit
+		)
+	end
+
+	def get_data
+		i2cset(0x00)
+		sleep 6.35e-3 + 6.5e-3
+		raw = i2cget(nil, 4).unpack("C4")
+		{
+			temperature: calc_temperature(raw[0], raw[1]),
+			humidity: calc_humidity(raw[2], raw[3])
+		}
+	end
+
+	def calc_temperature(d1, d2)
+	  ((d1<<8 | d2).to_f / 2**16 * 165) - 40
+	end
+
+	def calc_humidity(d1, d2)
+	  (d1<<8 | d2).to_f / 2**16 * 100
+	end
+end

data/lib/i2c/driver/gpio.rb

@@ -35,7 +35,7 @@ class I2CDevice::Driver::GPIO < I2CDevice::Driver::Base
 
 	def self.write(pin, val) #:nodoc: 
 		File.open("/sys/class/gpio/gpio#{pin}/value", "w") do |f|
-			f.syswrite(val && val.nonzero?? "1" : "0")
+			f.syswrite(val ? "1" : "0")
 		end
 	end
 

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

@@ -36,7 +36,7 @@ class I2CDevice::Driver::I2CDev < I2CDevice::Driver::Base
 	def i2cget(address, param, length)
 		i2c = File.open(@path, "r+")
 		i2c.ioctl(I2C_SLAVE, address)
-		i2c.syswrite(param.chr)
+		i2c.syswrite(param.chr) unless param.nil?
 		ret = i2c.sysread(length)
 		i2c.close
 		ret

data/xt/aqm0802a.rb

@@ -0,0 +1,7 @@
+# coding: utf-8
+
+require "i2c/device/aqm0802"
+
+aqm0802 = I2CDevice::AQM0802A.new
+aqm0802.put_line(0, 'helloｫ')
+aqm0802.put_line(1, ' world!')

data/xt/driver-gpio.rb

@@ -13,22 +13,22 @@ driver = I2CDevice::Driver::GPIO.new(
 )
 
 
-device = I2CDevice.new(address: 0x20, driver: driver)
-loop do
-	seq = Array.new(8) { rand(0x10) }
-	seq = (0..7).map {|n| 0x10 + n }
-	seq = (1..10).to_a
-	p seq
-	p device.i2cset(0x00, *seq)
-	# p device.i2cget(0x00, 8).unpack("C*")
-
-	exit 1
-	sleep 1
-end
-
-#mpl = MPL115A2.new(driver: driver)
+#device = I2CDevice.new(address: 0x20, driver: driver)
 #loop do
-#	p mpl.calculate_hPa
+#	seq = Array.new(8) { rand(0x10) }
+#	seq = (0..7).map {|n| 0x10 + n }
+#	seq = (1..10).to_a
+#	p seq
+#	p device.i2cset(0x00, *seq)
+#	# p device.i2cget(0x00, 8).unpack("C*")
+#
+#	exit 1
 #	sleep 1
 #end
 
+mpl = I2CDevice::MPL115A2.new(driver: driver)
+loop do
+	p mpl.calculate_hPa
+	sleep 1
+end
+

data/xt/hdc1000.rb

@@ -0,0 +1,6 @@
+
+require 'i2c/device/hdc1000'
+require 'pp'
+
+hdc = I2CDevice::HDC1000.new
+pp hdc.get_data

data/xt/mpl115a2.rb

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift "lib"
 
 require "i2c/device/mpl115a2"
 
-mpl = MPL115A2.new
+mpl = I2CDevice::MPL115A2.new
 
 loop do
 	p mpl.calculate_hPa

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i2c-devices
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - cho45
@@ -14,28 +14,28 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: i2c-devices is a drivers for i2c devices
@@ -45,7 +45,7 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- .gitignore
+- ".gitignore"
 - ChangeLog
 - README.md
 - Rakefile
@@ -55,6 +55,7 @@ files:
 - lib/i2c/device/adt7410.rb
 - lib/i2c/device/aqm0802.rb
 - lib/i2c/device/hd44780.rb
+- lib/i2c/device/hdc1000.rb
 - lib/i2c/device/mpl115a2.rb
 - lib/i2c/driver.rb
 - lib/i2c/driver/gpio.rb
@@ -65,7 +66,9 @@ files:
 - spec/i2cdevice_spec.rb
 - spec/mocki2cdevice.rb
 - xt/acm1602ni.rb
+- xt/aqm0802a.rb
 - xt/driver-gpio.rb
+- xt/hdc1000.rb
 - xt/i2cdetect.rb
 - xt/mpl115a2.rb
 homepage: https://github.com/cho45/ruby-i2c-devices
@@ -74,23 +77,23 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: i2c device drivers