Index: sources/ApplicationController.cpp =================================================================== diff -u -r20453ac382a122d1dde3c399ed9fcaf8a39b4ad6 -re4a0e2fc4c7ae0cbce0d670772276bf7f5ff3845 --- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 20453ac382a122d1dde3c399ed9fcaf8a39b4ad6) +++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision e4a0e2fc4c7ae0cbce0d670772276bf7f5ff3845) @@ -18,7 +18,6 @@ #include // Project -#include "ApplicationPost.h" #include "MainTimer.h" #include "MessageDispatcher.h" #include "Logger.h" @@ -27,6 +26,8 @@ #include "GuiController.h" #include "Settings.h" #include "MSettings.h" +#include "WifiInterface.h" +#include "BluetoothInterface.h" /*! @@ -35,7 +36,9 @@ * \param parent - QObject parent owner object. * Qt handles the children destruction by their parent objects life-cycle. */ -ApplicationController::ApplicationController(QObject *parent) : QObject(parent) { } +ApplicationController::ApplicationController(QObject *parent) : QObject(parent) { + _post.setParent(this); +} /*! * \brief ApplicationController initializer @@ -86,6 +89,17 @@ */ void ApplicationController::initConnections() { + + connect(&_post , SIGNAL(didWiFi ()), + &_WifiInterface , SLOT( doStart ())); + connect(&_post , SIGNAL( didBluetooth()), + this , SLOT(onPOSTBluetooth())); + + connect(&_post , SIGNAL( didFail (Gui::GuiAlarmID )), + this , SLOT(onPOSTFail (Gui::GuiAlarmID ))); + connect(&_post , SIGNAL( didDone (bool )), + this , SLOT (onPOSTDone (bool ))); + connect(&_MainTimer , SIGNAL( didTimeout()), this , SLOT(onMainTimerTimeout())); @@ -490,6 +504,38 @@ } /*! + * \brief ApplicationController::onPOSTBluetooth + * \details Starts the Bluetooth Interface + */ +void ApplicationController::onPOSTBluetooth() { + _BluetoothInterface.valid(true); + _BluetoothInterface.doStart(); +} + + +/*! + * \brief ApplicationController::onPOSTFail + * \details sends the Alarm Trigger message, used when the POST Failed. + * \param vAlarmID + */ +void ApplicationController::onPOSTFail(GuiAlarmID vAlarmID) { + emit didActionTransmit(GuiActionType::ID_AlarmTriggered, { vAlarmID ,0,0,0,0}); +} + +/*! + * \brief ApplicationController::onPOSTDone + * \details Sends the POST Final message + */ +void ApplicationController::onPOSTDone(bool vPass) { + AdjustUIPostFinalResultRequestData data; + data.mResult = vPass; + emit didAdjustment(data); + QString message = "ApplicationPost Done :" + QTime::currentTime().toString("HH:mm:ss.zzz"); + qDebug() << message; + LOG_DEBUG(message); +} + +/*! * \brief ApplicationController::settingsInit * \details The Settings read function is called in this method. * This callback function for the QCuncurrnent run. @@ -510,15 +556,7 @@ * \return void */ void ApplicationController::onstartPOST() { + LOG_DEBUG("ApplicationPost Start:" + QTime::currentTime().toString("HH:mm:ss.zzz")); emit didActionTransmit(GuiActionType::ID_KeepAlive, {}); - ApplicationPost post; - connect(&post, &ApplicationPost::didPOSTFail, [=] (Gui::GuiAlarmID vAlarmID) { - emit didActionTransmit(GuiActionType::ID_AlarmTriggered, { vAlarmID ,0,0,0,0}); - }); - connect(&post, &ApplicationPost::didPOSTDone, [=] (bool vResult) { - AdjustUIPostFinalResultRequestData data; - data.mResult = vResult; - emit didAdjustment(data); - }); - post.start(); + _post.start(); }