Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml =================================================================== diff -u -rdfd4fe3e511308ddd0e6ad9f93cc1d980d22e933 -r9000da1a6517e4a81a82d9d9a4b671ee4178360b --- sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision dfd4fe3e511308ddd0e6ad9f93cc1d980d22e933) +++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision 9000da1a6517e4a81a82d9d9a4b671ee4178360b) @@ -106,7 +106,7 @@ // it can get the minimum from the message // but some time it has been decided that UI shall always be set to minimum zero. minimum : Variables.ultrafiltrationMinDef // vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min - maximum : 8 //vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max + maximum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max minText.font.pixelSize: Fonts.fontPixelFluidText maxText.font.pixelSize: Fonts.fontPixelFluidText // If dryDemoMode is enabled the default UF volume is 2 liters otherwise it should be Index: sources/view/confirm/VConfirm.cpp =================================================================== diff -u -r40c81d8364424610feeffeb5ac30e990105c8c00 -r9000da1a6517e4a81a82d9d9a4b671ee4178360b --- sources/view/confirm/VConfirm.cpp (.../VConfirm.cpp) (revision 40c81d8364424610feeffeb5ac30e990105c8c00) +++ sources/view/confirm/VConfirm.cpp (.../VConfirm.cpp) (revision 9000da1a6517e4a81a82d9d9a4b671ee4178360b) @@ -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 ); @@ -95,6 +94,10 @@ void View::VConfirm::sendDryDemoCommand(quint32 vCommandID) { + enum Command_Num { + DRY_DEMO_COMMAND = 99 + }; + DuetConfirmUIrData data; data.mId = DRY_DEMO_COMMAND; data.mConfirm = vCommandID; @@ -141,7 +144,6 @@ }; if ( ! gEnableDryDemo ) return; - qDebug() << "Dry Demo status" << vData.mId; isUltrafilt (vData.mId == CMD_ULTRAFILTRATION); isConnection(vData.mId == CMD_CONNECTION ); } @@ -154,7 +156,6 @@ void View::VConfirm::onActionReceive(const DuetConfirmHDiData &vData) { isPowerOff(false ); - setConfirmCommand ( vData ); setConfirmId ( vData ); setDryDemoStatus ( vData ); Index: sources/view/confirm/VConfirm.h =================================================================== diff -u -r40c81d8364424610feeffeb5ac30e990105c8c00 -r9000da1a6517e4a81a82d9d9a4b671ee4178360b --- sources/view/confirm/VConfirm.h (.../VConfirm.h) (revision 40c81d8364424610feeffeb5ac30e990105c8c00) +++ sources/view/confirm/VConfirm.h (.../VConfirm.h) (revision 9000da1a6517e4a81a82d9d9a4b671ee4178360b) @@ -94,7 +94,7 @@ public slots: void doConfirm (bool vConfirm); - void sendDryDemoCommand (quint32 vCommandID); + void sendDryDemoCommand (quint32 vCommandID); signals: /*! @@ -103,8 +103,5 @@ * \param vData - data model includes request information */ void didAdjustment(const DuetConfirmUIrData &vData); - -private: - #define DRY_DEMO_COMMAND 99 }; }