diff --git a/.gitignore b/.gitignore index 556d7b9..ef7bf23 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ /debug /release /.project +/SystemGui.pro.user.3910d82.4.8-pre1 +/.qmake.stash diff --git a/.qmake.stash b/.qmake.stash index d717b0a..44ed09b 100644 --- a/.qmake.stash +++ b/.qmake.stash @@ -13,3 +13,37 @@ QMAKE_DEFAULT_LIBDIRS = \ /usr/lib \ /lib/x86_64-linux-gnu \ /lib +QMAKE_CXX.QT_COMPILER_STDCXX = 201402L +QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7 +QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3 +QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0 +QMAKE_CXX.COMPILER_MACROS = \ + QT_COMPILER_STDCXX \ + QMAKE_GCC_MAJOR_VERSION \ + QMAKE_GCC_MINOR_VERSION \ + QMAKE_GCC_PATCH_VERSION +QMAKE_CXX.INCDIRS = \ + /usr/include/c++/5 \ + /usr/include/x86_64-linux-gnu/c++/5 \ + /usr/include/c++/5/backward \ + /usr/lib/gcc/x86_64-linux-gnu/5/include \ + /usr/local/include \ + /usr/lib/gcc/x86_64-linux-gnu/5/include-fixed \ + /usr/include/x86_64-linux-gnu \ + /usr/include \ + C:/Qt/Qt5.14.2/Tools/mingw730_64/lib/gcc/x86_64-w64-mingw32/7.3.0/include/c++ \ + C:/Qt/Qt5.14.2/Tools/mingw730_64/lib/gcc/x86_64-w64-mingw32/7.3.0/include/c++/x86_64-w64-mingw32 \ + C:/Qt/Qt5.14.2/Tools/mingw730_64/lib/gcc/x86_64-w64-mingw32/7.3.0/include/c++/backward \ + C:/Qt/Qt5.14.2/Tools/mingw730_64/lib/gcc/x86_64-w64-mingw32/7.3.0/include \ + C:/Qt/Qt5.14.2/Tools/mingw730_64/lib/gcc/x86_64-w64-mingw32/7.3.0/include-fixed \ + C:/Qt/Qt5.14.2/Tools/mingw730_64/x86_64-w64-mingw32/include +QMAKE_CXX.LIBDIRS = \ + /usr/lib/gcc/x86_64-linux-gnu/5 \ + /usr/lib/x86_64-linux-gnu \ + /usr/lib \ + /lib/x86_64-linux-gnu \ + /lib \ + C:/Qt/Qt5.14.2/Tools/mingw730_64/lib/gcc/x86_64-w64-mingw32/7.3.0 \ + C:/Qt/Qt5.14.2/Tools/mingw730_64/lib/gcc \ + C:/Qt/Qt5.14.2/Tools/mingw730_64/x86_64-w64-mingw32/lib \ + C:/Qt/Qt5.14.2/Tools/mingw730_64/lib diff --git a/Sources/AvReceiver/AvReceiver.cpp b/Sources/AvReceiver/AvReceiver.cpp new file mode 100644 index 0000000..7821cfb --- /dev/null +++ b/Sources/AvReceiver/AvReceiver.cpp @@ -0,0 +1,76 @@ +#include "AvReceiver.h" +#include "AvReceiverNetworkCtrlInterface.h" + +CAvReceiver::CAvReceiver(CAvReceiverGui *ReceiverGui) +{ + mReceiverGui = ReceiverGui; + ReceiverGui->mProgramHandle = this; + mNetworkInterface = new CAvReceiverNetworkCtrlInterface(this); + + mReceiverPollTimer = new QTimer(); + mReceiverPollTimer->setSingleShot(false); + mReceiverPollTimer->setInterval(1000); + connect(mReceiverPollTimer,SIGNAL(timeout()),this,SLOT(PollTimerExpired())); +} + +CAvReceiver::~CAvReceiver() +{ + delete mNetworkInterface; + delete mReceiverPollTimer; +} + +int CAvReceiver::Start() +{ + mNetworkInterface->ConnectToMasterCtrl(); + mReceiverPollTimer->start(); + return RET_OK; +} + + +int CAvReceiver::SpeakerBToggleSwitchPressed(bool state) +{ + + QByteArray SpkrState; + SpkrState.clear(); + + if(state) + { + SpkrState.append((char)0x01); + } + else + { + SpkrState.append((char)0x00); + } + return mNetworkInterface->SendMasterCtrlCommand(AV_RECEIVER_INTERFACE_SET_SPEAKERB_REQUEST,SpkrState); + +} + + +int CAvReceiver::SpeakerAToggleSwitchPressed(bool state) +{ + + QByteArray SpkrState; + SpkrState.clear(); + + if(state) + { + SpkrState.append((char)0x01); + } + else + { + SpkrState.append((char)0x00); + } + return mNetworkInterface->SendMasterCtrlCommand(AV_RECEIVER_INTERFACE_SET_SPEAKERA_REQUEST,SpkrState); + +} + +void CAvReceiver::PollTimerExpired() +{ + mNetworkInterface->SendMasterCtrlCommand(AV_RECEIVER_INTERFACE_GENERAL_STATUS_REQUEST,QByteArray()); +} + +int CAvReceiver::ReceiverGeneralStatusReceived(QByteArray StatusData) +{ + mReceiverStatus.FromByteArray(StatusData); + mReceiverGui->UpdateReceiverStatus(mReceiverStatus); +} diff --git a/Sources/AvReceiver/AvReceiver.h b/Sources/AvReceiver/AvReceiver.h new file mode 100644 index 0000000..439d575 --- /dev/null +++ b/Sources/AvReceiver/AvReceiver.h @@ -0,0 +1,36 @@ +#ifndef AVRECEIVER_H +#define AVRECEIVER_H + +#include +#include "AvReceiverData.h" + +class CAvReceiverNetworkCtrlInterface; + +#include "AvReceiverGui.h" + +class CAvReceiver : public QObject +{ + Q_OBJECT +public: + CAvReceiver(CAvReceiverGui *ReceiverGui); + virtual ~CAvReceiver(); + + int Start(); + + int SpeakerBToggleSwitchPressed(bool state); + int SpeakerAToggleSwitchPressed(bool state); + int ReceiverGeneralStatusReceived(QByteArray StatusData); + + CAvReceiverNetworkCtrlInterface *mNetworkInterface; + CAvReceiverGui *mReceiverGui; + QTimer *mReceiverPollTimer; + +private: + CAvReceiverMainStatus mReceiverStatus; + +public slots: + void PollTimerExpired(); + +}; + +#endif // AVRECEIVER_H diff --git a/Sources/AvReceiver/AvReceiverData.cpp b/Sources/AvReceiver/AvReceiverData.cpp new file mode 100644 index 0000000..f8ace7a --- /dev/null +++ b/Sources/AvReceiver/AvReceiverData.cpp @@ -0,0 +1,52 @@ +#include "AvReceiverData.h" +#include + +CAvReceiverMainStatus::CAvReceiverMainStatus() +{ + mDataValid = false; + mReceiverOnline = false; +} + +QByteArray CAvReceiverMainStatus::ToByteArray() +{ + + QByteArray Output; + Output.clear(); + QDataStream Strm(&Output,QIODevice::WriteOnly); + + Strm << mMainPwrStatus; + Strm << mMainSleepStatus; + Strm << mMainVolume; + Strm << mIsMute; + Strm << mInput; + Strm << mProgram; + Strm << mSpeakerAState; + Strm << mSpeakerBState; + + Strm << mDataValid; + Strm << mReceiverOnline; + + return Output; + +} + +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 >> mSpeakerAState; + Strm >> mSpeakerBState; + + Strm >> mDataValid; + Strm >> mReceiverOnline; + + return RET_OK; + +} diff --git a/Sources/AvReceiver/AvReceiverData.h b/Sources/AvReceiver/AvReceiverData.h new file mode 100644 index 0000000..28c4c02 --- /dev/null +++ b/Sources/AvReceiver/AvReceiverData.h @@ -0,0 +1,30 @@ +#ifndef AVRECEIVERDATA_H +#define AVRECEIVERDATA_H +#include +#include "GlobalDefine.h" + + +class CAvReceiverMainStatus +{ +public: + + QByteArray ToByteArray(); + int FromByteArray(QByteArray Data); + + CAvReceiverMainStatus(); + + bool mMainPwrStatus; + bool mMainSleepStatus; + float mMainVolume; + bool mIsMute; + QString mInput; + QString mProgram; + bool mSpeakerAState; + bool mSpeakerBState; + + bool mDataValid; + bool mReceiverOnline; + +}; + +#endif // AVRECEIVERDATA_H diff --git a/Sources/AvReceiver/AvReceiverGui.cpp b/Sources/AvReceiver/AvReceiverGui.cpp new file mode 100644 index 0000000..e2d2e25 --- /dev/null +++ b/Sources/AvReceiver/AvReceiverGui.cpp @@ -0,0 +1,104 @@ +#include "AvReceiverGui.h" +#include "ui_AvReceiverGui.h" + +#include "AvReceiver.h" + +CAvReceiverGui::CAvReceiverGui(QWidget *parent) : + QWidget(parent), + ui(new Ui::CAvReceiverGui) +{ + ui->setupUi(this); + + connect(ui->mSpkBCheckBox,SIGNAL(toggled(bool)),this,SLOT(SpeakerBRadioClicked(bool))); + connect(ui->mSpkACheckBox,SIGNAL(toggled(bool)),this,SLOT(SpeakerARadioClicked(bool))); +} + +CAvReceiverGui::~CAvReceiverGui() +{ + delete ui; +} + +void CAvReceiverGui::SpeakerBRadioClicked(bool checked) +{ + mProgramHandle->SpeakerBToggleSwitchPressed(checked); +} + +void CAvReceiverGui::SpeakerARadioClicked(bool checked) +{ + mProgramHandle->SpeakerAToggleSwitchPressed(checked); +} + +int CAvReceiverGui::UpdateReceiverStatus(CAvReceiverMainStatus Status) +{ + QString StatusText; + + StatusText.clear(); + StatusText += "Receiver Status:\n\n"; + + StatusText += "Power: "; + if(Status.mMainPwrStatus == true) + { + StatusText += "ON\n"; + } + else + { + StatusText += "OFF\n"; + } + + StatusText += "Mute: "; + if(Status.mIsMute == true) + { + StatusText += "ON\n"; + } + else + { + StatusText += "OFF\n"; + } + + StatusText += "Main sleep: "; + if(Status.mMainSleepStatus == true) + { + StatusText += "ON\n"; + } + else + { + StatusText += "OFF\n"; + } + + StatusText += "Volume: "; + StatusText += QString("%1").arg(Status.mMainVolume); + StatusText +="\n"; + StatusText += "Input: "; + StatusText +=Status.mInput; + StatusText += "\n"; + StatusText += "Program: "; + StatusText +=Status.mProgram; + StatusText += "\n"; + + StatusText += "Zone A: "; + if(Status.mSpeakerAState == true) + { + StatusText += "ON\n"; + ui->mSpkACheckBox->setChecked(true); + } + else + { + StatusText += "OFF\n"; + ui->mSpkACheckBox->setChecked(false); + } + + StatusText += "Zone B: "; + if(Status.mSpeakerBState == true) + { + StatusText += "ON\n"; + ui->mSpkBCheckBox->setChecked(true); + } + else + { + StatusText += "OFF\n"; + ui->mSpkBCheckBox->setChecked(false); + } + + + ui->mRcvrStatusLabel->setText(StatusText); +} diff --git a/Sources/AvReceiver/AvReceiverGui.h b/Sources/AvReceiver/AvReceiverGui.h new file mode 100644 index 0000000..ad9e66f --- /dev/null +++ b/Sources/AvReceiver/AvReceiverGui.h @@ -0,0 +1,32 @@ +#ifndef AVRECEIVERGUI_H +#define AVRECEIVERGUI_H + +#include +class CAvReceiver; +#include "AvReceiverData.h" + +namespace Ui { +class CAvReceiverGui; +} + +class CAvReceiverGui : public QWidget +{ + Q_OBJECT + +public: + explicit CAvReceiverGui(QWidget *parent = 0); + ~CAvReceiverGui(); + + CAvReceiver *mProgramHandle; + + int UpdateReceiverStatus(CAvReceiverMainStatus Status); + +private: + Ui::CAvReceiverGui *ui; + +public slots: + void SpeakerBRadioClicked(bool checked); + void SpeakerARadioClicked(bool checked); +}; + +#endif // AVRECEIVERGUI_H diff --git a/Sources/AvReceiver/AvReceiverGui.ui b/Sources/AvReceiver/AvReceiverGui.ui new file mode 100644 index 0000000..0170e59 --- /dev/null +++ b/Sources/AvReceiver/AvReceiverGui.ui @@ -0,0 +1,71 @@ + + + CAvReceiverGui + + + + 0 + 0 + 796 + 447 + + + + Form + + + + + 230 + 30 + 201 + 16 + + + + AvReceiver + + + + + + 100 + 110 + 181 + 231 + + + + TextLabel + + + + + + 570 + 130 + 70 + 17 + + + + Speaker B + + + + + + 570 + 160 + 70 + 17 + + + + Speaker A + + + + + + diff --git a/Sources/AvReceiver/AvReceiverNetworkCtrlInterface.cpp b/Sources/AvReceiver/AvReceiverNetworkCtrlInterface.cpp new file mode 100644 index 0000000..cf0848d --- /dev/null +++ b/Sources/AvReceiver/AvReceiverNetworkCtrlInterface.cpp @@ -0,0 +1,79 @@ +#include "AvReceiverNetworkCtrlInterface.h" +#include "AvReceiver.h" + +CAvReceiverNetworkCtrlInterface::CAvReceiverNetworkCtrlInterface(CAvReceiver *ProgramHandle) +{ + mMyDeviceID = ID_AVRECEIVER_INTERFACE; + mNetworkPort = 2182; + mMasterCtrlIPAddress = "127.0.0.1"; + mNetworkCommSocket = 0; + mDeviceAddress = 1; + + mProgramHandle = ProgramHandle; +} +int CAvReceiverNetworkCtrlInterface::DeviceFrameReceived(int TargetDeviceID, int TargetDeviceAddress, int SenderID, int SenderAddress, int MessageID, int DataSize, QByteArray Data) +{ + Q_UNUSED(DataSize) + + + if(TargetDeviceID == mMyDeviceID && (TargetDeviceAddress == BROADCAST_VALUE || TargetDeviceAddress == mDeviceAddress)) + { + switch(MessageID) + { + + case AV_RECEIVER_INTERFACE_ACK: + { + qDebug("Av Receiver Interface ACK received :)"); + break; + } + + case AV_RECEIVER_INTERFACE_GENERAL_STATUS_RESPONSE: + { +// qDebug("Av Receiver General Status received :)"); + mProgramHandle->ReceiverGeneralStatusReceived(Data); + break; + } + + case AV_RECEIVER_INTERFACE_SET_MAIN_POWER_RESPONSE: + { + break; + } + + case AV_RECEIVER_INTERFACE_SET_SPEAKERB_RESPONSE: + { + break; + } + + case AV_RECEIVER_INTERFACE_SEND_DIRECT_CMD_RESPONSE: + { + break; + } + case AV_RECEIVER_INTERFACE_GENERAL_STATUS_REQUEST: + case AV_RECEIVER_INTERFACE_SET_MAIN_POWER_REQUEST: + case AV_RECEIVER_INTERFACE_SET_SPEAKERB_REQUEST: + case AV_RECEIVER_INTERFACE_SEND_DIRECT_CMD_REQUEST: + default: + { + qDebug("AV Receiver: Invalid Ethernet Msg received: %d",MessageID); + break; + } + + } + } + + return RET_OK; +} + +int CAvReceiverNetworkCtrlInterface::DeviceConnectedToMaster(bool Connected) +{ + + if(Connected) + { + qDebug("Av Receiver Interface connected to Master."); + return SendMasterCtrlCommand(AV_RECEIVER_INTERFACE_GENERAL_STATUS_REQUEST,QByteArray()); + } + else + return RET_ERROR; + + return RET_OK; +} diff --git a/Sources/AvReceiver/AvReceiverNetworkCtrlInterface.h b/Sources/AvReceiver/AvReceiverNetworkCtrlInterface.h new file mode 100644 index 0000000..149b74d --- /dev/null +++ b/Sources/AvReceiver/AvReceiverNetworkCtrlInterface.h @@ -0,0 +1,19 @@ +#ifndef AVRECEIVERNETWORKCTRLINTERFACE_H +#define AVRECEIVERNETWORKCTRLINTERFACE_H + +#include "MasterCtrlInterface.h" +class CAvReceiver; + +class CAvReceiverNetworkCtrlInterface: public CMasterCtrlInterface +{ +public: + CAvReceiverNetworkCtrlInterface(CAvReceiver *ProgramHandle); + + int DeviceFrameReceived(int TargetDeviceID, int TargetDeviceAddress, int SenderID, int SenderAddress, int MessageID, int DataSize, QByteArray Data); + int DeviceConnectedToMaster(bool Connected = true); + +private: + CAvReceiver *mProgramHandle; +}; + +#endif // AVRECEIVERNETWORKCTRLINTERFACE_H diff --git a/Sources/Chalet/Chalet.cpp b/Sources/Chalet/Chalet.cpp new file mode 100644 index 0000000..f44fe37 --- /dev/null +++ b/Sources/Chalet/Chalet.cpp @@ -0,0 +1,14 @@ +#include "Chalet.h" +#include "ChaletMasterCtrlInterface.h" + +CChalet::CChalet(CChaletGui *ChaletGui) +{ + mChaletGui = ChaletGui; + mChaletGui->mProgramHandle = this; + mNetworkInterface = new CChaletMasterCtrlInterface(this); +} + +CChalet::~CChalet() +{ + delete mNetworkInterface; +} diff --git a/Sources/Chalet/Chalet.h b/Sources/Chalet/Chalet.h new file mode 100644 index 0000000..d0b2837 --- /dev/null +++ b/Sources/Chalet/Chalet.h @@ -0,0 +1,22 @@ +#ifndef CCHALET_H +#define CCHALET_H + +#include +#include "ChaletGui.h" +class CChaletMasterCtrlInterface; + +class CChalet : public QObject +{ + Q_OBJECT +public: + explicit CChalet(CChaletGui *ChaletGui); + ~CChalet(); + + CChaletMasterCtrlInterface *mNetworkInterface; + CChaletGui *mChaletGui; + +signals: + +}; + +#endif // CCHALET_H diff --git a/Sources/Chalet/ChaletGui.cpp b/Sources/Chalet/ChaletGui.cpp new file mode 100644 index 0000000..ec0ecc9 --- /dev/null +++ b/Sources/Chalet/ChaletGui.cpp @@ -0,0 +1,15 @@ +#include "ChaletGui.h" +#include "ui_ChaletGui.h" +#include "Chalet.h" + +CChaletGui::CChaletGui(QWidget *parent) : + QWidget(parent), + ui(new Ui::CChaletGui) +{ + ui->setupUi(this); +} + +CChaletGui::~CChaletGui() +{ + delete ui; +} diff --git a/Sources/Chalet/ChaletGui.h b/Sources/Chalet/ChaletGui.h new file mode 100644 index 0000000..f923f81 --- /dev/null +++ b/Sources/Chalet/ChaletGui.h @@ -0,0 +1,26 @@ +#ifndef CHALETGUI_H +#define CHALETGUI_H + +#include + +class CChalet; + +namespace Ui { +class CChaletGui; +} + +class CChaletGui : public QWidget +{ + Q_OBJECT + +public: + explicit CChaletGui(QWidget *parent = nullptr); + ~CChaletGui(); + + CChalet *mProgramHandle; + +private: + Ui::CChaletGui *ui; +}; + +#endif // CHALETGUI_H diff --git a/Sources/Chalet/ChaletGui.ui b/Sources/Chalet/ChaletGui.ui new file mode 100644 index 0000000..2c98d19 --- /dev/null +++ b/Sources/Chalet/ChaletGui.ui @@ -0,0 +1,39 @@ + + + CChaletGui + + + + 0 + 0 + 615 + 521 + + + + Form + + + + + 220 + 40 + 201 + 31 + + + + + 12 + 75 + true + + + + Chalet + + + + + + diff --git a/Sources/Chalet/ChaletMasterCtrlInterface.cpp b/Sources/Chalet/ChaletMasterCtrlInterface.cpp new file mode 100644 index 0000000..47e1807 --- /dev/null +++ b/Sources/Chalet/ChaletMasterCtrlInterface.cpp @@ -0,0 +1,71 @@ +#include "ChaletMasterCtrlInterface.h" + +CChaletMasterCtrlInterface::CChaletMasterCtrlInterface(CChalet *ProgramHandle) +{ + mProgramHandle = ProgramHandle; +} + +int CChaletMasterCtrlInterface::DeviceConnectedToMaster(bool Connected) +{ + + if(Connected) + { + qDebug("Chalet Interface connected to Master."); + } + else + return RET_ERROR; + + return RET_OK; +} + +int CChaletMasterCtrlInterface::DeviceFrameReceived(int TargetDeviceID, int TargetDeviceAddress, int SenderID, int SenderAddress, int MessageID, int DataSize, QByteArray Data) +{ + Q_UNUSED(DataSize) + Q_UNUSED(SenderID) + Q_UNUSED(SenderAddress) + + + if(TargetDeviceID == mMyDeviceID && (TargetDeviceAddress == BROADCAST_VALUE || TargetDeviceAddress == mDeviceAddress)) + { + switch(MessageID) + { + case CHALET_INTERFACE_ACK: + { + qDebug("Chalet Interface ACK received :)"); + break; + } + + case CHALET_INTERFACE_GENERAL_STATUS_RESPONSE: + { + qDebug("Chalet General Status received :)"); + break; + } + + case CHALET_INTERFACE_AC_POWER_STATE_STATUS_RESPONSE: + { + break; + } + + case CHALET_INTERFACE_AC_POWER_SET_STATE_RESPONSE: + { + break; + } + + case CHALET_INTERFACE_BATTERY_VOLTAGE_RESPONSE: + { + break; + } + case CHALET_INTERFACE_GENERAL_STATUS_REQUEST: + case CHALET_INTERFACE_AC_POWER_STATE_STATUS_REQUEST: + case CHALET_INTERFACE_AC_POWER_SET_STATE_REQUEST: + case CHALET_INTERFACE_BATTERY_VOLTAGE_REQUEST: + default: + { + qDebug("Chalet: Invalid Ethernet Msg received from MasterCtrl: %d",MessageID); + break; + } + + } + } + return RET_OK; +} diff --git a/Sources/Chalet/ChaletMasterCtrlInterface.h b/Sources/Chalet/ChaletMasterCtrlInterface.h new file mode 100644 index 0000000..c757f1f --- /dev/null +++ b/Sources/Chalet/ChaletMasterCtrlInterface.h @@ -0,0 +1,19 @@ +#ifndef CCHALETMASTERCTRLINTERFACE_H +#define CCHALETMASTERCTRLINTERFACE_H + +#include "MasterCtrlInterface.h" +class CChalet; + +class CChaletMasterCtrlInterface: public CMasterCtrlInterface +{ +public: + CChaletMasterCtrlInterface(CChalet *ProgramHandle); + + int DeviceFrameReceived(int TargetDeviceID, int TargetDeviceAddress, int SenderID, int SenderAddress, int MessageID, int DataSize, QByteArray Data); + int DeviceConnectedToMaster(bool Connected = true); + +private: + CChalet *mProgramHandle; +}; + +#endif // CCHALETMASTERCTRLINTERFACE_H diff --git a/Sources/GuiMain.cpp b/Sources/GuiMain.cpp index 448162d..8aed425 100644 --- a/Sources/GuiMain.cpp +++ b/Sources/GuiMain.cpp @@ -6,10 +6,15 @@ CGuiMain::CGuiMain(QWidget *parent) { mSMSGui = new CSMSGui(this); mSprinklerGui = new CSprinklerGui(this); + mAvReceiverGui = new CAvReceiverGui(this); mMainTabWidget = new QTabWidget(this); + mChaletGui = new CChaletGui(this); setCentralWidget(mMainTabWidget); mMainTabWidget->addTab(mSMSGui,"SMS"); mMainTabWidget->addTab(mSprinklerGui,"Sprinkler"); + mMainTabWidget->addTab(mAvReceiverGui,"AV Receiver"); + mMainTabWidget->addTab(mChaletGui,"Chalet"); + resize(1024,768); } diff --git a/Sources/GuiMain.h b/Sources/GuiMain.h index 090df0d..53d0e17 100644 --- a/Sources/GuiMain.h +++ b/Sources/GuiMain.h @@ -6,6 +6,9 @@ #include "SMSGui.h" #include #include "SprinklerGui.h" +#include "AvReceiverGui.h" +#include "ChaletGui.h" + class CGuiMain : public QMainWindow { @@ -17,6 +20,8 @@ public: CSMSGui *mSMSGui; CSprinklerGui *mSprinklerGui; + CAvReceiverGui *mAvReceiverGui; + CChaletGui *mChaletGui; QTabWidget *mMainTabWidget; int RespawnMainWindow(); int HideMainWindow(); diff --git a/Sources/MasterCtrlInterface.cpp b/Sources/MasterCtrlInterface.cpp index baadc00..657259c 100644 --- a/Sources/MasterCtrlInterface.cpp +++ b/Sources/MasterCtrlInterface.cpp @@ -15,7 +15,7 @@ int CMasterCtrlInterface::ConnectToMasterCtrl() connect(mNetworkCommSocket,SIGNAL(disconnected()),this,SLOT(NetworkSocketDisconnected())); connect(mNetworkCommSocket,SIGNAL(readyRead()),this,SLOT(NetworkSocketDataAvailable())); - mNetworkCommSocket->connectToHost(mMasterCtrlAddress,mNetworkPort); + mNetworkCommSocket->connectToHost(mMasterCtrlIPAddress,mNetworkPort); return RET_OK; } @@ -94,3 +94,10 @@ void CMasterCtrlInterface::NetworkSocketDisconnected() qDebug("Disconnected from MasterCtrl"); } + +int CMasterCtrlInterface::SendMasterCtrlCommand(unsigned char MessageID, QByteArray Data) +{ + mNetworkCommSocket->write(GetTxPacket(MessageID,0,Data.data(),Data.size(),1,ID_MASTER,mMyDeviceID,mDeviceAddress)); + + return RET_OK; +} diff --git a/Sources/MasterCtrlInterface.h b/Sources/MasterCtrlInterface.h index 3796a26..4d83d43 100644 --- a/Sources/MasterCtrlInterface.h +++ b/Sources/MasterCtrlInterface.h @@ -18,17 +18,20 @@ public: QTcpSocket *mNetworkCommSocket; int mDeviceAddress; int mNetworkPort; - QString mMasterCtrlAddress; + QString mMasterCtrlIPAddress; int mMyDeviceID; int ConnectToMasterCtrl(); int DisconnectMasterCtrl(); + int SendMasterCtrlCommand(unsigned char MessageID, QByteArray Data); virtual int NewFrameReceived(int TargetDeviceID, int TargetDeviceAddress, int SenderID, int SenderAddress, int MessageID, int DataSize, QByteArray Data); virtual int DeviceFrameReceived(int TargetDeviceID, int TargetDeviceAddress, int SenderID, int SenderAddress, int MessageID, int DataSize, QByteArray Data) = 0; virtual int DeviceConnectedToMaster(bool Connected = true) = 0; + + public slots: void NetworkSocketConnected(); void NetworkSocketDataAvailable(); diff --git a/Sources/ProtocolDefs.h b/Sources/ProtocolDefs.h index 7874b55..bb336ad 100644 --- a/Sources/ProtocolDefs.h +++ b/Sources/ProtocolDefs.h @@ -27,16 +27,20 @@ jean-francois.martel@polymtl.ca enum eFrameIndex { - FRAME_HEADER_INDEX, - FRAME_SENDER_ID_INDEX, + FRAME_HEADER_INDEX = 0, FRAME_SENDER_ADDRESS_INDEX, - FRAME_DEST_ID_INDEX, + FRAME_SENDER_DEVICE_ID_INDEX, + FRAME_DEST_DEVICE_ID_INDEX, FRAME_DEST_ADDRESS_INDEX, FRAME_FLAGS_INDEX, FRAME_COMMAND_INDEX, FRAME_SIZE1_INDEX, FRAME_SIZE2_INDEX, - FRAME_DATA_INDEX + FRAME_SIZE3_INDEX, + FRAME_SIZE4_INDEX, + FRAME_DATA_INDEX, + + FRAME_INDEX_NBR }; enum DEVICES_IDS @@ -47,12 +51,14 @@ enum DEVICES_IDS ID_AV_MUX, //Audio Video Multiplexer ID_IR_REMOTE, //Infra red transmitter ID_DEADBOLT_DEVICE, - ID_RECEIVER_AMP, + ID_AV_RECEIVER, ID_SMS_CLIENT, ID_ETHERNET_VIRTUAL, ID_SPRINKLER_DEVICE, ID_SPRINKLER_INTERFACE, ID_DEADBOLT_INTERFACE, + ID_AVRECEIVER_INTERFACE, + ID_CHALET_INTERFACE, ID_NB_DEVICE_ID }; @@ -221,4 +227,39 @@ enum ETHERNET_NETWORK_VIRTUAL_CMDS }; +enum AV_RECEIVER_INTERFACE_CMDS +{ + AV_RECEIVER_INTERFACE_ACK = 1, + AV_RECEIVER_INTERFACE_GENERAL_STATUS_REQUEST, + AV_RECEIVER_INTERFACE_GENERAL_STATUS_RESPONSE, + AV_RECEIVER_INTERFACE_SET_MAIN_POWER_REQUEST, + AV_RECEIVER_INTERFACE_SET_MAIN_POWER_RESPONSE, + AV_RECEIVER_INTERFACE_SET_SPEAKERB_REQUEST, + AV_RECEIVER_INTERFACE_SET_SPEAKERB_RESPONSE, + AV_RECEIVER_INTERFACE_SET_SPEAKERA_REQUEST, + AV_RECEIVER_INTERFACE_SET_SPEAKERA_RESPONSE, + AV_RECEIVER_INTERFACE_SET_SPEAKERS_REQUEST, + AV_RECEIVER_INTERFACE_SET_SPEAKERS_RESPONSE, + AV_RECEIVER_INTERFACE_SEND_DIRECT_CMD_REQUEST, + AV_RECEIVER_INTERFACE_SEND_DIRECT_CMD_RESPONSE, + + + MAX_AV_RECEIVER_INTERFACE_CMD +}; + +enum CHALET_INTERFACE_CMDS +{ + CHALET_INTERFACE_ACK = 1, + CHALET_INTERFACE_GENERAL_STATUS_REQUEST, + CHALET_INTERFACE_GENERAL_STATUS_RESPONSE, + CHALET_INTERFACE_AC_POWER_STATE_STATUS_REQUEST, + CHALET_INTERFACE_AC_POWER_STATE_STATUS_RESPONSE, + CHALET_INTERFACE_AC_POWER_SET_STATE_REQUEST, + CHALET_INTERFACE_AC_POWER_SET_STATE_RESPONSE, + CHALET_INTERFACE_BATTERY_VOLTAGE_REQUEST, + CHALET_INTERFACE_BATTERY_VOLTAGE_RESPONSE, + + MAX_CHALET_INTERFACE_CMD +}; + #endif diff --git a/Sources/SMSClient/SMSGui.cpp b/Sources/SMSClient/SMSGui.cpp index 60a715c..6c7f878 100644 --- a/Sources/SMSClient/SMSGui.cpp +++ b/Sources/SMSClient/SMSGui.cpp @@ -41,32 +41,35 @@ int CSMSGui::FullConversationsUpdate() - for(int i = 0; i < ConversationsList->size(); i++) + if(ConversationsList->size() > 0) { - QFont NewMsgFont; - NewMsgFont.setBold(true); - - QTreeWidgetItem *NewContact = new QTreeWidgetItem(mContactsTreeWidget); - CSMSConversation *Conversation = ConversationsList->at(i); - CSMSMessage *LastMsg = Conversation->GetMostRecentMessage(); - NewContact->setIcon(0,QIcon(Conversation->GetConversationContact()->mContactPicture)); - if(LastMsg->mIsRead == false) + for(int i = 0; i < ConversationsList->size(); i++) { - NewContact->setFont(1,NewMsgFont); - NewContact->setFont(2,NewMsgFont); - } - NewContact->setText(1,Conversation->GetConversationContact()->mContactName); - NewContact->setText(2,Conversation->GetConversationContact()->mContactNumber); -// QVariant data = QVariant::fromValue((void*)Conversation); - NewContact->setData(0,Qt::UserRole,QVariant::fromValue((void*)Conversation)); - mContactsTreeWidget->insertTopLevelItem(0,NewContact); - } + QFont NewMsgFont; + NewMsgFont.setBold(true); - mContactsTreeWidget->resizeColumnToContents(0); - mContactsTreeWidget->resizeColumnToContents(1); - mContactsTreeWidget->resizeColumnToContents(2); - mContactsTreeWidget->topLevelItem(0)->setSelected(true); - ConversationClicked(mContactsTreeWidget->topLevelItem(0),0); + QTreeWidgetItem *NewContact = new QTreeWidgetItem(mContactsTreeWidget); + CSMSConversation *Conversation = ConversationsList->at(i); + CSMSMessage *LastMsg = Conversation->GetMostRecentMessage(); + NewContact->setIcon(0,QIcon(Conversation->GetConversationContact()->mContactPicture)); + if(LastMsg->mIsRead == false) + { + NewContact->setFont(1,NewMsgFont); + NewContact->setFont(2,NewMsgFont); + } + NewContact->setText(1,Conversation->GetConversationContact()->mContactName); + NewContact->setText(2,Conversation->GetConversationContact()->mContactNumber); + // QVariant data = QVariant::fromValue((void*)Conversation); + NewContact->setData(0,Qt::UserRole,QVariant::fromValue((void*)Conversation)); + mContactsTreeWidget->insertTopLevelItem(0,NewContact); + } + + mContactsTreeWidget->resizeColumnToContents(0); + mContactsTreeWidget->resizeColumnToContents(1); + mContactsTreeWidget->resizeColumnToContents(2); + mContactsTreeWidget->topLevelItem(0)->setSelected(true); + ConversationClicked(mContactsTreeWidget->topLevelItem(0),0); + } // mContactsTreeWidget->addTopLevelItem(QTreeWidget()); diff --git a/Sources/SMSClient/SMSMasterCtrlInterface.cpp b/Sources/SMSClient/SMSMasterCtrlInterface.cpp index 2ef0393..4ab4f52 100644 --- a/Sources/SMSClient/SMSMasterCtrlInterface.cpp +++ b/Sources/SMSClient/SMSMasterCtrlInterface.cpp @@ -11,10 +11,10 @@ CSMSMasterCtrlInterface::CSMSMasterCtrlInterface(CSMSClient *ProgramHandle) { mDeviceAddress = 1; mNetworkPort = 2182; -// mMasterCtrlAddress = "127.0.0.1"; + mMasterCtrlIPAddress = "127.0.0.1"; // mNetworkPort = 6463; - // mMasterCtrlAddress = "192.168.0.100"; - mMasterCtrlAddress = "mortel.myftp.org"; + // mMasterCtrlIPAddress = "192.168.0.100"; + // mMasterCtrlIPAddress = "mortel.myftp.org"; mNetworkCommSocket = 0; mMyDeviceID = ID_SMS_CLIENT; @@ -40,7 +40,7 @@ CSMSMasterCtrlInterface::~CSMSMasterCtrlInterface() //// connect(mNetworkCommSocket,SIGNAL(disconnected()),this,SLOT(NetworkSocketDisconnected())); //// connect(mNetworkCommSocket,SIGNAL(readyRead()),this,SLOT(NetworkSocketDataAvailable())); -//// mNetworkCommSocket->connectToHost(mMasterCtrlAddress,mNetworkPort); +//// mNetworkCommSocket->connectToHost(mMasterCtrlIPAddress,mNetworkPort); // return RET_OK; //} diff --git a/Sources/Sprinkler/SprinklerMasterCtrlInterface.cpp b/Sources/Sprinkler/SprinklerMasterCtrlInterface.cpp index 5e7ee47..767f84a 100644 --- a/Sources/Sprinkler/SprinklerMasterCtrlInterface.cpp +++ b/Sources/Sprinkler/SprinklerMasterCtrlInterface.cpp @@ -11,9 +11,9 @@ CSprinklerMasterCtrlInterface::CSprinklerMasterCtrlInterface(CSprinkler *Program { mDeviceAddress = 1; mNetworkPort = 2182; - mMasterCtrlAddress = "127.0.0.1"; + mMasterCtrlIPAddress = "127.0.0.1"; // mNetworkPort = 6463; -// mMasterCtrlAddress = "192.168.0.112"; +// mMasterCtrlIPAddress = "192.168.0.112"; mNetworkCommSocket = 0; mMyDeviceID = ID_SPRINKLER_INTERFACE; diff --git a/Sources/SystemGui.cpp b/Sources/SystemGui.cpp index 48814fd..d62343e 100644 --- a/Sources/SystemGui.cpp +++ b/Sources/SystemGui.cpp @@ -7,6 +7,7 @@ CSystemGui::CSystemGui(QObject *parent) : QObject(parent) mProgramSettings = new CProgramSettings(); mSMSClient = new CSMSClient(mGui->mSMSGui,&mSettings.mVoipMSSettings); mSprinklers = new CSprinkler(mGui->mSprinklerGui); + mAvReceiver = new CAvReceiver(mGui->mAvReceiverGui); mSysTrayMgr = new CSystemTrayManager(); mSysTrayMgr->mProgramHandle=this; @@ -20,6 +21,7 @@ CSystemGui::~CSystemGui() delete mSMSClient; delete mProgramSettings; delete mSysTrayMgr; + delete mAvReceiver; } @@ -28,6 +30,7 @@ void CSystemGui::Start() mProgramSettings->LoadSettings(&mSettings); mGui->show(); mSMSClient->Start(); + mAvReceiver->Start(); } diff --git a/Sources/SystemGui.h b/Sources/SystemGui.h index 4a695dd..af04a94 100644 --- a/Sources/SystemGui.h +++ b/Sources/SystemGui.h @@ -7,6 +7,9 @@ #include "ProgramSettings.h" #include "SystemTrayManager.h" #include "Sprinkler.h" +#include "AvReceiverGui.h" +#include "AvReceiver.h" + class CSystemGui : public QObject { @@ -29,6 +32,7 @@ private: CSettings mSettings; CSystemTrayManager *mSysTrayMgr; CSprinkler *mSprinklers; + CAvReceiver *mAvReceiver; signals: diff --git a/SystemGui.pro b/SystemGui.pro index 269bed6..46a6c35 100644 --- a/SystemGui.pro +++ b/SystemGui.pro @@ -25,8 +25,13 @@ DEFINES += QT_DEPRECATED_WARNINGS INCLUDEPATH += Sources\ Sources/SMSClient\ Sources/Sprinkler\ + Sources/AvReceiver\ + Sources/Chalet\ SOURCES += \ + Sources/Chalet/Chalet.cpp \ + Sources/Chalet/ChaletGui.cpp \ + Sources/Chalet/ChaletMasterCtrlInterface.cpp \ Sources/GuiMain.cpp \ Sources/main.cpp \ Sources/NetworkProtocol.cpp \ @@ -46,9 +51,16 @@ SOURCES += \ Sources/ToggleSwitch.cpp \ Sources/Sprinkler/Sprinkler.cpp \ Sources/Sprinkler/SprinklerMasterCtrlInterface.cpp \ - Sources/Sprinkler/SprinklerDevice.cpp + Sources/Sprinkler/SprinklerDevice.cpp \ + Sources/AvReceiver/AvReceiverGui.cpp \ + Sources/AvReceiver/AvReceiver.cpp \ + Sources/AvReceiver/AvReceiverNetworkCtrlInterface.cpp \ + Sources/AvReceiver/AvReceiverData.cpp HEADERS += Sources/AbstractNetworkInterface.h \ + Sources/Chalet/Chalet.h \ + Sources/Chalet/ChaletGui.h \ + Sources/Chalet/ChaletMasterCtrlInterface.h \ Sources/GuiMain.h \ Sources/NetworkProtocol.h \ Sources/ProgramSettings.h \ @@ -69,9 +81,15 @@ HEADERS += Sources/AbstractNetworkInterface.h \ Sources/Sprinkler/Sprinkler.h \ Sources/Sprinkler/SprinklerDevice.h \ Sources/Sprinkler/SprinklerMasterCtrlInterface.h \ - Sources/Sprinkler/SprinklerMasterCtrlInterface.h + Sources/Sprinkler/SprinklerMasterCtrlInterface.h \ + Sources/AvReceiver/AvReceiverGui.h \ + Sources/AvReceiver/AvReceiver.h \ + Sources/AvReceiver/AvReceiverNetworkCtrlInterface.h \ + Sources/AvReceiver/AvReceiverData.h FORMS += \ SMSGui.ui \ + Sources/Chalet/ChaletGui.ui \ Sources/Sprinkler/SprinklerGui.ui \ - Sources/Sprinkler/SprinklerDeviceGuiItem.ui + Sources/Sprinkler/SprinklerDeviceGuiItem.ui \ + Sources/AvReceiver/AvReceiverGui.ui diff --git a/ui_AvReceiverGui.h b/ui_AvReceiverGui.h new file mode 100644 index 0000000..b67aa58 --- /dev/null +++ b/ui_AvReceiverGui.h @@ -0,0 +1,68 @@ +/******************************************************************************** +** Form generated from reading UI file 'AvReceiverGui.ui' +** +** Created by: Qt User Interface Compiler version 5.14.2 +** +** WARNING! All changes made in this file will be lost when recompiling UI file! +********************************************************************************/ + +#ifndef UI_AVRECEIVERGUI_H +#define UI_AVRECEIVERGUI_H + +#include +#include +#include +#include +#include + +QT_BEGIN_NAMESPACE + +class Ui_CAvReceiverGui +{ +public: + QLabel *label; + QLabel *mRcvrStatusLabel; + QCheckBox *mSpkBCheckBox; + QCheckBox *mSpkACheckBox; + + void setupUi(QWidget *CAvReceiverGui) + { + if (CAvReceiverGui->objectName().isEmpty()) + CAvReceiverGui->setObjectName(QString::fromUtf8("CAvReceiverGui")); + CAvReceiverGui->resize(796, 447); + label = new QLabel(CAvReceiverGui); + label->setObjectName(QString::fromUtf8("label")); + label->setGeometry(QRect(230, 30, 201, 16)); + mRcvrStatusLabel = new QLabel(CAvReceiverGui); + mRcvrStatusLabel->setObjectName(QString::fromUtf8("mRcvrStatusLabel")); + mRcvrStatusLabel->setGeometry(QRect(100, 110, 181, 231)); + mSpkBCheckBox = new QCheckBox(CAvReceiverGui); + mSpkBCheckBox->setObjectName(QString::fromUtf8("mSpkBCheckBox")); + mSpkBCheckBox->setGeometry(QRect(570, 130, 70, 17)); + mSpkACheckBox = new QCheckBox(CAvReceiverGui); + mSpkACheckBox->setObjectName(QString::fromUtf8("mSpkACheckBox")); + mSpkACheckBox->setGeometry(QRect(570, 160, 70, 17)); + + retranslateUi(CAvReceiverGui); + + QMetaObject::connectSlotsByName(CAvReceiverGui); + } // setupUi + + void retranslateUi(QWidget *CAvReceiverGui) + { + CAvReceiverGui->setWindowTitle(QCoreApplication::translate("CAvReceiverGui", "Form", nullptr)); + label->setText(QCoreApplication::translate("CAvReceiverGui", "AvReceiver", nullptr)); + mRcvrStatusLabel->setText(QCoreApplication::translate("CAvReceiverGui", "TextLabel", nullptr)); + mSpkBCheckBox->setText(QCoreApplication::translate("CAvReceiverGui", "Speaker B", nullptr)); + mSpkACheckBox->setText(QCoreApplication::translate("CAvReceiverGui", "Speaker A", nullptr)); + } // retranslateUi + +}; + +namespace Ui { + class CAvReceiverGui: public Ui_CAvReceiverGui {}; +} // namespace Ui + +QT_END_NAMESPACE + +#endif // UI_AVRECEIVERGUI_H diff --git a/ui_ChaletGui.h b/ui_ChaletGui.h new file mode 100644 index 0000000..7ef73c4 --- /dev/null +++ b/ui_ChaletGui.h @@ -0,0 +1,57 @@ +/******************************************************************************** +** Form generated from reading UI file 'ChaletGui.ui' +** +** Created by: Qt User Interface Compiler version 5.14.2 +** +** WARNING! All changes made in this file will be lost when recompiling UI file! +********************************************************************************/ + +#ifndef UI_CHALETGUI_H +#define UI_CHALETGUI_H + +#include +#include +#include +#include + +QT_BEGIN_NAMESPACE + +class Ui_CChaletGui +{ +public: + QLabel *label; + + void setupUi(QWidget *CChaletGui) + { + if (CChaletGui->objectName().isEmpty()) + CChaletGui->setObjectName(QString::fromUtf8("CChaletGui")); + CChaletGui->resize(615, 521); + label = new QLabel(CChaletGui); + label->setObjectName(QString::fromUtf8("label")); + label->setGeometry(QRect(220, 40, 201, 31)); + QFont font; + font.setPointSize(12); + font.setBold(true); + font.setWeight(75); + label->setFont(font); + + retranslateUi(CChaletGui); + + QMetaObject::connectSlotsByName(CChaletGui); + } // setupUi + + void retranslateUi(QWidget *CChaletGui) + { + CChaletGui->setWindowTitle(QCoreApplication::translate("CChaletGui", "Form", nullptr)); + label->setText(QCoreApplication::translate("CChaletGui", "Chalet", nullptr)); + } // retranslateUi + +}; + +namespace Ui { + class CChaletGui: public Ui_CChaletGui {}; +} // namespace Ui + +QT_END_NAMESPACE + +#endif // UI_CHALETGUI_H diff --git a/ui_SprinklerDeviceGuiItem.h b/ui_SprinklerDeviceGuiItem.h index f68fa29..aaf767e 100644 --- a/ui_SprinklerDeviceGuiItem.h +++ b/ui_SprinklerDeviceGuiItem.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'SprinklerDeviceGuiItem.ui' ** -** Created by: Qt User Interface Compiler version 5.5.0 +** Created by: Qt User Interface Compiler version 5.14.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -10,10 +10,7 @@ #define UI_SPRINKLERDEVICEGUIITEM_H #include -#include #include -#include -#include #include #include #include @@ -31,19 +28,19 @@ public: void setupUi(QWidget *CSprinklerDeviceGuiItem) { if (CSprinklerDeviceGuiItem->objectName().isEmpty()) - CSprinklerDeviceGuiItem->setObjectName(QStringLiteral("CSprinklerDeviceGuiItem")); + CSprinklerDeviceGuiItem->setObjectName(QString::fromUtf8("CSprinklerDeviceGuiItem")); CSprinklerDeviceGuiItem->resize(540, 399); SprinklerAddress = new QLabel(CSprinklerDeviceGuiItem); - SprinklerAddress->setObjectName(QStringLiteral("SprinklerAddress")); + SprinklerAddress->setObjectName(QString::fromUtf8("SprinklerAddress")); SprinklerAddress->setGeometry(QRect(20, 10, 101, 41)); SprinklerFlowSpeed = new QLabel(CSprinklerDeviceGuiItem); - SprinklerFlowSpeed->setObjectName(QStringLiteral("SprinklerFlowSpeed")); + SprinklerFlowSpeed->setObjectName(QString::fromUtf8("SprinklerFlowSpeed")); SprinklerFlowSpeed->setGeometry(QRect(20, 50, 131, 41)); label = new QLabel(CSprinklerDeviceGuiItem); - label->setObjectName(QStringLiteral("label")); + label->setObjectName(QString::fromUtf8("label")); label->setGeometry(QRect(30, 100, 54, 17)); pushButton = new QPushButton(CSprinklerDeviceGuiItem); - pushButton->setObjectName(QStringLiteral("pushButton")); + pushButton->setObjectName(QString::fromUtf8("pushButton")); pushButton->setGeometry(QRect(220, 20, 80, 25)); pushButton->setCheckable(true); @@ -54,11 +51,11 @@ public: void retranslateUi(QWidget *CSprinklerDeviceGuiItem) { - CSprinklerDeviceGuiItem->setWindowTitle(QApplication::translate("CSprinklerDeviceGuiItem", "Form", 0)); - SprinklerAddress->setText(QApplication::translate("CSprinklerDeviceGuiItem", "Address : ", 0)); - SprinklerFlowSpeed->setText(QApplication::translate("CSprinklerDeviceGuiItem", "Flow speed :", 0)); - label->setText(QApplication::translate("CSprinklerDeviceGuiItem", "State : ", 0)); - pushButton->setText(QApplication::translate("CSprinklerDeviceGuiItem", "PushButton", 0)); + CSprinklerDeviceGuiItem->setWindowTitle(QCoreApplication::translate("CSprinklerDeviceGuiItem", "Form", nullptr)); + SprinklerAddress->setText(QCoreApplication::translate("CSprinklerDeviceGuiItem", "Address : ", nullptr)); + SprinklerFlowSpeed->setText(QCoreApplication::translate("CSprinklerDeviceGuiItem", "Flow speed :", nullptr)); + label->setText(QCoreApplication::translate("CSprinklerDeviceGuiItem", "State : ", nullptr)); + pushButton->setText(QCoreApplication::translate("CSprinklerDeviceGuiItem", "PushButton", nullptr)); } // retranslateUi }; diff --git a/ui_SprinklerGui.h b/ui_SprinklerGui.h index 876cd27..1fa9a7c 100644 --- a/ui_SprinklerGui.h +++ b/ui_SprinklerGui.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'SprinklerGui.ui' ** -** Created by: Qt User Interface Compiler version 5.5.0 +** Created by: Qt User Interface Compiler version 5.14.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -10,10 +10,7 @@ #define UI_SPRINKLERGUI_H #include -#include #include -#include -#include #include #include #include "ToggleSwitch.h" @@ -29,13 +26,13 @@ public: void setupUi(QWidget *CSprinklerGui) { if (CSprinklerGui->objectName().isEmpty()) - CSprinklerGui->setObjectName(QStringLiteral("CSprinklerGui")); + CSprinklerGui->setObjectName(QString::fromUtf8("CSprinklerGui")); CSprinklerGui->resize(1047, 560); label = new QLabel(CSprinklerGui); - label->setObjectName(QStringLiteral("label")); + label->setObjectName(QString::fromUtf8("label")); label->setGeometry(QRect(20, 10, 201, 51)); mValveSwitch = new CToggleSwitch(CSprinklerGui); - mValveSwitch->setObjectName(QStringLiteral("mValveSwitch")); + mValveSwitch->setObjectName(QString::fromUtf8("mValveSwitch")); mValveSwitch->setGeometry(QRect(220, 90, 91, 81)); retranslateUi(CSprinklerGui); @@ -45,8 +42,8 @@ public: void retranslateUi(QWidget *CSprinklerGui) { - CSprinklerGui->setWindowTitle(QApplication::translate("CSprinklerGui", "Form", 0)); - label->setText(QApplication::translate("CSprinklerGui", "Sprinklers network", 0)); + CSprinklerGui->setWindowTitle(QCoreApplication::translate("CSprinklerGui", "Form", nullptr)); + label->setText(QCoreApplication::translate("CSprinklerGui", "Sprinklers network", nullptr)); } // retranslateUi };