ur-sock 0.3.3 → 0.4444

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8dde2b66e0d8f0ab96fdbe057344b2b7472b65e08811d643ec4d55fa784b55f
-  data.tar.gz: 9fb11b94f2b0de59f0708e8d785b06a86116080259969e85b9e56dd25eb953cb
+  metadata.gz: 017a63d81101ae4de90a1b421a94c589006f8887b236cf0fba9e4208fd58ac6d
+  data.tar.gz: '06908cfefab950c4a9c82ef2cea5f8919dcd1cb1c1a237bfaae8f4aa794fa545'
 SHA512:
-  metadata.gz: 2ea13d1e1859e308f8d5c8e802987d666ad0fa84ccaf92419234d90ced941ff0fe220ba30d210b507c892d6839dd37f24100dad5131b0109fd2b6018528b2712
-  data.tar.gz: 926a8c316f11eb496add47ee6de9dd72dfd33cdc1b3b5ff3550592369cdebaea864417440ee7226c8d879e7235d22767ae9253e73e7608281c725f0e5d1baa77
+  metadata.gz: 8c93c0e40e543d0f2388a78620989b22d3ad8f93bdb49ced229895342730728ba1277e3d2dd9c86589dd4dea6fc348bd1d69ea43e46ff99a53c86b851489805c
+  data.tar.gz: f9d20ab1d6e5c4ba9f46887e785e5a0cb9b927dcec4c3fccf8eb100359ea04a3b3cc49a9696277030ef301563ad2ca1b0c6941b688868b2b419a78f072f0fd15

data/README.md

