diff --git a/dll/commdll.dll b/dll/commdll.dll index 316262b..7ead2f1 100644 Binary files a/dll/commdll.dll and b/dll/commdll.dll differ diff --git a/dll/commdllD.dll b/dll/commdllD.dll index 06d8c2c..611e7a8 100644 Binary files a/dll/commdllD.dll and b/dll/commdllD.dll differ diff --git a/dll/iodll.dll b/dll/iodll.dll index 2256137..c64fc5e 100644 Binary files a/dll/iodll.dll and b/dll/iodll.dll differ diff --git a/dll/iodllD.dll b/dll/iodllD.dll index fa97214..a03d2a1 100644 Binary files a/dll/iodllD.dll and b/dll/iodllD.dll differ diff --git a/dll/mcctrdllD.dll b/dll/mcctrdllD.dll index cb68aa4..a6e4202 100644 Binary files a/dll/mcctrdllD.dll and b/dll/mcctrdllD.dll differ diff --git a/dll/secsgemdll.dll b/dll/secsgemdll.dll index ab2af7c..dee2044 100644 Binary files a/dll/secsgemdll.dll and b/dll/secsgemdll.dll differ diff --git a/dll/secsgemdllD.dll b/dll/secsgemdllD.dll index 1d9496e..0bfc5fa 100644 Binary files a/dll/secsgemdllD.dll and b/dll/secsgemdllD.dll differ diff --git a/dll/utility.dll b/dll/utility.dll index ef7430d..5a8a4d0 100644 Binary files a/dll/utility.dll and b/dll/utility.dll differ diff --git a/dll/utilityD.dll b/dll/utilityD.dll index de63890..8f5d2cf 100644 Binary files a/dll/utilityD.dll and b/dll/utilityD.dll differ diff --git a/iodll/Include/InputController.h b/iodll/Include/InputController.h index 8bfa830..26288a4 100644 --- a/iodll/Include/InputController.h +++ b/iodll/Include/InputController.h @@ -66,17 +66,18 @@ public: void TerminateThread(); void StartUpdate(bool bStartUpdate); - void SetSimulateIo(bool simIo) + + // for bench debug testing + void SetSimulationIO(const std::vector& vecSimulationIO) { - m_bsimIo = simIo; + m_vecSimulationIO = vecSimulationIO; } - bool GetSimulateIo(void) + const std::vector& GetSimulationIO() { - return m_bsimIo; + return m_vecSimulationIO; } - bool m_bsimIo{ false }; // m_bsimIo - simIo private: std::array m_inputControllerBase{}; @@ -84,6 +85,8 @@ private: CHardwareIni m_iniHardware; std::vector m_vecCard; + std::vector m_vecSimulationIO; + static CInputController* instance; CWinThread* m_pThread{ nullptr }; diff --git a/iodll/Include/OutputController.h b/iodll/Include/OutputController.h index c3965d1..fbd2e3c 100644 --- a/iodll/Include/OutputController.h +++ b/iodll/Include/OutputController.h @@ -73,17 +73,16 @@ public: void StartUpdate(bool bStartUpdate); - void SetSimulateIo(bool simIo) + void SetSimulationIO(const std::vector& vecSimulationIO) { - m_bsimIo = simIo; + m_vecSimulationIO = vecSimulationIO; } - bool GetSimulateIo(void) + const std::vector& GetSimulationIO() { - return m_bsimIo; + return m_vecSimulationIO; } - bool m_bsimIo; // m_bsimIo - simIo private: std::array m_outputControllerBase{}; @@ -91,6 +90,8 @@ private: CHardwareIni m_iniHardware; std::vector m_vecCard; + std::vector m_vecSimulationIO; + static COutputController* instance; CWinThread* m_pThread{ nullptr }; diff --git a/iodll/lib/iodll.lib b/iodll/lib/iodll.lib index cf995c2..efbbbfe 100644 Binary files a/iodll/lib/iodll.lib and b/iodll/lib/iodll.lib differ diff --git a/iodll/lib/iodllD.lib b/iodll/lib/iodllD.lib index 4e5b357..caf2460 100644 Binary files a/iodll/lib/iodllD.lib and b/iodll/lib/iodllD.lib differ