Index: sources/ApplicationController.cpp =================================================================== diff -u -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 -rfa0bd4432f4726fc0d29de0f93a8d5e725cf0274 --- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) +++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision fa0bd4432f4726fc0d29de0f93a8d5e725cf0274) @@ -19,14 +19,13 @@ // Project #include "MainTimer.h" -#include "MessageDispatcher.h" +#include "MessageDispatcherAutoGen.h" #include "Logger.h" #include "DeviceController.h" //#include "FileHandler.h" #include "GuiController.h" #include "Settings.h" #include "MSettings.h" -#include "BluetoothInterface.h" /*! * \brief ApplicationController::ApplicationController @@ -90,10 +89,6 @@ this , SLOT(onPOSTEthernet (bool))); connect(&_post , SIGNAL( didWiFi (bool)), this , SLOT(onPOSTWiFi (bool))); - connect(&_post , SIGNAL( didBluetooth(bool)), - this , SLOT(onPOSTBluetooth(bool))); - connect(&_post , SIGNAL( didCloudSync(bool)), - this , SLOT(onPOSTCloudSync(bool))); connect(&_post , SIGNAL( didFail (Gui::GuiAlarmID )), this , SLOT(onPOSTFail (Gui::GuiAlarmID ))); @@ -350,25 +345,29 @@ */ void ApplicationController::checkIn() { - // DEBUG: return; -#ifndef DISABLE_KEEP_ALIVE - QVariantList mData; - int mFakeDataLen = gFakeData.length(); - if (mFakeDataLen) { - if (gFakeSeqAtBegin) { - createFakeSeqAtBeginLongMessage(mData, mFakeDataLen); - } - else { - createFakeSequencedLongMessage (mData, mFakeDataLen); - } - } - else { - mData += static_cast(GuiActionData::NoData); - } + UICheckINData mData; + onAdjustment(mData); - // AUTOGEN ISSUE - onActionTransmit(GuiActionType::ID_TDCheckIn, mData); -#endif + // DEBUG: return; +//#ifndef DISABLE_KEEP_ALIVE +// QVariantList mData; +// int mFakeDataLen = gFakeData.length(); +// if (mFakeDataLen) { +// if (gFakeSeqAtBegin) { +// createFakeSeqAtBeginLongMessage(mData, mFakeDataLen); +// } +// else { +// createFakeSequencedLongMessage (mData, mFakeDataLen); +// } +// } +// else { +// versionsRequest (); // TODO REMOVE THIS LINE FOR TESTING +// //mData += static_cast(GuiActionData::NoData); +// } +// +// // AUTOGEN ISSUE +// onActionTransmit(GuiActionType::ID_UICheckIN, mData); +//#endif } /*! @@ -566,33 +565,6 @@ } /*! - * \brief ApplicationController::onPOSTBluetooth - * \details Starts the Bluetooth Interface - */ -void ApplicationController::onPOSTBluetooth(bool vPass) { - if (vPass) { - _BluetoothInterface.valid(true); - _BluetoothInterface.doStart(); - } - else { - _BluetoothInterface.doNotifyStatePOSTError(); - } - // sending the data first, therefore in the slot for the didPOST we have the vPass and the Data to decide to use the data or not. - emit didPOSTBluetoothData (_post.macBluetooth()); - emit didPOSTBluetooth (vPass); -} - -/*! - * \brief ApplicationController::onPOSTCloudSync - * \details Notifies the CloudSync POST status - */ -void ApplicationController::onPOSTCloudSync(bool vPass) { - // sending the data first, therefore in the slot for the didPOST we have the vPass and the Data to decide to use the data or not. - emit didPOSTCloudSyncData("" /*_post.netCloudSync*/); // not needed and POST is not getting it yet. [ApplicationController => DeviceController] - emit didPOSTCloudSync (vPass); -} - -/*! * \brief ApplicationController::alarmTrigger * \details Queues the alarms, or send the list, or send one alarm * \param vAlarmID - The alarm ID to be triggered or queued. @@ -663,8 +635,8 @@ */ void ApplicationController::versionsRequest() { // AUTOGEN ISSUE - //AdjustVersionsRequestData adjustVersionsRequestData; - //emit didAdjustment(adjustVersionsRequestData); + FWVersionsRequestData adjustVersionsRequestData; + emit didAdjustment(adjustVersionsRequestData); LOG_DEBUG("POSTVersionReq Sent"); }