artoo-arduino 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34a20ea820138830b5aa01b4e559cee10d2b10d2
-  data.tar.gz: 7022e24bc2f4ee5a0466d0b4f79293a437a4b4ac
+  metadata.gz: 462cf370bd5b4897c067ebbbd345d043003bb8ab
+  data.tar.gz: a24d67d158bc6f063d0d30e3d51bbb56f66a4ff7
 SHA512:
-  metadata.gz: b65a4fb5ece3630cecd8a844f38cf2521d40dd08ec1f7afe8227433ce0cfd9217e8f14a32605a476856808fa48d75dd4b63e717d30060739249708695d153b31
-  data.tar.gz: c91d5c144a7c1ad45e3fa1a336afbd7fef05f8aae45eebe1dd86556ca288a3dc8cd105b8dead782e96389577ebd8bf63772ef164572d6d810dd2fd95225c2301
+  metadata.gz: 3da8e81b7ae739155b5006d64e74fa37413aa690c6608583552affed2ada3bb0080a92db9b2a3c4c74850e81a90170af1665d507a7fb8b6d7fa9665965cba52d
+  data.tar.gz: 22ac96ca8ed3d906f0a21893c7cecbef3dc85d4dae17fec0dcafb91e0664a78922ecc1f10184738eae8ec4f2425b09f8630623d0f426f0cfc6a9d5c1a673860c

data/.travis.yml

@@ -4,7 +4,7 @@ rvm:
   - 2.0.0
   - 1.9.3
   - jruby-1.7.9
-  - rbx-2.1.1
+  - rbx-2.2.7
 matrix:
   allow_failures:
     - rvm: jruby-1.7.9

data/README.md

@@ -21,7 +21,7 @@ gem install artoo-arduino
 ```ruby
 require 'artoo'
 
-connection :arduino, :adaptor => :firmata, :port => '127.0.0.1:8023'
+connection :arduino, :adaptor => :firmata, :port => '/dev/ttyACM0' #linux
 device :board, :driver => :device_info
 device :led, :driver => :led, :pin => 13
 
@@ -50,13 +50,12 @@ The following hardware devices have driver support via the artoo-i2c gem:
 
 ## Connecting to Arduino
 
-### OSX
+### OSX / Linux
 
 The main steps are:
 - Install the artoo-arduino gem
 - Find out what serial port your arduino is connected to
 - Upload the Firmata protocol to the arduino
-- Use a socket to serial connection to map a TCP socket to the local unix port
 - Connect to the device via Artoo
 
 First plug the Arduino into your computer via the USB/serial port. A dialog box will appear telling you that a new network interface has been detected. Click "Network Preferences...", and when it opens, simply click "Apply".
@@ -67,48 +66,10 @@ Install the artoo-arduino gem:
 $ gem install artoo-arduino
 ```
 
-Once plugged in, use the `artoo connect scan -t serial` command to find out your connection info and serial port address:
-
-```
-$ artoo connect scan -t serial
-```
-
-Use the `artoo firmata install` command to install avrdude,
-this will allow us to upload firmata to the arduino:
-
-```
-$ artoo firmata install
-```
-
-Once the avrdude uploader is installed we upload the firmata protocol to
-the arduino, use the arduino serial port address found when you ran `artoo
-connect scan -t serial`, or leave it blank to use the default address `/dev/ttyACM0`:
-
-```
-$ artoo firmata upload /dev/ttyACM0
-```
-
-Now you are ready to connect to the Arduino using a socket, in this example the socket to serial is set on port 4567 (which is also the default value):
+Install the hybridgroup-serialport gem:
 
 ```
-artoo connect serial ttyACM0 4567
-```
-
-### Ubuntu
-
-The main steps are:
-- Install the artoo-arduino gem
-- Find out what serial port your arduino is connected to
-- Upload the Firmata protocol to the arduino
-- Use a socket to serial connection to map a TCP socket to the local unix port
-- Connect to the device via Artoo
-
-First plug the Arduino into your computer via the USB/serial port.
-
-Install the artoo-arduino gem:
-
-```
-$ gem install artoo-arduino
+$ 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:
@@ -132,10 +93,14 @@ connect scan -t serial`, or leave it blank to use the default address `/dev/ttyA
 $ artoo firmata upload /dev/ttyACM0
 ```
 
-Now you are ready to connect to the Arduino using a socket, in this example the socket to serial is set on port 4567 (which is also the default value):
+Change the example to use the correct serial port address
+
+```
+connection :arduino, :adaptor => :firmata, :port => '/dev/ttyACM0' #linux
+```
 
 ```
-artoo connect serial ttyACM0 4567
+connection :arduino, :adaptor => :firmata, :port => '/dev/tty.usbmodem1411' #osx
 ```
 
 ### Windows

data/examples/analog_sensor.rb

