Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

wu

2023-11-30 0ece3ba8c92df0438af52b8de6b9225d8ada4103

 CanadaMes-ui/src/configuration/ServoManualone.json

@@ -1,44 +1,54 @@
[
  [
    {
      "name": "大车自动速度",
      "read": 33,
      "sending": 0,
      "type": "0",
      "address": "DB100.0",
      "count": 3
    }
  ],
  [
    {
      "name": "小车自动速度",
      "read": 33,
      "sending": 0,
      "type": "0",
      "address": "DB100.0",
      "count": 3
    }
  ],
  [
    {
      "name": "A01 所在格子",
      "read": 33,
      "sending": 0,
      "type": "0",
      "address": "DB100.0",
      "count": 3
      "value": 1
    },
    {
      "name": "数量",
      "read": 33,
      "sending": 0,
      "type": "0",
      "value": 1
    },
    {
      "name": "进片ID",
      "read": 33,
      "sending": 0,
      "type": "0",
      "value": 1
    },
    {
      "name": "长度",
      "read": 33,
      "sending": 0,
      "type": "0",
      "value": 1
    },
    {
      "name": "高度",
      "read": 33,
      "sending": 0,
      "type": "0",
      "value": 1
    },
    {
      "name": "取片格子",
      "read": 11,
      "sending": 0,
      "type": "0"
      "type": "0",
      "value": 1
    },
    {
      "name": "存片格子",
      "read": 22,
      "sending": 0,
      "type": "0"
      "type": "0",
      "value": 1
    },
    {
      "button": {
@@ -56,7 +66,14 @@
    },
    {
      "button": {
        "name": "自动启动",
        "name": "A01半自动",
        "value": 0,
        "address": "DB10.0"
      }
    },
    {
      "button": {
        "name": "半自动启动",
        "value": 0,
        "address": "DB10.0"
      }
@@ -69,19 +86,36 @@
      "sending": 0,
      "type": "0",
      "address": "DB100.1",
      "count": 3
      "count": 3,
      "value": 0
    },
    {
      "name": "取片格子",
      "read": 11,
      "sending": 0,
      "type": "0"
      "type": "0",
      "value": 0
    },
    {
      "name": "存片格子",
      "read": 22,
      "sending": 0,
      "type": "0"
      "type": "0",
      "value": 0
    },
    {
      "name": "数量",
      "read": 33,
      "sending": 0,
      "type": "0",
      "value": 0
    },
    {
      "name": "取片ID",
      "read": 33,
      "sending": 0,
      "type": "0",
      "value": 0
    },
    {
      "button": {
@@ -99,7 +133,92 @@
    },
    {
      "button": {
        "name": "自动启动",
        "name": "A02半自动",
        "value": 0,
        "address": "DB10.0"
      }
    },
    {
      "button": {
        "name": "半自动启动",
        "value": 0,
        "address": "DB10.0"
      }
    }
  ],
  [
    {
      "name": "A01翻转实时位置",
      "read": 33,
      "sending": 0,
      "type": "0",
      "address": "DB100.2",
      "count": 3,
      "value": 0
    },
    {
      "button": {
        "name": "故障",
        "value": 0,
        "address": "DB10.0"
      }
    },
    {
      "button": {
        "name": "复位",
        "value": 0,
        "address": "DB10.0"
      }
    },
    {
      "button": {
        "name": "未回零",
        "value": 0,
        "address": "DB10.0"
      }
    },
    {
      "button": {
        "name": "回零",
        "value": 0,
        "address": "DB10.0"
      }
    }
  ],
  [
    {
      "name": "A02翻转实时位置",
      "read": 33,
      "sending": 0,
      "type": "0",
      "address": "DB100.2",
      "count": 3,
      "value": 0
    },
    {
      "button": {
        "name": "故障",
        "value": 0,
        "address": "DB10.0"
      }
    },
    {
      "button": {
        "name": "复位",
        "value": 0,
        "address": "DB10.0"
      }
    },
    {
      "button": {
        "name": "未回零",
        "value": 0,
        "address": "DB10.0"
      }
    },
    {
      "button": {
        "name": "回零",
        "value": 0,
        "address": "DB10.0"
      }
@@ -112,13 +231,15 @@
      "sending": 0,
      "type": "0",
      "address": "DB100.2",
      "count": 3
      "count": 3,
      "value": 0
    },
    {
      "name": "目标格子",
      "read": 11,
      "sending": 0,
      "type": "0"
      "type": "0",
      "value": 0
    },
    {
      "button": {
@@ -130,6 +251,20 @@
    {
      "button": {
        "name": "复位",
        "value": 0,
        "address": "DB10.0"
      }
    },
    {
      "button": {
        "name": "未回零",
        "value": 0,
        "address": "DB10.0"
      }
    },
    {
      "button": {
        "name": "回零",
        "value": 0,
        "address": "DB10.0"
      }
@@ -142,13 +277,15 @@
      "sending": 0,
      "type": "0",
      "address": "DB100.3",
      "count": 3
      "count": 3,
      "value": 0
    },
    {
      "name": "目标格子",
      "read": 11,
      "sending": 0,
      "type": "0"
      "type": "0",
      "value": 0
    },
    {
      "button": {
@@ -163,56 +300,20 @@
        "value": 0,
        "address": "DB10.0"
      }
    }
  ],
  [
    {
      "name": "B02 所在格子",
      "read": 33,
      "sending": 0,
      "type": "0",
      "address": "DB100.3",
      "count": 3
    },
    {
      "name": "目标格子",
      "read": 11,
      "sending": 0,
      "type": "0"
    },
    {
      "button": {
        "name": "故障",
        "name": "未回零",
        "value": 0,
        "address": "DB10.0"
      }
    },
    {
      "button": {
        "name": "复位",
        "name": "回零",
        "value": 0,
        "address": "DB10.0"
      }
    }
  ],
  [
    {
      "name": "存片接片地址",
      "read": 33,
      "sending": 0,
      "type": "0",
      "address": "DB100.4",
      "count": 3
    }
  ],
  [
    {
      "name": "出片接片地址",
      "read": 33,
      "sending": 0,
      "type": "0",
      "address": "DB100.5",
      "count": 3
    }
  ]
]