SL
|
6c727478a7
|
Merge branch 'feature/high-performance-data-collector' into DevelopBase
# Conflicts:
# MECF.Framework.Common/Aitex/Core/RT/IOCore/AIAccessor.cs
# MECF.Framework.Common/Aitex/Core/RT/IOCore/AOAccessor.cs
# MECF.Framework.Common/Aitex/Core/RT/IOCore/DIAccessor.cs
# MECF.Framework.Common/Aitex/Core/RT/IOCore/DOAccessor.cs
# MECF.Framework.Common/Aitex/Core/RT/IOCore/IOAccessor.cs
# MECF.Framework.Common/Aitex/Core/RT/IOCore/Interfaces/IIOAccessor.cs
# MECF.Framework.Common/MECF/Framework/Common/IOCore/IoManager.cs
# MECF.Framework.RT.EquipmentLibrary/Devices/IoLineHeater.cs
# MECF.Framework.RT.EquipmentLibrary/Devices/IoMFC.cs
# MECF.Framework.RT.EquipmentLibrary/Devices/IoTC.cs
# SimulatorCore/IoProviders/SimulatorIO.cs
|
2024-02-26 09:18:51 +08:00 |