Index: sources/view/confirm/VConfirm.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rbd12a330df798024c3de30f727058d971dfc2cbe --- sources/view/confirm/VConfirm.cpp (.../VConfirm.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/confirm/VConfirm.cpp (.../VConfirm.cpp) (revision bd12a330df798024c3de30f727058d971dfc2cbe) @@ -42,7 +42,6 @@ GuiConfirmCommand cmd = static_cast( _command ); visible( ( cmd == GuiConfirmCommand::GENERIC_CONFIRM_CMD_REQUEST_OPEN || cmd == GuiConfirmCommand::GENERIC_CONFIRM_CMD_REJECT ) ); - switch ( cmd ) { case GuiConfirmCommand::GENERIC_CONFIRM_CMD_REQUEST_OPEN : adjustment_Reason ( GuiConfirmId::GENERIC_CONFIRM_ID_NONE ); @@ -93,6 +92,18 @@ id ( vData.mId ); } +void View::VConfirm::sendDryDemoCommand(quint32 vCommandID) +{ + enum Command_Num { + DRY_DEMO_COMMAND = 99 + }; + + DuetConfirmUIrData data; + data.mId = DRY_DEMO_COMMAND; + data.mConfirm = vCommandID; + emit didAdjustment(data); +} + /*! * \brief View::VConfirm::setPowerOffCommand */ @@ -125,6 +136,18 @@ id ( 0 ); } +void View::VConfirm::setDryDemoStatus(const DuetConfirmHDiData &vData) +{ + enum User_Command_ID { + CMD_ULTRAFILTRATION = 7, + CMD_CONNECTION = 8, + }; + + if ( ! gEnableDryDemo ) return; + isUltrafilt (vData.mId == CMD_ULTRAFILTRATION); + isConnection(vData.mId == CMD_CONNECTION ); +} + /*! * \brief VConfirm::onActionReceive * \details received response model data handler @@ -133,9 +156,9 @@ void View::VConfirm::onActionReceive(const DuetConfirmHDiData &vData) { isPowerOff(false ); - setConfirmCommand ( vData ); setConfirmId ( vData ); + setDryDemoStatus ( vData ); // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the Previous values before being set. ***