artoo 0.1.1 → 0.1.2

data/examples/ardrone.rb

@@ -1,7 +1,7 @@
 require 'artoo'
 
-connection :ardrone, :adaptor => :ardrone
-device :drone, :driver => :ardrone
+connection :ardrone, :adaptor => :ardrone, :port => '192.168.1.1:5556'
+device :drone, :driver => :ardrone, :connection => :ardrone
   
 work do
   drone.start

data/examples/ardrone_nav.rb

@@ -11,8 +11,8 @@ work do
   drone.start
   drone.take_off
   
-  after(25.seconds) { drone.hover.land }
-  after(30.seconds) { drone.stop }
+  after(50.seconds) { drone.hover.land }
+  after(60.seconds) { drone.stop }
 end
 
 def nav_update(*data)

data/examples/firmata.rb

@@ -1,6 +1,6 @@
 require 'artoo'
 
-connection :firmata, :adaptor => :firmata, :port => '4567' #/dev/tty.usbserial-A700636n'
+connection :firmata, :adaptor => :firmata, :port => '4567'
 device :board
 device :led, :driver => :led, :pin => 13
 

data/examples/hello_api_multiple.rb

@@ -9,7 +9,7 @@ class HelloRobot < Artoo::Robot
 	device :pinger, :driver => :pinger
 	device :pinger2, :driver => :pinger2
 
-	api :host => '127.0.0.1', :port => '4321'
+	api :host => '127.0.0.1', :port => '8080'
 
 	work do
 		puts "Hello from '#{name}' attached to API running at #{api_host}:#{api_port}..."

data/examples/sphero.rb

@@ -1,6 +1,6 @@
 require 'artoo'
 
-connection :sphero, :adaptor => :sphero, :port => '4560' #/dev/tty.Sphero-YRR-RN-SPP'
+connection :sphero, :adaptor => :sphero, :port => '4560'
 device :sphero, :driver => :sphero
   
 work do

data/examples/sphero_color.rb

@@ -1,12 +1,12 @@
 require 'artoo'
 
-connection :sphero, :adaptor => :sphero, :port => '4560' #/dev/tty.Sphero-YRR-RN-SPP'
+connection :sphero, :adaptor => :sphero, :port => '4560'
 device :sphero, :driver => :sphero
   
 work do
   @count = 1
   every(3.seconds) do
-    sphero.set_color(@count % 2 == 0 ? :green : :red)
+    sphero.set_color(@count % 2 == 0 ? :green : :blue)
     @count += 1
     sphero.roll 60, rand(360)
   end

data/examples/sphero_messages.rb

@@ -1,6 +1,6 @@
 require 'artoo'
 
-connection :sphero, :adaptor => :sphero, :port => '4560' #'/dev/tty.Sphero-BWY-RN-SPP'
+connection :sphero, :adaptor => :sphero, :port => '4560'
 device :sphero, :driver => :sphero
   
 work do

data/examples/sphero_multiple.rb

@@ -1,13 +1,4 @@
 require 'artoo/robot'
-
-#SPHEROS = ["4567", "4568", "4569", "4570", "4571"]
-SPHEROS = {"4560" => "/dev/tty.Sphero-BRG-RN-SPP",
-           "4561" => "/dev/tty.Sphero-YBW-RN-SPP",
-           "4562" => "/dev/tty.Sphero-BWY-RN-SPP",
-           "4563" => "/dev/tty.Sphero-YRR-RN-SPP",
-           "4564" => "/dev/tty.Sphero-OBG-RN-SPP",
-           "4565" => "/dev/tty.Sphero-GOB-RN-SPP",
-           "4566" => "/dev/tty.Sphero-PYG-RN-SPP"}
            
 class SpheroRobot < Artoo::Robot
   connection :sphero, :adaptor => :sphero
@@ -15,14 +6,29 @@ class SpheroRobot < Artoo::Robot
   
   work do
     @count = 1
-    every(3.seconds) do
-      sphero.set_color(@count % 2 == 0 ? :green : :red)
+    
+    every(1.second) do
+      sphero.set_color(@count % 2 == 0 ? :white : :blue)
       @count += 1
+    end
+
+    every(3.seconds) do
       sphero.roll 90, rand(360)
     end
+
+    after(60.seconds) do
+      sphero.stop
+    end
   end
 end
 
+SPHEROS = {"4560" => "/dev/tty.Sphero-BRG-RN-SPP",
+           "4561" => "/dev/tty.Sphero-YBW-RN-SPP",
+           "4562" => "/dev/tty.Sphero-BWY-RN-SPP",
+           "4563" => "/dev/tty.Sphero-YRR-RN-SPP",
+           "4564" => "/dev/tty.Sphero-OBG-RN-SPP",
+           "4565" => "/dev/tty.Sphero-GOB-RN-SPP",
+           "4566" => "/dev/tty.Sphero-PYG-RN-SPP"}
 robots = []
 SPHEROS.each_key {|p|
   robots << SpheroRobot.new(:connections => 

data/lib/artoo/adaptors/sphero.rb

@@ -9,7 +9,6 @@ module Artoo
 
       def finalize
         if connected?
-          #sphero.stop
           sphero.close
         end
       end

data/lib/artoo/api_route_helpers.rb

@@ -116,7 +116,11 @@ module Artoo
         if resp && !resp.nil?
           return if req.is_a?(Reel::WebSocket)
           status, body = resp
-          req.respond status, body
+          begin
+            req.respond status, body
+          rescue Errno::EAGAIN
+            retry
+          end
         else
           req.respond :not_found, "NOT FOUND"
         end

data/lib/artoo/version.rb

@@ -1,5 +1,5 @@
 module Artoo
   unless const_defined?('VERSION')
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: artoo
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  prerelease:
+  version: 0.1.2
 platform: ruby
 authors:
 - Ron Evans
@@ -10,7 +10,7 @@ authors:
 - Ari Lerner
 - Mario Ricalde
 - Daniel Fischer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2013-02-23 00:00:00.000000000 Z
@@ -24,7 +24,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -81,7 +81,6 @@ files:
 - examples/sphero_firmata.rb
 - examples/sphero_messages.rb
 - examples/sphero_multiple.rb
-- examples/wiiclassic.rb
 - lib/artoo.rb
 - lib/artoo/adaptors/adaptor.rb
 - lib/artoo/adaptors/ardrone.rb
@@ -137,32 +136,28 @@ files:
 - test/utility_test.rb
 homepage: https://github.com/hybridgroup/artoo
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 655550087860009642
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: !binary |-
+        MA==
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 655550087860009642
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
 rubyforge_project: artoo
-rubygems_version: 1.8.23
-signing_key: 
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: Ruby-based microframework for robotics
 test_files:

data/examples/wiiclassic.rb

@@ -1,94 +0,0 @@
-require 'artoo'
-
-connection :ardrone, :adaptor => :ardrone, :port => '192.168.1.1:5556'
-#connection :ardrone, :adaptor => :ardrone, :port => '192.168.0.100:5556'
-device :drone, :driver => :ardrone, :connection => :ardrone
-
-#connection :arduino, :adaptor => :firmata, :port => "/dev/ttyACM0"
-connection :arduino, :adaptor => :firmata, :port => "8023"
-device :classic, :driver => :wiiclassic, :connection => :arduino, :interval => 0.1
-
-work do
-  @rotate_pitch = 0.5
-  @fly_pitch = 0.7
-  @altitude_pitch = 1
-  @toggle_camera = 0
-  on classic, :a_button => proc { 
-    puts "Take Off" 
-    drone.take_off
-  }
-  on classic, :b_button => proc { 
-    puts "Hover" 
-    drone.hover
-  }
-  on classic, :x_button => proc { 
-    puts "Land" 
-    drone.land
-  }
-  on classic, :y_button => proc { 
-    puts "Toggle camera" 
-    if @toggle_camera == 0
-      puts "Bottom Camera Enabled"
-      drone.bottom_camera
-      @toggle_camera = 1
-    else
-      puts "Front Camera Enabled"
-      drone.front_camera
-      @toggle_camera = 0
-    end
-  }
-  on classic, :home_button => proc { 
-    puts "EMERGENGY!!!"
-    drone.emergency
-  }
-  on classic, :start_button => proc { 
-    puts "Start"
-    drone.start
-  }
-  on classic, :select_button => proc { 
-    puts "Stop"
-    drone.stop
-  }
-  on classic, :ry_up => proc {
-    puts "Up"
-    drone.up(@altitude_pitch)
-  }
-  on classic, :ry_down => proc {
-    puts "Down"
-    drone.down(@altitude_pitch)
-  }
-  on classic, :ly_up => proc {
-    puts "Forward"
-    drone.forward(@fly_pitch)
-  }
-  on classic, :ly_down => proc {
-    puts "Backward"
-    drone.backward(@fly_pitch)
-  }
-  on classic, :lx_right => proc {
-    puts "Right"
-    drone.right(@fly_pitch)
-  }
-  on classic, :lx_left => proc {
-    puts "Left"
-    drone.left(@fly_pitch)
-  }
-  on classic, :reset_pitch_roll => proc {
-    drone.left(0.0)
-    drone.forward(0.0)
-  }
-  on classic, :rotate_left => proc {
-    puts "rotate left"
-    drone.turn_left(@rotate_pitch)
-  } 
-  on classic, :rotate_right => proc {
-    puts "rotate right"
-    drone.turn_right(@rotate_pitch)
-  }
-  on classic, :reset_rotate => proc {
-    drone.turn_left(0.0)
-  }
-  on classic, :reset_altitude => proc {
-    drone.up(0.0)
-  } 
-end