arduino_firmata 0.1.7 → 0.1.8

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.1.8 2013-01-11
+
+* add tests
+* add function Arduino::reset
+
 === 0.1.7 2013-01-04
 
 * use bundler gem template

data/lib/arduino_firmata/arduino.rb

@@ -82,6 +82,10 @@ module ArduinoFirmata
       end
     end
 
+    def reset
+      write SYSTEM_RESET
+    end
+
     def digital_read(pin)
       (@digital_input_data[pin >> 3] >> (pin & 0x07)) & 0x01 > 0
     end
@@ -93,10 +97,21 @@ module ArduinoFirmata
     def pin_mode(pin, mode)
       write SET_PIN_MODE
       write pin
-      write mode
+      mode = case mode
+             when true
+               OUTPUT
+             when false
+               INPUT
+             else
+               mode
+             end
+      if write(mode) == 1
+        return mode
+      end
     end
 
     def digital_write(pin, value)
+      pin_mode pin, OUTPUT
       port_num = (pin >> 3) & 0x0F
       if value == 0 or value == false
         @digital_output_data[port_num] &= ~(1 << (pin & 0x07))
@@ -106,21 +121,27 @@ module ArduinoFirmata
 
       write(DIGITAL_MESSAGE | port_num)
       write(@digital_output_data[port_num] & 0x7F)
-      write(@digital_output_data[port_num] >> 7)
+      if write(@digital_output_data[port_num] >> 7) == 1
+        return value
+      end
     end
 
     def analog_write(pin, value)
       pin_mode pin, PWM
       write(ANALOG_MESSAGE | (pin & 0x0F))
       write(value & 0x7F)
-      write(value >> 7)
+      if write(value >> 7) == 1
+        return value
+      end
     end
 
     def servo_write(pin, angle)
       pin_mode pin, SERVO
       write(ANALOG_MESSAGE | (pin & 0x0F))
       write(angle & 0x7F)
-      write(angle >> 7)
+      if write(angle >> 7) == 1
+        return angle
+      end
     end
 
     private

data/lib/arduino_firmata/version.rb

@@ -1,4 +1,4 @@
 
 module ArduinoFirmata
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/samples/led_blink.rb

@@ -6,6 +6,8 @@ require 'arduino_firmata'
 arduino = ArduinoFirmata.connect ARGV.shift
 puts "firmata version #{arduino.version}"
 
+arduino.pin_mode 13, ArduinoFirmata::OUTPUT
+
 stat = true
 loop do
   puts stat

data/samples/servo.rb

@@ -8,6 +8,6 @@ arduino = ArduinoFirmata.connect ARGV.shift
 loop do
   angle = rand 180
   puts angle
-  arduino.servo_write 11, angle
+  arduino.servo_write 9, angle
   sleep 1
 end

data/test/test_arduino_firmata.rb

@@ -11,6 +11,14 @@ class TestArduinoFirmata < MiniTest::Unit::TestCase
     @arduino.close
   end
 
+  def test_digital_read
+    0.upto(13).each do |pin|
+      din = @arduino.digital_read pin
+      assert [true,false].include? din
+    end
+    @arduino.close
+  end
+
   def test_analog_read
     0.upto(5).each do |pin|
       ain = @arduino.analog_read pin
@@ -19,11 +27,36 @@ class TestArduinoFirmata < MiniTest::Unit::TestCase
     @arduino.close
   end
 
-  def test_digital_read
+  def test_digital_write
     0.upto(13).each do |pin|
-      din = @arduino.digital_read pin
-      assert [true,false].include? din
+      assert @arduino.digital_write(pin, true) == true
+      assert @arduino.digital_write(pin, false) == false
     end
     @arduino.close
   end
+
+  def test_analog_write
+    0.upto(13).each do |pin|
+      value = rand(256)
+      assert @arduino.analog_write(pin, value) == value
+    end
+    @arduino.close
+  end
+
+  def test_servo_write
+    0.upto(13).each do |pin|
+      angle = rand(181)
+      assert @arduino.servo_write(pin, angle) == angle
+    end
+    @arduino.close
+  end
+
+  def test_pin_mode
+    0.upto(13).each do |pin|
+      mode = [ArduinoFirmata::OUTPUT, ArduinoFirmata::INPUT].sample
+      assert @arduino.pin_mode(pin, mode) == mode
+    end
+    @arduino.close
+  end
+
 end

data/test/test_block.rb

@@ -10,4 +10,12 @@ class TestBlock < MiniTest::Unit::TestCase
     assert version_ and version_ > '2.0'
   end
 
+  def test_block_analog_read
+    ain = nil
+    ArduinoFirmata.connect ENV['ARDUINO'] do
+      ain = analog_read 0
+    end
+    assert 0 <= ain and ain < 1024
+  end
+
 end

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'backports'
 require 'minitest/autorun'
 
 $:.unshift File.expand_path '../lib', File.dirname(__FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arduino_firmata
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serialport