apiotics_factory 1.0.16 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5b1a2310ee7ed5c2853859e3a26288e7424b6ed
-  data.tar.gz: e5dd72dd9a7ab69cf6be41cd8d95b6afd4786007
+  metadata.gz: 2ea4136f25984b4d1c62dc85c657c5c04a89f753
+  data.tar.gz: e214651a7cedab80f695a6e86734e55055bcf4bf
 SHA512:
-  metadata.gz: 90679be12114cfffcb42547e0423f8484911b2bc4d1ab8abf71f6cdfca815334feba760e2902d3cee8d2ac6e0fff0ccdf2c6a1e8ef5ccceb303bbbc1e3b7dbfa
-  data.tar.gz: cd41cfc767470987178ea28d5312e8834aa06e7836310a9f97347b00ef32e0ee13dbe734f5d0f891fc8f884c0dbc5a920e37c6cc38f726656aac240d223cfabd
+  metadata.gz: 43638445a83dafe569f668372031b87007c53e3a2ae0802b3700ae5b54bf7fe807a78c7c33e166a474895fe425953b13c1ca12fe2f8c6f07df714ac8966a51da
+  data.tar.gz: 2cb015822df5617e5ea6d6d9a1179299f64e9057a4c9c4329402762384399c6279fc9757df79acc3d6e557340b2a0b7d3a0b33b68a99ea07c13ac60fc8c1b601

data/lib/apiotics_factory/version.rb

@@ -1,3 +1,3 @@
 module ApioticsFactory
-  VERSION = '1.0.16'
+  VERSION = '1.0.17'
 end

data/lib/templates/grove_pi/grove_pi.rb

@@ -1,12 +1,11 @@
 #!/usr/bin/env ruby
 
 module GrovePi
-  require 'json'
   require_relative 'i2c'
   require_relative 'i2c/driver/i2c-dev'
 
   at_exit do
-    release_lock
+    GrovePi.release_lock
   end
   
   # Commands.
@@ -68,7 +67,7 @@ module GrovePi
   @_i2c_grove_pi = nil
   
   # Initialize i2c file path
-  @_i2c_device_file = nil
+  @@_i2c_device_file = nil
   
 
 
@@ -132,19 +131,24 @@ module GrovePi
     cycle = true
     while cycle == true
       begin
-         @_i2c_device_file = File.open(LOCK_FILE_PATH, File::WRONLY|File::CREAT|File::EXCL)
+        puts "Getting lock."
+         @@_i2c_device_file = File.open(LOCK_FILE_PATH, File::WRONLY|File::CREAT|File::EXCL)
         cycle = false
+        puts "Lock acquired."
       rescue
-        sleep 0.1
+        puts "Could not get lock."
       end
     end
   end
     
   def self.release_lock
-    if @_i2c_device_file.is_a?(File)
-      @_i2c_device_file.close
+    puts "Releasing lock."
+    if @@_i2c_device_file.is_a?(File)
+      @@_i2c_device_file.close
       File.delete(LOCK_FILE_PATH)
-      @_i2c_device_file = nil
+      @@_i2c_device_file = nil
+      puts "Lock released."
+      sleep 0.1
     end
   end
 
@@ -166,42 +170,42 @@ module GrovePi
       if @_i2c_grove_pi == nil
         raise 'No GrovePi found.'
       end
-      self.get_lock
+      GrovePi.get_lock
     end
   end
 
   def self._set_pin_mode(pin, mode)
     self._ensure_init
     @_i2c_grove_pi.i2cset @_i2c_grove_pi.address, CMD_PIN_MODE, pin, mode, 0
-    self.release_lock
+    GrovePi.release_lock
   end
 
   def self._read_analog(pin)
     self._ensure_init
     @_i2c_grove_pi.i2cset @_i2c_grove_pi.address, CMD_READ_ANALOG, pin, 0, 0
     bytes = @_i2c_grove_pi.i2cget(@_i2c_grove_pi.address, 3).chars
-    self.release_lock
+    GrovePi.release_lock
     return (bytes[1].ord * 256) + bytes[2].ord
   end
 
   def self._write_analog(pin, value)
     self._ensure_init
     @_i2c_grove_pi.i2cset @_i2c_grove_pi.address, CMD_WRITE_ANALOG, pin, value, 0
-    self.release_lock
+    GrovePi.release_lock
   end
 
   def self._read_digital(pin)
     self._ensure_init
     @_i2c_grove_pi.i2cset @_i2c_grove_pi.address, CMD_READ_DIGITAL, pin, 0, 0
     val = @_i2c_grove_pi.i2cget(@_i2c_grove_pi.address, 2)
-    self.release_lock
+    GrovePi.release_lock
     return val.chars[0].ord
   end
 
   def self._write_digital(pin, value)
     self._ensure_init
     @_i2c_grove_pi.i2cset @_i2c_grove_pi.address, CMD_WRITE_DIGITAL, pin, value, 0
-    self.release_lock
+    GrovePi.release_lock
   end
 
   # Functions exposed to the user.
@@ -310,7 +314,7 @@ module GrovePi
     end
 
     @_i2c_slave_addresses[i2c_slave_address].i2cset i2c_slave_address, *data
-    release_lock
+    GrovePi.release_lock
   end
 
   # Miscellaneous functions.
@@ -346,7 +350,7 @@ module GrovePi
     @_i2c_grove_pi.i2cget(@_i2c_grove_pi.address, 1)
     numbers = @_i2c_grove_pi.i2cget(@_i2c_grove_pi.address, 3).chars
     
-    self.release_lock
+    GrovePi.release_lock
     return (numbers[1].ord) * 256 + (numbers[2].ord)
   end
 
@@ -391,7 +395,7 @@ module GrovePi
         end
       end
     end
-    self.release_lock
+    GrovePi.release_lock
   end
 
 
@@ -403,7 +407,7 @@ module GrovePi
   def self.fourDigit_init(pin)
     self._ensure_init
     @_i2c_grove_pi.i2cset(@_i2c_grove_pi.address, CMD_4DIG_INIT, pin, 0, 0)
-    self.release_lock
+    GrovePi.release_lock
   end
 
 
@@ -414,7 +418,7 @@ module GrovePi
     self._ensure_init
     @_i2c_grove_pi.i2cset(@_i2c_grove_pi.address, CMD_4DIG_DIGIT, pin, segment, value)
     sleep(0.05)
-    self.release_lock
+    GrovePi.release_lock
   end
 
   # Turn on entire display (88:88)
@@ -422,7 +426,7 @@ module GrovePi
     self._ensure_init
     @_i2c_grove_pi.i2cset(@_i2c_grove_pi.address, CMD_4DIG_ON, pin, 0, 0)
     sleep(0.05)
-    self.release_lock
+    GrovePi.release_lock
   end
 
   # Display a decimal value without leading zeros
@@ -438,7 +442,7 @@ module GrovePi
     @_i2c_grove_pi.i2cset(@_i2c_grove_pi.address, CMD_4DIG_VALUE, pin, byte1, byte2)
     
     sleep(0.05)
-    self.release_lock
+    GrovePi.release_lock
   end
   
   # Display a string
@@ -468,7 +472,7 @@ module GrovePi
       i += 1
       sleep(0.05)
     end
-    self.release_lock
+    GrovePi.release_lock
   end
 
   # Set brightness of display
@@ -477,7 +481,7 @@ module GrovePi
     self._ensure_init
     @_i2c_grove_pi.i2cset(@_i2c_grove_pi.address, CMD_4DIG_BRIGHTNESS, pin, brightness.to_i, 0)
     sleep(0.05)
-    self.release_lock
+    GrovePi.release_lock
   end
 
 
@@ -512,7 +516,7 @@ module GrovePi
     end
 
     @_i2c_slave_addresses[i2c_slave_address].i2cset *data
-    self.release_lock
+    GrovePi.release_lock
   end
 
   # Set the color of the LCD RGB display
@@ -556,4 +560,4 @@ module GrovePi
 
   # TODO: Implement rest of the commands that are supported by the firmware.
   
-end
+end

metadata

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