Merge branch 'develop' of http://112.124.35.216:65000/Sic-Software/MoS2 into develop

# Conflicts:
#	App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml
#	App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml
#	App/SicSimulator/Config/_ioDefinePM.xml
This commit is contained in:
hanqiangqiang
2026-08-03 16:38:06 +08:00
7 changed files with 107 additions and 133 deletions
@@ -747,9 +747,9 @@
<AO_ITEM Index="114" Name="AO_PressCtrl7" BufferOffset="114" Addr="114" Description="" />
<AO_ITEM Index="115" Name="AO_PressCtrl8" BufferOffset="115" Addr="115" Description="" />
<AO_ITEM Index="116" Name="AO_PressCtrl9" BufferOffset="116" Addr="116" Description="" />
<AO_ITEM Index="118" Name="AO_Setpointspeed" BufferOffset="118" Addr="118" Description="" />
<AO_ITEM Index="120" Name="AO_SetpointACC" BufferOffset="120" Addr="120" Description="" />
<AO_ITEM Index="121" Name="AO_SetpointDEC" BufferOffset="121" Addr="121" Description="" />
<AO_ITEM Index="118" Name="AO_SpindleSpeed" BufferOffset="118" Addr="118" Description="" />
<AO_ITEM Index="120" Name="AO_SpindleACC" BufferOffset="120" Addr="120" Description="" />
<AO_ITEM Index="121" Name="AO_SpindleDEC" BufferOffset="121" Addr="121" Description="" />
<AO_ITEM Index="123" Name="AO_ConfinementRingMode" BufferOffset="123" Addr="123" Description="" />
<AO_ITEM Index="124" Name="AO_ConfinementRingSpeed" BufferOffset="124" Addr="124" Description="" />
<AO_ITEM Index="125" Name="AO_ConfinementRingDistance" BufferOffset="125" Addr="125" Description="" />