Sic-Software/SIC-12
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 调整点表，增加新的AI、AO数据块，供PSU4使用。

Browse Source
This commit is contained in:
SL 2026-06-05 10:01:34 +08:00
parent ce7562bf1b
commit 81c3d05a82
4 changed files with 95 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml
View File

@ -703,11 +703,20 @@
<AI_ITEM Index="284" Name="AI_M44" BufferOffset="3" Addr="3" Description="" /> <AI_ITEM Index="284" Name="AI_M44" BufferOffset="3" Addr="3" Description="" />
<AI_ITEM Index="285" Name="AI_M45" BufferOffset="4" Addr="4" Description="" /> <AI_ITEM Index="285" Name="AI_M45" BufferOffset="4" Addr="4" Description="" />
<AI_ITEM Index="301" Name="AI_M41ActMode" BufferOffset="5" Addr="5" Description="" /> <AI_ITEM Index="301" Name="AI_M41ActMode" BufferOffset="20" Addr="20" Description="" />
<AI_ITEM Index="302" Name="AI_M42ActMode" BufferOffset="6" Addr="6" Description="" /> <AI_ITEM Index="302" Name="AI_M42ActMode" BufferOffset="21" Addr="21" Description="" />
<AI_ITEM Index="303" Name="AI_M43ActMode" BufferOffset="7" Addr="7" Description="" /> <AI_ITEM Index="303" Name="AI_M43ActMode" BufferOffset="22" Addr="22" Description="" />
<AI_ITEM Index="304" Name="AI_M44ActMode" BufferOffset="8" Addr="8" Description="" /> <AI_ITEM Index="304" Name="AI_M44ActMode" BufferOffset="23" Addr="23" Description="" />
<AI_ITEM Index="305" Name="AI_M45ActMode" BufferOffset="9" Addr="9" Description="" /> <AI_ITEM Index="305" Name="AI_M45ActMode" BufferOffset="24" Addr="24" Description="" />
</Block>
<Block Index="4">
<AI_ITEM Index="331" Name="AI_PSU4OutputVoltage" BufferOffset="0" Addr="0" Description="" />
<AI_ITEM Index="332" Name="AI_PSU4OutputArms" BufferOffset="1" Addr="1" Description="" />
<AI_ITEM Index="333" Name="AI_PSU4OutputPower" BufferOffset="2" Addr="2" Description="" />
<AI_ITEM Index="334" Name="AI_PSU4Status" BufferOffset="3" Addr="3" Description="" />
<AI_ITEM Index="335" Name="AI_PSU4SimVoltage" BufferOffset="4" Addr="4" Description="" />
<AI_ITEM Index="336" Name="AI_PSU4SimArms" BufferOffset="5" Addr="5" Description="" />
<AI_ITEM Index="337" Name="AI_PSU4Alarm" BufferOffset="6" Addr="6" Description="" />
</Block> </Block>
</Ana_In> </Ana_In>
<Ana_Out> <Ana_Out>
@ -950,11 +959,17 @@
<AO_ITEM Index="284" Name="AO_M44" BufferOffset="3" Addr="3" Description="" /> <AO_ITEM Index="284" Name="AO_M44" BufferOffset="3" Addr="3" Description="" />
<AO_ITEM Index="285" Name="AO_M45" BufferOffset="4" Addr="4" Description="" /> <AO_ITEM Index="285" Name="AO_M45" BufferOffset="4" Addr="4" Description="" />
<AO_ITEM Index="301" Name="AO_M41CtrlMode" BufferOffset="5" Addr="5" Description="" /> <AO_ITEM Index="301" Name="AO_M41CtrlMode" BufferOffset="20" Addr="20" Description="" />
<AO_ITEM Index="302" Name="AO_M42CtrlMode" BufferOffset="6" Addr="6" Description="" /> <AO_ITEM Index="302" Name="AO_M42CtrlMode" BufferOffset="21" Addr="21" Description="" />
<AO_ITEM Index="303" Name="AO_M43CtrlMode" BufferOffset="7" Addr="7" Description="" /> <AO_ITEM Index="303" Name="AO_M43CtrlMode" BufferOffset="22" Addr="22" Description="" />
<AO_ITEM Index="304" Name="AO_M44CtrlMode" BufferOffset="8" Addr="8" Description="" /> <AO_ITEM Index="304" Name="AO_M44CtrlMode" BufferOffset="23" Addr="23" Description="" />
<AO_ITEM Index="305" Name="AO_M45CtrlMode" BufferOffset="9" Addr="9" Description="" /> <AO_ITEM Index="305" Name="AO_M45CtrlMode" BufferOffset="24" Addr="24" Description="" />
</Block>
<Block Index="4">
<AO_ITEM Index="331" Name="AO_PSU4Enable" BufferOffset="0" Addr="0" Description="" />
<AO_ITEM Index="332" Name="AO_PSU4Reset" BufferOffset="1" Addr="1" Description="" />
<AO_ITEM Index="333" Name="AO_PSU4ArmLimited" BufferOffset="2" Addr="2" Description="" />
<AO_ITEM Index="340" Name="AO_PSU4Constant" BufferOffset="9" Addr="9" Description="" />
</Block> </Block>
</Ana_Out> </Ana_Out>
</IO_DEFINE> </IO_DEFINE>

