Modification au GUI de config du Watchdog vu que ce n'est pas un device dédié
This commit is contained in:
@@ -9,6 +9,9 @@ CCANDeviceConfig::CCANDeviceConfig()
|
||||
mDeviceDescription = "Description du module";
|
||||
mDeviceName = "Nom du module";
|
||||
mDevicePollPeriod = 200;
|
||||
mDeviceWatchdogActivated = false;
|
||||
mWatchdogCANMsgID = 0x5050;
|
||||
mWatchdogPeriod = 4000;
|
||||
}
|
||||
|
||||
CCANDeviceConfig::CCANDeviceConfig(CCANDeviceConfig &Other)
|
||||
@@ -25,7 +28,11 @@ QDataStream &operator>>(QDataStream &in, CCANDeviceConfig &dest)
|
||||
>> dest.mCANDeviceDatabaseFilename
|
||||
>> dest.mDeviceDescription
|
||||
>> dest.mDeviceName
|
||||
>> dest.mDevicePollPeriod;
|
||||
>> dest.mDevicePollPeriod
|
||||
>> dest.mDeviceWatchdogActivated
|
||||
>> dest.mWatchdogCANMsgID
|
||||
>> dest.mWatchdogPeriod
|
||||
;
|
||||
|
||||
return in;
|
||||
}
|
||||
@@ -36,7 +43,11 @@ QDataStream &operator<<(QDataStream &out, const CCANDeviceConfig &source)
|
||||
<< source.mCANDeviceDatabaseFilename
|
||||
<< source.mDeviceDescription
|
||||
<< source.mDeviceName
|
||||
<< source.mDevicePollPeriod;
|
||||
<< source.mDevicePollPeriod
|
||||
<< source.mDeviceWatchdogActivated
|
||||
<< source.mWatchdogCANMsgID
|
||||
<< source.mWatchdogPeriod
|
||||
;
|
||||
return out;
|
||||
}
|
||||
|
||||
@@ -53,6 +64,9 @@ CCANDeviceConfig& CCANDeviceConfig::operator=(const CCANDeviceConfig &source)
|
||||
this->mDeviceDescription = source.mDeviceDescription;
|
||||
this->mDeviceName = source.mDeviceName;
|
||||
this->mDevicePollPeriod = source.mDevicePollPeriod;
|
||||
this->mDeviceWatchdogActivated = source.mDeviceWatchdogActivated;
|
||||
this->mWatchdogCANMsgID = source.mWatchdogCANMsgID;
|
||||
this->mWatchdogPeriod = source.mWatchdogPeriod;
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
@@ -18,6 +18,9 @@ public:
|
||||
QString mDeviceDescription;
|
||||
QString mDeviceName;
|
||||
unsigned int mDevicePollPeriod;
|
||||
bool mDeviceWatchdogActivated;
|
||||
unsigned int mWatchdogCANMsgID;
|
||||
unsigned int mWatchdogPeriod;
|
||||
|
||||
CCANDeviceConfig &operator=(const CCANDeviceConfig &source);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user