Index: sources/ApplicationController.cpp =================================================================== diff -u -r389f028cb9d4d320eae393de7c4408a58a619356 -r1da89b0452b8ef9448847618e75c118f3f58bd0c --- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 389f028cb9d4d320eae393de7c4408a58a619356) +++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 1da89b0452b8ef9448847618e75c118f3f58bd0c) @@ -29,6 +29,7 @@ #include "WifiInterface.h" #include "BluetoothInterface.h" #include "VAdjustmentVersions.h" +#include "encryption.h" /*! * \brief ApplicationController::ApplicationController @@ -90,6 +91,8 @@ void ApplicationController::initConnections() { + connect(&_post , SIGNAL( didEthernet (bool)), + this , SLOT(onPOSTEthernet (bool))); connect(&_post , SIGNAL( didWiFi (bool)), this , SLOT(onPOSTWiFi (bool))); connect(&_post , SIGNAL( didBluetooth(bool)), @@ -134,6 +137,10 @@ connect(&_DeviceController , SIGNAL(didSDCardSpaceTooLow(quint8)), this , SLOT( onSDCardSpaceTooLow(quint8))); + // Configuration Partition + connect(&_DeviceController , SIGNAL(didCryptSetupMount(bool)), + this , SLOT( onCryptSetupMount(bool))); + connect(&_GuiController , SIGNAL(didExportLog (const GuiStringIndexMap &)), this , SLOT( onExportLog (const GuiStringIndexMap &))); connect(&_GuiController , SIGNAL(didExportService (const GuiStringIndexMap &)), @@ -309,6 +316,12 @@ } // disabled coco end +void ApplicationController::onCryptSetupMount(bool /*vPass*/) +{ + // if ( vPass ) + initSettings(); +} + /*! * \brief ApplicationController::onExportLog * \details the slot which will be called by UI to so the log export. @@ -541,17 +554,32 @@ emit didSettingsDone(); emit didPOSTPass(_post.isDone()); + + /// POST /// + keepAlive(); } /*! + * \brief ApplicationController::onPOSTEthernet + * \details sends the Ethernet mac to device controller + */ +void ApplicationController::onPOSTEthernet(bool vPass) { + emit didPOSTEthernet (vPass); + emit didPOSTEthernetData(_post.macEthernet()); +} + +/*! * \brief ApplicationController::onPOSTWiFi * \details Starts the WiFi Interface */ void ApplicationController::onPOSTWiFi(bool vPass) { if (vPass) { _WifiInterface.doStart(); } - emit didPOSTWiFi(vPass); + emit didPOSTWireless (vPass); + emit didPOSTWirelessData(_post.macWireless()); + + qDebug() << " ---------- " << _post.macWireless(); } /*! @@ -565,8 +593,9 @@ } else { _BluetoothInterface.doNotifyStatePOSTError(); - emit didPOSTBluetooth(vPass); } + emit didPOSTBluetooth (vPass); + emit didPOSTBluetoothData (_post.macBluetooth()); } /*! @@ -576,6 +605,7 @@ void ApplicationController::onPOSTCloudSync(bool vPass) { emit didPOSTCloudSync(vPass); + emit didPOSTBluetooth("000:000:000:000" /*_post.netCloudSync*/); // not needed and post is not getting it yet. } /*! @@ -591,14 +621,14 @@ * \brief ApplicationController::onPOSTDone * \details Sends the POST Final message */ -void ApplicationController::onPOSTDone(bool vPass) { +void ApplicationController::onPOSTDone(bool /*vPass*/) { LOG_DEBUG("ApplicationPOST Done"); - initSettings(); - - postDoneRequest(); - - versionsRequest(vPass); + /// in manufacturing mode the configurations must reside in /root/home + /// therefore the settings can be initialized after POST. + if ( gEnableManufacturing ) initSettings(); + /// POST /// postDoneRequest(); + /// POST /// versionsRequest(vPass); } /*! @@ -625,6 +655,5 @@ */ void ApplicationController::onstartPOST() { LOG_DEBUG("ApplicationPost Start"); - emit didActionTransmit(GuiActionType::ID_KeepAlive, {}); _post.start(); }