Commit 662a0c5f authored by golgoj4's avatar golgoj4

refs #2017 - checking in update to .pro to move the file to the bin dir

adds startup / initialization functions to start the device and do setup
stuck at needing user interaction.
parent 5fa8d2da
......@@ -17,7 +17,7 @@ INCLUDEPATH += /usr/include/qjson/ \
../../DCE/
LIBS += -lqjson
DESTDIR=../../bin
SOURCES += ../Main.cpp \
../../PlutoUtils/uuencode.cpp \
../../PlutoUtils/ThreadedClass.cpp \
......
This diff is collapsed.
......@@ -24,6 +24,7 @@
#include <qjson/parser.h>
#include <QNetworkAccessManager>
#include <QVariant>
#include <QTimer>
#include <QUrl>
#include <huecontrollerhardware.h>
#include <huebulb.h>
......@@ -39,14 +40,14 @@ namespace DCE
bool validated;
bool linkButton;
QString targetIpAddress;
QString authUser;
QList<HueControllerHardware*> hueControllers;
QList<HueBulb*> hueBulbs;
QTimer rTime;
// Private methods
public:
......@@ -70,6 +71,7 @@ namespace DCE
bool findControllers();
bool downloadControllerConfig(QUrl deviceIp, int index);
void getScreenSaverColor();
bool setupController(int controllerIndex);
virtual void OnReload();
......@@ -196,12 +198,16 @@ NOEMON or CANBUS */
void responseRecieved();
void initiateConfigDownload(QUrl target);
void testSignal();
void linkButtonChanged();
public slots:
void initResponse();
void downloadConfigResponse(QNetworkReply*);
void dummySlot();
void setLinkButton(bool link){linkButton = link; emit linkButtonChanged();}
bool getLinkButton(){return linkButton;}
bool checkLinkButton();
void processDataStore(const QByteArray data);
......
......@@ -195,7 +195,7 @@ int main(int argc, char* argv[])
{
cerr << "Unable to create logger" << endl;
}
LoggerWrapper::GetInstance()->LogAll();
LoggerWrapper::GetInstance()->Write(LV_STATUS, "Device: %d starting. Connecting to: %s",PK_Device,sRouter_IP.c_str());
bool bAppError=false;
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment