From 0f3ea8b9dd921b942015d30c5dfce06af25cd71c Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 13 十二月 2023 09:15:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 CanadaMes-ui/src/configuration/ManualJog.json |  228 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 119 insertions(+), 109 deletions(-)

diff --git a/CanadaMes-ui/src/configuration/ManualJog.json b/CanadaMes-ui/src/configuration/ManualJog.json
index 02678ba..36a392a 100644
--- a/CanadaMes-ui/src/configuration/ManualJog.json
+++ b/CanadaMes-ui/src/configuration/ManualJog.json
@@ -65,7 +65,83 @@
     },
     {
       "button": {
+        "name": "A01杈撻�佸弽鍚�",
+        "value": 0,
+        "address": "DB10.0",
+        "state": 1
+      },
+      "type": "3"
+    },
+    
+    {
+      "button": {
+        "name": "A01琛岃蛋鐐瑰姩",
+        "value": 0,
+        "address": "DB10.0",
+        "state": 0
+      },
+      "type": "3"
+    },
+    {
+      "button": {
+        "name": "A01缈昏浆",
+        "value": 0,
+        "address": "DB10.0",
+        "state": 1
+      },
+      "type": "3"
+    },
+    {
+      "button": {
+        "name": "A01娉ㄧ數娉�",
+        "value": 0,
+        "address": "DB10.0",
+        "state": 0
+      },
+      "type": "3"
+    },
+    {
+      "button": {
         "name": "A02杈撻�佹鍚�",
+        "value": 0,
+        "address": "DB10.0",
+        "state": 0
+      },
+      "type": "3"
+    },
+    {
+      "button": {
+        "name": "A02杈撻�佸弽鍚�",
+        "value": 0,
+        "address": "DB10.0",
+        "state": 1
+      },
+      "type": "3"
+    },
+    {
+      "button": {
+        "name": "A02琛岃蛋鐐瑰姩",
+        "value": 0,
+        "address": "DB10.0",
+        "state": 0
+      },
+      "type": "3"
+    },
+    {
+      "button": {
+        "name": "A02缈昏浆",
+        "value": 0,
+        "address": "DB10.0",
+        "state": 1
+      },
+      "type": "3"
+    },
+ 
+   
+
+    {
+      "button": {
+        "name": "A02娉ㄧ數娉�",
         "value": 0,
         "address": "DB10.0",
         "state": 0
@@ -83,51 +159,6 @@
     },
     {
       "button": {
-        "name": "B02杈撻��",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      },
-      "type": "3"
-    },
-    {
-      "button": {
-        "name": "A01缈昏浆",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      },
-      "type": "3"
-    },
-    {
-      "button": {
-        "name": "A02缈昏浆",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      },
-      "type": "3"
-    },
-    {
-      "button": {
-        "name": "A01琛岃蛋鐐瑰姩",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 0
-      },
-      "type": "3"
-    },
-    {
-      "button": {
-        "name": "A02琛岃蛋鐐瑰姩",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 0
-      },
-      "type": "3"
-    },
-    {
-      "button": {
         "name": "B01琛岃蛋鐐瑰姩",
         "value": 0,
         "address": "DB10.0",
@@ -135,6 +166,46 @@
       },
       "type": "3"
     },
+    
+    {
+      "button": {
+        "name": "B01缈昏浆姘旂几",
+        "value": 0,
+        "address": "DB10.0",
+        "state": 0
+      },
+      "type": "3"
+    },
+    {
+      "button": {
+        "name": "B01鍗囬檷姘旂几",
+        "value": 0,
+        "address": "DB10.0",
+        "state": 0
+      },
+      "type": "3"
+    }, {
+      "button": {
+        "name": "B01鍚规皵",
+        "value": 0,
+        "address": "DB10.0",
+        "state": 1
+      },
+      "type": "3"
+    },
+    {
+      "button": {
+        "name": "B02杈撻��",
+        "value": 0,
+        "address": "DB10.0",
+        "state": 1
+      },
+      "type": "3"
+    },
+    
+   
+   
+    
     {
       "button": {
         "name": "B02琛岃蛋鐐瑰姩",
@@ -164,75 +235,14 @@
     },
     {
       "button": {
-        "name": "B02鐢电闃�",
+        "name": "B02鍚规皵",
         "value": 0,
         "address": "DB10.0",
         "state": 1
-      },
-      "type": "3"
-    },
-    {
-      "button": {
-        "name": "B01缈昏浆姘旂几",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 0
-      },
-      "type": "3"
-    },
-    {
-      "button": {
-        "name": "B01鍗囬檷姘旂几",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 0
-      },
-      "type": "3"
-    },
-    {
-      "button": {
-        "name": "B01鐢电闃�",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      },
-      "type": "3"
-    },
-    {
-      "button": {
-        "name": "A01杈撻�佸弽鍚�",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      },
-      "type": "3"
-    },
-    {
-      "button": {
-        "name": "A02杈撻�佸弽鍚�",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      },
-      "type": "3"
-    },
-    {
-      "button": {
-        "name": "A01娉ㄧ數娉�",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 0
-      },
-      "type": "3"
-    },
-    {
-      "button": {
-        "name": "A02娉ㄧ數娉�",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 0
       },
       "type": "3"
     }
+   
+   
   ]
 ]
\ No newline at end of file

--
Gitblit v1.8.0