apiotics_factory 1.0.20 → 1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ce18cd9c7740a2e83af2b7a2ac74c46ef601390
-  data.tar.gz: fd8875ead100d5258facc99acff93de4e0c5c158
+  metadata.gz: 44182e8ba90552a11de5d2f68f8feb30a121cd88
+  data.tar.gz: 35f3f10e57c52c7f582217595ae7c9e4e3f1e457
 SHA512:
-  metadata.gz: a4d5151ef3c6476fa0f9f22bdceb68db07226b2e895881abb918f3c302585585f5445ac3a0147645066afde81de66acc22f90f064d9b9f75c4bf3c96e680e3e8
-  data.tar.gz: 17c58b85be6aaf274141e8b5eb3fcdee542ff8da7e97f0fe905ab3b9b126f5181fbbe88b612522cccd47d0f9f79410d43b41cd39d5e60b78b7032cecdb5c4e11
+  metadata.gz: 51b7f7871601d299e211831ffd48bdd24fe7299745d01800a37421c8640af90e7224035c77f9dacda1322e4c987eb9783198d0f864d4695ed5a752351f4d1371
+  data.tar.gz: 04fc144a2887908179dadb0e0583faf2ebd9cba1d3c4a69e199e11573ddde6bde133aa5c970c9abf06ec49915174f683f27c65ebe9cce38c37512b1d2f3c7b66

data/lib/apiotics_factory/version.rb

@@ -1,3 +1,3 @@
 module ApioticsFactory
-  VERSION = '1.0.20'
+  VERSION = '1.0.21'
 end

data/lib/templates/grove_pi/grove_pi.rb

@@ -182,9 +182,14 @@ module GrovePi
   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
+    read_value = @_i2c_grove_pi.i2cget(@_i2c_grove_pi.address, 3)
     GrovePi.release_lock
-    return (bytes[1].ord * 256) + bytes[2].ord
+    if read_value != nil
+      bytes = read_value.chars
+      return (bytes[1].ord * 256) + bytes[2].ord
+    else
+      return 65535
+    end
   end
 
   def self._write_analog(pin, value)
@@ -198,7 +203,11 @@ module GrovePi
     @_i2c_grove_pi.i2cset @_i2c_grove_pi.address, CMD_READ_DIGITAL, pin, 0, 0
     val = @_i2c_grove_pi.i2cget(@_i2c_grove_pi.address, 2)
     GrovePi.release_lock
-    return val.chars[0].ord
+    if val != nil
+      return val.chars[0].ord
+    else
+      return 0
+    end
   end
 
   def self._write_digital(pin, value)
@@ -291,13 +300,19 @@ module GrovePi
     end
 
     bytes = []
-    _bytes = @_i2c_slave_addresses[i2c_slave_address].i2cget(i2c_slave_address, length).chars
-
-    for b in _bytes
-      bytes << b.ord
+    read_value = @_i2c_slave_addresses[i2c_slave_address].i2cget(i2c_slave_address, length)
+    GrovePi.release_lock
+    
+    if read_value != nil
+      _bytes = read_value.chars
+      for b in _bytes
+        bytes << b.ord
+      end
+      return bytes
+    else
+      return ["0".ord]
     end
-    release_lock
-    return bytes
+    
   end
 
   def self.write_grove_pi_i2c(i2c_slave_address, *data)
@@ -322,9 +337,14 @@ module GrovePi
       begin
         self._ensure_init
         @_i2c_grove_pi.i2cset @_i2c_grove_pi.address, CMD_READ_FIRMWARE_VERSION, 0, 0, 0
-        bytes = @_i2c_grove_pi.i2cget(@_i2c_grove_pi.address, 4).chars
-        self.release_lock
-        return [bytes[1].ord, bytes[2].ord, bytes[3].ord]
+        read_value = @_i2c_grove_pi.i2cget(@_i2c_grove_pi.address, 4)
+        GrovePi.release_lock
+        if read_value != nil
+          bytes = read_value.chars
+          return [bytes[1].ord, bytes[2].ord, bytes[3].ord]
+        else
+          raise "Firmware version could not be read."
+        end
       rescue Errno::EREMOTEIO
         next
       end
@@ -347,10 +367,16 @@ module GrovePi
     sleep(0.06) #firmware has a time of 50ms so wait for more than that
 
     @_i2c_grove_pi.i2cget(@_i2c_grove_pi.address, 1)
-    numbers = @_i2c_grove_pi.i2cget(@_i2c_grove_pi.address, 3).chars
-    
     GrovePi.release_lock
-    return (numbers[1].ord) * 256 + (numbers[2].ord)
+    
+    read_value = @_i2c_grove_pi.i2cget(@_i2c_grove_pi.address, 3)
+    
+    if read_value != nil
+      numbers = read_value.chars
+      return (numbers[1].ord) * 256 + (numbers[2].ord)
+    else
+      return 0
+    end
   end
 
 
@@ -384,19 +410,21 @@ module GrovePi
 
           # read 10 more bytes 
           number = @_i2c_grove_pi.i2cget(@_i2c_grove_pi.address, 9)
-          
+          GrovePi.release_lock
           if !number.nil?
             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
+          else
+            return 0.0, -100.0
           end
-
         rescue Errno::EREMOTEIO
           next
         end
       end
     end
-    GrovePi.release_lock
-    return temp_value, humidity_value
+    
+    
   end
 
 

metadata

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