From 098f833ec06035c0209529a5d185bc94229022a8 Mon Sep 17 00:00:00 2001
From: nodyang <yangw@outlook.com>
Date: Mon, 11 Sep 2023 13:21:59 +0800
Subject: [PATCH] merge

---
 Main/MCEdit/Data/MCProject/nodeDevice.xml | 82 +++++++++++------------
 1 file changed, 39 insertions(+), 43 deletions(-)

diff --git a/Main/MCEdit/Data/MCProject/nodeDevice.xml b/Main/MCEdit/Data/MCProject/nodeDevice.xml
index bcbab12..45f0ea6 100644
--- a/Main/MCEdit/Data/MCProject/nodeDevice.xml
+++ b/Main/MCEdit/Data/MCProject/nodeDevice.xml
@@ -7,9 +7,9 @@
       <ReadHz value="5000" />
       <UnitLen value="8" />
       <Connection mode="Net">
-        <IP value="192.168.0.1" />
+        <IP value="192.168.1.10" />
         <Rack value="0" />
-        <Slot value="0" />
+        <Slot value="1" />
       </Connection>
     </Main>
     <Group>
@@ -2610,7 +2610,7 @@
           <Data name="wetMixingH_9_mixSpeed" runname="wetMixingH_9_mixSpeed" start="2502" len="2" method="Default_Float()" max="" issave="False" subtractor="" remark="速度" />
         </Data>
       </Group>
-      <Group name="RecipeDataFromPC" block="2104" start="0" len="1789" access="ReadWrite" remark="" isautoread="True">
+      <Group name="RecipeDataFromPC" block="2104" start="0" len="1789" access="ReadWrite" remark="" isautoread="False">
         <Data>
           <Data name="FirstWord" runname="FirstWord" start="0" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="预留" />
           <Data name="RecipeCode" runname="RecipeCode" start="1" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="配方代码" />
@@ -3758,7 +3758,7 @@
           <Data name="WeterM8Step9_Tolerance" runname="WeterM8Step9_Tolerance" start="1787" len="2" method="Default_Float()" max="" issave="False" subtractor="" remark="设定公差" />
         </Data>
       </Group>
-      <Group name="DB2102-valveInitDB" block="2102" start="0" len="91" access="ReadWrite" remark="valveInitDB" isautoread="True">
+      <Group name="DB2102-valveInitDB" block="2102" start="0" len="91" access="ReadWrite" remark="valveInitDB" isautoread="False">
         <Data>
           <Data name="BU1ASF01_ManualMode" runname="BU1ASF01_ManualMode" start="0" len="1" method="Default_Bit(0,1)" max="" issave="True" subtractor="" remark="手动模式" />
           <Data name="BU1ASF01_AutoMode" runname="BU1ASF01_AutoMode" start="0" len="1" method="Default_Bit(1,1)" max="" issave="True" subtractor="" remark="自动模式" />
@@ -3942,7 +3942,6 @@
           <Data name="BU1NSF01_AlarmPosition" runname="BU1NSF01_AlarmPosition" start="13" len="1" method="Default_Bit(10,1)" max="" issave="True" subtractor="" remark="反馈位置故障" />
           <Data name="BU1NSF01_Alarm" runname="BU1NSF01_Alarm" start="13" len="1" method="Default_Bit(11,1)" max="" issave="True" subtractor="" remark="故障指示" />
           <Data name="BU1NSF01_P" runname="BU1NSF01_P" start="13" len="1" method="Default_Bit(12,1)" max="" issave="True" subtractor="" remark="状态态志" />
-         
           <Data name="BU1OSF01_ManualMode" runname="BU1OSF01_ManualMode" start="14" len="1" method="Default_Bit(0,1)" max="" issave="True" subtractor="" remark="手动模式" />
           <Data name="BU1OSF01_AutoMode" runname="BU1OSF01_AutoMode" start="14" len="1" method="Default_Bit(1,1)" max="" issave="True" subtractor="" remark="自动模式" />
           <Data name="BU1OSF01_AlarmReset" runname="BU1OSF01_AlarmReset" start="14" len="1" method="Default_Bit(2,1)" max="" issave="True" subtractor="" remark="报警复位" />
