From ddfa9af2c729bb08723a62793ed21240d295d8d3 Mon Sep 17 00:00:00 2001 From: Michael Soukup Date: Thu, 7 Aug 2014 11:34:29 +0200 Subject: [PATCH] small change in config --- config.py | 5 ++--- config.pyc | Bin 2101 -> 2101 bytes 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/config.py b/config.py index f323bee..f002268 100644 --- a/config.py +++ b/config.py @@ -70,12 +70,12 @@ JOINTS_HOME = [TABLE_QUADRANT*math.pi/2, # FORCE MONITOR # # Enables force constraints on the tool (for manual control). -# When the force exceeds FORCE_CONSTRAINT (newton), the robot move in the direction +# When the force exceeds FORCE_CONSTRAINT, the robot move in the direction # opposite to the current command in T_FORCE_VIOLATION seconds. # Note: Setting this to "True" involves polling the UR5 through a real-time # monitor that runs at 125Hz. If the controller runs slow, try disabling this. USE_FORCE_MONITOR = True -FORCE_CONSTRAINT = 40 +FORCE_CONSTRAINT = 40 # Newton T_FORCE_VIOLATION = 0.3 @@ -134,7 +134,6 @@ Z_MAX = TABLE_Z + 2*BLOCK_DIM # # Hat switch:0 (All or nothing for direction). returns (+-1, +-1) = (+-x. +-y) # hx, hy = hat - HATCODE = -1 #set to -1 to avoid polling hat HX = 10 HY = 11 diff --git a/config.pyc b/config.pyc index 6918392bf9cb319cc67753c593a0cd903b0ad37a..afd848211a57c59f1dbc8f529b13e320aadb8d5d 100644 GIT binary patch delta 30 mcmdlguvLJa`7}JeNKkPT#GaqDOl%34TVFCb@69~ot delta 30 mcmdlguvLJa`7Y6w*T