Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rd619b1355f03ab8e2e53956908bda66fea542224 -r71784f783e4e2c0eadebef28eefb0fc53534ba66 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision d619b1355f03ab8e2e53956908bda66fea542224) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 71784f783e4e2c0eadebef28eefb0fc53534ba66) @@ -75,7 +75,7 @@ {Gui::GuiActionType::ID_AlarmStatus , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2bytes {Gui::GuiActionType::ID_AlarmTriggered , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AlarmCleared , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AlarmSilenceReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AlarmSilenceReq , 1 * 1 }, // 1 parameter each 1bytes {Gui::GuiActionType::ID_AlarmUserAckReq , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AlarmUserActionReq , 1 * 4 }, // 1 parameter each 4bytes Index: sources/gui/qml/main.qml =================================================================== diff -u -r43cdee7bb03f7fa0bd5c2bba7f9d011bb06806b1 -r71784f783e4e2c0eadebef28eefb0fc53534ba66 --- sources/gui/qml/main.qml (.../main.qml) (revision 43cdee7bb03f7fa0bd5c2bba7f9d011bb06806b1) +++ sources/gui/qml/main.qml (.../main.qml) (revision 71784f783e4e2c0eadebef28eefb0fc53534ba66) @@ -185,7 +185,7 @@ onResumeClicked : vAlarmStatus.doUserActionResume () onRinsebackClicked : vAlarmStatus.doUserActionRinseback() onEndClicked : vAlarmStatus.doUserActionEnd () - onOkClicked : vAlarmStatus.doUserActionOK () + onOkClicked : vAlarmStatus.doUserActionOk () onMinimizeClicked : { alarmMinimize() // when used minimizes the alarm it can stay minimized until otherwize is set Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -rd619b1355f03ab8e2e53956908bda66fea542224 -r71784f783e4e2c0eadebef28eefb0fc53534ba66 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision d619b1355f03ab8e2e53956908bda66fea542224) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 71784f783e4e2c0eadebef28eefb0fc53534ba66) @@ -348,12 +348,12 @@ * * | Payload || * | || - * | #1:(U32) | state | + * | #1:(U08) | silence | * */ class MAlarmSilenceReq : public MModel { public: - quint8 state = 1; + quint8 silence = 1; // coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. QString toString() { Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -r43cdee7bb03f7fa0bd5c2bba7f9d011bb06806b1 -r71784f783e4e2c0eadebef28eefb0fc53534ba66 --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 43cdee7bb03f7fa0bd5c2bba7f9d011bb06806b1) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 71784f783e4e2c0eadebef28eefb0fc53534ba66) @@ -75,9 +75,9 @@ { AlarmSilenceRequestData data; if (_alarm_Flag_alarmsSilenced) - data.state = 1; + data.silence = 0; // de-silence else - data.state = 0; + data.silence = 1; // silence emit didAdjustment(data); }