rpi_pwm 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d75263e424241d178c35a9a771cef5082671bd9a
-  data.tar.gz: ac93b7747099b04d4a545289e89a248673830c3c
+  metadata.gz: 13c9033952c730a81a3bc76e0033d3f3389b0a09
+  data.tar.gz: b375773d796520cad8d1b4171cbc2156eddfe8a3
 SHA512:
-  metadata.gz: bbcc2b9cb6798fd9696e92cd9b0c50f2e4ce11a7fd90456afaaec287b46e033f3481e03304385cf29ae5bdcb25d71f827b560e0092ef265a366f7cbee6ce4106
-  data.tar.gz: 95900204ff252d0cab623860d7dcd1499b862e2a745078f3801406307d7281ebb0f162167ad783ddff1f261bdae164bd76b22be70812f409807e5ef8bae2b74d
+  metadata.gz: aa648dfe4a33da3ab53a2d98d913dfa0b761b27d396b2c37ea2f946f10562890eca6f4e2dc7e17ff06c1d42b5b227961e641972217ac7139373f76caf486f881
+  data.tar.gz: 6462cbfb7a1f4dd27d9701bbf1173e9c104962d6f11d53977886f72f55baeef1cff4a62e8d3cba8a810073f52e748fa663207d9840c544b9232dc0d97a7965b2

data/lib/rpi_pwm.rb

@@ -7,148 +7,104 @@ require 'rpi_gpio'
 
 class RPiPwm
 
+  HIGH = true
+  LOW = false
 
-  class PinX
+  attr_accessor :duty_cycle, :freq
 
-    HIGH = true
-    LOW = false
 
-    attr_accessor :duty_cycle, :freq
+  def initialize(pin_num, duty_cycle: 100, freq: 100)
 
+    @id, @duty_cycle, @freq = pin_num, duty_cycle, freq
 
-    def initialize(pin_num, duty_cycle: 100, freq: 100)
+    RPi::GPIO.set_numbering :bcm
+    RPi::GPIO.setup pin_num, :as => :output
 
-      @id, @duty_cycle, @freq = pin_num, duty_cycle, freq
+    @pwm = RPi::GPIO::PWM.new(pin_num, freq)
 
-      RPi::GPIO.set_numbering :bcm
-      RPi::GPIO.setup pin_num, :as => :output
+    @on, @blinking = false, false
 
-      @pwm = RPi::GPIO::PWM.new(pin_num, freq)
-      @pwm.frequency = 40
+    at_exit { RPi::GPIO.clean_up pin_num}
 
-      @on, @blinking = false, false
+  end
 
-      at_exit { RPi::GPIO.clean_up pin_num}
+  def duty_cycle=(val)
+    @duty_cycle = val
+    @pwm.duty_cycle = val
+  end
 
-    end
+  def on(durationx=nil, duration: nil)
 
-    def duty_cycle=(val)
-      @duty_cycle = val
-      @pwm.duty_cycle = val
-    end
+    set_pin HIGH
+    @on = true      
+    duration ||=  durationx
+    
+    @off_thread.exit if @off_thread
+    @on_thread = Thread.new {(sleep duration; self.off()) } if duration
 
-    def on(durationx=nil, duration: nil)
+  end
 
-      set_pin HIGH
-      @on = true      
-      duration ||=  durationx
-      
-      @off_thread.exit if @off_thread
-      @on_thread = Thread.new {(sleep duration; self.off()) } if duration
+  def off(durationx=nil, duration: nil)
 
-    end
+    set_pin LOW
+    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
 
-    def off(durationx=nil, duration: nil)
+  end
+  
+  alias stop off        
+  alias start on
 
-      set_pin LOW
-      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
+  def blink(seconds=0.5, duration: nil)
 
-    end
-    
-    alias stop off        
-    alias start on
-
-    def blink(seconds=0.5, duration: nil)
-
-      @blinking = true
-      t2 = Time.now + duration if duration
-
-      Thread.new do
-        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
-        
-      end
-    end
-    
-    alias oscillate blink
+    @blinking = true
+    t2 = Time.now + duration if duration
 
-    def on?()  @on  end
-    def off?() !@on end
+    Thread.new do
+      while @blinking do
 
-    # set val with 0 (off) or 1 (on)
-    #
-    def set_pin(val)
+        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
 
-      if val then
-        @pwm.start @duty_cycle
-      else
-        @pwm.stop
-      end
+        break if !@blinking
         
-    end
-    
-    def to_s()
-      @id
+        self.off if duration and Time.now >= t2
+      end
+      
     end
   end
   
-  class Void
-    def on(duration=nil)               end
-    def off()                          end
-    def blink(seconds=0, duration=nil) end
-    alias stop off
-  end  
+  alias oscillate blink
 
+  def on?()  @on  end
+  def off?() !@on end
 
-  def initialize(x=[], duty_cycle: 100, freq: 100)
-    
-    a = case x
-    when Fixnum
-      [x]
-    when String
-      [x]
-    when Array
-      x
-    end
+  # set val with 0 (off) or 1 (on)
+  #
+  def set_pin(val)
 
-    RPi::GPIO.reset
-    
-    @pins = a.map {|pin| PinX.new pin, duty_cycle: duty_cycle, freq: freq }
-    
-    def @pins.[](i)
-
-      if i.respond_to? :to_i and i.to_i >= self.length then
-        puts "RPiPwm warning: PinX instance #{i.inspect} not found"
-        Void.new
-      else
-        super(i)
-      end 
-    end    
+    if val then
+      @pwm.start @duty_cycle
+    else
+      @pwm.stop
+    end
       
   end
-
-  def pin()   @pins.first  end
-  def pins()  @pins        end
-
-end
+  
+  def to_s()
+    @id
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rpi_pwm
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson