From 074d72f030ac29f271c29278f230f45fcdd7ef1f Mon Sep 17 00:00:00 2001 From: jfmartel Date: Sun, 2 Apr 2023 08:19:39 -0400 Subject: [PATCH] Ajout adresse IP dans statut LoraInterface --- .../LoraModuleInterfaceData.cpp | 21 +++++++++++++++++-- .../LoraModuleInterfaceData.h | 5 +++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/Sources/LoraModuleInterface/LoraModuleInterfaceData.cpp b/Sources/LoraModuleInterface/LoraModuleInterfaceData.cpp index d09b071..3a44093 100644 --- a/Sources/LoraModuleInterface/LoraModuleInterfaceData.cpp +++ b/Sources/LoraModuleInterface/LoraModuleInterfaceData.cpp @@ -26,6 +26,13 @@ CLoraModuleInterfaceStatus& CLoraModuleInterfaceStatus::operator = (const CLoraM mModuleAmbientRSSI = rhs.mModuleAmbientRSSI; mModuleLastRxRSSI = rhs.mModuleLastRxRSSI; + mIPAddress1 = rhs.mIPAddress1; + mIPAddress2 = rhs.mIPAddress2; + mIPAddress3 = rhs.mIPAddress3; + mIPAddress4 = rhs.mIPAddress4; + + + return *this; } @@ -45,7 +52,13 @@ QDataStream &operator<<(QDataStream &out, const CLoraModuleInterfaceStatus &sour << source.mModuleLBTEnabled << source.mModuleWORCycle << source.mModuleAmbientRSSI - << source.mModuleLastRxRSSI; + << source.mModuleLastRxRSSI + << source.mIPAddress1 + << source.mIPAddress2 + << source.mIPAddress3 + << source.mIPAddress4; + + return out; } @@ -66,7 +79,11 @@ QDataStream &operator>>(QDataStream &in, CLoraModuleInterfaceStatus &dest) >> dest.mModuleLBTEnabled >> dest.mModuleWORCycle >> dest.mModuleAmbientRSSI - >> dest.mModuleLastRxRSSI; + >> dest.mModuleLastRxRSSI + >> dest.mIPAddress1 + >> dest.mIPAddress2 + >> dest.mIPAddress3 + >> dest.mIPAddress4; return in; diff --git a/Sources/LoraModuleInterface/LoraModuleInterfaceData.h b/Sources/LoraModuleInterface/LoraModuleInterfaceData.h index 4770036..5d9c82c 100644 --- a/Sources/LoraModuleInterface/LoraModuleInterfaceData.h +++ b/Sources/LoraModuleInterface/LoraModuleInterfaceData.h @@ -95,6 +95,11 @@ public: quint8 mModuleAmbientRSSI; quint8 mModuleLastRxRSSI; + quint8 mIPAddress1; + quint8 mIPAddress2; + quint8 mIPAddress3; + quint8 mIPAddress4; + CLoraModuleInterfaceStatus& operator=(const CLoraModuleInterfaceStatus &rhs); };