Chalet LTE + dev

Sources/AvReceiver/AvReceiverData.cpp

@@ -14,16 +14,56 @@ QByteArray CAvReceiverMainStatus::ToByteArray()
     Output.clear();
     QDataStream Strm(&Output,QIODevice::WriteOnly);
 
-    Strm << mMainPwrStatus;
-    Strm <<  mMainSleepStatus;
-    Strm <<  mMainVolume;
-    Strm <<  mIsMute;
-    Strm <<  mInput;
-    Strm <<  mProgram;
+//    Strm << mMainPwrStatus;
+//    Strm <<  mMainSleepStatus;
+//    Strm <<  mMainVolume;
+//    Strm <<  mIsMute;
+//    Strm <<  mInput;
+//    Strm <<  mProgram;
 
-    Strm <<  mDataValid;
-    Strm <<  mReceiverOnline;
-    Strm << mSyncZonesVolumes;
+//    Strm <<  mDataValid;
+//    Strm <<  mReceiverOnline;
+//    Strm << mSyncZonesVolumes;
+
+    if(mMainPwrStatus == true)
+        Output.append(0x01);
+    else
+        Output.append((char)0x00);
+
+    if(mMainSleepStatus == true)
+        Output.append(0x01);
+    else
+        Output.append((char)0x00);
+
+     char VolArray[4];
+    memcpy(VolArray,&mMainVolume,4);
+    Output.append(VolArray);
+
+    if(mIsMute == true)
+        Output.append(0x01);
+    else
+        Output.append((char)0x00);
+
+    char String[50];
+    strcpy(String,mInput.toUtf8().data());
+    Output.append(String,50);
+    strcpy(String,mProgram.toUtf8().data());
+    Output.append(String,50);
+
+    if(mDataValid == true)
+        Output.append(0x01);
+    else
+        Output.append((char)0x00);
+
+    if(mReceiverOnline == true)
+        Output.append(0x01);
+    else
+        Output.append((char)0x00);
+
+    if(mSyncZonesVolumes == true)
+        Output.append(0x01);
+    else
+        Output.append((char)0x00);
 
    return Output;
 
@@ -34,16 +74,68 @@ int CAvReceiverMainStatus::FromByteArray(QByteArray Data)
     QDataStream Strm(Data);
     Strm.device()->seek(0);
 
-    Strm >> mMainPwrStatus;
-    Strm >>  mMainSleepStatus;
-    Strm >>  mMainVolume;
-    Strm >>  mIsMute;
-    Strm >>  mInput;
-    Strm >>  mProgram;
+//    Strm >> mMainPwrStatus;
+//    Strm >>  mMainSleepStatus;
+//    Strm >>  mMainVolume;
+//    Strm >>  mIsMute;
+//    Strm >>  mInput;
+//    Strm >>  mProgram;
 
-    Strm >>  mDataValid;
-    Strm >>  mReceiverOnline;
-    Strm >> mSyncZonesVolumes;
+//    Strm >>  mDataValid;
+//    Strm >>  mReceiverOnline;
+//    Strm >> mSyncZonesVolumes;
+
+    if(Data.at(0) == 1)
+        mMainPwrStatus = true;
+    else
+        mMainPwrStatus = false;
+
+    if(Data.at(1) == 1)
+        mMainSleepStatus = true;
+    else
+        mMainSleepStatus = false;
+
+     char VolArray[4];
+     VolArray[0] = Data[2];
+     VolArray[1] = Data[3];
+     VolArray[2] = Data[4];
+     VolArray[3] = Data[5];
+     memcpy(&mMainVolume,VolArray,4);
+
+    if(Data.at(6) == 1)
+        mIsMute = true;
+    else
+        mIsMute = false;
+
+    char String[50];
+    for(int i= 0; i < 50; i++)
+    {
+        String[i] = Data[i+6];
+    }
+    mInput.clear();
+    mInput.append(String);
+
+    for(int i= 0; i < 50; i++)
+    {
+        String[i] = Data[i+56];
+    }
+    mProgram.clear();
+    mProgram.append(String);
+
+    if(Data.at(107) == 1)
+        mDataValid = true;
+    else
+        mDataValid = false;
+
+    if(Data.at(108) == 1)
+        mReceiverOnline = true;
+    else
+        mReceiverOnline = false;
+
+    if(Data.at(109) == 1)
+        mSyncZonesVolumes = true;
+    else
+        mSyncZonesVolumes = false;
 
     return RET_OK;
 

Sources/GuiMain.cpp

@@ -9,6 +9,7 @@ CGuiMain::CGuiMain(QWidget *parent)
     mAvReceiverGui = new CAvReceiverGui(this);
     mMainTabWidget = new QTabWidget(this);
     mChaletGui = new CChaletGui(this);
+    mChaletGuiLTE = new CChaletGui(this);
     mIspindelGui = new CIspindelGUI(this);
     mTowerLightShowGui = new CTowerLightShowGui;
     mPICUploaderGui = new CPICUploaderGui;
@@ -20,6 +21,7 @@ CGuiMain::CGuiMain(QWidget *parent)
     mMainTabWidget->addTab(mTowerLightShowGui,"Lightshow");
     mMainTabWidget->addTab(mPICUploaderGui,"Firmware Upload");
     mMainTabWidget->addTab(mIspindelGui,"ISpindel");
+    mMainTabWidget->addTab(mChaletGuiLTE,"Chalet LTE");
 
     resize(1700,768);
 }

Sources/GuiMain.h

@@ -24,6 +24,7 @@ public:
     CSprinklerGui *mSprinklerGui;
     CAvReceiverGui *mAvReceiverGui;
     CChaletGui *mChaletGui;
+    CChaletGui *mChaletGuiLTE;
     QTabWidget *mMainTabWidget;
     CTowerLightShowGui *mTowerLightShowGui;
     CPICUploaderGui *mPICUploaderGui;

Sources/MasterCtrlInterface.cpp

@@ -10,10 +10,10 @@ CMasterCtrlInterface::CMasterCtrlInterface()
     connect(mNetworkCommSocket,SIGNAL(disconnected()),this,SLOT(NetworkSocketDisconnected()));
     connect(mNetworkCommSocket,SIGNAL(readyRead()),this,SLOT(NetworkSocketDataAvailable()));
 
-//    mMasterReconnectTimer.setInterval(500);
-//    mMasterReconnectTimer.stop();
-//    mMasterReconnectTimer.setSingleShot(false);
-//    connect(&mMasterReconnectTimer,SIGNAL(timeout()),this,SLOT(NetworkReconnectTimerExpired()));
+    mMasterReconnectTimer.setInterval(1000);
+    mMasterReconnectTimer.stop();
+    mMasterReconnectTimer.setSingleShot(false);
+    connect(&mMasterReconnectTimer,SIGNAL(timeout()),this,SLOT(NetworkReconnectTimerExpired()));
 
 }
 
@@ -27,7 +27,8 @@ int CMasterCtrlInterface::ConnectToMasterCtrl()
         connect(mNetworkCommSocket,SIGNAL(disconnected()),this,SLOT(NetworkSocketDisconnected()));
         connect(mNetworkCommSocket,SIGNAL(readyRead()),this,SLOT(NetworkSocketDataAvailable()));
     }
-    mNetworkCommSocket->connectToHost(mMasterCtrlIPAddress,mNetworkPort);
+    if(mNetworkCommSocket->state() == QAbstractSocket::UnconnectedState)
+        mNetworkCommSocket->connectToHost(mMasterCtrlIPAddress,mNetworkPort);
 
     return RET_OK;
 }