Index: firmware/App/Modes/ModePreTreat.c =================================================================== diff -u -rb70bf4c5a7cdb4218d812546b3bc5d7dad152700 -rbb114842e73659f097bb8b8ec0d670bfa4f8cb73 --- firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision b70bf4c5a7cdb4218d812546b3bc5d7dad152700) +++ firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision bb114842e73659f097bb8b8ec0d670bfa4f8cb73) @@ -36,7 +36,7 @@ // ********** private definitions ********** /// Interval (ms/task time) at which the pre-treatment state data is published on the CAN bus. -#define PRE_TREATMENT_DATA_PUB_INTERVAL ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) +#define PRE_TREATMENT_DATA_PUB_INTERVAL ( 250 / TASK_GENERAL_INTERVAL ) #define DIP_PATIENT_CONNECTION_FLOW_RATE_ML_MIN 100 ///< Patient connection sub-mode dialysate inlet pump flow rate in mL/min. @@ -302,9 +302,9 @@ * The signalUserStartTreatment function handles user requests to start treatment. * @details Inputs: patientConnectionConfirm, currentPreTreatmentState * @details Outputs: handled and send response to treatment start request - * @return TRUE if signal accepted, FALSE if not + * @return none *************************************************************************/ -BOOL signalUserStartTreatment( void ) +void signalUserStartTreatment( void ) { BOOL accepted = FALSE; REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NO_PATIENT_CONNECTION_CONFIRM; @@ -325,9 +325,7 @@ } } - sendTreatmentStartResponseMsg( accepted, rejReason ); - - return accepted; + sendStartTreatmentResponse( accepted, rejReason ); } /*********************************************************************//** @@ -497,7 +495,7 @@ if ( ( DG_MODE_STAN == dgOpMode ) && ( DG_STANDBY_MODE_STATE_IDLE == dgSubMode ) ) { state = HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE; - F32 const trimmerHeaterTemp = getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE ); + F32 const trimmerHeaterTemp = getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE ); F32 const primaryHeaterTemp = trimmerHeaterTemp + PRIMARY_HEATER_TARGET_TEMP_OFFSET; cmdStartDG();