Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r5ed84841f5852381b2e36328c0aeca7bc97b9c03 -r712b88374d635e38a9ef06ac19118c8a59bebd8c --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 5ed84841f5852381b2e36328c0aeca7bc97b9c03) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 712b88374d635e38a9ef06ac19118c8a59bebd8c) @@ -218,8 +218,6 @@ case Gui::GuiActionType::ID_DuetConfirmUIr : INTERPRET_TRANSMIT_MESSAGE(DuetConfirmUIrData ); break; // RO Water case Gui::GuiActionType::ID_DuetRoWaterModeUIi : INTERPRET_TRANSMIT_MESSAGE(DuetRoWaterModeUIiData ); break; - // Power Off -// case Gui::GuiActionType::ID_PowerOff : INTERPRET_TRSMT_MT_MESSAGE(AdjustPowerOffRequestData ); break; // POST case Gui::GuiActionType::ID_UIPostFinalResultData : INTERPRET_TRANSMIT_MESSAGE(AdjustUIPostFinalResultRequestData ); break; // Settings Index: sources/model/td/adjustment/MAdjustPowerOff.cpp =================================================================== diff -u -r5ed84841f5852381b2e36328c0aeca7bc97b9c03 -r712b88374d635e38a9ef06ac19118c8a59bebd8c --- sources/model/td/adjustment/MAdjustPowerOff.cpp (.../MAdjustPowerOff.cpp) (revision 5ed84841f5852381b2e36328c0aeca7bc97b9c03) +++ sources/model/td/adjustment/MAdjustPowerOff.cpp (.../MAdjustPowerOff.cpp) (revision 712b88374d635e38a9ef06ac19118c8a59bebd8c) @@ -17,23 +17,14 @@ using namespace Model; QVariantList MPowerOff::parameters() const { - return { -// _data.mStatus .value - }; + return { }; } bool MPowerOff::fromByteArray(const QByteArray &vByteArray, int *vIndex) { Q_UNUSED(vByteArray); Q_UNUSED(vIndex); -// int index = 0; // message data start position -// if (GetValue(vByteArray, index, _data.mStatus )) goto lError; return true ; - -//lError: -// if(vIndex) { *vIndex = index; } - -// return false ; } /*! @@ -43,6 +34,5 @@ */ MPowerOff::Data MPowerOff::data() const { Data data; -// data.mStatus = _data.mStatus.value; return data; } Index: sources/view/confirm/VConfirm.cpp =================================================================== diff -u -re255d4633b338f4f46c3a2fad5a62f982ebfcd18 -r712b88374d635e38a9ef06ac19118c8a59bebd8c --- sources/view/confirm/VConfirm.cpp (.../VConfirm.cpp) (revision e255d4633b338f4f46c3a2fad5a62f982ebfcd18) +++ sources/view/confirm/VConfirm.cpp (.../VConfirm.cpp) (revision 712b88374d635e38a9ef06ac19118c8a59bebd8c) @@ -40,8 +40,6 @@ command ( vData.mCommand ); GuiConfirmCommand cmd = static_cast( _command ); -// visible( ( cmd == GuiConfirmCommand::GENERIC_CONFIRM_CMD_REQUEST_OPEN ) ); - switch ( cmd ) { case GuiConfirmCommand::GENERIC_CONFIRM_CMD_REQUEST_OPEN : adjustment_Reason ( GuiConfirmId::GENERIC_CONFIRM_ID_NONE );