@@ -3956,14 +3955,12 @@
           <Data name="BU1OSF01_AlarmPosition" runname="BU1OSF01_AlarmPosition" start="14" len="1" method="Default_Bit(10,1)" max="" issave="True" subtractor="" remark="反馈位置故障" />
           <Data name="BU1OSF01_Alarm" runname="BU1OSF01_Alarm" start="14" len="1" method="Default_Bit(11,1)" max="" issave="True" subtractor="" remark="故障指示" />
           <Data name="BU1OSF01_P" runname="BU1OSF01_P" start="14" len="1" method="Default_Bit(12,1)" max="" issave="True" subtractor="" remark="状态态志" />
-          
           <Data name="BU1BLT01_ManualMode" runname="BU1BLT01_ManualMode" start="15" len="1" method="Default_Bit(0,1)" max="" issave="True" subtractor="" remark="手动模式" />
           <Data name="BU1BLT01_AutoMode" runname="BU1BLT01_AutoMode" start="15" len="1" method="Default_Bit(1,1)" max="" issave="True" subtractor="" remark="自动模式" />
           <Data name="BU1BLT01_AlarmReset" runname="BU1BLT01_AlarmReset" start="15" len="1" method="Default_Bit(2,1)" max="" issave="True" subtractor="" remark="报警复位" />
           <Data name="BU1BLT01_SetManual" runname="BU1BLT01_SetManual" start="15" len="1" method="Default_Bit(3,1)" max="" issave="True" subtractor="" remark="手动启动指令" />
           <Data name="BU1BLT01_SetAuto" runname="BU1BLT01_SetAuto" start="15" len="1" method="Default_Bit(4,1)" max="" issave="True" subtractor="" remark="自动启动指令" />
           <Data name="BU1BLT01_SetPosition" runname="BU1BLT01_SetPosition" start="15" len="1" method="Default_Bit(5,1)" max="" issave="True" subtractor="" remark="输出位置反馈" />
-          
           <Data name="BU1BLT01_UnSetPosition" runname="BU1BLT01_UnSetPosition" start="15" len="1" method="Default_Bit(6,1)" max="" issave="True" subtractor="" remark="非输出位置反馈" />
           <Data name="BU1BLT01_Set" runname="BU1BLT01_Set" start="15" len="1" method="Default_Bit(7,1)" max="" issave="True" subtractor="" remark="输出指令" />
           <Data name="BU1BLT01_AlarmSetPos" runname="BU1BLT01_AlarmSetPos" start="15" len="1" method="Default_Bit(8,1)" max="" issave="True" subtractor="" remark="输出指令时位置故障" />
@@ -3971,7 +3968,6 @@
           <Data name="BU1BLT01_AlarmPosition" runname="BU1BLT01_AlarmPosition" start="15" len="1" method="Default_Bit(10,1)" max="" issave="True" subtractor="" remark="反馈位置故障" />
           <Data name="BU1BLT01_Alarm" runname="BU1BLT01_Alarm" start="15" len="1" method="Default_Bit(11,1)" max="" issave="True" subtractor="" remark="故障指示" />
           <Data name="BU1BLT01_P" runname="BU1BLT01_P" start="15" len="1" method="Default_Bit(12,1)" max="" issave="True" subtractor="" remark="状态态志" />
-        
           <Data name="BU1BLT02_ManualMode" runname="BU1BLT02_ManualMode" start="16" len="1" method="Default_Bit(0,1)" max="" issave="True" subtractor="" remark="手动模式" />
           <Data name="BU1BLT02_AutoMode" runname="BU1BLT02_AutoMode" start="16" len="1" method="Default_Bit(1,1)" max="" issave="True" subtractor="" remark="自动模式" />
           <Data name="BU1BLT02_AlarmReset" runname="BU1BLT02_AlarmReset" start="16" len="1" method="Default_Bit(2,1)" max="" issave="True" subtractor="" remark="报警复位" />
@@ -4991,7 +4987,7 @@
           <Data name="BU8GEB01_P" runname="BU8GEB01_P" start="90" len="1" method="Default_Bit(12,1)" max="" issave="True" subtractor="" remark="状态态志" />
         </Data>
       </Group>
