Sic-Software
/
Sic10
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity
754 Commits 13 Branches 35 Tags 646 MiB
Commit Graph

21 Commits

Author SHA1 Message Date
hanqiangqiang bd0f61a11f Merge branch 'develop' into Sic02/Develop 
# Conflicts:
#	SicSimulator/Config/_ioDefinePM.xml
#	SicUI/Properties/AssemblyInfo.cs
#	ThirdParty/MECF.Framework/KXGEM.dll
#	ThirdParty/MECF.Framework/MECF.Framework.Common.dll
#	ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll
#	ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll
#	ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll
#	ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll
#	ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll
#	ThirdParty/MECF.Framework/Sicentury.Core.dll
#	ThirdParty/MECF.Framework/Sicentury.Localization.dll
#	ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll
 2024-06-12 13:13:06 +08:00
hanqiangqiang e1fd9f2c65 修改补液 2024-05-14 15:51:10 +08:00
HCL 0ad30c1b13 1.将配置文件名称中带有()、/等字符还原 2024-05-13 10:37:57 +08:00
HCL 90496c2714 Merge branch 'GEM' into feature/KX_GEM 
# Conflicts:
#	SicRT/Equipments/AutoTransfer.cs
#	ThirdParty/MECF.Framework/MECF.Framework.Common.dll
#	ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll
#	ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll
#	ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll
#	ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll
#	ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll
#	ThirdParty/MECF.Framework/Sicentury.Localization.dll
#	ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll
 2024-05-08 09:51:42 +08:00
hanqiangqiang d14b95e40b 1更新dll [63e1367]，修改TCS补液功能，库中备注当前使用的分支 
2修改Routine
3修改MFC相关配置项
4新增PM2和仿真新增IO,PM2的Device中配置V66 V67阀
 2024-05-07 11:19:06 +08:00
hanqiangqiang c7487a4ffb 更新换本号至 ## Version 1.3.1.40424 
1更新dll  [66e56a9]，新增TCS补液使用DI信号控制，兼容之前设备
2增加SC配置，兼容旧设备
3增加IO点位
 2024-04-24 17:26:18 +08:00
HCL 96ce5c4c07 Merge branch 'KX_GEM' into GEM 
# Conflicts:
#	Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
#	Modules/SicModules/Config/PM/PM1/interlockPM1.xml
#	Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml
#	Modules/SicModules/Config/PM/PM2/interlockPM2.xml
#	SicRT/Equipments/Systems/EquipmentManager.cs
#	SicRT/Instances/ToolLoader.cs
#	SicRT/SicRT.csproj
#	SicSimulator/Instances/SimulatorSystem.cs
#	SicUI/MainViewModel.cs
#	SicUI/SicUI.csproj
#	ThirdParty/MECF.Framework/MECF.Framework.Common.dll
#	ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll
#	ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll
#	ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll
#	ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll
#	ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll
#	ThirdParty/MECF.Framework/Sicentury.Core.dll
 2024-04-17 16:37:52 +08:00
hanqiangqiang fe7276afe6 1修改仿真中Float类型数据获取属性 
2修改方法名GetAoBufferFloat
3修改IO名称
4使用合并后的dll
 2024-02-22 11:00:24 +08:00
hanqiangqiang c02e54dbb9 1PM新增DI-73,AI-26,AI-27点位 
2监控加热带温区AI-26,AI-27超温报警
3增加配置控制报警输出等级
4仿真添加相应点位
 2024-02-21 11:02:19 +08:00
hanqiangqiang 2e43b4aad0 仿真添加DO_TVReset 2023-12-28 16:21:50 +08:00
hanqiangqiang 92ef20477e 添加DI_ApcButterflyError报警输出 2023-12-28 16:03:57 +08:00
HCL 484932e024 1.TM增加DO_TMCyclePurgeRoutineSuccessed,TM Purge后置为true，TM开腔后该DO置为false， 
TM Online时需检查该DO为true
 2023-10-11 11:52:21 +08:00
SIC1016\caipeilun 560d8cb75a 1.IO名称删除斜杠和括号 
2.元件标号转移到描述Description中
 2023-09-20 10:09:50 +08:00
hanqiangqiang fe00066965 修改PM的AI20名称 2023-08-17 17:02:56 +08:00
hanqiangqiang 3c16e1bdca 1更新dll [335a1f0] 
2添加加热伴侣超温检测硬件配置和参数配置
3修改AI名称
 2023-08-17 14:11:53 +08:00
HCL 531fe2caaa DI-327修改 2023-08-17 11:23:36 +08:00
HCL 342a14ae19 1.PM 增加DI_DNCommunicationError点及报警 2023-08-17 08:34:34 +08:00
SL 0f001d7077 修正模拟器TM点表中没有定义三色灯DO的问题。 2023-06-21 16:37:12 +08:00
hanqiangqiang 79a64ec49f 1添加PM2报警初始化 
2修改界面显示内容
3修改IO名称
 2023-06-03 15:15:25 +08:00
hanqiangqiang 4470038188 1::配置水温报警,IO名称太乱搞吐了，我想打洪膺 2023-05-24 17:50:36 +08:00
hanqiangqiang ffe2e41752 Repo Init 2023-05-10 10:26:01 +08:00