littlewire 0.9.2 → 0.9.3

data/examples/blinky.rb

@@ -1,7 +1,7 @@
 # A little blinky test to show how to make stuff happen with a littlewire in ruby!
 #
 # To get started, plug an LED in to the ISP cable between ground and Pin 4 (they're next to each other)
-require '../lib/littlewire.rb'
+require 'littlewire.rb'
 
 wire = LittleWire.connect
 

data/examples/fadey.rb

@@ -1,7 +1,7 @@
 # A little blinky test to show how to make stuff happen with a littlewire in ruby!
 #
 # To get started, plug an LED in to the ISP cable between ground and Pin 4 (they're next to each other) via a resistor (resistor not optional)
-require '../lib/littlewire.rb'
+require 'littlewire.rb'
 
 wire = LittleWire.connect
 

data/examples/led pixel.rb

@@ -6,7 +6,7 @@
 #
 # Note if you're running more than five or so from a littlewire you should power them
 # with an external power supply instead of Little Wire's VCC pin
-require '../lib/littlewire'
+require 'littlewire'
 
 wire = LittleWire.connect
 spi = wire.spi

data/examples/ws2811 audio.rb

@@ -0,0 +1,7 @@
+begin
+  require 'ffi-portaudio'
+rescue
+  puts "Need to install ffi-portaudio rubygem to use this example"
+end
+require 'littlewire'
+

data/examples/ws2811 colors.rb

@@ -1,4 +1,4 @@
-require '../lib/littlewire.rb'
+require 'littlewire'
 wire = LittleWire.connect
 pin = :pin1
 speed = 1

data/examples/ws2811 scan.rb

@@ -1,4 +1,4 @@
-require '../lib/littlewire.rb'
+require 'littlewire'
 wire = LittleWire.connect
 num_pixels = ARGV.first.to_i
 
@@ -21,5 +21,5 @@ loop do
   lit += 1
   lit %= num_pixels
   
-  sleep 0.01
+  sleep 0.02
 end

data/examples/ws2811 strobe.rb

@@ -0,0 +1,29 @@
+require 'littlewire'
+wire = LittleWire.connect
+pin = :pin1
+num_leds = 10
+MaxBPM = 500
+
+strobe_duration = 0.01
+bpm = 30
+
+Thread.start do
+  loop do
+    print "Enter BPM: "
+    new_bpm = (gets.to_f rescue bpm)
+    new_bpm = MaxBPM if new_bpm > MaxBPM
+    bpm = new_bpm
+    puts "Set to #{bpm}"
+  end
+end
+
+loop do
+  wire.ws2811.colors = ['white'] * num_leds
+  wire.ws2811.output pin
+  sleep(strobe_duration)
+  
+  wire.ws2811.colors = ['black'] * num_leds
+  wire.ws2811.output pin
+  blackout_duration = (60.0 / bpm) - strobe_duration
+  sleep((60.0 / bpm) - strobe_duration) if blackout_duration > 0
+end

data/examples/ws2811.rb

@@ -1,6 +1,6 @@
 # Send up to 64 colours to a string of WS2812 LEDs or 800khz (version 2) Adafruit Flora NeoPixels
 # Any 800khz mode ws2811 pixels will work
-require '../lib/littlewire.rb'
+require 'littlewire'
 wire = LittleWire.connect
 
 puts DATA.read # print out the little ascii art thing at the end of this file

data/lib/littlewire.rb

@@ -272,8 +272,7 @@ class LittleWire
     :onewire_write_bit,   # 51
     :pic_24f_programming, # 52 - experimental
     :pic_24f_sendsix,     # 53 - experimental
-    :ws2812_write,        # 54 - experimental
-    :ws2812_preload       # 55 - experimental
+    :ws2812,              # 54 - experimental
     # special cases
     # pic 24f send bytes - request = 0xD*
     # i2c send multiple messages - request = 0xE*     ### experimental ###

data/lib/ws2811.rb

@@ -30,23 +30,64 @@ class LittleWire::WS2811
     until colors_buffer.empty?
       
       if colors_buffer.length > 1
-        color = colors_buffer.shift
+        preload(colors_buffer.shift)
         
-        @wire.control_transfer(
-          function: :ws2812_preload,
-          wIndex: color.b << 8 | color.r,
-          wValue: color.g << 8
-        )
       elsif colors_buffer.length == 1
-        color = colors_buffer.shift
+        write(colors_buffer.shift, output_pin)
         
-        @wire.control_transfer(
-          function: :ws2812_write,
-          wIndex: color.b << 8 | color.r,
-          wValue: color.g << 8 | output_pin
-        )
       end
     end
   end
+  
+  def set *colors
+    @colors = colors.flatten
+    output
+  end
+  
+  def black!
+    @colors = ['black'] * 64
+    output
+  end
+  
+  private
+  
+  # push another set of rgb values to the buffer
+  def preload color
+    @wire.control_transfer(
+      function: :ws2812,
+      wIndex: color.b << 8 | color.r,
+      wValue: color.g << 8 | 0x20
+    )
+  end
+  
+  # send buffer from littlewire to LEDs
+  def flush pin
+    @wire.control_transfer(
+      function: :ws2812,
+      wIndex: 0, wValue: pin | 0x10
+    )
+    output_delay(@colors.length)
+  end
+  
+  # optimises preload followed by flush in to a single usb call
+  #   def write color, pin
+  #     preload color
+  #     flush pin
+  #   end
+  def write color, pin
+    @wire.control_transfer(
+      function: :ws2812,
+      wIndex: color.b << 8 | color.r,
+      wValue: color.g << 8 | pin | 0x30
+    )
+    output_delay(@colors.length)
+  end
+  
+  # wait as long as it will take for the message to output to the LED strip, so we don't make
+  # any more USB requests while the device is busy flushing pixels with interrupts disabled
+  def output_delay(pixels)
+    # each pixel consumes 30us for it's data, plus 50us reset at end of transmission
+    sleep((0.00003 * pixels) + 0.00005)
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: littlewire
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -68,8 +68,10 @@ files:
 - examples/blinky.rb
 - examples/fadey.rb
 - examples/led pixel.rb
+- examples/ws2811 audio.rb
 - examples/ws2811 colors.rb
 - examples/ws2811 scan.rb
+- examples/ws2811 strobe.rb
 - examples/ws2811.rb
 homepage: http://creativepony.com/littlewire/
 licenses: []