Index: sources/device/DeviceGlobals.h =================================================================== diff -u -ra2a273600d25e863214833ead3324a63fb4759f1 -re7adb742d7dd362b2deb795259694b223eea3bc0 --- sources/device/DeviceGlobals.h (.../DeviceGlobals.h) (revision a2a273600d25e863214833ead3324a63fb4759f1) +++ sources/device/DeviceGlobals.h (.../DeviceGlobals.h) (revision e7adb742d7dd362b2deb795259694b223eea3bc0) @@ -102,35 +102,35 @@ * \param vExitCode - the returned exit code \ * \param vStatus - the status of the process \ */ \ - void process##vATTRIBUTEFLC##Response(int vExitCode, QProcess::ExitStatus vStatus, \ - QProcess::ProcessChannel vChannel ); \ - void process##vATTRIBUTEFLC##ReadyOut( M##Device##vATTRIBUTEFLC##Response &); \ - void process##vATTRIBUTEFLC##ReadyErr( M##Device##vATTRIBUTEFLC##Response &); \ - void process##vATTRIBUTEFLC##Complete( M##Device##vATTRIBUTEFLC##Response &, \ - int vExitCode, QProcess::ExitStatus vStatus); \ +void process##vATTRIBUTEFLC##Response(int vExitCode, QProcess::ExitStatus vStatus, \ + QProcess::ProcessChannel vChannel ); \ + void process##vATTRIBUTEFLC##ReadyOut( M##Device##vATTRIBUTEFLC##Response &); \ + void process##vATTRIBUTEFLC##ReadyErr( M##Device##vATTRIBUTEFLC##Response &); \ + void process##vATTRIBUTEFLC##Complete( M##Device##vATTRIBUTEFLC##Response &, \ + int vExitCode, QProcess::ExitStatus vStatus); \ #define DEVICE_DEV_DECLARATION( vATTRIBUTEFLC ) \ void DeviceController::process##vATTRIBUTEFLC##ReadyOut(M##Device##vATTRIBUTEFLC##Response &vModel) { \ vModel._data.mCompleted = false; \ vModel._data.mAccepted = false; \ vModel._data.mMessage = _process##vATTRIBUTEFLC.readAllStandardOutput(); \ - } \ +} \ void DeviceController::process##vATTRIBUTEFLC##ReadyErr(M##Device##vATTRIBUTEFLC##Response &vModel) { \ vModel._data.mCompleted = false; \ vModel._data.mAccepted = false; \ vModel._data.mMessage = "Err:" +_process##vATTRIBUTEFLC.readAllStandardError(); \ - } \ +} \ void DeviceController::process##vATTRIBUTEFLC##Complete(M##Device##vATTRIBUTEFLC##Response &vModel, \ int vExitCode, QProcess::ExitStatus vStatus) { \ vModel._data.mCompleted = true; \ vModel._data.mAccepted = false; \ if (vStatus) vExitCode = Device::DeviceError::eDevice_Scripts_Error_Status; /* CrashExit */ \ vModel.fromByteArray( vModel._data.mMessage.toLatin1(), &vExitCode ); \ - } \ +} \ #define DEVICE_DEV_INIT_CONNECTIONS( vATTRIBUTEFLC ) \ - /* App -> Dev //TODO: Add the error LOG connection */ \ +/* App -> Dev //TODO: Add the error LOG connection */ \ connect(&_ApplicationController , SIGNAL(didAttributeRequest(const Device##vATTRIBUTEFLC##RequestData &)), \ this , SLOT( onAttributeRequest(const Device##vATTRIBUTEFLC##RequestData &))); \ connect(&_process##vATTRIBUTEFLC, QOverload::of(&QProcess::finished), \ @@ -152,46 +152,46 @@ private Q_SLOTS : void onAttributeRequest (const Device##vATTRIBUTEFLC##RequestData &vData) { \ /* this is a bridge only if it is required later can be removed and implemented */ \ emit didAttributeRequest(vData); /* Gui -> App */ \ - } \ +} \ Q_SIGNALS : void didAttributeResponse(const Device##vATTRIBUTEFLC##ResponseData &); \ private Q_SLOTS : void onAttributeResponse(const Device##vATTRIBUTEFLC##ResponseData &vData) { \ /* this is a bridge only if it is required later can be removed and implemented */ \ emit didAttributeResponse(vData); /* Gui <- App */ \ - } \ +} \ private : #define DEVICE_APP_INIT_CONNECTIONS( vATTRIBUTEFLC ) \ - /* Gui -> App */ \ - connect(&_GuiController , SIGNAL(didAttributeRequest (const Device##vATTRIBUTEFLC##RequestData &)), \ - this , SLOT( onAttributeRequest (const Device##vATTRIBUTEFLC##RequestData &))); \ + /* Gui -> App */ \ + connect(&_GuiController , SIGNAL(didAttributeRequest (const Device##vATTRIBUTEFLC##RequestData &)), \ + this , SLOT( onAttributeRequest (const Device##vATTRIBUTEFLC##RequestData &))); \ /* App <- Dev */ \ connect(&_DeviceController , SIGNAL(didAttributeResponse(const Device##vATTRIBUTEFLC##ResponseData &)), \ this , SLOT( onAttributeResponse(const Device##vATTRIBUTEFLC##ResponseData &))); /* ---------------------------- GUI */ #define DEVICE_GUI_BRIDGE_DEFINITION( vATTRIBUTEFLC ) \ - Q_SIGNALS : void didAttributeRequest (const Device##vATTRIBUTEFLC##RequestData &); \ +Q_SIGNALS : void didAttributeRequest (const Device##vATTRIBUTEFLC##RequestData &); \ public Q_SLOTS : void doAttributeRequest (const Device##vATTRIBUTEFLC##RequestData &vData) { \ - /* this is a bridge only if it is required later can be removed and implemented */ \ - emit didAttributeRequest(vData); /* Gui -> App */ \ - } \ + /* this is a bridge only if it is required later can be removed and implemented */ \ + emit didAttributeRequest(vData); /* Gui -> App */ \ +} \ Q_SIGNALS : void didAttributeResponse(const Device##vATTRIBUTEFLC##ResponseData &); \ public Q_SLOTS : void onAttributeResponse(const Device##vATTRIBUTEFLC##ResponseData &vData) { \ - /* this is a bridge only if it is required later can be removed and implemented */ \ - emit didAttributeResponse(vData); /* Gui <- App */ \ - } \ + /* this is a bridge only if it is required later can be removed and implemented */ \ + emit didAttributeResponse(vData); /* Gui <- App */ \ +} \ private : #define DEVICE_GUI_INIT_CONNECTIONS( vATTRIBUTEFLC ) \ - /* Gui <- App */ \ - connect(&_ApplicationController, SIGNAL(didAttributeResponse(const Device##vATTRIBUTEFLC##ResponseData &)), \ - this , SLOT( onAttributeResponse(const Device##vATTRIBUTEFLC##ResponseData &))); + /* Gui <- App */ \ + connect(&_ApplicationController, SIGNAL(didAttributeResponse(const Device##vATTRIBUTEFLC##ResponseData &)), \ + this , SLOT( onAttributeResponse(const Device##vATTRIBUTEFLC##ResponseData &))); /* ---------------------------- VIEW */ #define DEVICE_VIEW_INIT_CONNECTIONS( vATTRIBUTEFLC ) \ - /* to convert the value to the model and emit the signal to go to the controller (Qml -> View) */ \ +/* to convert the value to the model and emit the signal to go to the controller (Qml -> View) */ \ connect(this , SIGNAL(didAttributeRequest (const Device##vATTRIBUTEFLC##RequestData &)), \ - &_GuiController , SLOT( doAttributeRequest (const Device##vATTRIBUTEFLC##RequestData &))); \ + &_GuiController , SLOT( doAttributeRequest (const Device##vATTRIBUTEFLC##RequestData &))); \ /* View <- Gui */ \ connect(&_GuiController , SIGNAL(didAttributeResponse(const Device##vATTRIBUTEFLC##ResponseData &)), \ this , SLOT( onAttributeResponse(const Device##vATTRIBUTEFLC##ResponseData &))); @@ -201,18 +201,17 @@ /* ---------------------------- DEV */ // All the device attributes need to be listed here to be re-parented. #define DEVICE_DEV_PARENT_LIST \ - DEVICE_DEV_PARENT ( Brightness ) \ +DEVICE_DEV_PARENT ( Brightness ) \ DEVICE_DEV_PARENT ( USBMount ) \ DEVICE_DEV_PARENT ( WifiList ) \ DEVICE_DEV_PARENT ( WifiInfo ) \ DEVICE_DEV_PARENT ( WifiConnect ) \ - + DEVICE_DEV_PARENT ( FactoryReset ) \ /* DEVICE_DEV_PARENT ( BluetoothPairedReset ) \ DEVICE_DEV_PARENT ( BluetoothPairedQuery ) \ DEVICE_DEV_PARENT ( CryptSetup ) \ DEVICE_DEV_PARENT ( RootSSHAccess ) \ - DEVICE_DEV_PARENT ( FactoryReset ) \ DEVICE_DEV_PARENT ( Decommission ) \ */ @@ -223,12 +222,12 @@ DEVICE_DEV_INIT_CONNECTIONS ( WifiList ) \ DEVICE_DEV_INIT_CONNECTIONS ( WifiInfo ) \ DEVICE_DEV_INIT_CONNECTIONS ( WifiConnect ) \ + DEVICE_DEV_INIT_CONNECTIONS ( FactoryReset ) \ /* DEVICE_DEV_INIT_CONNECTIONS ( BluetoothPairedReset ) \ DEVICE_DEV_INIT_CONNECTIONS ( BluetoothPairedQuery ) \ DEVICE_DEV_INIT_CONNECTIONS ( CryptSetup ) \ DEVICE_DEV_INIT_CONNECTIONS ( RootSSHAccess ) \ - DEVICE_DEV_INIT_CONNECTIONS ( FactoryReset ) \ DEVICE_DEV_INIT_CONNECTIONS ( Decommission ) \ */ @@ -239,12 +238,13 @@ DEVICE_DEV_DEFINITION ( WifiList ) \ DEVICE_DEV_DEFINITION ( WifiInfo ) \ DEVICE_DEV_DEFINITION ( WifiConnect ) \ + DEVICE_DEV_DEFINITION ( FactoryReset ) \ + /* DEVICE_DEV_DEFINITION ( BluetoothPairedReset ) \ DEVICE_DEV_DEFINITION ( BluetoothPairedQuery ) \ DEVICE_DEV_DEFINITION ( CryptSetup ) \ DEVICE_DEV_DEFINITION ( RootSSHAccess ) \ - DEVICE_DEV_DEFINITION ( FactoryReset ) \ DEVICE_DEV_DEFINITION ( Decommission ) \ */ @@ -255,12 +255,13 @@ DEVICE_DEV_DECLARATION ( WifiList ) \ DEVICE_DEV_DECLARATION ( WifiInfo ) \ DEVICE_DEV_DECLARATION ( WifiConnect ) \ + DEVICE_DEV_DECLARATION ( FactoryReset ) \ + /* DEVICE_DEV_DECLARATION ( BluetoothPairedReset ) \ DEVICE_DEV_DECLARATION ( BluetoothPairedQuery ) \ DEVICE_DEV_DECLARATION ( CryptSetup ) \ DEVICE_DEV_DECLARATION ( RootSSHAccess ) \ - DEVICE_DEV_DECLARATION ( FactoryReset ) \ DEVICE_DEV_DECLARATION ( Decommission ) \ */ @@ -272,13 +273,14 @@ DEVICE_APP_INIT_CONNECTIONS ( WifiList ) \ DEVICE_APP_INIT_CONNECTIONS ( WifiInfo ) \ DEVICE_APP_INIT_CONNECTIONS ( WifiConnect ) \ + DEVICE_APP_INIT_CONNECTIONS ( FactoryReset ) \ + /* DEVICE_APP_INIT_CONNECTIONS ( BluetoothPairedReset ) \ DEVICE_APP_INIT_CONNECTIONS ( BluetoothPairedQuery ) \ DEVICE_APP_INIT_CONNECTIONS ( CryptSetup ) \ DEVICE_APP_INIT_CONNECTIONS ( RootSSHAccess ) \ DEVICE_APP_INIT_CONNECTIONS ( Decommission ) \ - DEVICE_APP_INIT_CONNECTIONS ( FactoryReset ) \ */ #define DEVICE_APP_BRIDGE_DEFINITION_LIST \ @@ -287,12 +289,13 @@ DEVICE_APP_BRIDGE_DEFINITION( WifiList ) \ DEVICE_APP_BRIDGE_DEFINITION( WifiInfo ) \ DEVICE_APP_BRIDGE_DEFINITION( WifiConnect ) \ + DEVICE_APP_BRIDGE_DEFINITION( FactoryReset ) \ + /* DEVICE_APP_BRIDGE_DEFINITION( BluetoothPairedReset ) \ DEVICE_APP_BRIDGE_DEFINITION( BluetoothPairedQuery ) \ DEVICE_APP_BRIDGE_DEFINITION( CryptSetup ) \ DEVICE_APP_BRIDGE_DEFINITION( RootSSHAccess ) \ - DEVICE_APP_BRIDGE_DEFINITION( FactoryReset ) \ DEVICE_APP_BRIDGE_DEFINITION( Decommission ) \ */ @@ -304,12 +307,13 @@ DEVICE_GUI_INIT_CONNECTIONS ( WifiList ) \ DEVICE_GUI_INIT_CONNECTIONS ( WifiInfo ) \ DEVICE_GUI_INIT_CONNECTIONS ( WifiConnect ) \ + DEVICE_GUI_INIT_CONNECTIONS ( FactoryReset ) \ + /* DEVICE_GUI_INIT_CONNECTIONS ( BluetoothPairedReset ) \ DEVICE_GUI_INIT_CONNECTIONS ( BluetoothPairedQuery ) \ DEVICE_GUI_INIT_CONNECTIONS ( CryptSetup ) \ DEVICE_GUI_INIT_CONNECTIONS ( RootSSHAccess ) \ - DEVICE_GUI_INIT_CONNECTIONS ( FactoryReset ) \ DEVICE_GUI_INIT_CONNECTIONS ( Decommission ) \ */ @@ -318,12 +322,13 @@ DEVICE_GUI_BRIDGE_DEFINITION( WifiList ) \ DEVICE_GUI_BRIDGE_DEFINITION( WifiInfo ) \ DEVICE_GUI_BRIDGE_DEFINITION( WifiConnect ) \ + DEVICE_GUI_BRIDGE_DEFINITION( FactoryReset ) \ + /* DEVICE_GUI_BRIDGE_DEFINITION( BluetoothPairedReset ) \ DEVICE_GUI_BRIDGE_DEFINITION( BluetoothPairedQuery ) \ DEVICE_GUI_BRIDGE_DEFINITION( CryptSetup ) \ DEVICE_GUI_BRIDGE_DEFINITION( RootSSHAccess ) \ - DEVICE_GUI_BRIDGE_DEFINITION( FactoryReset ) \ DEVICE_GUI_BRIDGE_DEFINITION( Decommission ) \ */ @@ -335,12 +340,13 @@ DEVICE_VIEW_INIT_CONNECTIONS( WifiList ) \ DEVICE_VIEW_INIT_CONNECTIONS( WifiInfo ) \ DEVICE_VIEW_INIT_CONNECTIONS( WifiConnect ) \ + DEVICE_VIEW_INIT_CONNECTIONS( FactoryReset ) \ + /* DEVICE_VIEW_INIT_CONNECTIONS( BluetoothPairedReset ) \ DEVICE_VIEW_INIT_CONNECTIONS( BluetoothPairedQuery ) \ DEVICE_VIEW_INIT_CONNECTIONS( CryptSetup ) \ DEVICE_VIEW_INIT_CONNECTIONS( RootSSHAccess ) \ - DEVICE_VIEW_INIT_CONNECTIONS( FactoryReset ) \ DEVICE_VIEW_INIT_CONNECTIONS( Decommission ) \ */