arduino_firmata 0.2.6 → 0.2.7

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.2.7 2013-03-20
+
+* select Thread/EventMachine on connect
+
 === 0.2.6 2013-03-13
 
 * select blocking/nonblocking IO on connect

data/README.md

@@ -16,7 +16,7 @@ Requirements
 
 * Ruby 1.8.7 or 1.9.2 or 1.9.3 or 2.0.0
 * Arduino (http://arduino.cc)
-  * testing with Arduino Duemillanove, UNO, Micro, Seeduino v2.
+  * testing with Arduino Duemillanove, UNO, Leonardo, Micro, Seeduino v2.
 * Arduino Standard Firmata v2.2
   * Arduino IDE -> [File] -> [Examples] -> [Firmata] -> [StandardFirmata]
 
@@ -46,6 +46,7 @@ arduino = ArduinoFirmata.connect  # use default arduino
 arduino = ArduinoFirmata.connect '/dev/tty.usb-device-name'
 arduino = ArduinoFirmata.connect '/dev/tty.usb-device-name', :bps => 57600
 arduino = ArduinoFirmata.connect '/dev/tty.usb-device-name', :nonblock_io => true
+arduino = ArduinoFirmata.connect '/dev/tty.usb-device-name', :eventmachine => true
 ```
 
 Board Version

data/lib/arduino_firmata/arduino.rb

@@ -3,10 +3,13 @@ module ArduinoFirmata
   class Arduino
     include EventEmitter
 
-    attr_reader :version, :status, :nonblock_io
+    attr_reader :version, :status, :nonblock_io, :eventmachine
 
     def initialize(serial_name, params)
       @nonblock_io = !!params[:nonblock_io]
+      @eventmachine = !!params[:eventmachine]
+      @read_byte_size = eventmachine ? 256 : 9600
+      @process_input_interval = eventmachine ? 0.0001 : 0.01
       @status = Status::CLOSE
       @wait_for_data = 0
       @execute_multi_byte_command = 0
@@ -44,14 +47,14 @@ module ArduinoFirmata
       end
 
       @thread_status = false
-      Thread.new{
+      run do
         @thread_status = true
         while status == Status::OPEN do
           process_input
-          sleep 0.01
+          sleep @process_input_interval
         end
         @thread_status = false
-      }.run
+      end
 
       (0...6).each do |i|
         write(REPORT_ANALOG | i)
@@ -70,6 +73,15 @@ module ArduinoFirmata
       sleep 0.5
     end
 
+    def run(&block)
+      return unless block_given?
+      if eventmachine
+        EM::defer &block
+      else
+        Thread.new &block
+      end
+    end
+
     def close
       return if status == Status::CLOSE
       @status = Status::CLOSE
@@ -171,9 +183,9 @@ module ArduinoFirmata
     def read
       return if status == Status::CLOSE
       if nonblock_io
-        @serial.read_nonblock 9600 rescue EOFError
+        @serial.read_nonblock @read_byte_size rescue EOFError
       else
-        @serial.read 9600 rescue EOFError
+        @serial.read @read_byte_size rescue EOFError
       end
     end
 

data/lib/arduino_firmata/const.rb

@@ -7,7 +7,8 @@ module ArduinoFirmata
         :bit => 8,
         :parity => 0,
         :stopbit => 1,
-        :nonblock_io => false
+        :nonblock_io => false,
+        :eventmachine => false
       }
     end
   end

data/lib/arduino_firmata/version.rb

@@ -1,4 +1,4 @@
 
 module ArduinoFirmata
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 end

data/samples/README.md

@@ -4,30 +4,39 @@ Digital/Analog IO
 -----------------
 - analog_read_write.rb
 - digital_read.rb
+- eventmachine.rb
 - led_blink.rb
 - led_fade.rb
 - on_analog_read.rb
 - on_digital_read.rb
 - servo.rb
-
+- tweet_temperature.rb
 
 Sysex Command
 -------------
 - sysex/sysex_led_blink.rb
 
 
-Tweet Temperature
------------------
+EventMachine
+------------
 
-    % gem install tw
-    % tw --user:add
-    % ruby tweet_temperature.rb
+    % gem install eventmachine
+    % ruby eventmachine.rb
 
 
 Sinatra Arduino
 ---------------
 
-    % gem install sinatra
+    % gem install sinatra eventmachine
     % ruby sinatra_arduino.rb
 
 => http://localhost:4567
+
+
+Tweet Temperature
+-----------------
+
+    % gem install tw
+    % tw --user:add
+    % ruby tweet_temperature.rb
+

data/samples/eventmachine.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
+require 'eventmachine'
+require 'arduino_firmata'
+
+EM::run do
+  arduino = ArduinoFirmata.connect ARGV.shift, :nonblock_io => true ,:eventmachine => true
+
+  arduino.on :analog_read do |pin, value|
+    puts "analog_read #{pin} => #{value}" if pin == 0
+  end
+
+  arduino.pin_mode 2, ArduinoFirmata::INPUT
+  arduino.on :digital_read do |pin, status|
+    puts "digital_read #{pin} => #{status}" if pin == 2
+  end
+
+  led_stat = false
+  EM::add_periodic_timer 1 do
+    puts led_stat
+    arduino.digital_write 13, led_stat
+    led_stat = !led_stat
+  end
+end

data/samples/sinatra_arduino.rb

@@ -2,10 +2,11 @@
 $:.unshift File.expand_path '../lib', File.dirname(__FILE__)
 require 'rubygems'
 require 'sinatra'
+require 'eventmachine'
 require 'arduino_firmata'
 
 # arduino = ArduinoFirmata.connect
-arduino = ArduinoFirmata.connect nil, :nonblock_io => true
+arduino = ArduinoFirmata.connect nil, :nonblock_io => true, :eventmachine => true
 
 get '/' do
   redirect './on'

metadata

@@ -2,7 +2,7 @@
 name: arduino_firmata
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors: 
 - Sho Hashimoto
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-13 00:00:00 Z
+date: 2013-03-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: serialport
@@ -72,6 +72,7 @@ files:
 - samples/analog_read_write.rb
 - samples/block.rb
 - samples/digital_read.rb
+- samples/eventmachine.rb
 - samples/led_blink.rb
 - samples/led_fade.rb
 - samples/on_analog_read.rb