Index: sources/device/DeviceGlobals.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r6c6f1f5d466badd9b4fd67be7c907234c342b2a2 --- sources/device/DeviceGlobals.h (.../DeviceGlobals.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/device/DeviceGlobals.h (.../DeviceGlobals.h) (revision 6c6f1f5d466badd9b4fd67be7c907234c342b2a2) @@ -19,12 +19,6 @@ // Project #include "StorageGlobals.h" -namespace Device { - -const QString _scriptsFolder = Storage::Scripts_Path_Name; - -} - /* DEVICE ATTRIBUTE PROPERTY DEFINITION */ // The FLC in vATTRIBUTEFLC means First Letter Capital #define ATTRIBUTE( vTYPE, vATTRIBUTE, vDEFAULT, vATTRIBUTEFLC) \ @@ -174,42 +168,79 @@ DEVICE_DEV_PARENT ( Brightness ) \ DEVICE_DEV_PARENT ( BluetoothPairedReset ) \ DEVICE_DEV_PARENT ( BluetoothPairedQuery ) \ + DEVICE_DEV_PARENT ( CryptSetup ) \ + DEVICE_DEV_PARENT ( RootSSHAccess ) \ + DEVICE_DEV_PARENT ( FactoryReset ) \ + DEVICE_DEV_PARENT ( Decommission ) \ + DEVICE_DEV_PARENT ( USBMount ) \ #define DEVICE_DEV_INIT_CONNECTIONS_LIST \ DEVICE_DEV_INIT_CONNECTIONS ( Brightness ) \ 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 ) \ + DEVICE_DEV_INIT_CONNECTIONS ( USBMount ) \ #define DEVICE_DEV_DEFINITION_LIST \ DEVICE_DEV_DEFINITION ( Brightness ) \ DEVICE_DEV_DEFINITION ( BluetoothPairedReset ) \ DEVICE_DEV_DEFINITION ( BluetoothPairedQuery ) \ + DEVICE_DEV_DEFINITION ( CryptSetup ) \ + DEVICE_DEV_DEFINITION ( RootSSHAccess ) \ + DEVICE_DEV_DEFINITION ( FactoryReset ) \ + DEVICE_DEV_DEFINITION ( Decommission ) \ + DEVICE_DEV_DEFINITION ( USBMount ) \ + /* ---------------------------- APP */ #define DEVICE_APP_INIT_CONNECTIONS_LIST \ DEVICE_APP_INIT_CONNECTIONS ( Brightness ) \ DEVICE_APP_INIT_CONNECTIONS ( BluetoothPairedReset ) \ DEVICE_APP_INIT_CONNECTIONS ( BluetoothPairedQuery ) \ + DEVICE_APP_INIT_CONNECTIONS ( CryptSetup ) \ + DEVICE_APP_INIT_CONNECTIONS ( RootSSHAccess ) \ + DEVICE_APP_INIT_CONNECTIONS ( FactoryReset ) \ + DEVICE_APP_INIT_CONNECTIONS ( Decommission ) \ #define DEVICE_APP_BRIDGE_DEFINITION_LIST \ DEVICE_APP_BRIDGE_DEFINITION( Brightness ) \ 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 ) \ + DEVICE_APP_BRIDGE_DEFINITION( USBMount ) \ /* ---------------------------- GUI */ #define DEVICE_GUI_BRIDGE_DEFINITION_LIST \ DEVICE_GUI_BRIDGE_DEFINITION( Brightness ) \ 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 ) \ #define DEVICE_GUI_INIT_CONNECTIONS_LIST \ DEVICE_GUI_INIT_CONNECTIONS ( Brightness ) \ 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 ) \ /* ---------------------------- VIEW */ #define DEVICE_VIEW_INIT_CONNECTIONS_LIST \ DEVICE_VIEW_INIT_CONNECTIONS( Brightness ) \ 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 ) \