littlewire 0.9.3 → 0.9.4

data/lib/littlewire.rb

@@ -163,8 +163,9 @@ class LittleWire
   def ws2811 pin = false
     raise "You need to update your LittleWire firmware to version 1.2 to use One Wire" unless version_hex >= 0x12
     @ws2811 ||= Array.new
-    @ws2811[pin || 0] ||= WS2811.new(self, pin)
-    return @ws2811[pin || 0]
+    pin = get_pin(LittleWire::DigitalPinMap, pin || 0)
+    @ws2811[pin] ||= WS2811.new(self, pin)
+    return @ws2811[pin]
   end
   
   alias_method :ws2812, :ws2811

data/lib/ws2811.rb

@@ -39,10 +39,11 @@ class LittleWire::WS2811
     end
   end
   
-  def set *colors
+  def send *colors
     @colors = colors.flatten
     output
   end
+  alias_method :set, :send
   
   def black!
     @colors = ['black'] * 64
@@ -55,8 +56,8 @@ class LittleWire::WS2811
   def preload color
     @wire.control_transfer(
       function: :ws2812,
-      wIndex: color.b << 8 | color.r,
-      wValue: color.g << 8 | 0x20
+      wIndex: color.b.to_i << 8 | color.r.to_i,
+      wValue: color.g.to_i << 8 | 0x20
     )
   end
   
@@ -64,7 +65,7 @@ class LittleWire::WS2811
   def flush pin
     @wire.control_transfer(
       function: :ws2812,
-      wIndex: 0, wValue: pin | 0x10
+      wIndex: 0, wValue: pin.to_i | 0x10
     )
     output_delay(@colors.length)
   end
@@ -77,8 +78,8 @@ class LittleWire::WS2811
   def write color, pin
     @wire.control_transfer(
       function: :ws2812,
-      wIndex: color.b << 8 | color.r,
-      wValue: color.g << 8 | pin | 0x30
+      wIndex: color.b.to_i << 8 | color.r.to_i,
+      wValue: color.g.to_i << 8 | pin.to_i | 0x30
     )
     output_delay(@colors.length)
   end
@@ -86,8 +87,8 @@ class LittleWire::WS2811
   # 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)
+    # each pixel consumes 30us for it's data, plus a little extra for reset
+    sleep((0.00003 * pixels) + 0.001)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: littlewire
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libusb
@@ -68,11 +68,6 @@ 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: []
 post_install_message: 

data/examples/ws2811 audio.rb

@@ -1,7 +0,0 @@
-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,20 +0,0 @@
-require 'littlewire'
-wire = LittleWire.connect
-pin = :pin1
-speed = 1
-num_leds = 64
-
-loop do
-  puts "red"
-  wire.ws2811.colors = ['red'] * num_leds
-  wire.ws2811.output pin
-  sleep speed
-  puts "green"
-  wire.ws2811.colors = ['green'] * num_leds
-  wire.ws2811.output pin
-  sleep speed
-  puts "blue"
-  wire.ws2811.colors = ['blue'] * num_leds
-  wire.ws2811.output pin
-  sleep speed
-end

data/examples/ws2811 scan.rb

@@ -1,25 +0,0 @@
-require 'littlewire'
-wire = LittleWire.connect
-num_pixels = ARGV.first.to_i
-
-lit = 0
-loop do
-  
-  text_output = ['-'] * num_pixels
-  text_output[lit] = '*'
-  puts text_output.join
-  
-  wire.ws2811.colors = num_pixels.times.map do |idx|
-    if idx == lit
-      'white'.to_color
-    else
-      'black'.to_color
-    end
-  end
-  wire.ws2811.output :pin1
-  
-  lit += 1
-  lit %= num_pixels
-  
-  sleep 0.02
-end

data/examples/ws2811 strobe.rb

@@ -1,29 +0,0 @@
-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,39 +0,0 @@
-# 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 'littlewire'
-wire = LittleWire.connect
-
-puts DATA.read # print out the little ascii art thing at the end of this file
-puts "Which pin to use for data output?"
-print "Enter pin number: "
-output_pin = gets.gsub(/[^0-9]/, '').to_i
-
-print "Enter 1st color: "
-wire.ws2811.colors = [gets.strip.to_color]
-wire.ws2811.output(output_pin) # output our first color
-
-titles = ['1st', '2nd', '3rd']
-
-63.times do |idx|
-  print "Enter #{titles[idx + 1] || "#{idx + 2}th"} color: "
-  gotten = gets.strip
-  break if gotten.empty?
-  # add colour to array
-  wire.ws2811.colors.push gotten.to_color
-  wire.ws2811.output(output_pin) # output the colours to the string
-end
-
-puts "All done!"
-
-__END__
- LittleWire connector:   |   Digispark Board:
-        /-----\          |         _________
-  pin_1 | o o | vcc      |   _____|        o| ds5
-  pin_2 | o o | pin 4    |  |-----         o| (usb - not available)
-  pin_3 | o o | gnd      |  |-----         o| (usb - not available)
-        \-----/          |  |-----         o| ds2
-                            |-----         o| ds1
-                                  |_o_o_o__o| ds0
-                                    5 g v
-                                    v n c
-                                      d c