Merge branch 'develop'

Conflicts:
	ui_SprinklerGui.h

Sources/Sprinkler/Sprinkler.cpp

@@ -0,0 +1,62 @@
+#include "Sprinkler.h"
+
+
+CSprinkler::CSprinkler(CSprinklerGui *GUI)
+{
+    mNetworkInterface = new CSprinklerMasterCtrlInterface(this);
+    mGui = GUI;
+
+    CSprinklerDevice *Sprinkler = new CSprinklerDevice();
+    mSprinklers.append(Sprinkler);
+}
+
+CSprinkler::~CSprinkler()
+{
+    for(int i = 0; i < mSprinklers.size(); i++)
+    {
+        delete mSprinklers[i];
+    }
+    mSprinklers.clear();
+}
+
+CSprinklerDevice* CSprinkler::FindSprinkler(int DeviceAddress)
+{
+    for(int i = 0; i < mSprinklers.size(); i++)
+    {
+        if(mSprinklers.at(i)->mDeviceAddress == DeviceAddress)
+        {
+            return mSprinklers[i];
+        }
+    }
+    return 0;
+}
+
+int CSprinkler::SetSprinklerState(int DeviceAddress, unsigned char State)
+{
+    CSprinklerDevice *Dev = FindSprinkler(DeviceAddress);
+    if(Dev != 0)
+    {
+        Dev->SetSprinklerState((SprinklerState)State);
+    }
+    else
+    {
+        return 0;
+    }
+
+    return 1;
+}
+
+int CSprinkler::SetSprinklerFlow(int DeviceAddress, unsigned short Flow)
+{
+    CSprinklerDevice *Dev = FindSprinkler(DeviceAddress);
+    if(Dev != 0)
+    {
+        Dev->SetFlow(Flow);
+    }
+    else
+    {
+        return 0;
+    }
+
+    return 1;
+}

Sources/Sprinkler/Sprinkler.h

@@ -0,0 +1,34 @@
+#ifndef SPRINKLER_H
+#define SPRINKLER_H
+
+#include <QObject>
+#include <QList>
+#include "SprinklerMasterCtrlInterface.h"
+#include "SprinklerGui.h"
+#include "SprinklerDevice.h"
+
+
+class CSprinkler : public QObject
+{
+    Q_OBJECT
+
+public:
+    CSprinkler(CSprinklerGui *GUI);
+    ~CSprinkler();
+
+    int SetSprinklerState(int DeviceAddress, unsigned char State);
+    int SetSprinklerFlow(int DeviceAddress, unsigned short Flow);
+
+private:
+    CSprinklerDevice *FindSprinkler(int DeviceAddress);
+
+public:
+
+    CSprinklerMasterCtrlInterface *mNetworkInterface;
+    CSprinklerGui *mGui;
+    QList<CSprinklerDevice*> mSprinklers;
+
+
+};
+
+#endif // SPRINKLER_H

Sources/Sprinkler/SprinklerMasterCtrlInterface.cpp

