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

292 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 4d8b8ff373 1更新dl [17e7875]，添加Recipe流量计算器 
2SC中新增配置，选择流量计算器
3Bootstrapper中注册服务
 2024-06-12 09:43:16 +08:00
hanqiangqiang 1a5fca3cf9 更新dll [b6590cf]，Recipe对比报错问题修改 2024-05-22 16:02:16 +08:00
hanqiangqiang 8aae2aa5a0 更新dll [0122cbc],更新内容TCS补液 
1补液结束取消2延时关闭
2补液开始前，如果DI-73有信号，不启动补液
 2024-05-17 14:32:44 +08:00
hanqiangqiang da5dec8deb 更新dll [e2ed568], 修改补液逻辑 2024-05-14 17:03:24 +08:00
hanqiangqiang e1fd9f2c65 修改补液 2024-05-14 15:51:10 +08:00
HCL 9d365437a8 Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic10 into develop 
# Conflicts:
#	SicRT/ReleaseNotes.md
#	SicUI/Properties/AssemblyInfo.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-13 13:21:13 +08:00
HCL 0ad30c1b13 1.将配置文件名称中带有()、/等字符还原 2024-05-13 10:37:57 +08:00
SL 2afebee275 refactor: 更新库文件至提交369bbf0。 
确保使用最新的库文件。
 2024-05-13 10:19:20 +08:00
HCL 06dd8167d3 1.更新KXGEM版本至1.2.1.510,支持()/-等特殊字符注册 2024-05-13 08:59:44 +08:00
hanqiangqiang 716ff390e2 1更新dll [4f0fd50]，修改Recipe中M2 M9 M15不参与计算 
2修改Buffer只有一层
3修改AutoTransfer中Buffer中层级问题
4修改Recipe配置的XML文件格式
 2024-05-11 08:37:29 +08:00
hanqiangqiang 45e96805d1 添加丢失CommandLine.dll 2024-05-10 10:27:11 +08:00
HCL a4d3ba69b0 1.修正Interlock有时不起作用的BUG 
2.在PreProcess、Procss、PostProcess过程中检查对应的DO-PreProcessRunning、DO-ProcessRunning、DO-PostProcessRunning信号，
 - 若为false则PM宕机
 2024-05-10 10:04:13 +08:00
HCL 45800b9210 1.调整位置，防止未安装GEM许可证机台有报错信息 2024-05-09 10:20:54 +08:00
HCL 686bef279e 1.GEM远程指令优化 2024-05-08 15:27:54 +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
HCL 8c4381736e 1.修正Interlock有时不起作用的BUG 
2.在PreProcess、Procss、PostProcess过程中检查对应的DO-PreProcessRunning、DO-ProcessRunning、DO-PostProcessRunning信号，
 - 若为false则PM宕机
 2024-05-07 15:10:47 +08:00
hanqiangqiang 2fe8909d6a 1更新dll [63e1367]，修改TCS补液功能， 2024-05-07 11:20:08 +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
HCL 7e5e9b9208 1.远程指令优化 2024-05-07 11:06:52 +08:00
HCL 9a8128a385 1.GEM终端消息增加确认按钮 2024-05-06 11:13:02 +08:00
HCL ab4dcfef83 1.Gem终端消息更新 2024-04-30 17:28:33 +08:00
HCL 0d08e3f9d1 1.优化Gem事件和报警 2024-04-30 16:01:13 +08:00
HCL f087327cf8 1.增加Sequence Change事件 2024-04-29 14:36:26 +08:00
HCL 734f6323db 1.修改GEM关于Recipe相关操作 2024-04-29 11:16:23 +08:00
HCL f4fae208e9 1.更新最新KXGEM版本 
2.增加变量Host端修改回调函数
 2024-04-26 17:36:49 +08:00
HCL bd42622863 1.增加PM2 SVID 2024-04-26 13:30:19 +08:00
HCL b5cb743aed 1.优化GEM 2024-04-25 17:37:04 +08:00
hanqiangqiang 11247dc31f 更新dll [793a35f]，TCS注水时检测DO_AV(H)，为False时报警提示 2024-04-25 17:30:39 +08:00
SL cfbae3f593 refactor(CommLibs): 同步最新公共库至ed040e2 
修正HeaterControlMode枚举，更名为HeatStrategy。
 2024-04-25 16:37:05 +08:00
HCL 9f137680ce 1.更新Gem配置文件 2024-04-25 14:33:57 +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 914956d8a7 1.SV按照配置文件初始化 2024-04-23 17:13:42 +08:00
HCL acb586f9da 1.修正Interlock有时存在不起作用的问题 
2.增加PM在PreProcess,Process,PostProcess状态下不能降隔热罩的功能
 2024-04-22 16:57:24 +08:00
hanqiangqiang 7bb479b6df 1.更新dll [cbf4da9],修改AE无法获取测温问题， 
2.修改测温配置项
3.修改SC配置项
 2024-04-22 16:51:49 +08:00
HCL e87c15c57d 1.更新KXGEM.dll至1.2.0.419版本 2024-04-22 08:48:09 +08:00
HCL c972b859b4 1.增加GEM界面 2024-04-18 17:14:28 +08:00
HCL 4b8c7b9f2b 1.修改名称，防止GEM初始化报错 2024-04-18 16:18:16 +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
HCL 745f5b9e36 Merge branch 'WaferTrayInfo' into develop 
# Conflicts:
#	SicRT/ReleaseNotes.md
#	SicUI/Properties/AssemblyInfo.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
 2024-04-07 10:44:10 +08:00
SIC1016\caipeilun 44fc5b6e44 更新Maintain界面 2024-03-28 17:35:24 +08:00
SL 8c7b862da2 Merge branch 'feature/fix-io-provider-may-not-sync-when-startup-issue' into develop 
# Conflicts:
#	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-03-25 17:24:56 +08:00
hanqiangqiang d11911a73e 更新dll [47e4c7e]，Recipe在线无法推送问题修改，人为修改后直接保存，会认为配方无变换导致无法推送， 2024-03-25 14:18:11 +08:00
SL aad1c3aee7 修正Interlock在PLC同步数据之前可能意外错误触发的问题 
调整ToolLoader中初始化各个管理器的顺序，以确保InterlockManager运行前PLC至少同步一次数据。
ToolLoader中增加IoProvider数据同步是否完成的检查。
修正和优化InterlockManager相关对象。
修正Module状态指示器的一些显示问题。
 2024-03-25 10:16:49 +08:00
HCL e23e365037 1.RecipeEditorView和RecipeSelectView优化过滤功能 2024-03-18 17:10:15 +08:00
SIC1016\caipeilun 2d310662a8 Maintain部分代码优化，修改代码结构，减少代码量 2024-03-16 14:23:30 +08:00
hanqiangqiang f76f2ce50a 更新dll [360af5c]， Process单步历史记录，非数据类型不进行处理 2024-03-15 13:58:32 +08:00
HCL 7a402fe880 Merge branch 'develop' into WaferTrayInfo 
# Conflicts:
#	SicRT/ReleaseNotes.md
#	SicUI/Properties/AssemblyInfo.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/zh/Sicentury.Localization.resources.dll
 2024-03-15 09:48:11 +08:00
HCL 4b0c142191 1.RecipeEditorView优化过滤功能 
2.RecipeSelectView增加Recipe过滤功能
 2024-03-15 09:27:05 +08:00
HCL 0e1ba89cc2 1.重新整理WaferTrayInfo和WaferManager 2024-03-13 15:16:56 +08:00