artoo-ardrone 1.0.2.pre → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90ff1f3261696e8553da95dac0ddc97fca6f1e4c
-  data.tar.gz: a536d02fdf1a1c73891bb02b2de70ed10e4c011a
+  metadata.gz: 37ac5db8e1d48c16c99f52fcf9f1ca95f1d41ba6
+  data.tar.gz: f2fec1d9c38c032146bf68f7abd1208048ff10a0
 SHA512:
-  metadata.gz: 5c7e4f7cd91b52a6f7ac83dfadbf83c2f447d2bce05f55cf177ff30aa652fbb2d6f94e6d36f9ec7842ed2f636f6075028f85799c779e87f1f8c5d925e201e5d1
-  data.tar.gz: d7fea985f01812115bfeb6854a4f1f0d7d7792b081b36046d37cf68259d21125fcd7bb4425d4cf9cc6749c4db1f592a07a754cae99687848be8dfba34e010f80
+  metadata.gz: 85a8b807a06a9363c3d5e22e13d97efd6035e78b91a244e7cb9975942c571afaf44afcd5db2c315b28e1b7659da13470363db9a78644fd3eb19f3f7a4a12b7f1
+  data.tar.gz: a70c856b41380eabb89274f492ca445324cfc1de1efe8c8a0d7fd10c9d24704a74abe4a531bc1d8fb738c1486a644f4d100a401f7f801873835e1e2d563b5a9f

data/Gemfile.lock

@@ -1,33 +1,31 @@
 PATH
   remote: .
   specs:
-    artoo-ardrone (1.0.2.pre)
-      artoo (~> 1.1.0.pre)
-      hybridgroup-argus (~> 0.4.0)
+    artoo-ardrone (1.0.3)
+      argus (~> 0.4.0)
+      artoo (~> 1.1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    artoo (1.1.0.pre)
-      celluloid (~> 0.15.0.pre2)
-      celluloid-io (~> 0.15.0.pre2)
+    argus (0.4.0)
+    artoo (1.1.0)
+      celluloid (~> 0.15.0)
+      celluloid-io (~> 0.15.0)
       multi_json (~> 1.6)
       pry (~> 0.9)
       rake (~> 10.0)
       reel (~> 0.4.0.pre)
       thor (~> 0.18.1)
-    celluloid (0.15.0.pre2)
-      timers (>= 1.0.0)
-    celluloid-io (0.15.0.pre2)
-      celluloid (>= 0.15.0.pre)
+    celluloid (0.15.1)
+      timers (~> 1.1.0)
+    celluloid-io (0.15.0)
+      celluloid (>= 0.15.0)
       nio4r (>= 0.5.0)
-    certified (0.1.1)
     coderay (1.0.9)
-    http (0.4.0)
-      certified
+    http (0.5.0.pre)
       http_parser.rb
-    http_parser.rb (0.5.3)
-    hybridgroup-argus (0.4.0)
+    http_parser.rb (0.6.0.beta.2)
     metaclass (0.0.1)
     method_source (0.8.2)
     minitest (5.0.1)
@@ -40,14 +38,13 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rack (1.5.2)
     rake (10.1.0)
-    reel (0.4.0.pre)
-      celluloid-io (>= 0.8.0)
-      http (>= 0.2.0)
-      http_parser.rb (>= 0.5.3)
-      rack (>= 1.4.0)
-      websocket_parser (>= 0.1.2)
+    reel (0.4.0.pre4)
+      celluloid (>= 0.15.0)
+      celluloid-io (>= 0.15.0)
+      http (>= 0.5.0.pre)
+      http_parser.rb (>= 0.6.0.beta.2)
+      websocket_parser (>= 0.1.4)
     slop (3.4.6)
     thor (0.18.1)
     timers (1.1.0)

data/artoo-ardrone.gemspec

@@ -19,8 +19,8 @@ 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.1.0.pre'
-  s.add_runtime_dependency 'hybridgroup-argus', '~> 0.4.0'
+  s.add_runtime_dependency 'artoo', '~> 1.1.0'
+  s.add_runtime_dependency 'argus', '~> 0.4.0'
   s.add_development_dependency 'minitest', '~> 5.0'
   s.add_development_dependency 'minitest-happy'
   s.add_development_dependency 'mocha', '~> 0.14.0'

data/examples/ardrone_nav.rb

@@ -0,0 +1,20 @@
+require 'artoo'
+
+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'
+device :nav, :driver => :ardrone_navigation, :connection => :navigation
+
+work do
+  on nav, :navdata => :nav_update
+  drone.start
+  drone.take_off
+  
+  after(25.seconds) { drone.hover.land }
+  after(30.seconds) { drone.stop }
+end
+
+def nav_update(*data)
+  p "#{data[1].inspect}"
+end

data/examples/ardrone_video.rb

@@ -0,0 +1,22 @@
+require 'artoo'
+
+connection :ardrone, :adaptor => :ardrone, :port => '192.168.1.1:5556'
+device :drone, :driver => :ardrone, :connection => :ardrone
+
+connection :videodrone, :adaptor => :ardrone_video, :port => '192.168.1.1:5555'
+device :video, :driver => :ardrone_video, :connection => :videodrone
+
+work do
+  on video, :frame => :v_frame
+  drone.start
+  drone.take_off
+
+	after(25.seconds) { drone.hover.land }
+  after(30.seconds) { drone.stop }
+end
+
+def v_frame(*data)
+	@count ||= 0
+	@count += 1
+  puts "Frame# #{@count} #{data[1].size} bytes"
+end

data/lib/artoo-ardrone/version.rb

@@ -1,5 +1,5 @@
 module Artoo
   module Ardrone
-    VERSION = '1.0.2.pre'
+    VERSION = '1.0.3'
   end
 end

data/lib/artoo/adaptors/ardrone.rb

@@ -19,7 +19,7 @@ module Artoo
       # Creates Argus Drone connection with device
       # @return [Boolean]
       def connect
-        require 'argus' unless defined?(::Argus)
+        require 'argus' unless defined?(Argus)
         @ardrone = Argus::Drone.new(socket: connect_to_udp, host: port.host, port: port.port)
         super
       end

data/lib/artoo/adaptors/ardrone_navigation.rb

@@ -10,8 +10,8 @@ module Artoo
       # Creates connection with Argus NavStreamer and starts ardrone device
       # @return [Boolean]
       def connect
-        require 'argus' unless defined?(::Argus)
-        @ardrone = Argus::NavStreamer.new(socket: connect_to_udp, host: port.host, port: port.port.to_i)
+        require 'argus' unless defined?(Argus)
+        @ardrone = Argus::NavStreamer.new(socket: connect_to_udp, remote_host: port.host, port: port.port.to_i)
         @ardrone.start
         super
       end

data/lib/artoo/adaptors/ardrone_video.rb

@@ -12,7 +12,8 @@ module Artoo
       # Argus PaVE Parser starting a stream with ardrone device
       # @return [Boolean]
       def connect
-        require 'argus' unless defined?(::Argus)
+        require 'argus' unless defined?(Argus)
+        require 'argus'
         @ardrone = Argus::VideoStreamer.new(socket: connect_to_tcp, host: port.host, post: port.port)
         @ardrone.start(connect_to_udp)
         super

data/lib/artoo/drivers/ardrone.rb

@@ -5,7 +5,9 @@ module Artoo
     # Ardrone driver behaviors
     # @see https://github.com/hybridgroup/argus/blob/master/lib/argus/drone.rb Argus::Drone docs for supported actions
     class Ardrone < Driver
-      COMMANDS = [:start, :stop, :hover, :land, :take_off, :emergency, :front_camera, :bottom_camera, :up, :down, :left, :right, :forward, :backward, :turn_left, :turn_right].freeze
+      COMMANDS = [:start, :stop, :hover, :land, :take_off, :emergency, 
+                  :front_camera, :bottom_camera, :up, :down, :left, :right, 
+                  :forward, :backward, :turn_left, :turn_right].freeze
 
       def start
         connection.start(false) # send false, so Argus does not use NavMonitor

data/lib/artoo/drivers/ardrone_navigation.rb

@@ -18,7 +18,8 @@ module Artoo
       # and event in update topic for it
       def handle_update
         navdata = connection.receive_data
-        publish(event_topic_name("update"), navdata)
+        publish(event_topic_name("update"), "navdata", navdata)
+        publish(event_topic_name("navdata"), navdata)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: artoo-ardrone
 version: !ruby/object:Gem::Version
-  version: 1.0.2.pre
+  version: 1.0.3
 platform: ruby
 authors:
 - Ron Evans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-31 00:00:00.000000000 Z
+date: 2013-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artoo
@@ -17,16 +17,16 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0.pre
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0.pre
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: hybridgroup-argus
+  name: argus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
@@ -98,6 +98,8 @@ files:
 - Rakefile
 - artoo-ardrone.gemspec
 - examples/ardrone.rb
+- examples/ardrone_nav.rb
+- examples/ardrone_video.rb
 - lib/artoo-ardrone.rb
 - lib/artoo-ardrone/version.rb
 - lib/artoo/adaptors/ardrone.rb
@@ -125,9 +127,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: artoo-ardrone
 rubygems_version: 2.0.3