@@ -4,8 +4,8 @@ require 'artoo'
 # change to the correct analog input, in this case pin A0.
 # Circuit and schematic here: http://arduino.cc/en/tutorial/button
 
-#connection :firmata, :adaptor => :firmata, :port => '/dev/tty*'
-connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:8023'
+connection :firmata, :adaptor => :firmata, :port => '/dev/ttyACM0' #linux
+#connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:8023'
 
 # Analog inputs are based from 0 to 5 on the Arduino UNO, may vary on other arduino boards
 device :sensor, driver: :analog_sensor, pin: 0, interval: 0.25, upper: 900, lower: 200

data/examples/blink_led.rb

@@ -2,8 +2,8 @@ require 'artoo'
 
 # Circuit and schematic here: http://arduino.cc/en/Tutorial/Blink
 
-#connection :firmata, :adaptor => :firmata, :port => '/dev/tty*'
-connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:8023'
+connection :firmata, :adaptor => :firmata, :port => '/dev/ttyACM0' #linux
+#connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:8023'
 device :board, :driver => :device_info
 device :led, :driver => :led, :pin => 13
 

data/examples/blink_led_with_toggle.rb

@@ -2,8 +2,8 @@ require 'artoo'
 
 # Circuit and schematic here: http://arduino.cc/en/Tutorial/Blink
 
-#connection :firmata, :adaptor => :firmata, :port => '/dev/tty*'
-connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:8023'
+connection :firmata, :adaptor => :firmata, :port => '/dev/ttyACM0' #linux
+#connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:8023'
 device :board, :driver => :device_info
 device :led, :driver => :led, :pin => 13
 

data/examples/button_and_led.rb

@@ -2,8 +2,8 @@ require 'artoo'
 
 # Circuit and schematic here: http://arduino.cc/en/tutorial/button
 
-#connection :firmata, :adaptor => :firmata, :port => '/dev/tty*'
-connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:8023'
+connection :firmata, :adaptor => :firmata, :port => '/dev/ttyACM0' # linux
+#connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:8023'
 device :led, :driver => :led, :pin => 13
 device :button, :driver => :button, :pin => 2, :interval => 0.01
 

data/examples/dc_motor_speed.rb

@@ -2,8 +2,8 @@ require 'artoo'
 
 #Circuit's breadboard layout here: http://learn.adafruit.com/adafruit-arduino-lesson-13-dc-motors/breadboard-layout
 
-#connection :firmata, :adaptor => :firmata, :port => '/dev/tty*'
-connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:4567'
+connection :firmata, :adaptor => :firmata, :port => '/dev/ttyACM0' # linux
+#connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:4567'
 device :board, :driver => :device_info
 device :motor, :driver => :motor, :speed_pin => 3 # Use a PWM pin
 

data/examples/dc_motor_speed_h-bridge_2_pins.rb

@@ -3,8 +3,8 @@ require 'artoo'
 #Circuit's breadboard layout for the L293D: http://www.electrojoystick.com/tutorial/?p=759
 #For the L239DNE: http://bit.ly/14QdjD5
 
-#connection :firmata, :adaptor => :firmata, :port => '/dev/tty*'
-connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:8023'
+connection :firmata, :adaptor => :firmata, :port => '/dev/ttyACM0' # linux
+#connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:8023'
 device :board, :driver => :device_info
 device :motor, :driver => :motor, 
                :forward_pin  => 4, # Digital or PWM pin

data/examples/dc_motor_switch.rb

@@ -2,8 +2,8 @@ require 'artoo'
 
 #Circuit's breadboard layout here: http://learn.adafruit.com/adafruit-arduino-lesson-13-dc-motors/breadboard-layout
 
-#connection :firmata, :adaptor => :firmata, :port => '/dev/tty*'
-connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:8023'
+connection :firmata, :adaptor => :firmata, :port => '/dev/ttyACM0' # linux
+#connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:8023'
 device :board, :driver => :device_info
 device :motor, :driver => :motor, :switch_pin => 3 # Use a digital or PWM pin
 

data/examples/dc_motor_switch_h-bridge_2_pins.rb

@@ -4,8 +4,8 @@ require 'artoo'
 #For the L239DNE: http://bit.ly/14QdjD5,
 #   L293DNE's pin 1 should go to 5V instead of to Arduino's pin 9
 
-#connection :firmata, :adaptor => :firmata, :port => '/dev/tty*'
-connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:8023'
+connection :firmata, :adaptor => :firmata, :port => '/dev/ttyACM0' # linux
+#connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:8023'
 device :board, :driver => :device_info
 device :motor, :driver => :motor, :forward_pin => 4, :backward_pin => 2
 

data/examples/led_brightness.rb

@@ -2,8 +2,8 @@ require 'artoo'
 
 # Circuit and schematic here: http://arduino.cc/en/Tutorial/Fade
 
