Index: sources/model/hd/alarm/MAlarmStatusData.cpp =================================================================== diff -u -r4af6dcfa0281dc27714a26514e82bf3def901b5a -rcce8bc97b115389caa630db4fba177c326027d6f --- sources/model/hd/alarm/MAlarmStatusData.cpp (.../MAlarmStatusData.cpp) (revision 4af6dcfa0281dc27714a26514e82bf3def901b5a) +++ sources/model/hd/alarm/MAlarmStatusData.cpp (.../MAlarmStatusData.cpp) (revision cce8bc97b115389caa630db4fba177c326027d6f) @@ -165,7 +165,7 @@ case GuiAlarmID::ALARM_ID_POST_ACID_CONDUCTIVITY_OUT_OF_RANGE : { result = QObject::tr("Post-acid concentrate conductivity out of range" ); break; } case GuiAlarmID::ALARM_ID_POST_BICARB_CONDUCTIVITY_OUT_OF_RANGE : { result = QObject::tr("Post-bicarb concentrate conductivity out of range" ); break; } case GuiAlarmID::ALARM_ID_RO_PUMP_FLOW_RATE_OUT_OF_RANGE : { result = QObject::tr("RO pump flow rate out of range" ); break; } - case GuiAlarmID::ALARM_ID_DG_THERMISOTRS_TEMPERATURE_OUT_OF_RANGE : { result = QObject::tr("DG thermistors/sensors temperature out of range" ); break; } + case GuiAlarmID::ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE : { result = QObject::tr("DG thermistors/sensors temperature out of range" ); break; } case GuiAlarmID::ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE : { result = QObject::tr("DG fan RPM out of range" ); break; } case GuiAlarmID::ALARM_ID_DG_DIALYSATE_FILL_OUT_OF_TIME : { result = QObject::tr("DG dialysate fill runs out of time" ); break; } case GuiAlarmID::ALARM_ID_CP1_SPEED_CONTROL_ERROR : { result = QObject::tr("DG concentrate pump CP1 speed control error" ); break; } Index: sources/view/hd/data/VHDTreatmentStatesData.cpp =================================================================== diff -u -r4af6dcfa0281dc27714a26514e82bf3def901b5a -rcce8bc97b115389caa630db4fba177c326027d6f --- sources/view/hd/data/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision 4af6dcfa0281dc27714a26514e82bf3def901b5a) +++ sources/view/hd/data/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision cce8bc97b115389caa630db4fba177c326027d6f) @@ -75,7 +75,7 @@ txEnd ( vData.mSubMode == GuiTreatmentStates ::TREATMENT_END_STATE ); // Treatment states - Dialysis txDialysis_Running ( vData.mSubMode == GuiTreatmentStates ::TREATMENT_DIALYSIS_STATE ); - txDialysis_End ( vData.mSubMode == GuiTreatmentStates ::TREATMENT_DIALYSIS_END_STATE ); +// txDialysis_End ( vData.mSubMode == GuiTreatmentStates ::TREATMENT_DIALYSIS_END_STATE ); // Treatment states - Rinse back txRinseback_Running ( vData.mSubMode == GuiTreatmentStates ::TREATMENT_RINSEBACK_STATE ); //// TODO: Has been removed // txRinseback_Pause ( vData.mSubMode == GuiTreatmentStates ::TREATMENT_RINSEBACK_PAUSE_STATE ); Index: sources/view/hd/data/VHDTreatmentStatesData.h =================================================================== diff -u -rae1042a0c14d6d27556730183cc2cbe1a00bc0a7 -rcce8bc97b115389caa630db4fba177c326027d6f --- sources/view/hd/data/VHDTreatmentStatesData.h (.../VHDTreatmentStatesData.h) (revision ae1042a0c14d6d27556730183cc2cbe1a00bc0a7) +++ sources/view/hd/data/VHDTreatmentStatesData.h (.../VHDTreatmentStatesData.h) (revision cce8bc97b115389caa630db4fba177c326027d6f) @@ -93,7 +93,7 @@ PROPERTY( bool , txDialysis_Running , false) ///< TREATMENT_DIALYSIS_STATE Perform dialysis. Deliver Heparin as prescribed. Deliver UF as prescribed. Handle saline boluses as requested // coco begin validated: Manually tested // not used yet since the Treatment Start/stop/end has not been implemented yet. - PROPERTY( bool , txDialysis_End , false) ///< TREATMENT_DIALYSIS_END_STATE Dialysis has ended. Blood pump slowed. Dialyzer is bypassed. Dialysate is recirculated. User can rinseback +// PROPERTY( bool , txDialysis_End , false) ///< TREATMENT_DIALYSIS_END_STATE Dialysis has ended. Blood pump slowed. Dialyzer is bypassed. Dialysate is recirculated. User can rinseback // coco end // ---- Treatment states - Rinse back // coco begin validated: Manually tested