@@ -79,7 +79,7 @@ Please read [CONTRIBUTING.md](https://gist.github.com/PurpleBooth/b24679402957c6
 * **Florian Pauker**
 * **Jürgen Mangler**
 
-See also the list of [contributors](https://intra.acdp.at/gogs/fpauker/ua4ur/contributors) who participated in this project.
+See also the list of [contributors](https://github.com/fpauker/ua4ur/contributors) who participated in this project.
 
 ## License
 

data/lib/dashboard.rb

@@ -6,6 +6,8 @@ require 'uri'
 module UR
 
   class Dash
+    class Reconnect < Exception; end
+
     module ConnectionState
       DISCONNECTED = 'DISCONNECTED'
       CONNECTED = 'CONNECTED'
@@ -79,15 +81,14 @@ module UR
     def load_program (programname)
       @logger.debug "loadprogram"
       send = "load " + programname + ".urp\n"
-      puts send
-      @sock.write (send)
+      @sock.write send
       line = @sock.gets.strip
-      if line.match(/^./) == 'L'
+      if line.match(/^L/)
         @logger.debug line
         true
       else
         @logger.error line
-        nil
+        raise UR::Dash::Reconnect.new('Dashboard server down or not in Remote Mode')
       end
     end
 
@@ -99,7 +100,7 @@ module UR
         true
       else
         @logger.error line
-        nil
+        raise UR::Dash::Reconnect.new('Dashboard server down or not in Remote Mode')
       end
     end
 
@@ -111,7 +112,7 @@ module UR
         true
       else
         @logger.error line
-        nil
+        raise UR::Dash::Reconnect.new('Dashboard server down or not in Remote Mode')
       end
     end
 
@@ -123,7 +124,7 @@ module UR
         true
       else
         @logger.error line
-        nil
+        raise UR::Dash::Reconnect.new('Dashboard server down or not in Remote Mode')
       end
     end
 
@@ -135,7 +136,7 @@ module UR
         true
       else
         @logger.error line
-        nil
+        raise UR::Dash::Reconnect.new('Dashboard server down or not in Remote Mode')
       end
     end
 
@@ -147,7 +148,7 @@ module UR
         true
       else
         @logger.error line
-        nil
+        raise UR::Dash::Reconnect.new('Dashboard server down or not in Remote Mode')
       end
     end
 
@@ -159,14 +160,18 @@ module UR
     end
 
     def get_loaded_program
-      @sock.write ("get loaded program\n")
-      line = @sock.gets.strip
+      begin
+        @sock.write ("get loaded program\n")
+        line = @sock.gets.strip
+      rescue
+        raise UR::Dash::Reconnect.new('Loaded program can not be got. Dashboard server down or not in Remote Mode')
+      end  
       if line.match(/^Loaded program:\s(.+)/)
         @logger.debug line
         path = $1.strip
       else
         @logger.error line
-        nil
+        raise UR::Dash::Reconnect.new('Loaded program can not be got. Dashboard server down or not in Remote Mode')
       end
     end
 
@@ -187,6 +192,7 @@ module UR
         @logger.debug line
       else
         @logger.error line
+        raise UR::Dash::Reconnect.new('Dashboard server down or not in Remote Mode')
       end
     end
 
@@ -198,7 +204,7 @@ module UR
         true
       else
         @logger.error line
-        nil
+        raise UR::Dash::Reconnect.new('Cant determine if program is saved. Dashboard server down or not in Remote Mode')
       end
     end
 
@@ -223,6 +229,7 @@ module UR
         @logger.debug line
       else
         @logger.error line
+        raise UR::Dash::Reconnect.new('Cant set operation mode manual. DDashboard server down or not in Remote Mode')
       end
     end
 
@@ -233,6 +240,7 @@ module UR
         @logger.debug line
       else
         @logger.error line
+        raise UR::Dash::Reconnect.new('Cant set operation mode automatic. Dashboard server down or not in Remote Mode')
       end
     end
 
@@ -244,6 +252,7 @@ module UR
         true
       else
         @logger.error line
+        raise UR::Dash::Reconnect.new('Cant clear operation mode. Dashboard server down or not in Remote Mode')
       end
     end
 
@@ -255,7 +264,7 @@ module UR
         true
       else
         @logger.error line
-        nil
+        raise UR::Dash::Reconnect.new('Cant power on. Dashboard server down or not in Remote Mode')
       end
     end
 
@@ -267,7 +276,7 @@ module UR
         true
       else
         @logger.error line
-        nil
+        raise UR::Dash::Reconnect.new('Cant power off. Dashboard server down or not in Remote Mode')
       end
     end
 
@@ -279,7 +288,7 @@ module UR
         true
       else
         @logger.error line
-        nil
+        raise UR::Dash::Reconnect.new('Cant release breaks. Dashboard server down or not in Remote Mode')
       end
     end
 
@@ -298,7 +307,7 @@ module UR
         true
       else
         @logger.error line
-        nil
+        raise UR::Dash::Reconnect.new('Cant unlock protective stop. Dashboard server down or not in Remote Mode')
       end
     end
 
@@ -310,7 +319,7 @@ module UR
         true
       else
         @logger.error line
-        nil
+        raise UR::Dash::Reconnect.new('Cant close safety popup. Dashboard server down or not in Remote Mode')
       end
     end
 
@@ -322,7 +331,7 @@ module UR
         true
       else
         @logger.error line
-        nil
+        raise UR::Dash::Reconnect.new('Cant load installation. Dashboard server down or not in Remote Mode')
       end
     end
 
@@ -334,7 +343,7 @@ module UR
         true
       else
         @logger.error line
-        nil
+        raise UR::Dash::Reconnect.new('Cant restart safety. Dashboard server down or not in Remote Mode')
       end
     end
 

data/lib/rtde.rb

@@ -101,7 +101,7 @@ module UR
     def connect #{{{
       return if @sock
 
-      @buf = '' # buffer data in binary format
+      @buf = ''.b # buffer data in binary format
       begin
         @sock = Socket.new Socket::AF_INET, Socket::SOCK_STREAM
         @sock.setsockopt Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1
@@ -159,18 +159,18 @@ module UR
         @logger.error 'Cannot send when RTDE synchroinization is inactive'
         return
       end
-      if not @input_config.key?(input_data.recipe_id)
+      if not @input_config.include? input_data.recipe_id
         @logger.error 'Input configuration id not found: ' + @input_data.recipe_id
         return
       end
       config = @input_config[input_data.recipe_id]
       send_all Command::RTDE_DATA_PACKAGE, config.pack(input_data)
     end #}}}
-    def send_and_receive(cmd, payload = '') #{{{
+    def send_and_receive(cmd, payload = ''.b) #{{{
       @logger.debug 'Start send_and_receive'
       send_all(cmd, payload) ? recv(cmd) : nil
     end #}}}
-    def send_all(command, payload = '') #{{{
+    def send_all(command, payload = ''.b) #{{{
       fmt = 'S>C'
       size = ([0,0].pack fmt).length + payload.length
       buf = [size, command].pack(fmt) + payload
@@ -261,16 +261,16 @@ module UR
       return true
     end #}}}
 
-    def receive #{{{
+    def receive(binary=false) #{{{
       @logger.debug 'Start receive'
       if !@output_config
         @logger.error 'Output configuration not initialized'
         nil
       end
       return nil if @conn_state != ConnectionState::STARTED
-      recv Command::RTDE_DATA_PACKAGE
+      recv Command::RTDE_DATA_PACKAGE, binary
     end #}}}
-    def recv(command) #{{{
+    def recv(command, binary=false) #{{{
       @logger.debug 'Start recv' + @buf.to_s
       while connected?
         readable, _, xlist = IO.select([@sock], [], [@sock])
@@ -311,7 +311,7 @@ module UR
             end
             if packet_header.command == command
               @logger.debug 'returning becuase of packet_header.command == command'
-              return data
+              return  binary ? packet[1..-1] : data
             else
               @logger.info 'skipping package(2)'
             end

data/lib/serialize.rb

@@ -64,6 +64,8 @@ module UR
         data[offset...offset+size].map(&:to_i)
       elsif data_type == 'INT32' or data_type == 'UINT8'
         data[offset].to_i
+      elsif data_type == 'BOOL'
+        data[offset].to_i > 0 ? true : false
       else
         raise TypeError.new('unpack_field: unknown data type: ' + data_type)
       end
@@ -131,7 +133,6 @@ module UR
         rmd.id = buf.unpack('C')[0]
         rmd.types = buf[1..-1].split(',')
         rmd.fmt = 'C'
-        #p rmd.types
         rmd.types.each do |i|
           if i == 'INT32'
             rmd.fmt += 'i>'
@@ -151,10 +152,12 @@ module UR
             rmd.fmt += 'Q>'
           elsif i == 'UINT8'
             rmd.fmt += 'C'
+          elsif i == 'BOOL'
+            rmd.fmt += '?'
           elsif i == 'IN_USE'
-            raise TypeError 'An input parameter is already in use.'
+            #raise TypeError 'An input parameter is already in use.'
           else
-            raise TypeError 'Unknown data type: ' + i
+            #raise TypeError 'Unknown data type: ' + i
           end
         end
         rmd

data/ur-sock.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "ur-sock"
-  s.version          = "0.3.3"
+  s.version          = "0.4444"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of Universal Robot (UR) Socket Communication."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ur-sock
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: '0.4444'
 platform: ruby
 authors:
 - Florian Pauker
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2019-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-smart