Conflicts: Sources/Sprinkler/SprinklerDevice.cpp Sources/Sprinkler/SprinklerDevice.h SystemGui.pro ui_SprinklerGui.h
39 lines
700 B
C++
39 lines
700 B
C++
#include "SprinklerDevice.h"
|
|
|
|
<<<<<<< HEAD
|
|
|
|
CSprinklerDevice::CSprinklerDevice()
|
|
{
|
|
mDeviceLocation = "Backyard";
|
|
mDeviceAddress = 1;
|
|
mSprinklerState = SPRINKLER_UNKNOWN_STATE;
|
|
mFlowMeter = 0;
|
|
}
|
|
|
|
int CSprinklerDevice::SetSprinklerState(SprinklerState State)
|
|
{
|
|
mSprinklerState = State;
|
|
return 1;
|
|
}
|
|
|
|
SprinklerState CSprinklerDevice::GetSprinklerState()
|
|
{
|
|
return mSprinklerState;
|
|
}
|
|
|
|
int CSprinklerDevice::SetFlow(unsigned short flow)
|
|
{
|
|
mFlowMeter = flow;
|
|
return 1;
|
|
}
|
|
|
|
unsigned short CSprinklerDevice::GetFlow()
|
|
{
|
|
return mFlowMeter;
|
|
=======
|
|
CSprinklerDevice::CSprinklerDevice(QObject *parent) : QObject(parent)
|
|
{
|
|
|
|
>>>>>>> 2c22dda0f4b581f6a3d2d892b18202b64b8bc289
|
|
}
|