apiotics_factory 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f26ab3e02dbf8d9e2ef12cb78aa6b18dcbdccce
-  data.tar.gz: 00bcae0c277e65b2563cf50819657ca7052ecab8
+  metadata.gz: cb99cea55e392ce659821534aa4035d7b027a208
+  data.tar.gz: 5061c5353562c4e3058e5b377e468421df05f829
 SHA512:
-  metadata.gz: 6bf0b67c00a2538631a3588f3a36cf9ad19cab3b71e357144e34eede89c761c42095d6ad03bed6c1d2e2b5bbcd7e0d27c3f61f58b1128bf3670d2ed3e7893403
-  data.tar.gz: c19dd6553b9ae704e3469300910cbe4a08857a55526475bcc565bc57c804e8daa09231c7ae6c74a88ba553334369dcffe9e85f4ce41189c60fb5768e756d57df
+  metadata.gz: c640a055093018dd3f5f21e865c585773575a414695570ab49b6c5a9c44b6a57d726448ca8327cef0ea6735b611c0b370bb6095dff4b728bba42ee4d9345207b
+  data.tar.gz: 8c42c5c0f5f7a0087e1c836042aba5e703213aec34ee8b056bd10452f4111b6629684a55ba5fcea980c9569d4f6097a32c2a6d6b025721796bc3ae9df6b9c90b

data/lib/apiotics_factory/version.rb

@@ -1,3 +1,3 @@
 module ApioticsFactory
-  VERSION = '1.0.9'
+  VERSION = '1.0.10'
 end

data/lib/templates/grove_pi/grove_pi.rb

@@ -41,7 +41,7 @@ module GrovePi
   D7 = 7
   D8 = 8
 
-  PINS_DIGITAL = [D2, D3, D4, D5, D6, D7, D8]
+  PINS_DIGITAL = [D2, D3, D4, D5, D6, D7, D8, A2] #added A2 to test using analog port as digital
 
   # Pin modes.
   PIN_MODE_IN = 0
@@ -209,7 +209,8 @@ module GrovePi
       begin
         self._set_pin_mode pin, PIN_MODE_IN
         return self._read_digital pin
-      rescue Errno::EREMOTEIO
+      rescue => e
+        puts e.message
         next
       end
     end
@@ -310,26 +311,41 @@ module GrovePi
   # Temperature and Humidity Sensor
 
   # Read temperature and humidity values from sensor
-  def self.read_temp_humidity(pin)
+  def self.read_temp_humidity(pin, sensor_version)
     self._ensure_init
+    
+    # if sensor is white: module_type = 1, if sensor is blue: module_type = 0
+    if sensor_version == "white"
+      module_type = 1 
+    else 
+      module_type = 0
+    end
 
-    module_type = 1 # if sensor is white: module_type = 1, if sensor is blue: module_type = 0
-    @_i2c_grove_pi.i2cset(@_i2c_grove_pi.address, CMD_READ_TEMP_HUM, pin, module_type, 0)   
+    error = false
+    begin
+      @_i2c_grove_pi.i2cset(@_i2c_grove_pi.address, CMD_READ_TEMP_HUM, pin, module_type, 0)   
+    rescue => e
+      puts e.message
+      error = true
+    end
 
-    for i in 0..CONFIG_RETRIES - 1
-      begin
-        # read one byte
-        @_i2c_grove_pi.i2cget(@_i2c_grove_pi.address, 1)
 
-        # read 10 more bytes 
-        number = @_i2c_grove_pi.i2cget(@_i2c_grove_pi.address, 9)
-        
-        temp_value = number[1..4].unpack('f')[0].round(2) * 9/5 + 32 #convert to F
-        humidity_value = number[5..8].unpack('f')[0].round(2)
+    if error == false
+      for i in 0..CONFIG_RETRIES - 1
+        begin
+          # read one byte
+          @_i2c_grove_pi.i2cget(@_i2c_grove_pi.address, 1)
 
-        return temp_value, humidity_value 
-      rescue Errno::EREMOTEIO
-        next
+          # read 10 more bytes 
+          number = @_i2c_grove_pi.i2cget(@_i2c_grove_pi.address, 9)
+          
+          temp_value = number[1..4].unpack('f')[0].round(2) * 9/5 + 32 #convert to F
+          humidity_value = number[5..8].unpack('f')[0].round(2)
+
+          return temp_value, humidity_value 
+        rescue Errno::EREMOTEIO
+          next
+        end
       end
     end
   end

