Index: sources/device/DeviceController.cpp
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r23eda7b49841f242485b70d0a96f4bdde50f71bc
--- sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision 23eda7b49841f242485b70d0a96f4bdde50f71bc)
@@ -29,7 +29,6 @@
 #include "ApplicationController.h"
 #include "FileHandler.h"
 #include "DeviceModels.h"
-#include "DeviceError.h"
 
 // namespace
 using namespace Model;
@@ -447,11 +446,11 @@
 {
     // ----- initializing the member variable models
     _deviceBrightnessRequest ._data = vData;
-    _deviceBrightnessResponse._data.mBrightnessPercent = _deviceBrightnessRequest._data.mBrightness_old * 10; // set to old value in case of error
 
+
     // ----- extract the required data
-    _deviceBrightnessRequest._data.mBrightness_val = vData.mBrightnessPercent / 10; // convert the GUI value(percent) to device value
-    LOG_EVENT(_deviceBrightnessRequest.toString());
+    _deviceBrightnessRequest.setBrightnessSysVal();
+    LOG_EVENT( _deviceBrightnessRequest.toString());
 
     // ----- check that script exists.
     QString script;
@@ -464,24 +463,6 @@
         return;
     }
 
-    // ----- check the data is valid
-    // TODO : this should be in the model
-    if ( _deviceBrightnessRequest.mBrightness_min > _deviceBrightnessRequest._data.mBrightness_val || _deviceBrightnessRequest._data.mBrightness_val > _deviceBrightnessRequest.mBrightness_max ) {
-        checkError(DeviceError::eDevice_Scripts_Error_OutOfRange, _deviceBrightnessResponse);
-        return;
-    }
-
-    // ----- check the value is in the list of correct resolution
-    //       create the list of correct values
-    // TODO : this should be in the model
-    QList<quint8> _allowableValues;
-    for ( quint8 i = _deviceBrightnessRequest.mBrightness_min; i <= _deviceBrightnessRequest.mBrightness_max; i += _deviceBrightnessRequest.mBrightness_res ) _allowableValues += i;
-    //       check the value is in the list
-    if ( ! _allowableValues.contains(_deviceBrightnessRequest._data.mBrightness_val) ) {
-        checkError(DeviceError::eDevice_Scripts_Error_Incorrect_Req, _deviceBrightnessResponse);
-        return;
-    }
-
     // ----- run the process
     _processBrightness.start(script, QStringList() << QString::number(_deviceBrightnessRequest._data.mBrightness_val));
 }
@@ -500,21 +481,21 @@
 void DeviceController::onProcessBrightnessExitCode(int vExitCode, QProcess::ExitStatus)
 {
     // TODO: Move this into the model.
-    _deviceBrightnessResponse._data.mBrightnessPercent = _deviceBrightnessRequest._data.mBrightness_old * 10; // set to old value in case of error
+    // _deviceBrightnessResponse._data.mBrightnessPercent = _deviceBrightnessRequest._data.mBrightness_old * 10; // set to old value in case of error
     if ( ! checkError(static_cast<DeviceError::Scripts_Error_Enum>(vExitCode), _deviceBrightnessResponse, _deviceBrightnessResponse.toString()) ) { // has no error
         if (_deviceBrightnessRequest._data.mRead) {
             bool ok = false;
             int brightness = _processBrightness.readLine().toInt(&ok);
             if (ok) {
-                _deviceBrightnessResponse._data.mBrightnessPercent = brightness * 10;
+                _deviceBrightnessResponse.setBrightnessPercent(brightness);
             }
             else {
                 checkError(DeviceError::eDevice_Scripts_Error_Incorrect_Rsp,_deviceBrightnessResponse, _deviceBrightnessResponse.toString());
                 return;
             }
         }
         else {
-            _deviceBrightnessResponse._data.mBrightnessPercent = _deviceBrightnessRequest._data.mBrightness_val * 10;
+            _deviceBrightnessResponse.setBrightnessPercent(_deviceBrightnessRequest._data.mBrightness_val);
             _deviceBrightnessResponse._data.mMessage = _deviceBrightnessResponse.toString();
         }
         LOG_EVENT(_deviceBrightnessResponse._data.mMessage);
@@ -552,7 +533,6 @@
     didAttributeResponse(model.data());
 }
 
-
 void DeviceController::onAttributeRequest(const DeviceBluetoothPairedQueryRequestData &)
 {
     // ----- check that script exists.