arduino_firmata 0.2.0 → 0.2.1

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.2.1 2013-01-13
+
+* add digital_read event - Arduino::on(:digital_read, pin, status)
+
 === 0.2.0 2013-01-12
 
 * Sysex Command support

data/README.md

@@ -14,16 +14,21 @@ Install
 Requirements
 ------------
 
+* Ruby 1.8.7+ or 1.9.2+
+* Arduino (http://arduino.cc)
+  * testing with Arduino Duemillanove, UNO, Micro, Seeduino v2.
 * Arduino Standard Firmata v2.2
   * Arduino IDE -> [File] -> [Examples] -> [Firmata] -> [StandardFirmata]
-* Ruby 1.8.7+
-* Ruby 1.9.2+
 
 
 Synopsis
 --------
 
-Setup
+- https://github.com/shokai/arduino_firmata/tree/master/samples
+
+### Setup
+
+Connect
 ```ruby
 require 'arduino_firmata'
 
@@ -37,6 +42,14 @@ Board Version
 puts "firmata version #{arduino.version}"
 ```
 
+Close
+```ruby
+arduino.close
+```
+
+
+### I/O
+
 Digital Write
 ```ruby
 arduino.digital_write 13, true
@@ -47,6 +60,12 @@ Digital Read
 ```ruby
 arduino.pin_mode 7, ArduinoFirmata::INPUT
 puts arduino.digital_read 7  # => true/false
+
+arduino.on :digital_read do |pin, status|
+  if pin == 7
+    puts "digital pin #{pin} changed : #{status}"
+  end
+end
 ```
 
 Analog Write (PWM)
@@ -63,7 +82,7 @@ puts arduino.analog_read 0  # => 0 ~ 1023
 
 arduino.on :analog_read 0 do |pin, value|
   if pin == 0
-    puts "analog pin #{pin} changed #{value}"
+    puts "analog pin #{pin} changed : #{value}"
   end
 end
 ```
@@ -77,30 +96,18 @@ loop do
 end
 ```
 
-Close
-```ruby
-arduino.close
-```
 
-Block
-```ruby
-ArduinoFirmata.connect do
-  puts "firmata version #{version}"
+### Sysex
 
-  30.times do
-    an = analog_read 0
-    analog_write 11, an
-    sleep 0.01
-  end
-end
-```
+- http://firmata.org/wiki/V2.1ProtocolDetails#Sysex_Message_Format
+- https://github.com/shokai/arduino_firmata/tree/master/samples/sysex
 
-Send Sysex Command
+Send
 ```ruby
-arduino.sysex 0x01, [13, 5, 2]
+arduino.sysex 0x01, [13, 5, 2]  # command, data_array
 ```
 
-Regist Sysex Command Event
+Regist Receive Event
 ```ruby
 arduino.on :sysex do |command, data|
   puts "command : #{command}"
@@ -108,8 +115,20 @@ arduino.on :sysex do |command, data|
 end
 ```
 
-see samples https://github.com/shokai/arduino_firmata/tree/master/samples
 
+### Block Style
+
+```ruby
+ArduinoFirmata.connect do
+  puts "firmata version #{version}"
+
+  30.times do
+    an = analog_read 0
+    analog_write 11, an
+    sleep 0.01
+  end
+end
+```
 
 Test
 ----

data/lib/arduino_firmata/arduino.rb

@@ -188,7 +188,14 @@ module ArduinoFirmata
           if @execute_multi_byte_command != 0 and @wait_for_data == 0
             case @execute_multi_byte_command
             when DIGITAL_MESSAGE
+              digital_inputs = @digital_input_data.clone
               @digital_input_data[@multi_byte_channel] = (@stored_input_data[0] << 7) + @stored_input_data[1]
+              0.upto(15).each do |i|
+                current = digital_read i
+                if current != ((digital_inputs[i >> 3] >> (i & 0x07)) & 0x01 > 0)
+                  emit :digital_read, i, current
+                end
+              end
             when ANALOG_MESSAGE
               analog_value = (@stored_input_data[0] << 7) + @stored_input_data[1]
               unless @analog_input_data[@multi_byte_channel] == analog_value

data/lib/arduino_firmata/version.rb

@@ -1,4 +1,4 @@
 
 module ArduinoFirmata
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/samples/README.md

@@ -7,6 +7,7 @@ Digital/Analog IO
 - led_blink.rb
 - led_fade.rb
 - on_analog_read.rb
+- on_digital_read.rb
 - servo.rb
 
 

data/samples/digital_read.rb

@@ -5,10 +5,10 @@ require 'arduino_firmata'
 
 arduino = ArduinoFirmata.connect ARGV.shift
 
-arduino.pin_mode 7, ArduinoFirmata::INPUT
+arduino.pin_mode 2, ArduinoFirmata::INPUT
 
 loop do
-  if arduino.digital_read 7
+  if arduino.digital_read 2
     puts "on"
     arduino.digital_write 13, true
   else

data/samples/on_digital_read.rb

@@ -0,0 +1,20 @@
+#usr/bin/env ruby
+$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
+require 'rubygems'
+require 'arduino_firmata'
+
+arduino = ArduinoFirmata.connect ARGV.shift
+arduino.pin_mode 2, ArduinoFirmata::INPUT
+
+arduino.on :digital_read do |pin, status|
+  if pin == 2
+    puts "digital pin #{pin} changed : #{status}"
+  end
+end
+
+led_stat = false
+loop do
+  arduino.digital_write 13, led_stat
+  led_stat = !led_stat
+  sleep 1
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arduino_firmata
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -87,6 +87,7 @@ files:
 - samples/led_blink.rb
 - samples/led_fade.rb
 - samples/on_analog_read.rb
+- samples/on_digital_read.rb
 - samples/servo.rb
 - samples/sinatra_arduino.rb
 - samples/sysex/README.md