@@ -0,0 +1,111 @@
+#include "SprinklerMasterCtrlInterface.h"
+#include <QByteArray>
+#include <QDataStream>
+#include <QBuffer>
+#include "SystemGui.h"
+#include "Sprinkler.h"
+
+
+
+CSprinklerMasterCtrlInterface::CSprinklerMasterCtrlInterface(CSprinkler *ProgramHandle)
+{
+    mDeviceAddress = 1;
+    mNetworkPort = 2182;
+    mMasterCtrlAddress = "127.0.0.1";
+//    mNetworkPort = 6463;
+//    mMasterCtrlAddress = "192.168.0.112";
+    mNetworkCommSocket = 0;
+    mMyDeviceID = ID_SPRINKLER_INTERFACE;
+
+    mProgramHandle = ProgramHandle;
+}
+
+CSprinklerMasterCtrlInterface::~CSprinklerMasterCtrlInterface()
+{
+//    if(mNetworkCommSocket !=0)
+//    {
+////        mNetworkCommSocket->disconnectFromHost();
+//   //     delete mNetworkCommSocket;
+//    }
+}
+
+int CSprinklerMasterCtrlInterface::DeviceConnectedToMaster(bool Connected)
+{
+    if(Connected)
+    {
+         mNetworkCommSocket->write(GetTxPacket(SPRINKLER_INTERFACE_GET_SPRINKLERS_REQUEST,0,0,0,1,ID_MASTER,mMyDeviceID,mDeviceAddress));
+    }
+    else
+    {
+        //???
+    }
+    return RET_OK;
+}
+
+int CSprinklerMasterCtrlInterface::DeviceFrameReceived(int TargetDeviceID, int TargetDeviceAddress, int SenderDeviceID, int SenderAddress, int MessageID, int DataSize, QByteArray Data)
+{
+    Q_UNUSED(DataSize)
+
+
+    if(TargetDeviceID == mMyDeviceID && (TargetDeviceAddress == BROADCAST_VALUE || TargetDeviceAddress == mDeviceAddress))
+    {
+        switch(MessageID)
+        {
+            case SPRINKLER_INTERFACE_ACK:
+            {
+                break;
+            }
+            case SPRINKLER_INTERFACE_STATUS_REQUEST:
+            {
+                QByteArray Frame,ResponseData;
+                ResponseData.append(ACK);
+                ResponseData.append((char)SPRINKLER_INTERFACE_STATUS_RESPONSE);
+                Frame = GetTxPacket(SPRINKLER_INTERFACE_STATUS_RESPONSE,0,ResponseData.data(),ResponseData.size(),1,ID_MASTER,ID_SPRINKLER_INTERFACE,mDeviceAddress);
+                mNetworkCommSocket->write(Frame);
+                break;
+            }
+            case SPRINKLER_INTERFACE_GET_SPRINKLERS_RESPONSE:
+            {
+                break;
+            }
+            case SPRINKLER_INTERFACE_GET_SPRINKLER_DATA_RESPONSE:
+            {
+                break;
+            }
+            case SPRINKLER_INTERFACE_SET_SPRINKLER_DATA_ACK:
+            {
+                break;
+            }
+            case SPRINKLER_INTERFACE_GET_SPRINKLER_STATE_RESPONSE:
+            {
+                for(int i = 0; i < Data.at(0); i++)
+                {
+
+                }
+                break;
+            }
+            case SPRINKLER_INTERFACE_SET_SPRINKLER_STATE_ACK:
+            {
+                QByteArray Frame,RequestData;
+                RequestData.append(1);  //device address
+                Frame = GetTxPacket(SPRINKLER_INTERFACE_GET_SPRINKLER_STATE_REQUEST,0,RequestData.data(),RequestData.size(),1,ID_MASTER,ID_SPRINKLER_INTERFACE,mDeviceAddress);
+                mNetworkCommSocket->write(Frame);
+                break;
+            }
+            case SPRINKLER_INTERFACE_STATUS_RESPONSE:
+            case SPRINKLER_INTERFACE_GET_SPRINKLERS_REQUEST:
+            case SPRINKLER_INTERFACE_GET_SPRINKLER_DATA_REQUEST:
+            case SPRINKLER_INTERFACE_SET_SPRINKLER_DATA_REQUEST:
+            case SPRINKLER_INTERFACE_GET_SPRINKLER_STATE_REQUEST:
+            case SPRINKLER_INTERFACE_SET_SPRINKLER_STATE_REQUEST:
+            default:
+            {
+                qDebug("Sprinkler: Invalid Ethernet MSg received: %d",MessageID);
+                break;
+            }
+
+        }
+    }
+
+    return RET_OK;
+}

Sources/Sprinkler/SprinklerMasterCtrlInterface.h

@@ -0,0 +1,28 @@
+#ifndef CSPRINKLERMASTERCTRLINTERFACE_H
+#define CSPRINKLERMASTERCTRLINTERFACE_H
+
+#include "MasterCtrlInterface.h"
+
+
+//class CSystemGui;
+class CSprinkler;
+
+
+class CSprinklerMasterCtrlInterface: public CMasterCtrlInterface
+{
+    //Q_OBJECT
+public:
+
+
+    CSprinkler *mProgramHandle;
+
+    CSprinklerMasterCtrlInterface(CSprinkler *ProgramHandle);
+    ~CSprinklerMasterCtrlInterface();
+
+    virtual int DeviceFrameReceived(int TargetDeviceID, int TargetDeviceAddress, int SenderID, int SenderAddress, int MessageID, int DataSize, QByteArray Data);
+    virtual int DeviceConnectedToMaster(bool Connected);
+
+
+};
+
+#endif // CSPRINKLERMASTERCTRLINTERFACE_H

Sources/ToggleSwitch.cpp

@@ -0,0 +1,25 @@
+#include "ToggleSwitch.h"
+#include <QPainter>
+
+CToggleSwitch::CToggleSwitch(QWidget *parent) :
+    QAbstractButton(parent)
+{
+
+}
+
+void CToggleSwitch::paintEvent(QPaintEvent *e)
+{
+    mOnPixmap = QPixmap("./Ico/switch-off-icon.png").scaled(size());
+    mOffPixmap = QPixmap("./Ico/switch-on-icon.png").scaled(size());
+    QPainter painter(this);
+
+    if(isChecked())
+    {
+         painter.drawPixmap(0,0,mOnPixmap);
+    }
+    else
+    {
+        painter.drawPixmap(0,0,mOffPixmap);
+    }
+
+}

Sources/ToggleSwitch.h

@@ -0,0 +1,20 @@
+#ifndef TOGGLESWITCH_H
+#define TOGGLESWITCH_H
+
+#include <QAbstractButton>
+#include <QPixmap>
+
+class CToggleSwitch : public QAbstractButton
+{
+    Q_OBJECT
+public:
+    CToggleSwitch(QWidget *parent = 0);
+    QPixmap mOnPixmap, mOffPixmap;
+
+    void paintEvent(QPaintEvent *e);
+signals:
+
+public slots:
+};
+
+#endif // TOGGLESWITCH_H