LAN Devices presence
This commit is contained in:
@@ -19,8 +19,7 @@
|
||||
#include "QtEndian"
|
||||
|
||||
|
||||
COtarcikCan::COtarcikCan(QObject *parent) : QObject(parent),
|
||||
TestMonitor("192.168.50.40",32,true,"Test")
|
||||
COtarcikCan::COtarcikCan(QObject *parent) : QObject(parent)
|
||||
{
|
||||
mGPTimer = new QTimer;
|
||||
connect(mGPTimer,SIGNAL(timeout()),this,SLOT(GPTimerExpired()));
|
||||
@@ -55,6 +54,7 @@ int COtarcikCan::Start()
|
||||
mMainWindow.mDataLoggingSettingsPage->mProgramHandle = this;
|
||||
mMainWindow.mGeneralStatusPage->mProgramPtr = this;
|
||||
mMainWindow.mGeneralStatusPage->mCPUInterface = &mCPUInterface;
|
||||
mLANDevicesPresenceMonitor.mProgramPtr = this;
|
||||
// mMainWindow.mCANWatchdogSettingsPage->mProgramHandle = this;
|
||||
|
||||
mMainWindow.show();
|
||||
@@ -95,6 +95,9 @@ int COtarcikCan::Start()
|
||||
mDeviceDetectionConfigParams = *mSystemConfig.GetDeviceDetectionConfig();
|
||||
mMainWindow.mDataLoggingSettingsPage->SetDeviceConfigSettings(mSystemConfig.GetDeviceDetectionConfig());
|
||||
|
||||
|
||||
mLANDevicesPresenceMonitor.Start(mSystemConfig.GetDeviceDetectionConfig()->GetLANDevicesConfigList());
|
||||
|
||||
// mMainWindow.mCANWatchdogSettingsPage->SetCANWatchdogConfig(mSystemConfig.GetCANWatchdogConfig());
|
||||
|
||||
// mGPTimer->setSingleShot(false);
|
||||
@@ -120,6 +123,7 @@ int COtarcikCan::Start()
|
||||
mMainWindow.mCANbusSettingsPage->SetDevicesList(&mCANDevicesList);
|
||||
|
||||
connect(&mInternetMonitor,&CInternetMonitor::InternetStateChanged,mMainWindow.mGeneralStatusPage,&CGeneralStatusPage::InternetStatusChanged);
|
||||
connect(&mInternetMonitor,&CInternetMonitor::InternetStateChanged,mMainWindow.mDataLoggingSettingsPage,&CLoggingSettingsPage::SetInternetPresenceStatus);
|
||||
mInternetMonitor.Start();
|
||||
|
||||
|
||||
@@ -255,6 +259,9 @@ int COtarcikCan::SaveDeviceDetectionSettingsRequest(CDeviceDetectionConfig *Devi
|
||||
mDeviceDetectionConfigParams = *DeviceDetectconfig;
|
||||
mSystemConfig.SetDeviceDetectionConfig(DeviceDetectconfig);
|
||||
mSystemConfig.SaveConfig();
|
||||
mLANDevicesPresenceMonitor.Stop();
|
||||
mLANDevicesPresenceMonitor.Start(DeviceDetectconfig->GetLANDevicesConfigList());
|
||||
return RET_OK;
|
||||
}
|
||||
|
||||
void COtarcikCan::GPTimerExpired()
|
||||
@@ -269,6 +276,7 @@ int COtarcikCan::SetCANConnectionStatusRequest(bool Connected)
|
||||
|
||||
int COtarcikCan::SetMQTTConnectionSatusRequest(bool Connected)
|
||||
{
|
||||
mMainWindow.mDataLoggingSettingsPage->SetMQTTPresenceStatus(Connected);
|
||||
return mMainWindow.mGeneralStatusPage->SetMQTTConnectionStatus(Connected);
|
||||
}
|
||||
|
||||
@@ -283,6 +291,12 @@ int COtarcikCan::UpdateMQTTBufferingStatusRequest(QString BufferingMode, QString
|
||||
return RET_OK;
|
||||
}
|
||||
|
||||
int COtarcikCan::UpdateLANDevicesPresenceStatusRequest(QList<bool> LanDevicesStatus)
|
||||
{
|
||||
mMainWindow.mDataLoggingSettingsPage->SetLANDevicesPresenceStatus(LanDevicesStatus);
|
||||
return RET_OK;
|
||||
}
|
||||
|
||||
int COtarcikCan::SaveCANWatchdogSettingsRequest(CCANWatchdogConfig *CANWatchdogConfig)
|
||||
{
|
||||
mSystemConfig.SetCANWatchdogConfig(CANWatchdogConfig);
|
||||
|
||||
Reference in New Issue
Block a user