artoo-arduino 1.1.0 → 1.2.0

data/test/adaptors/firmata_test.rb

@@ -22,4 +22,34 @@ describe Artoo::Adaptors::Firmata do
 
     @adaptor.connected?.must_equal false
   end
+
+  describe "device info interface" do
+    it "#firmware_name"
+    it "#version"
+  end
+
+  describe "digital GPIO interface" do
+    it "#digital_read"
+    it "#digital_write"
+  end
+
+  describe "analog GPIO interface" do
+    it "#analog_read"
+    it "#analog_write"
+  end
+
+  describe "PWM GPIO interface" do
+    it "#pwm_write"
+  end
+
+  describe "servo GPIO interface" do
+    it "#servo_write"
+  end
+
+  describe "i2c interface" do
+    it "#i2c_start"
+    it "#i2c_end"
+    it "#i2c_read"
+    it "#i2c_write"
+  end
 end

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: artoo-arduino
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ron Evans
 - Adrian Zankich
 - Rafael Magaña
+- Edgar Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-07 00:00:00.000000000 Z
+date: 2013-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artoo
@@ -18,42 +19,56 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: hybridgroup-firmata
+  name: artoo-gpio
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: littlewire
+  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.9.7
+        version: 0.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 0.4.5
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -112,46 +127,26 @@ files:
 - README.md
 - Rakefile
 - artoo-arduino.gemspec
-- examples/firmata_blink_led.rb
-- examples/firmata_blink_led_with_toggle.rb
-- examples/firmata_button_and_led.rb
-- examples/firmata_dc_motor_speed.rb
-- examples/firmata_dc_motor_speed_h-bridge_2_pins.rb
-- examples/firmata_dc_motor_switch.rb
-- examples/firmata_dc_motor_switch_h-bridge_2_pins.rb
-- examples/firmata_led_brightness.rb
-- examples/firmata_led_with_button_toggle.rb
-- examples/firmata_maxbotix.rb
-- examples/firmata_motor.rb
-- examples/firmata_servo.rb
-- examples/firmata_wiichuck.rb
-- examples/littlewire_blink_led_with_toggle.rb
-- examples/littlewire_button_and_led.rb
-- examples/littlewire_dc_motor_speed.rb
-- examples/littlewire_maxbotix.rb
+- examples/analog_sensor.rb
+- examples/blink_led.rb
+- examples/blink_led_with_toggle.rb
+- examples/button_and_led.rb
+- examples/dc_motor_speed.rb
+- examples/dc_motor_speed_h-bridge_2_pins.rb
+- examples/dc_motor_switch.rb
+- examples/dc_motor_switch_h-bridge_2_pins.rb
+- examples/led_brightness.rb
+- examples/led_brightness_with_analog_input.rb
+- examples/led_with_button_toggle.rb
+- examples/maxbotix.rb
+- examples/motor.rb
+- examples/motor_speed_with_analog_input.rb
+- examples/servo.rb
+- examples/wiichuck.rb
 - lib/artoo-arduino.rb
 - lib/artoo-arduino/version.rb
 - lib/artoo/adaptors/firmata.rb
-- lib/artoo/adaptors/littlewire.rb
-- lib/artoo/drivers/board.rb
-- lib/artoo/drivers/button.rb
-- lib/artoo/drivers/led.rb
-- lib/artoo/drivers/maxbotix.rb
-- lib/artoo/drivers/motor.rb
-- lib/artoo/drivers/servo.rb
-- lib/artoo/drivers/wiichuck.rb
-- lib/artoo/drivers/wiiclassic.rb
-- lib/artoo/drivers/wiidriver.rb
 - test/adaptors/firmata_test.rb
-- test/adaptors/littlewire_test.rb
-- test/drivers/firmata_board_test.rb
-- test/drivers/led_test.rb
-- test/drivers/maxbotix_test.rb
-- test/drivers/motor_test.rb
-- test/drivers/servo_test.rb
-- test/drivers/wiichuck_test.rb
-- test/drivers/wiiclassic_test.rb
-- test/drivers/wiidriver_test.rb
 - test/test_helper.rb
 homepage: https://github.com/hybridgroup/artoo-arduino
 licenses:

