From 0ece3ba8c92df0438af52b8de6b9225d8ada4103 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 30 十一月 2023 08:46:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 CanadaMes-ui/src/configuration/ManualJog.json |  260 +++++++++++++++++++++++++++------------------------
 1 files changed, 139 insertions(+), 121 deletions(-)

diff --git a/CanadaMes-ui/src/configuration/ManualJog.json b/CanadaMes-ui/src/configuration/ManualJog.json
index 8ac07e3..d70708a 100644
--- a/CanadaMes-ui/src/configuration/ManualJog.json
+++ b/CanadaMes-ui/src/configuration/ManualJog.json
@@ -3,10 +3,11 @@
     {
       "button": {
         "name": "D01杈撻��",
-        "value": 1,
+        "value": 0,
         "address": "DB10.0",
         "state": 0
-      }
+      },
+      "type": "3"
     },
     {
       "button": {
@@ -14,7 +15,8 @@
         "value": 1,
         "address": "DB10.0",
         "state": 0
-      }
+      },
+      "type": "3"
     },
     {
       "button": {
@@ -22,7 +24,8 @@
         "value": 1,
         "address": "DB10.0",
         "state": 1
-      }
+      },
+      "type": "3"
     },
     {
       "button": {
@@ -30,7 +33,8 @@
         "value": 0,
         "address": "DB10.0",
         "state": 1
-      }
+      },
+      "type": "3"
     },
     {
       "button": {
@@ -38,7 +42,8 @@
         "value": 0,
         "address": "DB10.0",
         "state": 1
-      }
+      },
+      "type": "3"
     },
     {
       "button": {
@@ -46,109 +51,35 @@
         "value": 0,
         "address": "DB10.0",
         "state": 1
-      }
-    }
-  ],
-  [
-    {
-      "button": {
-        "name": "A01娉ㄦ补娉�",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 0
-      }
-    },
-    {
-      "button": {
-        "name": "A01缈昏浆",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 0
-      }
-    },
-    {
-      "button": {
-        "name": "A01琛岃蛋鐐瑰姩",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      }
+      },
+      "type": "3"
     },
     {
       "button": {
         "name": "A01杈撻�佹鍚�",
         "value": 0,
         "address": "DB10.0",
-        "state": 1
-      }
-    },
-    {
-      "button": {
-        "name": "A01杈撻�佸弽鍚�",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      }
-    }
-  ],
-  [
-    {
-      "button": {
-        "name": "A02娉ㄦ补娉�",
-        "value": 0,
-        "address": "DB10.0",
         "state": 0
-      }
-    },
-    {
-      "button": {
-        "name": "A02缈昏浆",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 0
-      }
-    },
-    {
-      "button": {
-        "name": "A02琛岃蛋鐐瑰姩",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      }
+      },
+      "type": "3"
     },
     {
       "button": {
         "name": "A02杈撻�佹鍚�",
         "value": 0,
         "address": "DB10.0",
-        "state": 1
-      }
+        "state": 0
+      },
+      "type": "3"
     },
-    {
-      "button": {
-        "name": "A02杈撻�佸弽鍚�",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      }
-    }
-  ],
-  [
     {
       "button": {
         "name": "B01杈撻��",
         "value": 0,
         "address": "DB10.0",
-        "state": 0
-      }
-    },
-    {
-      "button": {
-        "name": "B01琛岃蛋鐐瑰姩",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 0
-      }
+        "state": 1
+      },
+      "type": "3"
     },
     {
       "button": {
@@ -156,7 +87,53 @@
         "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",
+        "state": 1
+      },
+      "type": "3"
     },
     {
       "button": {
@@ -164,33 +141,8 @@
         "value": 0,
         "address": "DB10.0",
         "state": 1
-      }
-    }
-  ],
-  [
-    {
-      "button": {
-        "name": "B01缈昏浆姘旂几",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 0
-      }
-    },
-    {
-      "button": {
-        "name": "B01鍗囬檷姘旂几",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 0
-      }
-    },
-    {
-      "button": {
-        "name": "B01鐢电闃�",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      }
+      },
+      "type": "3"
     },
     {
       "button": {
@@ -198,7 +150,8 @@
         "value": 0,
         "address": "DB10.0",
         "state": 0
-      }
+      },
+      "type": "3"
     },
     {
       "button": {
@@ -206,7 +159,8 @@
         "value": 0,
         "address": "DB10.0",
         "state": 0
-      }
+      },
+      "type": "3"
     },
     {
       "button": {
@@ -214,7 +168,71 @@
         "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