|
|
|
@ -10,14 +10,14 @@ namespace nsMMF
|
|
|
|
using OutputStatus = struct _OutputStatus {
|
|
|
|
using OutputStatus = struct _OutputStatus {
|
|
|
|
char PtName[80]{};
|
|
|
|
char PtName[80]{};
|
|
|
|
bool On{ false };
|
|
|
|
bool On{ false };
|
|
|
|
bool RequestChgState{ false };
|
|
|
|
|
|
|
|
bool ChgStateOn{ false };
|
|
|
|
|
|
|
|
// Padding
|
|
|
|
// Padding
|
|
|
|
bool Padding1{ false };
|
|
|
|
bool Padding1{ false };
|
|
|
|
bool Padding2{ false };
|
|
|
|
bool Padding2{ false };
|
|
|
|
bool Padding3{ false };
|
|
|
|
bool Padding3{ false };
|
|
|
|
bool Padding4{ false };
|
|
|
|
bool Padding4{ false };
|
|
|
|
bool Padding5{ false };
|
|
|
|
bool Padding5{ false };
|
|
|
|
|
|
|
|
bool Padding6{ false };
|
|
|
|
|
|
|
|
bool Padding7{ false };
|
|
|
|
|
|
|
|
|
|
|
|
// Assignment operator overload
|
|
|
|
// Assignment operator overload
|
|
|
|
_OutputStatus& operator=(const _OutputStatus& rhs)
|
|
|
|
_OutputStatus& operator=(const _OutputStatus& rhs)
|
|
|
|
@ -26,14 +26,14 @@ namespace nsMMF
|
|
|
|
strcpy_s(PtName, rhs.PtName);
|
|
|
|
strcpy_s(PtName, rhs.PtName);
|
|
|
|
|
|
|
|
|
|
|
|
On = rhs.On;
|
|
|
|
On = rhs.On;
|
|
|
|
RequestChgState = rhs.RequestChgState;
|
|
|
|
|
|
|
|
ChgStateOn = rhs.ChgStateOn;
|
|
|
|
|
|
|
|
//
|
|
|
|
//
|
|
|
|
Padding1 = rhs.Padding1;
|
|
|
|
Padding1 = rhs.Padding1;
|
|
|
|
Padding2 = rhs.Padding2;
|
|
|
|
Padding2 = rhs.Padding2;
|
|
|
|
Padding3 = rhs.Padding3;
|
|
|
|
Padding3 = rhs.Padding3;
|
|
|
|
Padding4 = rhs.Padding4;
|
|
|
|
Padding4 = rhs.Padding4;
|
|
|
|
Padding5 = rhs.Padding5;
|
|
|
|
Padding5 = rhs.Padding5;
|
|
|
|
|
|
|
|
Padding6 = rhs.Padding6;
|
|
|
|
|
|
|
|
Padding7 = rhs.Padding7;
|
|
|
|
//
|
|
|
|
//
|
|
|
|
return *this;
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -55,17 +55,13 @@ namespace nsMMF
|
|
|
|
strcpy_s(x.PtName, name.c_str());
|
|
|
|
strcpy_s(x.PtName, name.c_str());
|
|
|
|
|
|
|
|
|
|
|
|
getValue(j, "On", x.On);
|
|
|
|
getValue(j, "On", x.On);
|
|
|
|
getValue(j, "RequestChgState", x.RequestChgState);
|
|
|
|
|
|
|
|
getValue(j, "ChgStateOn", x.ChgStateOn);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
inline void to_json(json& j, const OutputStatus& x)
|
|
|
|
inline void to_json(json& j, const OutputStatus& x)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
j = nlohmann::json{
|
|
|
|
j = nlohmann::json{
|
|
|
|
{ "PtName", x.PtName },
|
|
|
|
{ "PtName", x.PtName },
|
|
|
|
{ "On", x.On },
|
|
|
|
{ "On", x.On }
|
|
|
|
{ "RequestChgState", x.RequestChgState },
|
|
|
|
|
|
|
|
{ "ChgStateOn", x.ChgStateOn }
|
|
|
|
|
|
|
|
};
|
|
|
|
};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|