Merge pull request #33 from hybridgroup/dev

Rubyserial
hybridgroup · Jul 4, 2014 · fb68b9f · fb68b9f
2 parents 8c9b344 + 424bb5e
commit fb68b9f
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 93 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .rvmrc
 .rbx
 pkg
+Gemfile.lock
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,10 @@
 language: ruby
 rvm:
-  - 2.1.0
   - 2.0.0
+  - 2.1.0
   - 1.9.3
-  - jruby-1.7.9
-  - rbx-2.2.7
-matrix:
-  allow_failures:
-    - rvm: jruby-1.7.9
+  - jruby
+  - rbx-2.2.10
+script:
+  - bundle install
+  - bundle exec rake test
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/README.md b/README.md
@@ -66,12 +66,6 @@ Install the artoo-arduino gem:
 $ gem install artoo-arduino
 ```
 
-Install the hybridgroup-serialport gem:
-
-```
-$ gem install hybridgroup-serialport
-```
-
 Once plugged in, use the `artoo connect scan -t serial` command to find out your connection info and serial port address:
 
 ```

diff --git a/artoo-arduino.gemspec b/artoo-arduino.gemspec
@@ -22,10 +22,10 @@ Gem::Specification.new do |s|
   s.extensions    = ["ext/Rakefile"]
 
   s.add_runtime_dependency 'artoo', '>= 1.6.0'
-  s.add_runtime_dependency 'artoo-gpio'
-  s.add_runtime_dependency 'artoo-i2c'
+  s.add_runtime_dependency 'artoo-gpio', '>= 0.4.1'
+  s.add_runtime_dependency 'artoo-i2c', '>= 0.5.0'
   s.add_runtime_dependency 'hybridgroup-firmata', '>= 0.4.5'
   s.add_development_dependency 'minitest', '~> 5.0'
-  s.add_development_dependency 'minitest-happy'
+  s.add_development_dependency 'minitest-happy', '~> 1.0.0'
   s.add_development_dependency 'mocha', '~> 0.14.0'
 end
diff --git a/lib/artoo-arduino/version.rb b/lib/artoo-arduino/version.rb
@@ -1,5 +1,5 @@
 module Artoo
   module Arduino
-    VERSION = '1.4.3'
+    VERSION = '1.4.4'
   end
 end
diff --git a/lib/artoo/adaptors/firmata.rb b/lib/artoo/adaptors/firmata.rb
@@ -53,10 +53,9 @@ def digital_read(pin)
       end
 
       # GPIO - analog
-      # NOTE pins are numbered A0-A5, which translate to digital pins 14-19
       def analog_read(pin)
-        firmata.set_pin_mode(digital_pin(pin), ::Firmata::PinModes::ANALOG)
-        firmata.toggle_pin_reporting(digital_pin(pin))
+        firmata.set_pin_mode(firmata.analog_pins[pin], ::Firmata::PinModes::ANALOG)
+        firmata.toggle_pin_reporting(firmata.analog_pins[pin])
         firmata.read_and_process
 
         value = 0
@@ -67,10 +66,6 @@ def analog_read(pin)
         value
       end
 
-      def digital_pin(pin = 0)
-        pin + 14
-      end
-
       # GPIO - PWM
       def pwm_write(pin, level)
         firmata.set_pin_mode(pin, ::Firmata::PinModes::PWM)

diff --git a/test/adaptors/firmata_test.rb b/test/adaptors/firmata_test.rb
@@ -66,6 +66,7 @@
       it "#analog_read" do
        @firmata_event.stubs(:name).returns(:analog_read_1)
        @firmata_event.stubs(:data).returns([128])
+       @firmata.stubs(:analog_pins).returns([0,1])
        @firmata.expects(:read_and_process)
        @adaptor.analog_read(1).must_equal 128
       end