artoo-arduino 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 462cf370bd5b4897c067ebbbd345d043003bb8ab
-  data.tar.gz: a24d67d158bc6f063d0d30e3d51bbb56f66a4ff7
+  metadata.gz: 37f2c8debd9d14ba4a38e1f9a774a320efc7cf9e
+  data.tar.gz: 1de8cea99160cdc864644fa7ec47cc38a820eab8
 SHA512:
-  metadata.gz: 3da8e81b7ae739155b5006d64e74fa37413aa690c6608583552affed2ada3bb0080a92db9b2a3c4c74850e81a90170af1665d507a7fb8b6d7fa9665965cba52d
-  data.tar.gz: 22ac96ca8ed3d906f0a21893c7cecbef3dc85d4dae17fec0dcafb91e0664a78922ecc1f10184738eae8ec4f2425b09f8630623d0f426f0cfc6a9d5c1a673860c
+  metadata.gz: e90ecfbc36317303699a0db9239b80dd6c1cc31d338049fa7b04e79a7da0e0bc70fbd63ebf184fa41ecfc107e3615afddf973d498f517d8e875142ff604993ef
+  data.tar.gz: de66fc030176df9fc8954751e04458430badf6d4ad2362b4c206e307875b0d32ce91c51723292efbf6ee7d1bfabb0949aaab6aaaacc655bcf427140a9afcba19

data/.gitignore

@@ -1,3 +1,4 @@
 .rvmrc
 .rbx
 pkg
+Gemfile.lock

data/.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

data/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:
 
 ```

data/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 'hybridgroup-firmata', '>= 0.4.5'
+  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.6'
   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

data/examples/analog_sensor.rb

@@ -7,7 +7,6 @@ require 'artoo'
 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
 device :led, :driver => :led, :pin => 8
 

data/examples/led_dance.rb

@@ -0,0 +1,31 @@
+# Use this example to make your leds dance!
+# LEDS variable controls number of connected leds
+# TIME varirable controls velocity
+# First led should be on port 2, next leds on consecutive ports
+
+require 'artoo'
+
+LEDS = 6
+TIME = 0.05
+
+connection :firmata, :adaptor => :firmata, :port => '/dev/tty.usbmodem1411' #osx
+device :board, :driver => :device_info
+
+LEDS.times do |i|
+  device "led_#{i+1}", :driver => :led, :pin => (i+2)
+end
+
+work do
+
+  current = 0
+  leds    = devices.to_a.select {|d| d[1].name.include?('led') }
+
+  every(TIME) do
+    led = leds[current % LEDS][1]
+
+    led.on? ? led.off : led.on
+
+    current += 1
+  end
+
+end

data/examples/temperature_sensor.rb

@@ -0,0 +1,15 @@
+require 'artoo'
+
+connection :firmata, :adaptor => :firmata, :port => '/dev/cu.usbmodem1451'
+
+# TMP36 temperature sensor used for this example
+device :sensor, driver: :analog_sensor, pin: 0
+
+work do
+  every 5 do
+    voltage = ( sensor.analog_read(0) * 5.0 ) / 1024
+    temp    = ( voltage - 0.5 ) * 100
+
+    puts "Current temperature is #{temp}"
+  end
+end

data/lib/artoo-arduino.rb

@@ -1,8 +1,7 @@
-require 'lib/artoo/adaptors/firmata'
-require 'lib/artoo/adaptors/littlewire'
+require 'artoo/adaptors/firmata'
 
 %w{ button led motor servo wiichuck wiiclassic wiidriver }.each do |f|
-  require "lib/artoo/drivers/#{f}")
+  require "artoo/drivers/#{f}"
 end
 
-require 'lib/artoo-arduino/version'
+require 'artoo-arduino/version'

data/lib/artoo-arduino/version.rb

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

data/lib/artoo/adaptors/firmata.rb

@@ -53,10 +53,9 @@ module Artoo
       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 @@ module Artoo
         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)

data/test/adaptors/firmata_test.rb

@@ -66,6 +66,7 @@ describe Artoo::Adaptors::Firmata do
       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

data/test/test_helper.rb

@@ -1,7 +1,9 @@
+require 'minitest'
 require 'minitest/autorun'
 require 'mocha/setup'
 require 'firmata'
 require 'artoo/robot'
+require 'artoo-arduino'
 
 Celluloid.logger = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: artoo-arduino
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Ron Evans
@@ -11,104 +11,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-07-04 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'
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: artoo-i2c
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: hybridgroup-firmata
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.6
 - !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'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.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,11 +119,10 @@ extensions:
 - ext/Rakefile
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rvmrc.example
-- .travis.yml
+- ".gitignore"
+- ".rvmrc.example"
+- ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -138,11 +137,13 @@ files:
 - examples/dc_motor_switch_h-bridge_2_pins.rb
 - examples/led_brightness.rb
 - examples/led_brightness_with_analog_input.rb
+- examples/led_dance.rb
 - examples/led_with_button_toggle.rb
 - examples/maxbotix.rb
 - examples/motor.rb
 - examples/motor_speed_with_analog_input.rb
 - examples/servo.rb
+- examples/temperature_sensor.rb
 - examples/wiichuck.rb
 - ext/Rakefile
 - lib/artoo-arduino.rb
@@ -163,21 +164,18 @@ 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.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Artoo adaptor and driver for Arduino
-test_files:
-- test/adaptors/firmata_test.rb
-- test/test_helper.rb
-has_rdoc: 
+test_files: []

data/Gemfile.lock

@@ -1,70 +0,0 @@
-PATH
-  remote: .
-  specs:
-    artoo-arduino (1.4.2)
-      artoo (>= 1.6.0)
-      artoo-gpio
-      artoo-i2c
-      hybridgroup-firmata (>= 0.4.5)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    artoo (1.6.1)
-      celluloid (~> 0.15.0)
-      celluloid-io (~> 0.15.0)
-      multi_json (~> 1.6)
-      pry (~> 0.9)
-      rake
-      reel (~> 0.4.0)
-      robeaux (~> 0.0.3)
-      thor (~> 0.18.1)
-    artoo-gpio (0.4.0)
-      artoo (>= 1.6.0)
-    artoo-i2c (0.5.0)
-      artoo (>= 1.6.0)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    celluloid-io (0.15.0)
-      celluloid (>= 0.15.0)
-      nio4r (>= 0.5.0)
-    coderay (1.1.0)
-    event_emitter (0.2.5)
-    http (0.5.0)
-      http_parser.rb
-    http_parser.rb (0.6.0)
-    hybridgroup-firmata (0.4.5)
-      event_emitter
-    metaclass (0.0.1)
-    method_source (0.8.2)
-    minitest (5.0.1)
-    minitest-happy (1.0.0)
-    mocha (0.14.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.8.4)
-    nio4r (1.0.0)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rake (10.1.1)
-    reel (0.4.0)
-      celluloid (>= 0.15.1)
-      celluloid-io (>= 0.15.0)
-      http (>= 0.5.0)
-      http_parser.rb (>= 0.6.0.beta.2)
-      websocket_parser (>= 0.1.4)
-    robeaux (0.0.4)
-    slop (3.4.7)
-    thor (0.18.1)
-    timers (1.1.0)
-    websocket_parser (0.1.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  artoo-arduino!
-  minitest (~> 5.0)
-  minitest-happy
-  mocha (~> 0.14.0)