Index: sources/drydemo/StateControllerTreatment.cpp =================================================================== diff -u -rbb80bbccaf1c911be48493868c18c656d84b2ec1 -rfb3e70cb47f3d22f31f68358c1bda69cce9cd248 --- sources/drydemo/StateControllerTreatment.cpp (.../StateControllerTreatment.cpp) (revision bb80bbccaf1c911be48493868c18c656d84b2ec1) +++ sources/drydemo/StateControllerTreatment.cpp (.../StateControllerTreatment.cpp) (revision fb3e70cb47f3d22f31f68358c1bda69cce9cd248) @@ -9,7 +9,7 @@ { qint32 setBPRateMLPM = _treatmentParams.bloodFlowRateMLPM - BLOOD_PRIME_START_FLOW_MLPM; float rampRateS = ((BLOOD_PRIME_VOLUME_ML / (setBPRateMLPM + BLOOD_PRIME_VOLUME_ML) / BLOOD_PRIME_START_FLOW_MLPM) / 2.0) * SECONDS_PER_MINUTE; - qDebug() << "Step cal" << _treatmentParams.bloodFlowRateMLPM << setBPRateMLPM << rampRateS; + // qDebug() << "Step cal" << _treatmentParams.bloodFlowRateMLPM << setBPRateMLPM << rampRateS; rampRateS = (rampRateS < SECONDS_PER_MINUTE ? SECONDS_PER_MINUTE : rampRateS); float rampStepML = setBPRateMLPM / rampRateS; @@ -42,7 +42,7 @@ // If the user has changed the flow then do not control (ramp) the steps currBloodFlowMLPM += rampStepML; - qDebug() << "Flow calc" << currBloodFlowMLPM; + // qDebug() << "Flow calc" << currBloodFlowMLPM; if (rampStepML < 0){ // If the ramp is negative, check the current flow not be less than target and if it is, set it to min @@ -244,14 +244,14 @@ quint32 acceptReject = REJECT_VALUE; QVariantList reason; - if (_treatmentSubStates.txStates == TREAT_DIALYSIS_STATE) { + if (_treatmentSubStates.txState == TREAT_DIALYSIS_STATE) { // Assume the default state is UF state _treatmentSubStates.dialysisSubState = DIALYSIS_UF_STATE; _treatmentSubStates.dialysisSubState = (cmd == 0 ? DIALYSIS_UF_PAUSED_STATE : _treatmentSubStates.dialysisSubState); acceptReject = ACCEPT_VALUE; qDebug() << "UF Pa" << _treatmentSubStates.dialysisSubState; } - else if (_treatmentSubStates.txStates != TREAT_DIALYSIS_STATE) { reason.append(REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE); } + else if (_treatmentSubStates.txState != TREAT_DIALYSIS_STATE) { reason.append(REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE); } else { quint32 r = (cmd == 0 ? REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS : REQUEST_REJECT_REASON_UF_NOT_PAUSED); reason.append(r);