Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -rd949be21f2a9badd0978dddaaf436f6805de28dc -r6e6ec6822b82c77bb4942c9f4061e860d1a70f85 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision d949be21f2a9badd0978dddaaf436f6805de28dc) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 6e6ec6822b82c77bb4942c9f4061e860d1a70f85) @@ -349,7 +349,7 @@ void MessageDispatcher::onAdjustment(const AdjustHDAlarmVolumeRequestData &vData) { QVariantList mData; - mData += vData.volume2HD(); + mData += vData.volume(); onActionTransmit(GuiActionType::ID_AlarmVolumeSetReq, mData); } Index: sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml =================================================================== diff -u -rf6b80a12cbbf42bea4448b9f8424350f5496d624 -r6e6ec6822b82c77bb4942c9f4061e860d1a70f85 --- sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml (.../SettingsVolumeBrightness.qml) (revision f6b80a12cbbf42bea4448b9f8424350f5496d624) +++ sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml (.../SettingsVolumeBrightness.qml) (revision 6e6ec6822b82c77bb4942c9f4061e860d1a70f85) @@ -50,8 +50,8 @@ anchors.verticalCenter: parent.verticalCenter width : 500 step : 1 // no zero - minimum : 1 // 1 - maximum : 5 // 10 + minimum : 1 + maximum : 5 ticks : true unit : "" onReleased : vDevice.brightness = _brightness.value @@ -82,8 +82,8 @@ anchors.verticalCenter: parent.verticalCenter width : 500 step : 1 // no zero - minimum : 1 // 1 - maximum : 5 // 5 + minimum : 1 + maximum : 5 ticks : true unit : "" onReleased : { Index: sources/model/hd/adjustment/settings/MAdjustHDRequests.h =================================================================== diff -u -r53b262fea2d4b5bd78ff878fda0848f3737e7b74 -r6e6ec6822b82c77bb4942c9f4061e860d1a70f85 --- sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision 53b262fea2d4b5bd78ff878fda0848f3737e7b74) +++ sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision 6e6ec6822b82c77bb4942c9f4061e860d1a70f85) @@ -75,16 +75,10 @@ */ class MAdjustHDAlarmVolumeReq : public MModel { - const int hw2ui = 20; // HD vol range is [1-5] and we show [20%-100%] to user (100 / 5). - quint32 _volume =100; // values in range of [20, 40, 60, 80, 100] or [1..5]*20 + quint32 _volume = 5; // HD vol range is [1-5] public: - - quint32 volume2HD() const { - return _volume / hw2ui; - } - - quint32 volume() { + quint32 volume() const{ return _volume; } void volume(quint32 vVolume) { Index: sources/view/settings/VSettings.h =================================================================== diff -u -rd949be21f2a9badd0978dddaaf436f6805de28dc -r6e6ec6822b82c77bb4942c9f4061e860d1a70f85 --- sources/view/settings/VSettings.h (.../VSettings.h) (revision d949be21f2a9badd0978dddaaf436f6805de28dc) +++ sources/view/settings/VSettings.h (.../VSettings.h) (revision 6e6ec6822b82c77bb4942c9f4061e860d1a70f85) @@ -64,7 +64,7 @@ PROPERTY(QVariantMap , instructions , {} ) SETTINGS(QString , servicePass , "" , Storage::Settings_Category_SettingsSystem , "Service" , "Password" ) - SETTINGS(quint8 , alarmVolume , 100 , Storage::Settings_Category_SettingsSystem , "Alarm" , "Volume" ) + SETTINGS(quint8 , alarmVolume , 5 , Storage::Settings_Category_SettingsSystem , "Alarm" , "Volume" ) SETTINGS(bool , roWaterMode , false , Storage::Settings_Category_SettingsSystem , "RoWaterMode" , "RoWaterMode" ) SETTINGS(bool , noCANBus , false , Storage::Settings_Category_NoCANBus , "Navigation" , "Create Treatment To Patient ID" )