-      <Group name="DB2103-motorInitDB" block="2103" start="0" len="201" access="ReadWrite" remark="motorInitDB" isautoread="True">
+      <Group name="DB2103-motorInitDB" block="2103" start="0" len="201" access="ReadWrite" remark="motorInitDB" isautoread="False">
         <Data>
           <Data name="DM1ASI01_ManualMode" runname="DM1ASI01_ManualMode" start="0" len="1" method="Default_Bit(0,1)" max="" issave="True" subtractor="" remark="手动模式" />
           <Data name="DM1ASI01_AutoMode" runname="DM1ASI01_AutoMode" start="0" len="1" method="Default_Bit(1,1)" max="" issave="True" subtractor="" remark="自动模式" />
@@ -7669,41 +7665,41 @@
           <Data name="SV1GDS01_P1" runname="SV1GDS01_P1" start="76" len="1" method="Default_Bit(15,1)" max="" issave="True" subtractor="" remark="" />
         </Data>
       </Group>
-      <Group name="DB2105-PlanFromPC" block="2105" start="0" len="26" access="ReadWrite" remark="db2105" isautoread="True">
+      <Group name="DB2105-PlanFromPC" block="2105" start="0" len="26" access="ReadWrite" remark="db2105" isautoread="False">
         <Data>
