diff --git a/dll/iodll.dll b/dll/iodll.dll index eb12470..b2cdc4e 100644 Binary files a/dll/iodll.dll and b/dll/iodll.dll differ diff --git a/dll/iodllD.dll b/dll/iodllD.dll index d244502..38d7b1a 100644 Binary files a/dll/iodllD.dll and b/dll/iodllD.dll differ diff --git a/dll/mcctrdll.dll b/dll/mcctrdll.dll index 8ac2489..568f51e 100644 Binary files a/dll/mcctrdll.dll and b/dll/mcctrdll.dll differ diff --git a/dll/mcctrdllD.dll b/dll/mcctrdllD.dll index 2b06471..79914a0 100644 Binary files a/dll/mcctrdllD.dll and b/dll/mcctrdllD.dll differ diff --git a/iodll/Include/InputController.h b/iodll/Include/InputController.h index e7fc966..3e8d2a9 100644 --- a/iodll/Include/InputController.h +++ b/iodll/Include/InputController.h @@ -56,17 +56,6 @@ public: void StartUpdate(bool bStartUpdate); - // for bench debug testing - void SetSimulationIO(const std::vector& vecSimulationIO) - { - m_vecSimulationIO = vecSimulationIO; - } - - const std::vector& GetSimulationIO() - { - return m_vecSimulationIO; - } - private: std::array m_inputControllerBase{}; @@ -74,8 +63,6 @@ private: CHardwareCfgFactory m_cfgHardwareFty; 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 3cc5dc2..7d34770 100644 --- a/iodll/Include/OutputController.h +++ b/iodll/Include/OutputController.h @@ -61,16 +61,6 @@ public: void StartUpdate(bool bStartUpdate); - void SetSimulationIO(const std::vector& vecSimulationIO) - { - m_vecSimulationIO = vecSimulationIO; - } - - const std::vector& GetSimulationIO() - { - return m_vecSimulationIO; - } - private: std::array m_outputControllerBase{}; @@ -78,8 +68,6 @@ private: CHardwareCfgFactory m_cfgHardwareFty; std::vector m_vecCard; - std::vector m_vecSimulationIO; - static COutputController* instance; CWinThread* m_pThread{ nullptr }; diff --git a/iodll/Include/OutputStatus.h b/iodll/Include/OutputStatus.h index 7d81714..6a23568 100644 --- a/iodll/Include/OutputStatus.h +++ b/iodll/Include/OutputStatus.h @@ -10,14 +10,14 @@ namespace nsMMF using OutputStatus = struct _OutputStatus { char PtName[80]{}; bool On{ false }; - bool RequestChgState{ false }; - bool ChgStateOn{ false }; // Padding bool Padding1{ false }; bool Padding2{ false }; bool Padding3{ false }; bool Padding4{ false }; bool Padding5{ false }; + bool Padding6{ false }; + bool Padding7{ false }; // Assignment operator overload _OutputStatus& operator=(const _OutputStatus& rhs) @@ -26,14 +26,14 @@ namespace nsMMF strcpy_s(PtName, rhs.PtName); On = rhs.On; - RequestChgState = rhs.RequestChgState; - ChgStateOn = rhs.ChgStateOn; // Padding1 = rhs.Padding1; Padding2 = rhs.Padding2; Padding3 = rhs.Padding3; Padding4 = rhs.Padding4; Padding5 = rhs.Padding5; + Padding6 = rhs.Padding6; + Padding7 = rhs.Padding7; // return *this; } @@ -55,17 +55,13 @@ namespace nsMMF strcpy_s(x.PtName, name.c_str()); getValue(j, "On", x.On); - getValue(j, "RequestChgState", x.RequestChgState); - getValue(j, "ChgStateOn", x.ChgStateOn); } inline void to_json(json& j, const OutputStatus& x) { j = nlohmann::json{ { "PtName", x.PtName }, - { "On", x.On }, - { "RequestChgState", x.RequestChgState }, - { "ChgStateOn", x.ChgStateOn } + { "On", x.On } }; } diff --git a/iodll/lib/iodll.lib b/iodll/lib/iodll.lib index a322a07..8d055f5 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 b9140ac..4b43d31 100644 Binary files a/iodll/lib/iodllD.lib and b/iodll/lib/iodllD.lib differ