diff --git a/Otarcik_CAN/Sources/DeviceDetectionConfig.cpp b/Otarcik_CAN/Sources/DeviceDetectionConfig.cpp index f4c0add..9c429fc 100644 --- a/Otarcik_CAN/Sources/DeviceDetectionConfig.cpp +++ b/Otarcik_CAN/Sources/DeviceDetectionConfig.cpp @@ -3,8 +3,8 @@ CDeviceDetectionConfig::CDeviceDetectionConfig() { - mInternetDetectionCANStatusBit = 31; - mMQTTDetectionCANStatusBit = 31; + mInternetDetectionCANStatusBit = 32; + mMQTTDetectionCANStatusBit = 33; for(int i = 0; i < MAX_NB_LAN_DEVICE_DETECTION; i++) { mLANDeviceDetectConfigList.append(CLANDevicePresenceConfig()); diff --git a/Otarcik_CAN/Sources/InternetMonitor.cpp b/Otarcik_CAN/Sources/InternetMonitor.cpp index 1b06725..0166aa0 100644 --- a/Otarcik_CAN/Sources/InternetMonitor.cpp +++ b/Otarcik_CAN/Sources/InternetMonitor.cpp @@ -37,8 +37,10 @@ bool CInternetMonitor::IsInternetActive() return mInternetActive; } -int CInternetMonitor::Start() +int CInternetMonitor::Start(quint64 CANReportingBit) { + mCANReportingMask = 1; + mCANReportingMask <<= CANReportingBit; CheckInternet(); return RET_OK; } @@ -101,3 +103,13 @@ void CInternetMonitor::ConnectionTimerExpired() } mInternetActive = false; } + +quint64 CInternetMonitor::GetCANInternetStatusMask() +{ + if(mInternetActive == true) + { + return 0; + } + + return mCANReportingMask; +} diff --git a/Otarcik_CAN/Sources/InternetMonitor.h b/Otarcik_CAN/Sources/InternetMonitor.h index 6bc45bf..a938750 100644 --- a/Otarcik_CAN/Sources/InternetMonitor.h +++ b/Otarcik_CAN/Sources/InternetMonitor.h @@ -14,13 +14,15 @@ class CInternetMonitor : public QObject public: explicit CInternetMonitor(QObject *parent = 0); ~CInternetMonitor(); - int Start(); + int Start(quint64 CANReportingBit); bool IsInternetActive(); + quint64 GetCANInternetStatusMask(); private: QNetworkAccessManager *mNetMgr; bool mInternetActive; QTimer *mCheckInternetStateTimer, *mConnectionTimer; + quint64 mCANReportingMask; int CheckInternet(); diff --git a/Otarcik_CAN/Sources/OtarcikCan.cpp b/Otarcik_CAN/Sources/OtarcikCan.cpp index 134c3e0..71be0e5 100644 --- a/Otarcik_CAN/Sources/OtarcikCan.cpp +++ b/Otarcik_CAN/Sources/OtarcikCan.cpp @@ -124,7 +124,7 @@ int COtarcikCan::Start() connect(&mInternetMonitor,&CInternetMonitor::InternetStateChanged,mMainWindow.mGeneralStatusPage,&CGeneralStatusPage::InternetStatusChanged); connect(&mInternetMonitor,&CInternetMonitor::InternetStateChanged,mMainWindow.mDataLoggingSettingsPage,&CLoggingSettingsPage::SetInternetPresenceStatus); - mInternetMonitor.Start(); + mInternetMonitor.Start(mSystemConfig.mDeviceDetectionParams.mInternetDetectionCANStatusBit); return 0; diff --git a/Otarcik_CAN/debug/Otarcik_CAN.exe b/Otarcik_CAN/debug/Otarcik_CAN.exe index 66ab578..357d5be 100644 Binary files a/Otarcik_CAN/debug/Otarcik_CAN.exe and b/Otarcik_CAN/debug/Otarcik_CAN.exe differ