changed movements for pre-dipping in glueGlass

psi46 · Dec 6, 2022 · 3ed8d82 · 3ed8d82
1 parent 616aff0
commit 3ed8d82
Show file tree

Hide file tree

Showing 4 changed files with 95 additions and 89 deletions.
diff --git a/Controller1/usr/usrapp/CMS_Module/.outlining.json b/Controller1/usr/usrapp/CMS_Module/.outlining.json
@@ -1024,188 +1024,188 @@
     },
     {
       "mode": 3,
-      "name": "glueGlass",
+      "name": "moveDown",
       "nodes": [
         {
-          "start": 8,
-          "end": 6393,
+          "start": 54,
+          "end": 330,
           "isCollapsed": false
         },
         {
-          "start": 36,
-          "end": 1426,
+          "start": 154,
+          "end": 251,
           "isCollapsed": false
         },
         {
-          "start": 189,
-          "end": 1313,
+          "start": 254,
+          "end": 322,
           "isCollapsed": false
         },
         {
-          "start": 304,
-          "end": 698,
+          "start": 389,
+          "end": 428,
           "isCollapsed": false
-        },
+        }
+      ]
+    },
+    {
+      "mode": 3,
+      "name": "start",
+      "nodes": [
         {
-          "start": 332,
-          "end": 499,
+          "start": 191,
+          "end": 240,
           "isCollapsed": false
         },
         {
-          "start": 510,
-          "end": 683,
+          "start": 243,
+          "end": 328,
           "isCollapsed": false
         },
         {
-          "start": 705,
-          "end": 1301,
+          "start": 267,
+          "end": 320,
           "isCollapsed": false
         },
         {
-          "start": 841,
-          "end": 1301,
+          "start": 570,
+          "end": 734,
           "isCollapsed": false
         },
         {
-          "start": 869,
-          "end": 1069,
+          "start": 595,
+          "end": 725,
           "isCollapsed": false
         },
         {
-          "start": 1080,
-          "end": 1286,
+          "start": 670,
+          "end": 715,
           "isCollapsed": false
         },
         {
-          "start": 1320,
-          "end": 1409,
+          "start": 806,
+          "end": 868,
           "isCollapsed": false
         },
         {
-          "start": 1498,
-          "end": 6382,
+          "start": 2415,
+          "end": 2553,
           "isCollapsed": false
-        },
+        }
+      ]
+    },
+    {
+      "mode": 3,
+      "name": "glueGlass",
+      "nodes": [
         {
-          "start": 1553,
-          "end": 3923,
+          "start": 8,
+          "end": 6553,
           "isCollapsed": false
         },
         {
-          "start": 2704,
-          "end": 3627,
+          "start": 36,
+          "end": 1426,
           "isCollapsed": false
         },
         {
-          "start": 2730,
-          "end": 3612,
+          "start": 189,
+          "end": 1313,
           "isCollapsed": false
         },
         {
-          "start": 2818,
-          "end": 3596,
+          "start": 304,
+          "end": 698,
           "isCollapsed": false
         },
         {
-          "start": 3937,
-          "end": 4067,
+          "start": 332,
+          "end": 499,
           "isCollapsed": false
         },
         {
-          "start": 4002,
-          "end": 4055,
+          "start": 510,
+          "end": 683,
           "isCollapsed": false
         },
         {
-          "start": 4151,
-          "end": 6125,
+          "start": 705,
+          "end": 1301,
           "isCollapsed": false
         },
         {
-          "start": 4175,
-          "end": 6112,
+          "start": 841,
+          "end": 1301,
           "isCollapsed": false
         },
         {
-          "start": 4259,
-          "end": 6098,
+          "start": 869,
+          "end": 1069,
           "isCollapsed": false
         },
         {
-          "start": 5127,
-          "end": 5226,
+          "start": 1080,
+          "end": 1286,
           "isCollapsed": false
-        }
-      ]
-    },
-    {
-      "mode": 3,
-      "name": "moveDown",
-      "nodes": [
+        },
         {
-          "start": 54,
-          "end": 330,
+          "start": 1320,
+          "end": 1409,
           "isCollapsed": false
         },
         {
-          "start": 154,
-          "end": 251,
+          "start": 1498,
+          "end": 6542,
           "isCollapsed": false
         },
         {
-          "start": 254,
-          "end": 322,
+          "start": 1553,
+          "end": 4083,
           "isCollapsed": false
         },
         {
-          "start": 389,
-          "end": 428,
+          "start": 2864,
+          "end": 3787,
           "isCollapsed": false
-        }
-      ]
-    },
-    {
-      "mode": 3,
-      "name": "start",
-      "nodes": [
+        },
         {
-          "start": 191,
-          "end": 240,
+          "start": 2890,
+          "end": 3772,
           "isCollapsed": false
         },
         {
-          "start": 243,
-          "end": 328,
+          "start": 2978,
+          "end": 3756,
           "isCollapsed": false
         },
         {
-          "start": 267,
-          "end": 320,
+          "start": 4097,
+          "end": 4227,
           "isCollapsed": false
         },
         {
-          "start": 570,
-          "end": 734,
+          "start": 4162,
+          "end": 4215,
           "isCollapsed": false
         },
         {
-          "start": 595,
-          "end": 725,
+          "start": 4311,
+          "end": 6285,
           "isCollapsed": false
         },
         {
-          "start": 670,
-          "end": 715,
+          "start": 4335,
+          "end": 6272,
           "isCollapsed": false
         },
         {
-          "start": 806,
-          "end": 868,
+          "start": 4419,
+          "end": 6258,
           "isCollapsed": false
         },
         {
-          "start": 2415,
-          "end": 2553,
+          "start": 5287,
+          "end": 5386,
           "isCollapsed": false
         }
       ]

diff --git a/Controller1/usr/usrapp/CMS_Module/CMS_Module.dtx b/Controller1/usr/usrapp/CMS_Module/CMS_Module.dtx
@@ -408,5 +408,8 @@
     </Data>
     <Data name="trXY" access="private" xsi:type="array" type="trsf" size="1" />
     <Data name="sMovementID" access="private" xsi:type="array" type="string" size="1" />
+    <Data name="trPressOne" access="private" xsi:type="array" type="trsf" size="1">
+      <Value key="0" z="1" />
+    </Data>
   </Datas>
 </Database>
diff --git a/Controller1/usr/usrapp/CMS_Module/glueGlass.pgx b/Controller1/usr/usrapp/CMS_Module/glueGlass.pgx
@@ -68,11 +68,14 @@
         call print("pre-dip glue stamp")
         call moveDown(glueFirstPoint[1], mVerySlow, trZero, false)
         delay(waitGlue)
-        movel(appro(glueFirstPoint[1], trZsafe), tTool, mNomSpeed)
+        movel(appro(glueFirstPoint[1], trZclose), tTool, mVerySlow)
+        movel(appro(glueFirstPoint[0], trZclose), tTool, mNomSpeed)
 
-        call moveDown(glueFirstPoint[0], mVerySlow, trZero, false)
+        movel(appro(glueFirstPoint[0], trZero), tTool, mVerySlow)
+        waitEndMove()
+        //call moveDown(glueFirstPoint[0], mVerySlow, trZero, false)
         delay(waitGlue)
-        movel(appro(glueFirstPoint[0], trZsafe), tTool, mNomSpeed)
+        movel(appro(glueFirstPoint[0], trZclose), tTool, mVerySlow)
         
         call parkEndProgram()
         

diff --git a/Controller1/usr/usrapp/CMS_Module/start.pgx b/Controller1/usr/usrapp/CMS_Module/start.pgx
@@ -7,7 +7,7 @@
     <Code><![CDATA[begin
 
   call print("Welcome to TEPX module production")
-  version = "2022/11/22-01"
+  version = "2022/12/06-05"
   strTCPIP = "TCP/IP sockets not activated"
   bSockets = false