-            <Data name="Plan0_RecipeCode" runname="Plan0_RecipeCode" start="0" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="配方代码" />
-			<Data name="Plan0_PlanCode" runname="Plan0_PlanCode" start="1" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="计划代码" />
-			<Data name="Plan0_Batch" runname="Plan0_Batch" start="2" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="数量" />
-			<Data name="Plan0_Start" runname="Plan0_Start" start="3" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="启动" />
-			<Data name="Plan0_Pause" runname="Plan0_Pause" start="4" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="暂停" />
-			<Data name="Plan0_Stop" runname="Plan0_Stop" start="5" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="取消" />
-			<Data name="Plan1_RecipeCode" runname="Plan1_RecipeCode" start="6" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="配方代码" />
-			<Data name="Plan1_PlanCode" runname="Plan1_PlanCode" start="7" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="计划代码" />
-			<Data name="Plan1_Batch" runname="Plan1_Batch" start="8" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="数量" />
-			<Data name="Plan1_Start" runname="Plan1_Start" start="9" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="启动" />
-			<Data name="Plan1_Pause" runname="Plan1_Pause" start="10" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="暂停" />
-			<Data name="Plan1_Stop" runname="Plan1_Stop" start="11" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="取消" />
-			<Data name="Plan2_RecipeCode" runname="Plan2_RecipeCode" start="12" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="配方代码" />
-			<Data name="Plan2_PlanCode" runname="Plan2_PlanCode" start="13" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="计划代码" />
-			<Data name="Plan2_Batch" runname="Plan2_Batch" start="14" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="数量" />
-			<Data name="Plan2_Start" runname="Plan2_Start" start="15" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="启动" />
-			<Data name="Plan2_Pause" runname="Plan2_Pause" start="16" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="暂停" />
-			<Data name="Plan2_Stop" runname="Plan2_Stop" start="17" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="取消" />
-			<Data name="Plan3_RecipeCode" runname="Plan3_RecipeCode" start="18" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="配方代码" />
-			<Data name="Plan3_PlanCode" runname="Plan3_PlanCode" start="19" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="计划代码" />
-			<Data name="Plan3_Batch" runname="Plan3_Batch" start="20" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="数量" />
-			<Data name="Plan3_Start" runname="Plan3_Start" start="21" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="启动" />
-			<Data name="Plan3_Pause" runname="Plan3_Pause" start="22" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="暂停" />
-			<Data name="Plan3_Stop" runname="Plan3_Stop" start="23" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="取消" />
-			<Data name="Status0" runname="Status0" start="24" len="1" method="Default_Bit(0,1)" max="" issave="True" subtractor="" remark="Line1" />
-			<Data name="Status1" runname="Status1" start="24" len="1" method="Default_Bit(1,1)" max="" issave="True" subtractor="" remark="Line2" />
-			<Data name="Status2" runname="Status2" start="24" len="1" method="Default_Bit(2,1)" max="" issave="True" subtractor="" remark="Line3" />
-			<Data name="Status3" runname="Status3" start="24" len="1" method="Default_Bit(3,1)" max="" issave="True" subtractor="" remark="Line4" />
-			<Data name="End0" runname="End0" start="0" len="25" method="Default_Bit(0,1)" max="" issave="True" subtractor="" remark="Line1" />
-			<Data name="End1" runname="End1" start="0" len="25" method="Default_Bit(1,1)" max="" issave="True" subtractor="" remark="Line2" />
-			<Data name="End2" runname="End2" start="0" len="25" method="Default_Bit(2,1)" max="" issave="True" subtractor="" remark="Line3" />
-			<Data name="End3" runname="End3" start="0" len="25" method="Default_Bit(3,1)" max="" issave="True" subtractor="" remark="Line4" />
-		</Data>
+          <Data name="Plan0_RecipeCode" runname="Plan0_RecipeCode" start="0" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="配方代码" />
+          <Data name="Plan0_PlanCode" runname="Plan0_PlanCode" start="1" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="计划代码" />
+          <Data name="Plan0_Batch" runname="Plan0_Batch" start="2" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="数量" />
+          <Data name="Plan0_Start" runname="Plan0_Start" start="3" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="启动" />
+          <Data name="Plan0_Pause" runname="Plan0_Pause" start="4" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="暂停" />
+          <Data name="Plan0_Stop" runname="Plan0_Stop" start="5" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="取消" />
+          <Data name="Plan1_RecipeCode" runname="Plan1_RecipeCode" start="6" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="配方代码" />
+          <Data name="Plan1_PlanCode" runname="Plan1_PlanCode" start="7" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="计划代码" />
+          <Data name="Plan1_Batch" runname="Plan1_Batch" start="8" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="数量" />
+          <Data name="Plan1_Start" runname="Plan1_Start" start="9" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="启动" />
+          <Data name="Plan1_Pause" runname="Plan1_Pause" start="10" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="暂停" />
+          <Data name="Plan1_Stop" runname="Plan1_Stop" start="11" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="取消" />
+          <Data name="Plan2_RecipeCode" runname="Plan2_RecipeCode" start="12" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="配方代码" />
+          <Data name="Plan2_PlanCode" runname="Plan2_PlanCode" start="13" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="计划代码" />
+          <Data name="Plan2_Batch" runname="Plan2_Batch" start="14" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="数量" />
+          <Data name="Plan2_Start" runname="Plan2_Start" start="15" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="启动" />
+          <Data name="Plan2_Pause" runname="Plan2_Pause" start="16" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="暂停" />
+          <Data name="Plan2_Stop" runname="Plan2_Stop" start="17" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="取消" />
+          <Data name="Plan3_RecipeCode" runname="Plan3_RecipeCode" start="18" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="配方代码" />
+          <Data name="Plan3_PlanCode" runname="Plan3_PlanCode" start="19" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="计划代码" />
+          <Data name="Plan3_Batch" runname="Plan3_Batch" start="20" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="数量" />
+          <Data name="Plan3_Start" runname="Plan3_Start" start="21" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="启动" />
+          <Data name="Plan3_Pause" runname="Plan3_Pause" start="22" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="暂停" />
+          <Data name="Plan3_Stop" runname="Plan3_Stop" start="23" len="1" method="Default_ShortDiv()" max="" issave="True" subtractor="" remark="取消" />
+          <Data name="Status0" runname="Status0" start="24" len="1" method="Default_Bit(0,1)" max="" issave="True" subtractor="" remark="Line1" />
+          <Data name="Status1" runname="Status1" start="24" len="1" method="Default_Bit(1,1)" max="" issave="True" subtractor="" remark="Line2" />
+          <Data name="Status2" runname="Status2" start="24" len="1" method="Default_Bit(2,1)" max="" issave="True" subtractor="" remark="Line3" />
+          <Data name="Status3" runname="Status3" start="24" len="1" method="Default_Bit(3,1)" max="" issave="True" subtractor="" remark="Line4" />
+          <Data name="End0" runname="End0" start="0" len="25" method="Default_Bit(0,1)" max="" issave="True" subtractor="" remark="Line1" />
+          <Data name="End1" runname="End1" start="0" len="25" method="Default_Bit(1,1)" max="" issave="True" subtractor="" remark="Line2" />
+          <Data name="End2" runname="End2" start="0" len="25" method="Default_Bit(2,1)" max="" issave="True" subtractor="" remark="Line3" />
+          <Data name="End3" runname="End3" start="0" len="25" method="Default_Bit(3,1)" max="" issave="True" subtractor="" remark="Line4" />
+        </Data>
       </Group>
     </Group>
   </Equip>