77
App/SicRT/Config/IoProviderConfig.xml
View File

@ -1,54 +1,51 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<IoProviders system="Sic" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" > <IoProviders system="Sic" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
<!--<IoProvider load_condition="0" module="PM1" name="io" map_module="PM1" map_file="_ioDefinePM.xml" class="MECF.Framework.RT.Core.IoProviders.MCProtocolPlc" assembly="MECF.Framework.RT.Core">
<Parameter ip="127.0.0.1" port="6831" network_id="1" station_id="1"></Parameter> <!--
<Blocks> 如果PLC模拟器配置中增加了Block节点，则相应的在 “D:\MyProjects\芯三代\Sicentury\SIC-12\App\SicSimulator\Instances\SimulatorModulePlc.cs”
<Block type="di" offset="0" size="640" value_type=""></Block> 对象中增加调整Block的数量。如下：
<Block type="do" offset="0" size="640" value_type=""></Block> public const int DiBlockCount = 1;
<Block type="ai" offset="0" size="640" value_type="float"></Block> public const int DoBlockCount = 1;
<Block type="ao" offset="0" size="640" value_type="float"></Block> public const int AiBlockCount = 5;
</Blocks> public const int AoBlockCount = 5;
</IoProvider>
<IoProvider load_condition="0" module="PM2" name="io" map_module="PM2" map_file="_ioDefinePM.xml" class="MECF.Framework.RT.Core.IoProviders.MCProtocolPlc" assembly="MECF.Framework.RT.Core"> -->
<Parameter ip="127.0.0.1" port="6832" network_id="1" station_id="1"></Parameter> <!--TM Simulator-->
<Blocks> <IoProvider load_condition="0" module="TM" name="io" map_module="TM" map_file="tm\IODefinePlatform.xml"
<Block type="di" offset="0" size="640" value_type=""></Block> class="MECF.Framework.RT.Core.IoProviders.MCProtocolPlc" assembly="MECF.Framework.RT.Core">
<Block type="do" offset="0" size="640" value_type=""></Block>
<Block type="ai" offset="0" size="640" value_type="float"></Block>
<Block type="ao" offset="0" size="640" value_type="float"></Block>
</Blocks>
</IoProvider>-->
<IoProvider load_condition="0" module="TM" name="io" map_module="TM" map_file="tm\IODefinePlatform.xml" class="MECF.Framework.RT.Core.IoProviders.MCProtocolPlc" assembly="MECF.Framework.RT.Core">
<Parameter ip="127.0.0.1" port="6833" network_id="1" station_id="1"></Parameter> <Parameter ip="127.0.0.1" port="6833" network_id="1" station_id="1"></Parameter>
<Blocks> <Blocks>
<Block type="di" index="0" size="640" value_type="" variable=""></Block> <Block type="di" index="0" size="640" value_type="" variable=""></Block>
<Block type="do" index="0" size="640" value_type="" variable=""></Block> <Block type="do" index="0" size="640" value_type="" variable=""></Block>
<Block type="ai" index="0" size="640" value_type="float"></Block> <Block type="ai" index="0" size="640" value_type="float"></Block>
<Block type="ao" index="0" size="640" value_type="float" variable=""></Block> <Block type="ao" index="0" size="640" value_type="float" variable=""></Block>
<!--<Block type="ai" index="1" size="640" value_type="float"></Block>
<Block type="di" index="1" size="640" value_type="float" variable="" comment=""/>
<Block type="di" index="2" size="640" value_type="float" variable="" comment=""/>
<Block type="do" index="1" size="640" value_type="float" variable="" comment=""/>
<Block type="do" index="2" size="640" value_type="float" variable="" comment=""/>-->
</Blocks> </Blocks>
</IoProvider> </IoProvider>
<IoProvider load_condition="0" module="PM1" name="io" map_module="PM1" map_file="pm\pm1\_ioDefinePM1.xml" class="Aitex.Core.RT.Device.Devices.AdsIoProvider" assembly="MECF.Framework.RT.EquipmentLibrary" > <!--PM1 Simulator-->
<IoProvider load_condition="0" module="PM1" name="io" map_module="PM1" map_file="pm\pm1\_ioDefinePM1.xml"
class="Aitex.Core.RT.Device.Devices.AdsIoProvider" assembly="MECF.Framework.RT.EquipmentLibrary" >
<Parameter></Parameter> <Parameter></Parameter>
<Blocks> <Blocks>
<Block type="di" index="0" size="416" value_type="" variable="GVL_IO.PM1_DI_G"></Block> <Block type="di" index="0" size="416" value_type="" variable="GVL_IO.PM1_DI_G"/>
<Block type="do" index="0" size="256" value_type="" variable="GVL_IO.PM1_DO_G"></Block> <Block type="do" index="0" size="256" value_type="" variable="GVL_IO.PM1_DO_G"/>
<Block type="ai" index="0" size="181" value_type="float" variable="GVL_IO.PM1_AI_G"></Block> <Block type="ai" index="0" size="181" value_type="float" variable="GVL_IO.PM1_AI_G"/>
<Block type="ao" index="0" size="181" value_type="float" variable="GVL_IO.PM1_AO_G"></Block> <Block type="ao" index="0" size="181" value_type="float" variable="GVL_IO.PM1_AO_G"/>
<Block type="ai" index="1" size="100" value_type="float" variable="GVL_IO.PM1_AI_G_2"></Block> <Block type="ai" index="1" size="100" value_type="float" variable="GVL_IO.PM1_AI_G_2"/>
<Block type="ao" index="1" size="100" value_type="float" variable="GVL_IO.PM1_AO_G_2"></Block> <Block type="ao" index="1" size="100" value_type="float" variable="GVL_IO.PM1_AO_G_2"/>
<Block type="ai" index="2" size="40" value_type="float" variable="GVL_IO.PM1_AI_G_3"></Block> <Block type="ai" index="2" size="40" value_type="float" variable="GVL_IO.PM1_AI_G_3"/>
<Block type="ao" index="2" size="40" value_type="float" variable="GVL_IO.PM1_AO_G_3"></Block> <Block type="ao" index="2" size="40" value_type="float" variable="GVL_IO.PM1_AO_G_3"/>
<Block type="ai" index="3" size="10" value_type="float" variable="GVL_IO.PM1_AI_G_4"/>
<Block type="ao" index="3" size="10" value_type="float" variable="GVL_IO.PM1_AO_G_4"/>
<Block type="ai" index="4" size="10" value_type="float" variable="GVL_IO.PM1_AI_G_5"/>
<Block type="ao" index="4" size="10" value_type="float" variable="GVL_IO.PM1_AO_G_5"/>
</Blocks> </Blocks>
</IoProvider> </IoProvider>
<IoProvider load_condition="0" module="PM2" name="io" map_module="PM2" map_file="pm\pm2\_ioDefinePM2.xml" class="Aitex.Core.RT.Device.Devices.AdsIoProvider" assembly="MECF.Framework.RT.EquipmentLibrary" > <!--PM2 Simulator-->
<IoProvider load_condition="0" module="PM2" name="io" map_module="PM2" map_file="pm\pm2\_ioDefinePM2.xml"
class="Aitex.Core.RT.Device.Devices.AdsIoProvider" assembly="MECF.Framework.RT.EquipmentLibrary" >
<Parameter></Parameter> <Parameter></Parameter>
<Blocks> <Blocks>
<Block type="di" index="0" size="416" value_type="" variable="GVL_IO.PM2_DI_G"></Block> <Block type="di" index="0" size="416" value_type="" variable="GVL_IO.PM2_DI_G"></Block>
@ -59,6 +56,10 @@
<Block type="ao" index="1" size="100" value_type="float" variable="GVL_IO.PM2_AO_G_2"></Block> <Block type="ao" index="1" size="100" value_type="float" variable="GVL_IO.PM2_AO_G_2"></Block>
<Block type="ai" index="2" size="40" value_type="float" variable="GVL_IO.PM2_AI_G_3"></Block> <Block type="ai" index="2" size="40" value_type="float" variable="GVL_IO.PM2_AI_G_3"></Block>
<Block type="ao" index="2" size="40" value_type="float" variable="GVL_IO.PM2_AO_G_3"></Block> <Block type="ao" index="2" size="40" value_type="float" variable="GVL_IO.PM2_AO_G_3"></Block>
<Block type="ai" index="3" size="10" value_type="float" variable="GVL_IO.PM1_AI_G_4"/>
<Block type="ao" index="3" size="10" value_type="float" variable="GVL_IO.PM1_AO_G_4"/>
<Block type="ai" index="4" size="10" value_type="float" variable="GVL_IO.PM1_AI_G_5"/>
<Block type="ao" index="4" size="10" value_type="float" variable="GVL_IO.PM1_AO_G_5"/>
</Blocks> </Blocks>
</IoProvider> </IoProvider>
@ -87,6 +88,10 @@
<Block type="ao" index="1" size="100" value_type="float" variable="DB100.DBD2032"></Block> <Block type="ao" index="1" size="100" value_type="float" variable="DB100.DBD2032"></Block>
<Block type="ai" index="2" size="40" value_type="float" variable="DB100.DBD2432"></Block> <Block type="ai" index="2" size="40" value_type="float" variable="DB100.DBD2432"></Block>
<Block type="ao" index="2" size="40" value_type="float" variable="DB100.DBD2592"></Block> <Block type="ao" index="2" size="40" value_type="float" variable="DB100.DBD2592"></Block>
<Block type="ai" index="3" size="10" value_type="float" variable="DB100.DBD2752"/>
<Block type="ao" index="3" size="10" value_type="float" variable="DB100.DBD2792"/>
<Block type="ai" index="3" size="10" value_type="float" variable="DB100.DBD2832"/>
<Block type="ao" index="3" size="10" value_type="float" variable="DB100.DBD2872"/>
</Blocks> </Blocks>
</IoProvider> </IoProvider>
@ -101,6 +106,10 @@
<Block type="ao" index="1" size="100" value_type="float" variable="DB100.DBD2032"></Block> <Block type="ao" index="1" size="100" value_type="float" variable="DB100.DBD2032"></Block>
<Block type="ai" index="2" size="40" value_type="float" variable="DB100.DBD2432"></Block> <Block type="ai" index="2" size="40" value_type="float" variable="DB100.DBD2432"></Block>
<Block type="ao" index="2" size="40" value_type="float" variable="DB100.DBD2592"></Block> <Block type="ao" index="2" size="40" value_type="float" variable="DB100.DBD2592"></Block>
<Block type="ai" index="3" size="10" value_type="float" variable="DB100.DBD2752"/>
<Block type="ao" index="3" size="10" value_type="float" variable="DB100.DBD2792"/>
<Block type="ai" index="3" size="10" value_type="float" variable="DB100.DBD2832"/>
<Block type="ao" index="3" size="10" value_type="float" variable="DB100.DBD2872"/>
</Blocks> </Blocks>
</IoProvider> </IoProvider>