-#connection :firmata, :adaptor => :firmata, :port => '/dev/tty*'
-connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:8023'
+connection :firmata, :adaptor => :firmata, :port => '/dev/ttyACM0' # linux
+#connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:8023'
 device :board, :driver => :device_info
 device :led, :driver => :led, :pin => 3
 

data/examples/led_brightness_with_analog_input.rb

@@ -8,8 +8,8 @@ require 'artoo'
 # change to the correct analog input, in this case pin A0.
 # Circuit and schematic here: http://arduino.cc/en/tutorial/button
 
-#connection :firmata, :adaptor => :firmata, :port => '/dev/tty*'
-connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:8023'
+connection :firmata, :adaptor => :firmata, :port => '/dev/ttyACM0' # linux
+#connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:8023'
 device :sensor, driver: :analog_sensor, pin: 0, interval: 0
 device :led, :driver => :led, :pin => 3
 

data/examples/led_with_button_toggle.rb

@@ -2,8 +2,8 @@ require 'artoo'
 
 # Circuit and schematic here: http://arduino.cc/en/tutorial/button
 
-#connection :firmata, :adaptor => :firmata, :port => '/dev/tty*'
-connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:8023'
+connection :firmata, :adaptor => :firmata, :port => '/dev/ttyACM0' # linux
+#connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:8023'
 device :led, :driver => :device_info, :pin => 13
 device :button, :driver => :button, :pin => 2, :interval => 0.01
 

data/examples/maxbotix.rb

@@ -2,8 +2,8 @@ require 'artoo'
 
 # Circuit and schematic here: http://www.electrojoystick.com/tutorial/?page_id=285
 
-#connection :firmata, :adaptor => :firmata, :port => '/dev/ttyACM0'
-connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:4567'
+connection :firmata, :adaptor => :firmata, :port => '/dev/ttyACM0'
+#connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:4567'
 device :sonar, :driver => :maxbotix, :pin => 0, :interval => 0.5
 device :board, :driver => :device_info
 

data/examples/motor.rb

@@ -7,8 +7,8 @@ speed_pin = 3 # PWM pin
 speed = 0
 forward = true
 
-#connection :firmata, :adaptor => :firmata, :port => '/dev/tty*'
-connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:8023'
+connection :firmata, :adaptor => :firmata, :port => '/dev/ttyACM0' #linux
+#connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:8023'
 device :board, :driver => :device_info
 device :motor, :driver => :motor, :pin => [leg1_pin, leg2_pin, speed_pin]
 

data/examples/motor_speed_with_analog_input.rb

@@ -7,8 +7,8 @@ require 'artoo'
 # change to the correct analog input, in this case pin A0.
 # Circuit and schematic here: http://arduino.cc/en/tutorial/button
 
-#connection :firmata, :adaptor => :firmata, :port => '/dev/tty*'
-connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:8023'
+connection :firmata, :adaptor => :firmata, :port => '/dev/ttyACM0' #linux
+#connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:8023'
 device :sensor, driver: :analog_sensor, pin: 0, interval: 0
 device :motor, :driver => :motor, :speed_pin => 3 # Use a PWM pin
 

data/examples/servo.rb

@@ -2,8 +2,8 @@ require 'artoo'
 
 # Circuit and schematic here: http://arduino.cc/en/Tutorial/Sweep
 
-#connection :firmata, :adaptor => :firmata, :port => '/dev/tty*'
-connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:8023'
+connection :firmata, :adaptor => :firmata, :port => '/dev/ttyACM0' #linux
+#connection :firmata, :adaptor => :firmata, :port => '127.0.0.1:8023'
 device :board, :driver => :device_info
 device :servo, :driver => :servo, :pin => 3 # pin must be a PWM pin
 

data/lib/artoo-arduino/version.rb

@@ -1,5 +1,5 @@
 module Artoo
   module Arduino
-    VERSION = '1.4.2'
+    VERSION = '1.4.3'
   end
 end

data/lib/artoo/commands/arduino.rb

@@ -1,3 +1,5 @@
+require 'artoo/commands/firmata'
+
 module Artoo
   module Commands
     class Arduino < Artoo::Commands::Firmata

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: artoo-arduino
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Ron Evans
@@ -11,104 +11,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artoo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: artoo-gpio
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: artoo-i2c
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hybridgroup-firmata
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.5
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: minitest-happy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.0
 description: Artoo adaptor and driver for Arduino
@@ -119,9 +119,9 @@ extensions:
 - ext/Rakefile
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rvmrc.example"
-- ".travis.yml"
+- .gitignore
+- .rvmrc.example
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -163,18 +163,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: artoo-arduino
-rubygems_version: 2.2.2
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Artoo adaptor and driver for Arduino
-test_files: []
+test_files:
+- test/adaptors/firmata_test.rb
+- test/test_helper.rb
+has_rdoc: