rpi 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c9dc28e91ead4d24acb32becc2760c8651169e2
-  data.tar.gz: d63a47fbaba95fb2346451ecf4f7e5280c77a70f
+  metadata.gz: 76b839fcf54da81b0e89dbde7baf90c7fe3f8d3f
+  data.tar.gz: 686e899dde81c9007a913ac984deabafa08ba997
 SHA512:
-  metadata.gz: a8a0e58408996d34cbaff0dd5da980c4eb196c233209e2e33b0d10c0f4ce115ed4758f764547d14840d393c837a2124571fb88cf56c9d230846c3e949881e9f1
-  data.tar.gz: d6da6f1c50c8b81411bbd3ad9b121335144a7a35238abf761d6bbb44495975444d69aa8fd06257d89c91ff508ac9826f23c20f72cdd1296ea2984432e64ca3a9
+  metadata.gz: c5ac67b4d436d205192703250c64d22d6a73d46f6525827e0202ade519ab8d04bb880d41db8c9caae13f7b086d6cdfa9a502809e709beef9d9e28edc2f0539b9
+  data.tar.gz: 9fe559f58641b5c42cdfb80b195f3dfca4e03b05debfda27d1c2ed1c0266b96b6fb9564efaef7d16202c3989ee20bc7923943f87eeb9b6c385bb6ad4af638901

data/lib/rpi.rb

@@ -18,21 +18,30 @@ class RPi
     def initialize(id)
       @id = id
       super(pin: id, direction: :out)
-      @state = self.value
+      @on, @blinking = false, false
     end
 
-    def on(duration=nil)
+    def on(durationx=nil, duration: nil)
       super(); 
-      @state = :on
-      (sleep duration; self.off) if duration
+      @on = true      
+      duration ||=  durationx
+      
+      @off_thread.exit if @off_thread
+      @on_thread = Thread.new {(sleep duration; self.off()) } if duration
+
     end
 
-    def off(duration=nil)
+    def off(durationx=nil, duration: nil)
+
+      super();
+      return if @internal_call
+      
+      @on, @blinking = false, false      
+      duration ||=  durationx
+      
+      @on_thread.exit if @on_thread
+      @off_thread = Thread.new { (sleep duration; self.on()) } if duration
 
-      return if self.off?
-      super()
-      @state = :off
-      (sleep duration; self.on) if duration
     end
     
     alias high on # opposite of low
@@ -46,12 +55,25 @@ class RPi
 
     def blink(seconds=0.5, duration: nil)
 
-      @state = :blink
+      @blinking = true
       t2 = Time.now + duration if duration
 
       Thread.new do
-        while @state == :blink do
-          (set_pin HIGH; sleep seconds; set_pin LOW; sleep seconds) 
+        while @blinking do
+
+          set_pin HIGH
+          sleep seconds / 2.0
+          break if !@blinking
+          sleep seconds / 2.0 
+          break if !@blinking
+          
+          set_pin LOW;
+          sleep seconds / 2.0
+          break if !@blinking
+          sleep seconds / 2.0
+
+          break if !@blinking
+          
           self.off if duration and Time.now >= t2
         end
         
@@ -60,16 +82,16 @@ class RPi
     
     alias oscillate blink
 
-    def on?()  @state == :on  end
-    def off?() @state == :off end
+    def on?()  @on  end
+    def off?() !@on end
 
     # set val with 0 (off) or 1 (on)
     #
     def set_pin(val)
 
-      state = @state
+      @internal_call = true
       self.update_value val
-      @state = state
+      @internal_call = false
     end
     
     def to_s()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rpi
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - James Robertson