artoo-ardrone 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bc5acd4687ec069209f7bb716184b457813530d
-  data.tar.gz: 60232183554a45cc4faa9c9fc966e3366b651dd5
+  metadata.gz: 5f6041cd5e75911fb7c57340bb32eb5c5d0a38f7
+  data.tar.gz: 3bfcf7537ccdc036629ef87edc0cb7c8bb159eba
 SHA512:
-  metadata.gz: 9f670ede922a86b83dbe08a8d298a554c78d0828e551a5e2bfbac5028ec72d6f600f166b197859673ec3a131952a7d59c8e9a6d645cde599b5804da23e929c05
-  data.tar.gz: 0033765d9674b4d3ab3a21dc8ac254641eed1a51882e1ca28db68aa36297acc38c96b00efd5e08026b5cf4f047e95e3a3163ca005255fed24a4857904eb98168
+  metadata.gz: 1b38650e04900693ff7c6e35e92f9cdf0e616ec90146e3e256c431b0cb5f498d21cfd4c2d391de0c689700dffd715dd369484909043dcdd87f52e5c897454186
+  data.tar.gz: b46fbea0e36b05e1cfc33e3272c145bd1e9eac8e660a4fda25402e85a90ffe7eb0aac3caa974cb0844f87615ac3c0fd304a208a3977a9c3ef83ad32613c6cf83

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    artoo-ardrone (1.2.0)
-      artoo (>= 1.3.0)
+    artoo-ardrone (1.3.0)
+      artoo (>= 1.4.0)
       hybridgroup-argus (>= 0.5.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    artoo (1.3.0)
+    artoo (1.4.1)
       celluloid (~> 0.15.0)
       celluloid-io (~> 0.15.0)
       multi_json (~> 1.6)
@@ -25,7 +25,7 @@ GEM
     http (0.5.0)
       http_parser.rb
     http_parser.rb (0.6.0.beta.2)
-    hybridgroup-argus (0.5.0)
+    hybridgroup-argus (0.5.1)
     metaclass (0.0.1)
     method_source (0.8.2)
     minitest (5.0.1)

data/README.md

@@ -24,11 +24,7 @@ connection :ardrone, :adaptor => :ardrone
 device :drone, :driver => :ardrone, :connection => :ardrone
 
 work do
-  on drone, :ready => :fly
   drone.start
-end
-
-def fly(*data)
   drone.take_off
   after(15.seconds) { drone.hover.land }
   after(20.seconds) { drone.stop }

data/artoo-ardrone.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'artoo', '>= 1.3.0'
+  s.add_runtime_dependency 'artoo', '>= 1.4.0'
   s.add_runtime_dependency 'hybridgroup-argus', '>= 0.5.0'
   s.add_development_dependency 'minitest', '>= 5.0'
   s.add_development_dependency 'minitest-happy'

data/examples/ardrone_animate.rb

@@ -1,9 +1,9 @@
 require 'artoo'
 
-connection :ardrone, :adaptor => :ardrone
+connection :ardrone, :adaptor => :ardrone, :port => '192.168.1.1:5556'
 device :drone, :driver => :ardrone, :connection => :ardrone
 
-connection :navigation, :adaptor => :ardrone_navigation
+connection :navigation, :adaptor => :ardrone_navigation, :port => '192.168.1.1:5554'
 device :nav, :driver => :ardrone_navigation, :connection => :navigation
 
 work do
@@ -13,7 +13,7 @@ end
 
 def fly(*data)
   drone.take_off
-  after(10.seconds) { drone.animate(:turnaround, 3000) }
+  after(10.seconds) { drone.animate(:flip_ahead, 1000) }
   after(15.seconds) { drone.hover.land }
   after(20.seconds) { drone.stop }
 end

data/examples/ardrone_autoreset.rb

@@ -1,6 +1,6 @@
 require 'artoo'
 
-connection :ardrone, :adaptor => :ardrone
+connection :ardrone, :adaptor => :ardrone, :port => '192.168.1.1:5556'
 device :drone, :driver => :ardrone, :connection => :ardrone
 
 connection :navigation, :adaptor => :ardrone_navigation, :port => '192.168.1.1:5554'

data/lib/artoo-ardrone/version.rb

@@ -1,5 +1,5 @@
 module Artoo
   module Ardrone
-    VERSION = '1.2.0'
+    VERSION = '1.3.0'
   end
 end

data/lib/artoo/adaptors/ardrone.rb

@@ -5,28 +5,20 @@ module Artoo
     # This class connects to a ARDrone 2.0
     # @see http://rubydoc.info/gems/hybridgroup-argus/0.2.0/Argus/Drone Argus Drone Documentation
     class Ardrone < Adaptor
-      finalizer :finalize
       attr_reader :ardrone
 
-      # Finalizes connection with ARDrone by landing and stopping the device
-      def finalize
-        if connected?
-          ardrone.land
-          ardrone.stop
-        end
-      end
-
       # Creates Argus Drone connection with device
       # @return [Boolean]
       def connect
         require 'argus' unless defined?(::Argus::Drone)
-        @ardrone = ::Argus::Drone.new(socket: connect_to_udp, host: port.host, port: port.port)
+        @ardrone = ::Argus::Drone.new(socket: connect_to_udp, remote_host: port.host, port: port.port)
         super
       end
 
       # Disconnects device by stopping it and ending connection
       # @return [Boolean]
       def disconnect
+        ardrone.land
         ardrone.stop
         super
       end

data/lib/artoo/adaptors/ardrone_navigation.rb

@@ -11,6 +11,7 @@ module Artoo
       # @return [Boolean]
       def connect
         require 'argus' unless defined?(::Argus::NavStreamer)
+        puts "nav", port.host, port.port
         @ardrone = ::Argus::NavStreamer.new(socket: connect_to_udp, remote_host: port.host, port: port.port.to_i)
         @ardrone.start
         super

data/lib/artoo/drivers/ardrone.rb

@@ -7,7 +7,7 @@ module Artoo
     class Ardrone < Driver
       COMMANDS = [:start, :stop, :hover, :land, :take_off, :enable_emergency, :disable_emergency,
                   :front_camera, :bottom_camera, :up, :down, :left, :right, 
-                  :forward, :backward, :turn_left, :turn_right, :reset_watchdog, :led].freeze
+                  :forward, :backward, :turn_left, :turn_right, :reset_watchdog, :led, :animate].freeze
 
       def start(nav=nil)
         connection.start(false) # send false, so Argus does not use NavMonitor

data/test/adaptors/ardrone_test.rb

@@ -17,6 +17,7 @@ describe Artoo::Adaptors::Ardrone do
   it 'Artoo::Adaptors::Ardrone#disconnect' do
     @adaptor.connect
 
+    @ardrone.expects(:land)
     @ardrone.expects(:stop)
     @adaptor.disconnect
     @adaptor.connected?.must_equal false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: artoo-ardrone
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Ron Evans
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artoo
@@ -20,14 +20,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: hybridgroup-argus
   requirement: !ruby/object:Gem::Requirement