Index: sources/device/DeviceController.h =================================================================== diff -u -r61f16c988a159401c92730b4cbfca5085c77222f -r97d593e2e7adb36f2f9f97f9bb9958dcef740bc1 --- sources/device/DeviceController.h (.../DeviceController.h) (revision 61f16c988a159401c92730b4cbfca5085c77222f) +++ sources/device/DeviceController.h (.../DeviceController.h) (revision 97d593e2e7adb36f2f9f97f9bb9958dcef740bc1) @@ -21,15 +21,17 @@ // Project #include "main.h" // Doxygen : don't remove #include "Threads.h" +#include "DeviceGlobals.h" #include "DeviceModels.h" +#include "DeviceError.h" // Define -#define _DeviceController Storage::DeviceController::I() +#define _DeviceController Device::DeviceController::I() // forward declarations class tst_initializations; -namespace Storage { +namespace Device { /*! * \brief The DeviceController class @@ -69,18 +71,14 @@ bool _pauseSpaceCheck = false; - const QString _scriptsFolder = Storage::Scripts_Path_Name; + DEVICE_DEV_DEFINITION_LIST - const quint8 _brightness_min = 20 ; - const quint8 _brightness_max = 100 ; - const quint8 _brightness_res = 20 ; - quint8 _brightness_val = 100 ; - QProcess _processBrightness ; + const quint8 _brightness_min = 2; + const quint8 _brightness_max = 10; + const quint8 _brightness_res = 2; + quint8 _brightness_old = _brightness_min; + quint8 _brightness_val = 10; -public slots : void onAttributeRequest (const DeviceBrightnessRequestData &vData); -signals : void didAttributeResponse (const DeviceBrightnessResponseData &); -private slots : void onProcessBrightnessFinished(int vExitCode); - public slots: bool init(); bool init(QThread &vThread); @@ -103,7 +101,10 @@ bool driveSpaceCheck(const QString &vPath, qint64 &vTotalBytes, qint64 &vAvailableBytes, bool *vIsReadOnly = nullptr); - bool checkScript(QString &vScript, const QString &vShellScript); + template + bool checkError(DeviceError::Scripts_Error_Enum vError, TModel &vModel,QString vExtraLogInfo = ""); + DeviceError::Scripts_Error_Enum checkScript(QString &vScript, const QString &vShellScript); + signals: /*! * \brief didUSBDriveMount