Beaucoup de dev... début de LoraModuleInterface

Sources/Chalet/ChaletInterface.cpp

@@ -9,6 +9,7 @@ CChaletInterface::CChaletInterface(int Address, CAbstractNetworkCommIF *NetworkI
 
     connect(mChaletLoraDevice,SIGNAL(DeviceWifiStoredParamsReceived()),this,SLOT(DeviceWiFiDataReceived()));
     connect(mChaletLoraDevice,SIGNAL(DeviceFirmwareVersionReceived()),this,SLOT(DeviceFirmwareVersionReceived()));
+    connect(mChaletLoraDevice,SIGNAL(DeviceWifiStatusReceived(QByteArray)),this,SLOT(DeviceWifiStatusReceived(QByteArray)));
 
 }
 
@@ -119,6 +120,11 @@ int CChaletInterface::NewDeviceFrameReceived(int DeviceID, int DeviceAddress, in
 //            mChaletLoraDevice->ResetCommStats();
             break;
         }
+        case CHALET_INTERFACE_GET_WIFI_STATUS_REQUEST:
+        {
+            mChaletLoraDevice->SendGetWifiStatusRequest();
+            break;
+        }
         case CHALET_INTERFACE_WIFI_GET_DEVICE_PARAMS_RESPONSE:
         case CHALET_INTERFACE_WIFI_SET_DEVICE_PARAMS_RESPONSE:
         case CHALET_INTERFACE_GET_DATA_LOG_RESPONSE:
@@ -129,6 +135,7 @@ int CChaletInterface::NewDeviceFrameReceived(int DeviceID, int DeviceAddress, in
         case CHALET_INTERFACE_BATTERY_VOLTAGE_RESPONSE:
         case CHALET_INTERFACE_WIFI_SET_STATE_RESPONSE:
         case CHALET_INTERFACE_CLEAR_COMMS_STATS_RESPONSE:
+        case CHALET_INTERFACE_GET_WIFI_STATUS_RESPONSE:
         {
             break;
 
@@ -160,3 +167,8 @@ void CChaletInterface::DeviceFirmwareVersionReceived()
     QByteArray Data = mChaletLoraDevice->GetDeviceFirmwareVersion();
     mNetworkInterfacePtr->SendNetworkMessage(ID_CHALET_INTERFACE,mDeviceAddress,CHALET_INTERFACE_GET_FIRMWARE_VERSION_RESPONSE,Data.size(),&Data);
 }
+
+void CChaletInterface::DeviceWifiStatusReceived(QByteArray Data)
+{
+    mNetworkInterfacePtr->SendNetworkMessage(ID_CHALET_INTERFACE,mDeviceAddress,CHALET_INTERFACE_GET_WIFI_STATUS_RESPONSE,Data.size(),&Data);
+}

Sources/Chalet/ChaletInterface.h

@@ -21,6 +21,7 @@ private:
 public slots:
     void DeviceWiFiDataReceived();
     void DeviceFirmwareVersionReceived();
+    void DeviceWifiStatusReceived(QByteArray Data);
 
 };
 

Sources/Chalet/ChaletLoraDevice.cpp

@@ -169,8 +169,8 @@ int CChaletLoraDevice::NewDeviceFrameReceived(int DeviceID, int DeviceAddress, i
         }
         case CHALET_WIFI_STATUS_RESPONSE:
         {
-            mChaletMainStatus.mWiFiModuleStatus = Data[0];
             CmdResponseReceived(CHALET_WIFI_STATUS_REQUEST);
+            emit DeviceWifiStatusReceived(Data);
             break;
         }
         case CHALET_WIFI_SET_STATE_RESPONSE:
@@ -211,7 +211,7 @@ int CChaletLoraDevice::NewDeviceFrameReceived(int DeviceID, int DeviceAddress, i
         {
 
             CmdResponseReceived(CHALET_GET_STORED_WIFI_SETTINGS_REQUEST);
-            mDeviceWiFiParameters = Data.left(8);
+            mDeviceWiFiParameters = Data.left(DataSize);
             emit DeviceWifiStoredParamsReceived();
             break;
         }
@@ -370,6 +370,11 @@ int CChaletLoraDevice::SendClearCommStatsRequest()
     return ScheduleChaletCommand(CHALET_CLEAR_COMMS_STATISTICS_REQUEST,QByteArray());
 }
 
+int CChaletLoraDevice::SendGetWifiStatusRequest()
+{
+    return ScheduleChaletCommand(CHALET_WIFI_STATUS_REQUEST,QByteArray());
+}
+
 int CChaletLoraDevice::SendChaletCommand(int CmdID, int DataSize, QByteArray Data)
 {
     mNetworkInterfacePtr->SendNetworkMessage(ID_CHALET_DEVICE,mDeviceAddress,CmdID,DataSize,&Data);
@@ -416,6 +421,8 @@ int CChaletLoraDevice::CmdResponseReceived(int CmdID)
     return RET_OK;
 }
 
+
+
 int CChaletLoraDevice::ScheduleChaletStatusRequest()
 {
    return ScheduleChaletCommand(CHALET_GENERAL_STATUS_REQUEST,0,QByteArray());

Sources/Chalet/ChaletLoraDevice.h

@@ -73,6 +73,7 @@ public:
     int SendSetWifiParams(QByteArray Data);
     int SendGetFirmwareVersion();
     int SendClearCommStatsRequest();
+    int SendGetWifiStatusRequest();
 
     int CmdResponseReceived(int CmdID);
     int ScheduleChaletStatusRequest();
@@ -85,6 +86,7 @@ signals:
     void DeviceWifiStoredParamsReceived();
     void DeviceWifiSetParamsResult(char);
     void DeviceFirmwareVersionReceived();
+    void DeviceWifiStatusReceived(QByteArray);
 
 public slots:
     void CommTimerExpired();