data/examples/littlewire_blink_led_with_toggle.rb

@@ -1,17 +0,0 @@
-require 'artoo'
-
-# Uses Digispark USB board (http://digistump.com/products/1) 
-# with Little Wire protocol (http://littlewire.cc)
-
-connection :digispark, :adaptor => :littlewire, :vendor => 0x1781, :product => 0x0c9f
-device :board, :driver => :board
-device :led, :driver => :led, :pin => 1
-
-work do
-  puts "Firmware name: #{board.firmware_name}"
-  puts "Firmware version: #{board.version}"
-
-  every 1.second do
-    led.toggle
-  end
-end

data/examples/littlewire_button_and_led.rb

@@ -1,16 +0,0 @@
-require 'artoo'
-
-# Circuit and schematic here: http://arduino.cc/en/tutorial/button
-
-connection :digispark, :adaptor => :littlewire, :vendor => 0x1781, :product => 0x0c9f
-device :board, :driver => :board
-device :led, :driver => :led, :pin => 1
-device :button, :driver => :button, :pin => 0, :interval => 0.01
-
-work do
-  puts "Firmware name: #{board.firmware_name}"
-  puts "Firmware version: #{board.version}"
-  puts "Press the button connected on pin #{button.pin}..."
-
-  on button, :push    => proc { led.toggle }
-end

data/examples/littlewire_dc_motor_speed.rb

@@ -1,31 +0,0 @@
-require 'artoo'
-
-#Circuit's breadboard layout here: http://learn.adafruit.com/adafruit-arduino-lesson-13-dc-motors/breadboard-layout
-
-connection :digispark, :adaptor => :littlewire, :vendor => 0x1781, :product => 0x0c9f
-device :board, :driver => :board
-device :motor, :driver => :motor, :speed_pin => 1 # Use a PWM pin
-
-work do
-  puts "Firmware name: #{board.firmware_name}"
-  puts "Firmata version: #{board.version}"
-  puts "Stopping motor..."
-  motor.min # same as 'motor.stop' or 'motor.speed(0)'
-  sleep 3
-  puts "Setting to maximum speed..."
-  motor.max # same as 'motor.start'
-  sleep 3
-
-  speed = 0
-  step = 50
-
-  every 3.seconds do
-    motor.speed(speed)
-    puts "Current speed: #{motor.current_speed}"
-    speed += step
-    if [0, 250].include?(speed)
-      step = -step
-    end
-  end
-end
-

data/examples/littlewire_maxbotix.rb

@@ -1,19 +0,0 @@
-require 'artoo'
-
-# Circuit and schematic here: http://www.electrojoystick.com/tutorial/?page_id=285
-
-connection :digispark, :adaptor => :littlewire, :vendor => 0x1781, :product => 0x0c9f
-device :sonar, :driver => :maxbotix, :pin => 0, :interval => 0.5
-device :board, :driver => :board
-
-work do
-  on sonar, :range => :sonar_reading
-
-  puts "Firmware name: #{board.firmware_name}"
-  puts "Firmata version: #{board.version}"
-  puts "starting sonar..."
-end
-
-def sonar_reading(*args)
-  puts args[1] * 1000
-end

data/lib/artoo/adaptors/littlewire.rb