data/lib/templates/grove_pi/i2c/driver/gpio.rb

@@ -10,32 +10,62 @@ class I2CDevice::Driver::GPIO < I2CDevice::Driver::Base
 
 	def self.export(pin) #:nodoc: 
 		File.open("/sys/class/gpio/export", "w") do |f|
-			f.syswrite(pin)
+		  begin
+  		  f.flock(FILE::LOCK_EX)
+  			f.syswrite(pin)
+  			f.flock(FILE::LOCK_UN)
+  		rescue
+  		  f.flock(FILE::LOCK_UN)
+  		end
 		end
 	end
 
 	def self.unexport(pin) #:nodoc: 
 		File.open("/sys/class/gpio/unexport", "w") do |f|
-			f.syswrite(pin)
+		  begin
+  		  f.flock(FILE::LOCK_EX)
+  			f.syswrite(pin)
+  			f.flock(FILE::LOCK_UN)
+  		rescue
+  		  f.flock(FILE::LOCK_UN)
+  		end
 		end
 	end
 
 	def self.direction(pin, direction) #:nodoc: 
 		# [:in, :out, :high, :low].include?(direction) or raise "direction must be :in, :out, :high or :low"
 		File.open("/sys/class/gpio/gpio#{pin}/direction", "w") do |f|
-			f.syswrite(direction)
+		  begin
+  		  f.flock(FILE::LOCK_EX)
+  			f.syswrite(direction)
+  			f.flock(FILE::LOCK_UN)
+  		rescue
+  		  f.flock(FILE::LOCK_UN)
+  		end
 		end
 	end
 
 	def self.read(pin) #:nodoc: 
 		File.open("/sys/class/gpio/gpio#{pin}/value", "r") do |f|
-			f.sysread(1).to_i
+		  begin
+  		  f.flock(FILE::LOCK_EX)
+  			f.sysread(1).to_i
+  			f.flock(FILE::LOCK_UN)
+  		rescue
+  		  f.flock(FILE::LOCK_UN)
+  		end
 		end
 	end
 
 	def self.write(pin, val) #:nodoc: 
 		File.open("/sys/class/gpio/gpio#{pin}/value", "w") do |f|
-			f.syswrite(val ? "1" : "0")
+		  begin
+  		  f.flock(FILE::LOCK_EX)
+  			f.syswrite(val ? "1" : "0")
+  			f.flock(FILE::LOCK_UN)
+  		rescue
+  		  f.flock(FILE::LOCK_UN)
+  		end
 		end
 	end
 

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

@@ -39,11 +39,17 @@ class I2CDevice::Driver::I2CDev < I2CDevice::Driver::Base
 	# Interface of I2CDevice::Driver
 	def i2cget(address, param, length)
 		i2c = File.open(@path, "r+")
-		i2c.ioctl(@slave_command, address)
-		i2c.syswrite(param.chr) unless param.nil?
-		ret = i2c.sysread(length)
-		i2c.close
-		ret
+		begin
+		  i2c.flock(FILE::LOCK_EX)
+  		i2c.ioctl(@slave_command, address)
+  		i2c.syswrite(param.chr) unless param.nil?
+  		ret = i2c.sysread(length)
+  		i2c.flock(FILE::LOCK_UN)
+  		i2c.close
+  	  ret
+  	rescue
+  	  f.flock(FILE::LOCK_UN)
+  	end
 	rescue Errno::EIO => e
 		raise I2CDevice::I2CIOError, e.message
 	end
@@ -51,9 +57,15 @@ class I2CDevice::Driver::I2CDev < I2CDevice::Driver::Base
 	# Interface of I2CDevice::Driver
 	def i2cset(address, *data)
 		i2c = File.open(@path, "r+")
-		i2c.ioctl(@slave_command, address)
-		i2c.syswrite(data.pack("C*"))
-		i2c.close
+		begin
+  		i2c.flock(FILE::LOCK_EX)
+  		i2c.ioctl(@slave_command, address)
+  		i2c.syswrite(data.pack("C*"))
+  		i2c.flock(FILE::LOCK_UN)
+  		i2c.close
+  	rescue
+  	  i2c.flock(FILE::LOCK_UN)
+  	end
 	rescue Errno::EIO => e
 		raise I2CDevice::I2CIOError, e.message
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apiotics_factory
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Apiotics
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A Gem To Generate Apiotics Drivers