Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907

# Conflicts:
#	Main/MCEdit/Data/MCProject/nodeDevice.xml

Main/MCEdit/App.config

@@ -31,7 +31,7 @@
     <!--机台号-->
     <add key="EquipCode" value="01"/>
     <!--设备时钟类型，值包括Thread或Timer-->
-    <add key="BASE_EQUIP_CLOCKTYPE" value="Thread"/>
+    <add key="BASE_EQUIP_CLOCKTYPE" value="Timer"/>
     <!-- 是否加载数据源树 -->
     <add key="IsLoadDataSourceTree" value="true"/>
     <!--是否开启保存回放数据-->

Main/MCEdit/Data/MCProject/nodeDevice.xml

@@ -802,7 +802,7 @@
 		
 		</Data>
       </Group>
-      <Group name="reportDataToPC" block="2106" start="0" len="2824" access="ReadWrite" remark="reportDataToPC" isautoread="True">
+      <Group name="reportDataToPC" block="2106" start="0" len="2824" access="ReadWrite" remark="reportDataToPC" isautoread="False">
         <Data>
           <Data name="dryerA_dos0_eqNo" runname="dryerA_dos0_eqNo" start="0" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="设备编号" />
           <Data name="dryerA_dos0_batch" runname="dryerA_dos0_batch" start="1" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="批次号" />
@@ -2814,7 +2814,7 @@
           <Data name="wetMixingH_9_actTolerence" runname="wetMixingH_9_actTolerence" start="2822" 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="配方代码" />
@@ -8053,7 +8053,7 @@
           <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="计划代码" />