Sprinkler device et interface dev

Sources/Sprinkler/SprinklerDevice.cpp

@@ -1,12 +1,13 @@
 #include "SprinklerDevice.h"
 #include "ProtocolDefs.h"
 #include <QDebug>
+#include "SprinklerMgr.h"
 
 
-CSprinklerDevice::CSprinklerDevice(int Address, CAbstractNetworkCommIF *NetworkInterface):
+CSprinklerDevice::CSprinklerDevice(int Address, CAbstractNetworkCommIF *NetworkInterface, CSprinklerMgr *SprinklerMgr):
     CNetworkDevice(ID_SPRINKLER_DEVICE,Address,NetworkInterface)
 {
-
+    mSprinklerMgr = SprinklerMgr;
 }
 
 CSprinklerDevice::~CSprinklerDevice()

Sources/Sprinkler/SprinklerDevice.h

@@ -4,16 +4,20 @@
 #include "GlobalDefine.h"
 #include "NetworkDevice.h"
 
+class CSprinklerMgr;
 
 class CSprinklerDevice:  public QObject, public CNetworkDevice
 {
     Q_OBJECT
 public:
-    CSprinklerDevice(int Address, CAbstractNetworkCommIF *NetworkInterface);
+    CSprinklerDevice(int Address, CAbstractNetworkCommIF *NetworkInterface, CSprinklerMgr *SprinklerMgr);
     virtual ~CSprinklerDevice();
 
     virtual int NewDeviceFrameReceived(int DeviceID, int DeviceAddress, int MessageID, int DataSize, QByteArray Data);
 
+
+    CSprinklerMgr *mSprinklerMgr;
+
 };
 
 #endif // SPRINKLERDEVICE_H

Sources/Sprinkler/SprinklerInterface.cpp

@@ -1,12 +1,13 @@
 #include "SprinklerInterface.h"
 #include "ProtocolDefs.h"
 #include <QDebug>
+#include "SprinklerMgr.h"
 
 
-CSprinklerInterface::CSprinklerInterface(int Address, CAbstractNetworkCommIF *NetworkInterface):
-    CNetworkDevice(ID_SPRINKLER_DEVICE,Address,NetworkInterface)
+CSprinklerInterface::CSprinklerInterface(int Address, CAbstractNetworkCommIF *NetworkInterface, CSprinklerMgr *SprinklerMgr):
+    CNetworkDevice(ID_SPRINKLER_INTERFACE,Address,NetworkInterface)
 {
-
+    mSprinklerMgr = SprinklerMgr;
 }
 
 CSprinklerInterface::~CSprinklerInterface()

Sources/Sprinkler/SprinklerInterface.h

@@ -5,15 +5,20 @@
 #include "NetworkDevice.h"
 
 
+class CSprinklerMgr;
+
+
 class CSprinklerInterface:  public QObject, public CNetworkDevice
 {
     Q_OBJECT
 public:
-    CSprinklerInterface(int Address, CAbstractNetworkCommIF *NetworkInterface);
+    CSprinklerInterface(int Address, CAbstractNetworkCommIF *NetworkInterface, CSprinklerMgr *SprinklerMgr);
     virtual ~CSprinklerInterface();
 
     virtual int NewDeviceFrameReceived(int DeviceID, int DeviceAddress, int MessageID, int DataSize, QByteArray Data);
 
+    CSprinklerMgr *mSprinklerMgr;
+
 };
 
 #endif // SPRINKLERDEVICE_H

Sources/Sprinkler/SprinklerMgr.cpp

@@ -2,5 +2,5 @@
 
 CSprinklerMgr::CSprinklerMgr(QObject *parent) : QObject(parent)
 {
-
+    mProgramHandle = 0;
 }

Sources/Sprinkler/SprinklerMgr.h

@@ -3,15 +3,20 @@
 
 #include <QObject>
 
+
+class CMasterCtrl;
+
 class CSprinklerMgr : public QObject
 {
     Q_OBJECT
 public:
     explicit CSprinklerMgr(QObject *parent = 0);
 
+    CMasterCtrl *mProgramHandle;
+
 signals:
 
 public slots:
 };
 
-#endif // SPRINKLERMGR_H
+#endif // SPRINKLERMGR_H