jfmartel/Masterctrl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pré-voyage

Browse Source
This commit is contained in:
J-F Martel
2017-07-19 11:04:25 -04:00
parent 8a0c368243
commit f31358e6dd
12 changed files with 793 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/Sprinkler/SprinklerDevice.cpp
+59 -3
View File
@@ -7,13 +7,28 @@
CSprinklerDevice::CSprinklerDevice(int Address, CAbstractNetworkCommIF *NetworkInterface, CSprinklerMgr *SprinklerMgr):
CNetworkDevice(ID_SPRINKLER_DEVICE,Address,NetworkInterface)
{
mSprinklerState = SPRINKLER_UNKNOWN_STATE;
mSprinklerMgr = SprinklerMgr;
mSprinklerStatusTimer = new QTimer();
mSprinklerStatusTimer->setInterval(5000);
mSprinklerStatusTimer->setSingleShot(true);
connect(mSprinklerStatusTimer,SIGNAL(timeout()),this,SLOT(StatusTimerExpired()));
mSprinklerStatusTimer->start();
}
CSprinklerDevice::~CSprinklerDevice()
{
}
SprinklerState CSprinklerDevice::GetSprinklerState()
{
return mSprinklerState;
}
int CSprinklerDevice::NewDeviceFrameReceived(int DeviceID, int DeviceAddress, int MessageID, int DataSize, QByteArray Data)
{
Q_UNUSED(DeviceID)
@@ -21,12 +36,31 @@ int CSprinklerDevice::NewDeviceFrameReceived(int DeviceID, int DeviceAddress, in
Q_UNUSED(DataSize)
Q_UNUSED(Data)
return RET_OK;
switch(MessageID)
{
case SPRINKLER_DEVICE_STATUS_RESPONSE:
{
if(Data.at(0) != (unsigned char)mSprinklerState)
{
if(Data.at(0) == SPRINKLER_ON_STATE || Data.at(0) == SPRINKLER_OFF_STATE)
{
mSprinklerState = (SprinklerState)Data.at(0);
//TODO: emit sprinkler change event.
}
else
{
mSprinklerState = SPRINKLER_UNKNOWN_STATE;
qDebug("Rx Invalid sprinkler state [%d] from device [%d]",Data.at(0),DeviceAddress);
}
}
mFlowMeter = Data.at(1);
mFlowMeter <<= 8;
mFlowMeter |= (unsigned short)Data.at(2);
qDebug("Sprinkler status RX. Valve:%d, flow:%d",Data.at(0),mFlowMeter);
mSprinklerStatusTimer->start();
break;
}
case SPRINKLER_DEVICE_ACK:
@@ -35,14 +69,33 @@ int CSprinklerDevice::NewDeviceFrameReceived(int DeviceID, int DeviceAddress, in
}
case SPRINKLER_DEVICE_SET_SPRINKLER_STATE_ACK:
{
mNetworkInterfacePtr->SendNetworkMessage(ID_SPRINKLER_DEVICE,1,SPRINKLER_DEVICE_GET_SPRINKLER_STATE_REQUEST,0,QByteArray());
break;
}
case SPRINKLER_DEVICE_GET_SPRINKLER_STATE_RESPONSE:
{
if(Data.at(0) != (unsigned char)mSprinklerState)
{
if(Data.at(0) == SPRINKLER_ON_STATE || Data.at(0) == SPRINKLER_OFF_STATE)
{
mSprinklerState = (SprinklerState)Data.at(0);
//TODO: emit sprinkler change event.
}
else
{
mSprinklerState = SPRINKLER_UNKNOWN_STATE;
qDebug("Rx Invalid sprinkler state [%d] from device [%d]",Data.at(0),DeviceAddress);
}
}
qDebug("Valve state RX. Valve:%d",Data.at(0));
break;
}
case SPRINKLER_DEVICE_GET_WATER_FLOW_RESPONSE:
{
mFlowMeter = Data.at(0);
mFlowMeter <<= 8;
mFlowMeter |= (unsigned short)Data.at(1);
qDebug("Flow value RX. flow:%d",mFlowMeter);
break;
}
case SPRINKLER_DEVICE_GET_MOISTURE_RESPONSE:
@@ -88,4 +141,7 @@ int CSprinklerDevice::NewDeviceFrameReceived(int DeviceID, int DeviceAddress, in
return 0;
}
void CSprinklerDevice::StatusTimerExpired()
{
mNetworkInterfacePtr->SendNetworkMessage(ID_SPRINKLER_DEVICE,1,SPRINKLER_DEVICE_STATUS_REQUEST,0,QByteArray());
}
Sources/Sprinkler/SprinklerDevice.h
+16
View File
@@ -3,6 +3,14 @@
#include "GlobalDefine.h"
#include "NetworkDevice.h"
#include <QTimer>
typedef enum eSprinklerState
{
SPRINKLER_OFF_STATE = 0,
SPRINKLER_ON_STATE,
SPRINKLER_UNKNOWN_STATE
}SprinklerState;
class CSprinklerMgr;
@@ -15,8 +23,16 @@ public:
virtual int NewDeviceFrameReceived(int DeviceID, int DeviceAddress, int MessageID, int DataSize, QByteArray Data);
SprinklerState GetSprinklerState();
unsigned short mFlowMeter;
CSprinklerMgr *mSprinklerMgr;
QTimer *mSprinklerStatusTimer;
SprinklerState mSprinklerState;
public slots:
void StatusTimerExpired();
};
Sources/Sprinkler/SprinklerInterface.cpp
+18
View File
@@ -2,6 +2,7 @@
#include "ProtocolDefs.h"
#include <QDebug>
#include "SprinklerMgr.h"
#include "SprinklerDevice.h"
CSprinklerInterface::CSprinklerInterface(int Address, CAbstractNetworkCommIF *NetworkInterface, CSprinklerMgr *SprinklerMgr):
@@ -47,6 +48,23 @@ int CSprinklerInterface::NewDeviceFrameReceived(int DeviceID, int DeviceAddress,
}
case SPRINKLER_INTERFACE_GET_SPRINKLER_STATE_REQUEST:
{
// if(Data.at(0) == 0xFF)
// {
// //send all devices...
// }
// if(Data.at(0) == 1)
// {
// }
CSprinklerDevice *Sprinkler = mSprinklerMgr->GetSprinkler(1);
QByteArray Frame, MsgData;
MsgData.append(1); //1 device.
MsgData.append(Sprinkler->mDeviceAddress); //1st device address
MsgData.append((unsigned char)Sprinkler->mSprinklerState);
mNetworkInterfacePtr->SendNetworkMessage(ID_SPRINKLER_INTERFACE,mDeviceAddress,SPRINKLER_INTERFACE_GET_SPRINKLER_STATE_RESPONSE,MsgData.size(),MsgData);
break;
}
case SPRINKLER_INTERFACE_SET_SPRINKLER_STATE_REQUEST:
Sources/Sprinkler/SprinklerMgr.cpp
+25
View File
@@ -1,6 +1,31 @@
#include "SprinklerMgr.h"
#include "SprinklerDevice.h"
CSprinklerMgr::CSprinklerMgr(QObject *parent) : QObject(parent)
{
mProgramHandle = 0;
}
int CSprinklerMgr::NewSprinklerDeviceCreated(CSprinklerDevice *Device)
{
mSprinklersList.append(Device);
return RET_OK;
}
CSprinklerDevice* CSprinklerMgr::GetSprinkler(int SprinklerNetworkAddress)
{
if(mSprinklersList.isEmpty())
{
return 0;
}
for(int i = 0; i < mSprinklersList.size(); i++)
{
if(mSprinklersList.at(i)->mDeviceAddress == SprinklerNetworkAddress)
{
return mSprinklersList.at(i);
}
}
return 0;
}
Sources/Sprinkler/SprinklerMgr.h
+7
View File
@@ -2,9 +2,11 @@
#define SPRINKLERMGR_H
#include <QObject>
#include <QList>
class CMasterCtrl;
class CSprinklerDevice;
class CSprinklerMgr : public QObject
{
@@ -13,6 +15,11 @@ public:
explicit CSprinklerMgr(QObject *parent = 0);
CMasterCtrl *mProgramHandle;
QList<CSprinklerDevice*> mSprinklersList;
int NewSprinklerDeviceCreated(CSprinklerDevice* Device);
CSprinklerDevice* GetSprinkler(int SprinklerNetworkAddress);
signals: