urua 0.99.5002 → 0.99.5004

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3ee01168708553d0decf46b79486a4f166e2c8fb0bc4ca242632136788bffb8
-  data.tar.gz: aace03047b700a0db3ea42a27d6b2dc843c0243f927190be6fe97fb25a806fbc
+  metadata.gz: 94ce72efcb23082b842157f2e93e065493c5654785e3fd1e992967336552b814
+  data.tar.gz: d7d7b4dac9cedd7a849120b8f8d4fe9bc8bc73b07bac9225a787fd4d29e4d673
 SHA512:
-  metadata.gz: 2d0f01cf260daca24bbf05e85f1ad841b8c2f8b0d49f39d602bfe866a81e26798053d0046e93a5b2cbd445b3b0ad4b885c947c62a46bb801781fc551ae9c2984
-  data.tar.gz: 29f862c4783ab81a8c38890cf768b7f4f919b123ebfa05622a31b126934603f807575105bbe6993973f067895bae7b19bc392c9c13706aba0ad21242b7b20c4f
+  metadata.gz: f1dddcdd1e2bbd4d501b3c813d6f88d4914fbeb484aee42fffb2e8e907deb083f1eed95c681595196efb6ab87f0efb2deb946fee44f48f15417da8ea200ce494
+  data.tar.gz: d213ed840b83bb818d4b8dc49f46f0e6d560e916a2fe91418f3f020dc91ca2d758fd54fcba217c7521bae825f20e3d60d54ba74fc45faeefb1df206ebf45bc51

data/README.md

@@ -2,28 +2,68 @@
 
 # URUA 
 
-OPC UA Server for Universal Robots
+A simple OPC UA server for Universal robots in ruby, which uses the ur-sock and opcua-smart library.
 
 ## Getting Started
 
-A simple ruby server, which uses th ur-sock and opcua-smart library.
+A simple ruby server, which uses the ur-sock and opcua-smart library.
 
 ### Prerequisites & Intallation
 
-To run the server we need the following packages:
+For this server the OPC UA installation of the opcua-smart gem is required. 
+Please follow the instructions at https://github.com/etm/opcua-smart and install the opcua gem.
 
-* ruby gems:
+Additionally you have to install the URUA gem with:
+
+```
+gem install urua
+```
+
+If you want to develop or extend the server, just use the following instruction
+```
+git clone https://github.com/fpauker/urua
+git clone https://github.com/fpauker/ur-sock
+git clone https://github.com/etm/opcua-smart
 ```
-gem install opcua
-gem install ur-sock
+
+Just follow the install instructions of the 3 projects.
+After installing all packages do 
+
+```
+cd urua/server
 ```
+in this directory the devserver.rb and the devserver.config are located. 
+
+### Starting the server
+
+To start the server type in the following commands:
+
+```
+cd urua/server
+./uruaserver.rb start
+```
+or 
+```
+cd urua/server
+./devserver.rb start 
+```
+to start the developing server.
+
 
 ## Adress space
 
