Index: sources/device/DeviceGlobals.h =================================================================== diff -u -re7adb742d7dd362b2deb795259694b223eea3bc0 -r86df7ff03ea32f9cd8a18bbbc7b2e01de64c783f --- sources/device/DeviceGlobals.h (.../DeviceGlobals.h) (revision e7adb742d7dd362b2deb795259694b223eea3bc0) +++ sources/device/DeviceGlobals.h (.../DeviceGlobals.h) (revision 86df7ff03ea32f9cd8a18bbbc7b2e01de64c783f) @@ -102,7 +102,7 @@ * \param vExitCode - the returned exit code \ * \param vStatus - the status of the process \ */ \ -void process##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 &); \ @@ -114,23 +114,23 @@ 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,12 +152,12 @@ 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 ) \ @@ -170,16 +170,16 @@ /* ---------------------------- 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 */ \ -} \ + } \ 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 */ \ -} \ + } \ private : #define DEVICE_GUI_INIT_CONNECTIONS( vATTRIBUTEFLC ) \ @@ -189,7 +189,7 @@ /* ---------------------------- 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 &))); \ /* View <- Gui */ \ @@ -201,18 +201,19 @@ /* ---------------------------- 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 ( RootSSHAccess ) \ + DEVICE_DEV_PARENT ( Decommission ) \ /* DEVICE_DEV_PARENT ( BluetoothPairedReset ) \ DEVICE_DEV_PARENT ( BluetoothPairedQuery ) \ DEVICE_DEV_PARENT ( CryptSetup ) \ - DEVICE_DEV_PARENT ( RootSSHAccess ) \ - DEVICE_DEV_PARENT ( Decommission ) \ + */ // All the device attributes need to be listed here to be connected to the signal slots. @@ -223,12 +224,13 @@ DEVICE_DEV_INIT_CONNECTIONS ( WifiInfo ) \ DEVICE_DEV_INIT_CONNECTIONS ( WifiConnect ) \ DEVICE_DEV_INIT_CONNECTIONS ( FactoryReset ) \ + DEVICE_DEV_INIT_CONNECTIONS ( RootSSHAccess ) \ + DEVICE_DEV_INIT_CONNECTIONS ( Decommission ) \ /* DEVICE_DEV_INIT_CONNECTIONS ( BluetoothPairedReset ) \ DEVICE_DEV_INIT_CONNECTIONS ( BluetoothPairedQuery ) \ DEVICE_DEV_INIT_CONNECTIONS ( CryptSetup ) \ - DEVICE_DEV_INIT_CONNECTIONS ( RootSSHAccess ) \ - DEVICE_DEV_INIT_CONNECTIONS ( Decommission ) \ + */ // All the device attributes need to be listed here to be defined with needed signal, slots, values, ... . @@ -239,13 +241,12 @@ DEVICE_DEV_DEFINITION ( WifiInfo ) \ DEVICE_DEV_DEFINITION ( WifiConnect ) \ DEVICE_DEV_DEFINITION ( FactoryReset ) \ - + DEVICE_DEV_DEFINITION ( RootSSHAccess ) \ + DEVICE_DEV_DEFINITION ( Decommission ) \ /* DEVICE_DEV_DEFINITION ( BluetoothPairedReset ) \ DEVICE_DEV_DEFINITION ( BluetoothPairedQuery ) \ DEVICE_DEV_DEFINITION ( CryptSetup ) \ - DEVICE_DEV_DEFINITION ( RootSSHAccess ) \ - DEVICE_DEV_DEFINITION ( Decommission ) \ */ // All the device attributes need to be listed here to be defined with needed signal, slots, values, ... . @@ -256,13 +257,12 @@ DEVICE_DEV_DECLARATION ( WifiInfo ) \ DEVICE_DEV_DECLARATION ( WifiConnect ) \ DEVICE_DEV_DECLARATION ( FactoryReset ) \ - + DEVICE_DEV_DECLARATION ( RootSSHAccess ) \ + DEVICE_DEV_DECLARATION ( Decommission ) \ /* DEVICE_DEV_DECLARATION ( BluetoothPairedReset ) \ DEVICE_DEV_DECLARATION ( BluetoothPairedQuery ) \ DEVICE_DEV_DECLARATION ( CryptSetup ) \ - DEVICE_DEV_DECLARATION ( RootSSHAccess ) \ - DEVICE_DEV_DECLARATION ( Decommission ) \ */ /* ---------------------------- APP */ @@ -274,13 +274,12 @@ DEVICE_APP_INIT_CONNECTIONS ( WifiInfo ) \ DEVICE_APP_INIT_CONNECTIONS ( WifiConnect ) \ DEVICE_APP_INIT_CONNECTIONS ( FactoryReset ) \ - + DEVICE_APP_INIT_CONNECTIONS ( RootSSHAccess ) \ + DEVICE_APP_INIT_CONNECTIONS ( Decommission ) \ /* 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 ) \ */ #define DEVICE_APP_BRIDGE_DEFINITION_LIST \ @@ -290,13 +289,12 @@ DEVICE_APP_BRIDGE_DEFINITION( WifiInfo ) \ DEVICE_APP_BRIDGE_DEFINITION( WifiConnect ) \ DEVICE_APP_BRIDGE_DEFINITION( FactoryReset ) \ - + DEVICE_APP_BRIDGE_DEFINITION( RootSSHAccess ) \ + DEVICE_APP_BRIDGE_DEFINITION( Decommission ) \ /* DEVICE_APP_BRIDGE_DEFINITION( BluetoothPairedReset ) \ DEVICE_APP_BRIDGE_DEFINITION( BluetoothPairedQuery ) \ DEVICE_APP_BRIDGE_DEFINITION( CryptSetup ) \ - DEVICE_APP_BRIDGE_DEFINITION( RootSSHAccess ) \ - DEVICE_APP_BRIDGE_DEFINITION( Decommission ) \ */ /* ---------------------------- GUI */ @@ -308,13 +306,12 @@ DEVICE_GUI_INIT_CONNECTIONS ( WifiInfo ) \ DEVICE_GUI_INIT_CONNECTIONS ( WifiConnect ) \ DEVICE_GUI_INIT_CONNECTIONS ( FactoryReset ) \ - + DEVICE_GUI_INIT_CONNECTIONS ( RootSSHAccess ) \ + DEVICE_GUI_INIT_CONNECTIONS ( Decommission ) \ /* DEVICE_GUI_INIT_CONNECTIONS ( BluetoothPairedReset ) \ DEVICE_GUI_INIT_CONNECTIONS ( BluetoothPairedQuery ) \ DEVICE_GUI_INIT_CONNECTIONS ( CryptSetup ) \ - DEVICE_GUI_INIT_CONNECTIONS ( RootSSHAccess ) \ - DEVICE_GUI_INIT_CONNECTIONS ( Decommission ) \ */ #define DEVICE_GUI_BRIDGE_DEFINITION_LIST \ @@ -323,13 +320,12 @@ DEVICE_GUI_BRIDGE_DEFINITION( WifiInfo ) \ DEVICE_GUI_BRIDGE_DEFINITION( WifiConnect ) \ DEVICE_GUI_BRIDGE_DEFINITION( FactoryReset ) \ - + DEVICE_GUI_BRIDGE_DEFINITION( RootSSHAccess ) \ + DEVICE_GUI_BRIDGE_DEFINITION( Decommission ) \ /* DEVICE_GUI_BRIDGE_DEFINITION( BluetoothPairedReset ) \ DEVICE_GUI_BRIDGE_DEFINITION( BluetoothPairedQuery ) \ DEVICE_GUI_BRIDGE_DEFINITION( CryptSetup ) \ - DEVICE_GUI_BRIDGE_DEFINITION( RootSSHAccess ) \ - DEVICE_GUI_BRIDGE_DEFINITION( Decommission ) \ */ /* ---------------------------- VIEW */ @@ -341,12 +337,11 @@ DEVICE_VIEW_INIT_CONNECTIONS( WifiInfo ) \ DEVICE_VIEW_INIT_CONNECTIONS( WifiConnect ) \ DEVICE_VIEW_INIT_CONNECTIONS( FactoryReset ) \ - + DEVICE_VIEW_INIT_CONNECTIONS( RootSSHAccess ) \ + DEVICE_VIEW_INIT_CONNECTIONS( Decommission ) \ /* DEVICE_VIEW_INIT_CONNECTIONS( BluetoothPairedReset ) \ DEVICE_VIEW_INIT_CONNECTIONS( BluetoothPairedQuery ) \ DEVICE_VIEW_INIT_CONNECTIONS( CryptSetup ) \ - DEVICE_VIEW_INIT_CONNECTIONS( RootSSHAccess ) \ - DEVICE_VIEW_INIT_CONNECTIONS( Decommission ) \ */