apiotics_factory 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95734d4ab16fa4e71e6f4ee5703c3db3a04504db
-  data.tar.gz: 257e8b067ae47c1820e2bdcfad41af83f4bd694d
+  metadata.gz: c59e4c2af33710657bcf828cac7f8fad3a31020d
+  data.tar.gz: b35cff21244a958ca0a4de7c03aa720eb53ac6a3
 SHA512:
-  metadata.gz: 1ae45143b10d166ff4555bf9ec1c9bd7742ce2436b3fb657e12168096dd443f3fba73c59b9cda6689c61f1374c245ef7f373a431d3221c4f9da9b26eef0b0773
-  data.tar.gz: 70c1d654675dfd1ebf7abf536786b8dc4c7e7c12909df268cd7e9f4f4dd18ecc2d94a130c6238209c18535db446342a8b2c325322afb1ff81a1ce05a8ab0e0f0
+  metadata.gz: 20530e3885b7bab8fb53a069745f0be79ec34d59d39ce0805011100548d09e10d60acfab728130ef91852907639af4f001eea66f6fb925409e6748fc1c277d31
+  data.tar.gz: 409a7a0181e5a6d84bac9910ae51ace88a5c9511e2f3c491106bd56c83e2c7ed43d90946001b7e3297d7c8cfe70a523d7fd6d2a91578ea4c424d82123adfa70f

data/lib/apiotics_factory/version.rb

@@ -1,3 +1,3 @@
 module ApioticsFactory
-  VERSION = '1.0.12'
+  VERSION = '1.0.13'
 end

data/lib/templates/apiotics_interfaces.rb.erb

@@ -13,18 +13,24 @@ class <%= @driver_name %> < ApioticsDriver
   <% @interfaces["all"].each do |k, v|%>
   <% unless k == "port" || k == "delay" %>
   <% if v["accessor"] == "write only" || v["accessor"] == "read/write"  %>
-  def <%= "write_#{k}(#{v["type"]})"%> 
+  def <%= "write_#{k}(#{v["type"]})"%>
+    # IF YOU ARE USING GROVE PI PERIPHERALS, UNCOMMENT THE GrovePi.get_lock AND GrovePi.release_lock LINES BELOW.
+    # GrovePi.get_lock 
     
     # Your hardware specific logic to set the state of your <%= k %> hardware goes here based on the value of the <%= v['type'] %> variable.
     
+    # GrovePi.release_lock
     self.send_msg(<%= v["type"]%>) # This line sends a confirmation message back to the web application noting that the operation is complete.
   end
   <% end %>
   <% if v["accessor"] == "read only" || v["accessor"] == "read/write" %>
   def <%= "read_#{k}"%> 
+    # IF YOU ARE USING GROVE PI PERIPHERALS, UNCOMMENT THE GrovePi.get_lock AND GrovePi.release_lock LINES BELOW.
+    # GrovePi.get_lock
     
     # Your hardware specific logic here should read a value from your <%= k %> hardware, and set the <%= v["type"] %> variable appropriately.
     
+    # GrovePi.release_lock
     self.send_msg(<%= v["type"]%>) # This line sends the value in the <%= v["type"] %> variable to the web application.
   end
   <% end %>

data/lib/templates/grove_pi/grove_pi.rb

@@ -1,9 +1,14 @@
 #!/usr/bin/env ruby
 
 module GrovePi
+  require 'json'
   require_relative 'i2c'
   require_relative 'i2c/driver/i2c-dev'
 
+  at_exit do
+    release_lock
+  end
+  
   # Commands.
   CMD_READ_DIGITAL = 1
   CMD_WRITE_DIGITAL = 2
@@ -54,10 +59,18 @@ module GrovePi
   # LCD RGB display - I2C addresses
   DISPLAY_TEXT_ADDRESS = 0x3e #0x3e
   DISPLAY_RGB_ADDRESS = 0x62 #0x62
-
+  
+  
+  # Initialize the lock file path.
+  LOCK_FILE_PATH = "/tmp/grove"
 
   # The initialized I2C object.
   @_i2c_grove_pi = nil
+  
+  # Initialize i2c file path
+  @_i2c_device_file = nil
+  
+
 
   # Storage for I2C slave addresses present on ports I2C-1, I2C-2 or I2C-3.
   @_i2c_slave_addresses = Hash.new
@@ -114,13 +127,33 @@ module GrovePi
 
     return false, nil
   end
+  
+  def self.get_lock
+    cycle = true
+    while cycle == true
+      begin
+         @_i2c_device_file = File.open(LOCK_FILE_PATH, File::WRONLY|File::CREAT|File::EXCL)
+        cycle = false
+      rescue
+        sleep 0.1
+      end
+    end
+  end
+    
+  def self.release_lock
+    if @_i2c_device_file.is_a(File)
+      @_i2c_device_file.close
+      File.delete(LOCK_FILE_PATH)
+      @_i2c_device_file = nil
+    end
+  end
 
   def self._grove_pi_init()
-    status, i2c_device_file = self._grove_pi_discover
+    status, @_i2c_device_file = self._grove_pi_discover
 
-    if status && i2c_device_file != nil
+    if status && @_i2c_device_file != nil
       return I2CDevice.new address: GROVE_PI_I2C_SLAVE_ADDRESS,
-                           driver: I2CDevice::Driver::I2CDev.new(i2c_device_file)
+                           driver: I2CDevice::Driver::I2CDev.new(_@i2c_device_file)
     else
       return nil
     end
@@ -133,6 +166,9 @@ module GrovePi
       if @_i2c_grove_pi == nil
         raise 'No GrovePi found.'
       end
+      unless @_i2c_device_file.is_a(File)
+        raise "Unable to secure lock on #{LOCK_FILE_PATH}."
+      end
     end
   end
 

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

@@ -40,16 +40,13 @@ class I2CDevice::Driver::I2CDev < I2CDevice::Driver::Base
 	def i2cget(address, param, length)
 		i2c = File.open(@path, "r+")
 		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 => e
   	  puts e.message
-  	  i2c.flock(File::LOCK_UN)
   	end
 	rescue Errno::EIO => e
 		raise I2CDevice::I2CIOError, e.message
@@ -59,14 +56,11 @@ class I2CDevice::Driver::I2CDev < I2CDevice::Driver::Base
 	def i2cset(address, *data)
 		i2c = File.open(@path, "r+")
 		begin
-  		i2c.flock(File::LOCK_EX)
   		i2c.ioctl(@slave_command, address)
   		i2c.syswrite(data.pack("C*"))
-  		i2c.flock(File::LOCK_UN)
   		i2c.close
   	rescue => e
   	  puts e.message
-  	  i2c.flock(File::LOCK_UN)
   	end
 	rescue Errno::EIO => e
 		raise I2CDevice::I2CIOError, e.message

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apiotics_factory
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Apiotics