-![Architecture](adressspace/ur1.png?raw=true | width=50)
-![Architecture](adressspace/ur2.png?raw=true | width=50)
-![Architecture](adressspace/ur3.png?raw=true | width=50)
-![Architecture](adressspace/ur5.png?raw=true | width=50)
+The server's adress space is shown in the pictures below. 
+
+![Architecture](https://github.com/fpauker/urua/blob/master/adressspace/ur1.png?raw=true)
+![Architecture](https://github.com/fpauker/urua/blob/master/adressspace/ur2.png?raw=true)
+![Architecture](https://github.com/fpauker/urua/blob/master/adressspace/ur3.png?raw=true)
+![Architecture](https://github.com/fpauker/urua/blob/master/adressspace/ur5.png?raw=true)
+
+It offers several features combining 3 different interfaces of the Universal robot. It uses the 
+
+* Primary Secondary Interface for direct execution of UR scripts
+* Dashboard server for orchestration functions e.g. starting/stopping a program
+* RTDE interface for getting the robot states
 
 ## Contributing
 

data/lib/urua.rb

@@ -28,13 +28,17 @@ module URUA
     opts['dash'] = UR::Dash.new(opts['ipadress']).connect rescue nil
   end #}}}
 
+  def self::start_psi(opts)
+    opts['psi'] = UR::Psi.new(opts['ipadress']).connect rescue nil
+  end
+
   def self::start_rtde(opts) #{{{
     ### Loading config file
     conf = UR::XMLConfigFile.new opts['rtde_config']
     output_names, output_types = conf.get_recipe opts['rtde_config_recipe_base']
     opts['rtde'] = UR::Rtde.new(opts['ipadress']).connect
 
-    ### Set Speed to very slow
+    ### Set Speed
     if opts['rtde_config_recipe_speed']
       speed_names, speed_types = conf.get_recipe opts['rtde_config_recipe_speed']
       opts['speed'] = opts['rtde'].send_input_setup(speed_names, speed_types)
@@ -56,22 +60,34 @@ module URUA
     begin
       yield
     rescue UR::Dash::Reconnect => e
+      puts e.message
       tries += 1
       if tries < 2
         URUA::start_dash opts
         retry
       end
+    rescue UR::Psi::Reconnect => e
+      puts e.message
+      tries += 1
+      if tries < 2
+        URUA::start_psi opts
+        retry
+      end
     end
   end #}}}
 
   def self::ssh_start(opts) #{{{
-    opts['ssh'] = opts['password'] ? Net::SSH.start(opts['ipadress'], opts['username'], password: opts['password']) : Net::SSH.start(opts['ipadress'], opts['username'])
+    if opts['certificate']
+      opts['ssh'] = Net::SSH.start(opts['ipadress'], opts['username'], :keys => [ opts['certificate'] ])
+    else
+      opts['ssh'] = opts['password'] ? Net::SSH.start(opts['ipadress'], opts['username'], password: opts['password']) : Net::SSH.start(opts['ipadress'], opts['username'])
+    end
   end #}}}
 
   def self::download_program(opts,name) #{{{
     counter = 0
     begin
-      opts['ssh'].scp.download File.join(opts['url'],name)
+      opts['ssh'].scp.download! File.join(opts['url'],name)
     rescue => e
       counter += 1
       URUA::ssh_start opts
@@ -102,9 +118,14 @@ module URUA
     progs
   end #}}}
 
+  def self::robotprogram_running?(opts)
+    opts['ps'].value == 'Playing'
+  end
+
   def self::implementation_startup(opts) #{{{
     opts['rtde_config'] ||= File.join(__dir__,'rtde.conf.xml')
     opts['rtde_config_recipe_base'] ||= 'out'
+    opts['rtde_config_recipe_speed'] ||= 'speed'
 
     Proc.new do
       on startup do |opts|
@@ -113,6 +134,7 @@ module URUA
         opts['dash'] = nil
         opts['rtde'] = nil
         opts['programs'] = nil
+        opts['psi'] = nil
 
         # ProgramFile
         opts['pf'] = opts['server'].types.add_object_type(:ProgramFile).tap{ |p|
@@ -123,10 +145,20 @@ module URUA
             end
           end
           p.add_method :StartProgram do |node|
-            a = node.id.to_s.split('/')
-            URUA::protect_reconnect_run(opts) do
-              opts['dash'].load_program(a[-2])
-              opts['dash'].start_program
+            unless URUA::robotprogram_running?(opts)
+              a = node.id.to_s.split('/')
+              URUA::protect_reconnect_run(opts) do
+                opts['dash'].load_program(a[-2])
+                opts['dash'].start_program
+              end
+            end
+          end
+          p.add_method :StartAsUrScript do |node|
+            unless URUA::robotprogram_running?(opts)
+              a = node.id.to_s.split('/')
+              URUA::protect_reconnect_run(opts) do
+                opts['psi'].execute_ur_script(URUA::download_program(opts, a[-2]+".script"))
+              end
             end
           end
         }
@@ -172,8 +204,10 @@ module URUA
             end
           end
           r.add_method :StartProgram do
-            URUA::protect_reconnect_run(opts) do
-              nil unless opts['dash'].start_program
+            unless URUA::robotprogram_running?(opts)
+              URUA::protect_reconnect_run(opts) do
+                nil unless opts['dash'].start_program
+              end
             end
           end
           r.add_method :StopProgram do
@@ -186,6 +220,13 @@ module URUA
               opts['dash'].pause_program
             end
           end
+          r.add_method :RunUrScript, content: OPCUA::TYPES::STRING do |node, content|
+            unless URUA::robotprogram_running?(opts)
+              URUA::protect_reconnect_run(opts) do
+                opts['psi'].execute_ur_script(content)
+              end
+            end
+          end
           r.add_method :PowerOn do
             if opts['rm'].value.to_s != 'Running'
               Thread.new do
@@ -232,7 +273,7 @@ module URUA
         }
         ### populating the adress space
         ### Robot object
-        robot = opts['server'].objects.manifest(:UR10e, rt)
+        robot = opts['server'].objects.manifest(File.basename(opts['namespace']), rt)
 
         opts['sn'] = robot.find(:SerialNumber)
         opts['model'] = robot.find(:RobotModel)
@@ -291,6 +332,7 @@ module URUA
         ### Connecting to universal robot
         URUA::start_rtde opts
         URUA::start_dash opts
+        URUA::start_psi opts
 
         ### Manifest programs
         opts['programs'] = robot.find(:Programs)
@@ -298,7 +340,7 @@ module URUA
         opts['progs'] = []
         opts['semaphore'] = Mutex.new
         ### check if interfaces are ok
-        raise if !opts['dash'] || !opts['rtde'] ##### TODO, don't return, raise
+        raise if !opts['dash'] || !opts['rtde'] || !opts['psi']
 
         # Functionality for threading in loop
         opts['doit_state'] = Time.now.to_i
@@ -308,6 +350,17 @@ module URUA
         # Serious comment (we do the obvious stuff)
         opts['sn'].value = opts['dash'].get_serial_number
         opts['model'].value = opts['dash'].get_robot_model
+      rescue Errno::ECONNREFUSED => e
+        print 'ECONNREFUSED: '
+        puts e.message
+      rescue UR::Dash::Reconnect => e
+        URUA::start_dash opts
+        puts e.message
+        puts e.backtrace
+      rescue UR::Psi::Reconnect => e
+        URUA::start_psi opts
+        puts e.message
+        puts e.backtrace
       rescue => e
         puts e.message
         puts e.backtrace
@@ -338,14 +391,12 @@ module URUA
               # check every 10 seconds for new programs
               progs = URUA::get_robot_programs(opts)
               delete = opts['progs'] - progs
-              # puts 'Missing Nodes: ' + delete.to_s
               delete.each do |d|
                 d = d[0..-5]
                 opts['prognodes'][d].delete!
                 opts['prognodes'].delete(d)
               end
               add = progs - opts['progs']
-              # puts 'New nodes: ' + add.to_s
               add.each do |a|
                 a = a[0..-5]
                 opts['prognodes'][a] = opts['programs'].manifest(a, opts['pf'])
@@ -383,10 +434,14 @@ module URUA
           URUA::split_vector6_data(data['actual_qd'],opts['as'], opts['asa']) # Actual TCP Speed
           URUA::split_vector6_data(data['actual_qd'],opts['af'], opts['afa']) # Actual TCP Force
 
+          ######TODO Fix Write Values that opc ua does not overwrite the speed slider mask of manual changes
           # Write values
           if opts['rtde_config_recipe_speed']
-            opts['speed']['speed_slider_fraction'] = opts['ov'].value / 100.0
-            opts['rtde'].send(opts['speed'])
+            #if opts['ov'] != opts['ovold']
+            #  if opts['ov'] == data['target_speed_fraction']
+            #opts['speed']['speed_slider_fraction'] = opts['ov'].value / 100.0
+            #opts['rtde'].send(opts['speed'])
+            opts['ovold'] = data['target_speed_fraction']
           end
         else
           if Time.now.to_i - 10 > opts['doit_rtde']
@@ -394,18 +449,21 @@ module URUA
             URUA::start_rtde opts
           end
         end
-
       rescue Errno::ECONNREFUSED => e
-        puts 'ECONNREFUSED:'
+        print 'ECONNREFUSED: '
         puts e.message
       rescue UR::Dash::Reconnect => e
         URUA::start_dash opts
+        puts e.message
+        puts e.backtrace
+      rescue UR::Psi::Reconnect => e
+        URUA::start_psi opts
+        puts e.message
+        puts e.backtrace
       rescue => e
-        unless opts['dash']
-          URUA::start_dash opts
-        end
-        p e.message
-        p e.backtrace
+        puts e.message
+        puts e.backtrace
+        raise
       end
     end
   end #}}}

data/server/devserver.conf

@@ -1,12 +1,12 @@
 ### OPC UA specific config
 ### --------------------------------------------------------------------------
-namespace: https://centurio.work/ur10evva
+namespace: https://centurio.work/urwst51
 
 ### UR specific config
 ### --------------------------------------------------------------------------
-ipadress: 192.168.1.26
-username: ur
-password: easybot
+ipadress: 131.130.37.204
+username: root
+certificate: /home/paukerf87/Projects/urua/server/devserver.rsa
 url: /programs
 
 ### UR simulation specific config

data/server/uruaserver.conf

@@ -1,6 +1,6 @@
 ### OPC UA specific config
 ### --------------------------------------------------------------------------
-namespace: https://centurio.work/ur10evva
+namespace: https://centurio.work/ur10
 
 ### UR specific config
 ### --------------------------------------------------------------------------

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: urua
 version: !ruby/object:Gem::Version
-  version: 0.99.5002
+  version: 0.99.5004
 platform: ruby
 authors:
 - Florian Pauker
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2020-07-17 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opcua
@@ -46,6 +46,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -53,6 +56,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.9
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +87,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: ed25519
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: bcrypt_pbkdf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: OPC UA Server for Universal Robots. See https://github.com/fpauker/urua
 email: florian.pauker@gmail.com
 executables: