tg-can-controls-gateway 0.1.0 → 0.1.1

data/Rakefile

@@ -15,9 +15,10 @@ begin
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
 
     gem.add_development_dependency "rspec"
+    gem.add_runtime_dependency "eventmachine", ">=0.12.10"
     gem.add_runtime_dependency "applix"
     gem.add_runtime_dependency "gom-script"
-    gem.add_runtime_dependency "eventmachine", ">=0.12.10"
+    gem.add_runtime_dependency "osc", ">=0.1.4"
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/can-controls-gateway.rb

@@ -1,4 +1,5 @@
 require 'gom/remote'
 require 'ccg_logger'
 require 'runner'
+require 'osc'
 require 'rca_command'

data/lib/osc_broadcast_sender.rb

@@ -6,8 +6,11 @@ require 'time'
 ADDR           = ['<broadcast>', 6567] # broadcast address
 STATION_ID     = 1
 DIMENSIONALITY = 2
-EVENTS   = [ "swipeDown", "swipeUp", "swipeLeft", "swipeRight", "zoomIn", "zoomOut",
-             "cancel", "mouseDown", 'bigSwipe', "mouseMove", 'mouseUp', 'otherunknown' ]
+EVENTS = [ 
+#  "swipeDown", "swipeUp", "swipeLeft", "swipeRight", "zoomIn", "zoomOut",
+#  "cancel", "mouseDown", 'bigSwipe', "mouseMove", 'mouseUp', 'otherunknown' 
+  "swipeLeft", "swipeRight"
+]
 
 UDPSock = UDPSocket.new
 UDPSock.setsockopt(Socket::SOL_SOCKET, Socket::SO_BROADCAST, true)
@@ -41,4 +44,4 @@ end
 
 UDPSock.close
 
-puts "good bye"
+puts "good bye"

data/lib/osc_to_rca_dispatcher.rb

@@ -11,7 +11,7 @@ module CanControlsGateway
       @raw_data    = data
       @osc_packet  = OSC::Packet.decode @raw_data rescue @osc_packet = nil
       @osc_message = @osc_packet[0][1] rescue @osc_message = nil
-      @event       = extract_event
+      @event       = extract_event @osc_message
     end
     
     def dispatch_rca
@@ -26,17 +26,15 @@ module CanControlsGateway
     
     private
     
-    def extract_event
-      return nil if @osc_message.nil?
-      if @osc_message[0].kind_of?(OSC::OSCString) #s
-        return EVENTS[@osc_message[0].to_s]
-      elsif @osc_message[2].kind_of?(OSC::OSCString) # ffs
-        return EVENTS[@osc_message[2].to_s]
+    def extract_event omsg
+      return nil if omsg.nil?
+      if omsg[0].kind_of?(OSC::OSCString) #s
+        EVENTS[omsg[0].to_s]
+      elsif omsg[2].kind_of?(OSC::OSCString) # ffs
+        EVENTS[omsg[2].to_s]
       else
-        return nil # something else, e.g. ff
+        nil # something else, e.g. ff
       end
     end
-    
   end
-  
-end
+end

data/lib/runner.rb

@@ -15,9 +15,7 @@ class CcgRunner < Gom::Remote::Entry
   }
 
   include OAttr
-  oattr :incoming_osc_port, :device
-
-  attr_reader :valve
+  oattr :incoming_osc_port, :device, :valve
 
   def self.instance
     @@instance
@@ -35,6 +33,7 @@ class CcgRunner < Gom::Remote::Entry
     STATION['rci_uri'] = device_rci_uri
     puts " -- STATION info: #{STATION.inspect}"
 
+    @options[:valve] = valve.to_sym # type fixing the GOM string
     init_gnp
   end
 
@@ -67,9 +66,9 @@ class CcgRunner < Gom::Remote::Entry
     connection.subscribe @sub
   end
 
-  def valve_update op, attribute
-    @valve = attribute["value"].to_sym
-    puts " -- can-controls-valve now: #{@valve}"
+  def valve_update _, attribute
+    @options[:valve] = attribute["value"].to_sym
+    puts " -- can-controls-valve now: #{valve}"
   end
 end
 

data/lib/server.rb

@@ -11,9 +11,7 @@ module UdpServer
   end
 
   def receive_data(data)
-    puts "1"
     return unless(CcgRunner.instance.valve == :open)
-    puts "2"
 
     ##
     #CcgLogger::LOGGER.info "#{Time.now.iso8601} |  >> raw incoming data: ----------------------"
@@ -26,9 +24,13 @@ module UdpServer
     
     # RCA
     rca_dispatching = proc {
-      my_dispatcher = CanControlsGateway::OscToRcaDispatcher.new data
-      #CcgLogger::LOGGER.info my_dispatcher.event.inspect
-      my_dispatcher.dispatch_rca
+      begin 
+        my_dispatcher = CanControlsGateway::OscToRcaDispatcher.new data
+        #CcgLogger::LOGGER.info my_dispatcher.event.inspect
+        my_dispatcher.dispatch_rca
+      rescue Exception => e
+        puts " ## #{e}\n -> #{e.backtrace.join "\n    "}"
+      end
     }
     rca_callback = proc { |result|
       #if result

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tg-can-controls-gateway
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - art+com/andreas marr
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-01 00:00:00 +01:00
+date: 2010-02-02 00:00:00 +01:00
 default_executable: can_controls_gateway
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.12.10
+    version: 
 - !ruby/object:Gem::Dependency 
   name: applix
   type: :runtime
@@ -43,14 +53,14 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: eventmachine
+  name: osc
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.12.10
+        version: 0.1.4
     version: 
 description: to be written
 email: entwicklung.t-gallery@artcom.de