15
App/SicSimulator/Config/_ioDefinePM.xml
View File

@ -709,6 +709,15 @@
<AI_ITEM Index="304" Name="AI_M44ActMode" BufferOffset="8" Addr="8" Description="" /> <AI_ITEM Index="304" Name="AI_M44ActMode" BufferOffset="8" Addr="8" Description="" />
<AI_ITEM Index="305" Name="AI_M45ActMode" BufferOffset="9" Addr="9" Description="" /> <AI_ITEM Index="305" Name="AI_M45ActMode" BufferOffset="9" Addr="9" Description="" />
</Block> </Block>
<Block Index="4">
<AI_ITEM Index="331" Name="AI_PSU4OutputVoltage" BufferOffset="0" Addr="0" Description="" />
<AI_ITEM Index="332" Name="AI_PSU4OutputArms" BufferOffset="1" Addr="1" Description="" />
<AI_ITEM Index="333" Name="AI_PSU4OutputPower" BufferOffset="2" Addr="2" Description="" />
<AI_ITEM Index="334" Name="AI_PSU4Status" BufferOffset="3" Addr="3" Description="" />
<AI_ITEM Index="335" Name="AI_PSU4SimVoltage" BufferOffset="4" Addr="4" Description="" />
<AI_ITEM Index="336" Name="AI_PSU4SimArms" BufferOffset="5" Addr="5" Description="" />
<AI_ITEM Index="337" Name="AI_PSU4Alarm" BufferOffset="6" Addr="6" Description="" />
</Block>
</Ana_In> </Ana_In>
<Ana_Out> <Ana_Out>
<Block Index="0"> <Block Index="0">
@ -956,5 +965,11 @@
<AO_ITEM Index="304" Name="AO_M44CtrlMode" BufferOffset="8" Addr="8" Description="" /> <AO_ITEM Index="304" Name="AO_M44CtrlMode" BufferOffset="8" Addr="8" Description="" />
<AO_ITEM Index="305" Name="AO_M45CtrlMode" BufferOffset="9" Addr="9" Description="" /> <AO_ITEM Index="305" Name="AO_M45CtrlMode" BufferOffset="9" Addr="9" Description="" />
</Block> </Block>
<Block Index="4">
<AO_ITEM Index="331" Name="AO_PSU4Enable" BufferOffset="0" Addr="0" Description="" />
<AO_ITEM Index="332" Name="AO_PSU4Reset" BufferOffset="1" Addr="1" Description="" />
<AO_ITEM Index="333" Name="AO_PSU4ArmLimited" BufferOffset="2" Addr="2" Description="" />
<AO_ITEM Index="340" Name="AO_PSU4Constant" BufferOffset="9" Addr="9" Description="" />
</Block>
</Ana_Out> </Ana_Out>
</IO_DEFINE> </IO_DEFINE>