@@ -1,63 +0,0 @@
-require 'artoo/adaptors/adaptor'
-
-module Artoo
-  module Adaptors
-    # Connect to Digispark or Littlewire device using Little Wire protocol
-    # @see http://littlewire.cc/
-    class Littlewire < Adaptor
-      attr_reader :littlewire, :vendor, :product, :usb
-
-      def initialize(params={})
-        super
-
-        params[:additional_params] ||= {}
-        @vendor = params[:additional_params][:vendor] || 0x1781
-        @product = params[:additional_params][:product] || 0x0c9f
-      end
-
-      # Creates connection with littlewire board
-      # @return [Boolean]
-      def connect
-        require 'littlewire' unless defined?(::LittleWire)
-        @littlewire = ::LittleWire.new(connect_to_usb)
-        super
-        return true
-      end
-
-      # Closes connection with littlewire board
-      # @return [Boolean]
-      def disconnect
-        littlewire.finished
-        super
-      end
-
-      # Returns firmware name of littlewire board
-      # @return [String]
-      def firmware_name
-        "Little Wire"
-      end
-
-      def digital_read(pin)
-        littlewire.digital_write(pin, true)
-        littlewire.digital_read(pin)
-      end
-
-      def pwm_write(pin, level)
-        littlewire.software_pwm_write(pin, level)
-      end
-
-      def connect_to_usb
-        @usb = LIBUSB::Context.new.devices(
-          :idVendor  => vendor,
-          :idProduct => product
-        ).first
-      end
-
-      # Uses method missing to call Littlewire methods
-      # @see https://github.com/Bluebie/littlewire.rb
-      def method_missing(method_name, *arguments, &block)
-        littlewire.send(method_name, *arguments, &block)
-      end
-    end
-  end
-end

data/lib/artoo/drivers/board.rb

@@ -1,10 +0,0 @@
-require 'artoo/drivers/driver'
-
-module Artoo
-  module Drivers
-    # Board driver behaviors
-    class Board < Driver
-      COMMANDS = [:firmware_name, :version, :connect].freeze
-    end
-  end
-end

data/lib/artoo/drivers/button.rb

@@ -1,43 +0,0 @@
-require 'artoo/drivers/driver'
-
-module Artoo
-  module Drivers
-    # Button driver behaviors
-    class Button < Driver
-      COMMANDS = [:is_pressed?].freeze
-
-      DOWN = 1
-      UP = 0
-
-      # @return [Boolean] True if pressed
-      def is_pressed?
-        (@pressed_val == 1) ? true : false
-      end
-
-      def start_driver
-        @pressed_val = 0
-
-        every(interval) do
-          new_value = connection.digital_read(pin)
-          update(new_value) if !new_value.nil? && new_value != is_pressed?
-        end
-
-        super
-      end
-
-      private
-      # Publishes events according to the button feedback
-      def update(new_val)
-        if new_val == 1
-          @pressed_val = 1
-          publish(event_topic_name("update"), "push", new_val)
-          publish(event_topic_name("push"), new_val)
-        else
-          @pressed_val = 0
-          publish(event_topic_name("update"), "release", new_val)
-          publish(event_topic_name("release"), new_val)
-        end
-      end
-    end
-  end
-end

data/lib/artoo/drivers/led.rb

@@ -1,59 +0,0 @@
-require 'artoo/drivers/driver'
-
-module Artoo
-  module Drivers
-    # The LED driver behaviors
-    class Led < Driver
-
-      COMMANDS = [:on, :off, :toggle, 
-                  :brightness, 
-                  :on?, :off?].freeze
-
-      def initialize(params = {})
-        @is_on = false
-        super
-      end
-
-      # @return [Boolean] True if on
-      def on?
-        @is_on
-      end
-
-      # @return [Boolean] True if off
-      def off?
-        (not on?)
-      end
-
-      # Sets led to level HIGH
-      def on
-        change_state(pin, :high)
-        @is_on = true
-        true
-      end
-
-      # Sets led to level LOW
-      def off
-        change_state(pin, :low)
-        @is_on = false
-        true
-      end
-
-      # Toggle status
-      # @example on > off, off > on
-      def toggle
-        on? ? off : on
-      end
-
-      # Change brightness level
-      # @param [Integer] level
-      def brightness(level=0)
-        connection.pwm_write(pin, level)
-      end
-
-      private
-      def change_state(pin, level)
-        connection.digital_write(pin, level)
-      end
-    end
-  end
-end