remove SimulationIO code

main
Yik Teng Hie 1 year ago
parent 11dd9b2e77
commit 857b890ee1

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -56,17 +56,6 @@ public:
void StartUpdate(bool bStartUpdate);
// for bench debug testing
void SetSimulationIO(const std::vector<std::string>& vecSimulationIO)
{
m_vecSimulationIO = vecSimulationIO;
}
const std::vector<std::string>& GetSimulationIO()
{
return m_vecSimulationIO;
}
private:
std::array<CInputControllerBase*, MAX_INPUT_CARD_TYPE> m_inputControllerBase{};
@ -74,8 +63,6 @@ private:
CHardwareCfgFactory m_cfgHardwareFty;
std::vector<stCard> m_vecCard;
std::vector<std::string> m_vecSimulationIO;
static CInputController* instance;
CWinThread* m_pThread{ nullptr };

@ -61,16 +61,6 @@ public:
void StartUpdate(bool bStartUpdate);
void SetSimulationIO(const std::vector<std::string>& vecSimulationIO)
{
m_vecSimulationIO = vecSimulationIO;
}
const std::vector<std::string>& GetSimulationIO()
{
return m_vecSimulationIO;
}
private:
std::array<COutputControllerBase*, MAX_OUTPUT_CARD_TYPE> m_outputControllerBase{};
@ -78,8 +68,6 @@ private:
CHardwareCfgFactory m_cfgHardwareFty;
std::vector<stCard> m_vecCard;
std::vector<std::string> m_vecSimulationIO;
static COutputController* instance;
CWinThread* m_pThread{ nullptr };

@ -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 }
};
}

Binary file not shown.

Binary file not shown.
Loading…
Cancel
Save