Index: firmware/App/Controllers/DialInFlow.c =================================================================== diff -u -re45524455c005d4fa1734efcbaf7ed0499302670 -r4b661aa14eff362b3ebb154e7791fcaa87d68368 --- firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision e45524455c005d4fa1734efcbaf7ed0499302670) +++ firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision 4b661aa14eff362b3ebb154e7791fcaa87d68368) @@ -5,13 +5,13 @@ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * -* @file DialInFlow.c +* @file DialInFlow.c * -* @author (last) H. Nguyen -* @date (last) 28-Oct-2021 +* @author (last) H. Nguyen +* @date (last) 28-Oct-2021 * -* @author (original) Sean -* @date (original) 16-Dec-2019 +* @author (original) Sean +* @date (original) 16-Dec-2019 * ***************************************************************************/ @@ -97,7 +97,7 @@ #define DIP_GEAR_RATIO 32.0 ///< DialIn pump motor to dialIn pump gear ratio. #define DIP_PWM_ZERO_OFFSET 0.1 ///< 10% PWM duty cycle = zero speed. /// Macro converts flow rate to estimate PWM needed to achieve it. // TODO - I added 1.2 gain based on empirical data -#define DIP_PWM_FROM_ML_PER_MIN(rate) ( (rate) * DIP_ML_PER_MIN_TO_PUMP_RPM_FACTOR * DIP_GEAR_RATIO * DIP_MOTOR_RPM_TO_PWM_DC_FACTOR * 1.2 + DIP_PWM_ZERO_OFFSET ) +#define DIP_PWM_FROM_ML_PER_MIN(rate) ( (rate) * DIP_ML_PER_MIN_TO_PUMP_RPM_FACTOR * DIP_GEAR_RATIO * DIP_MOTOR_RPM_TO_PWM_DC_FACTOR * 1.258 + DIP_PWM_ZERO_OFFSET ) /// Conversion from PWM duty cycle % to commanded pump motor speed. #define DIP_PWM_TO_MOTOR_SPEED_RPM(pwm) ( ((pwm) - DIP_PWM_ZERO_OFFSET) * 4000.0 ) @@ -953,7 +953,9 @@ if ( lastDialInPumpDirectionCount != dirErrorCnt ) { lastDialInPumpDirectionCount = dirErrorCnt; +#ifndef DISABLE_PUMP_DIRECTION_CHECKS SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR, (U32)HD_PUMP_DIALYSATE_INLET_PUMP ) +#endif } #endif Index: firmware/App/Controllers/DialInFlow.h =================================================================== diff -u -re45524455c005d4fa1734efcbaf7ed0499302670 -r4b661aa14eff362b3ebb154e7791fcaa87d68368 --- firmware/App/Controllers/DialInFlow.h (.../DialInFlow.h) (revision e45524455c005d4fa1734efcbaf7ed0499302670) +++ firmware/App/Controllers/DialInFlow.h (.../DialInFlow.h) (revision 4b661aa14eff362b3ebb154e7791fcaa87d68368) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * -* @file DialInFlow.h +* @file DialInFlow.h * -* @author (last) Sean Nash -* @date (last) 03-Aug-2020 +* @author (last) Sean Nash +* @date (last) 13-Aug-2021 * -* @author (original) Sean -* @date (original) 16-Dec-2019 +* @author (original) Sean +* @date (original) 16-Dec-2019 * ***************************************************************************/ Index: firmware/App/Controllers/PresOccl.c =================================================================== diff -u -r84e94699ac1a6236a6aba130e45149a9cf3ac5f8 -r4b661aa14eff362b3ebb154e7791fcaa87d68368 --- firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision 84e94699ac1a6236a6aba130e45149a9cf3ac5f8) +++ firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision 4b661aa14eff362b3ebb154e7791fcaa87d68368) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * -* @file PresOccl.c +* @file PresOccl.c * -* @author (last) Sean Nash -* @date (last) 24-Sep-2020 +* @author (last) Sean Nash +* @date (last) 19-Aug-2021 * -* @author (original) Sean -* @date (original) 15-Jan-2020 +* @author (original) Sean +* @date (original) 15-Jan-2020 * ***************************************************************************/ @@ -576,11 +576,11 @@ if ( bpOccl > ( OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) ) { signalBloodPumpHardStop(); // Stop pump immediately - SET_ALARM_WITH_1_U32_DATA( ALARM_ID_OCCLUSION_BLOOD_PUMP, bpOccl ) + //SET_ALARM_WITH_1_U32_DATA( ALARM_ID_OCCLUSION_BLOOD_PUMP, bpOccl ) } else if ( bpOccl < ( OCCLUSION_CLEAR_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) ) { - clearAlarmCondition( ALARM_ID_OCCLUSION_BLOOD_PUMP ); + //clearAlarmCondition( ALARM_ID_OCCLUSION_BLOOD_PUMP ); } #endif } Index: firmware/App/Controllers/SyringePump.c =================================================================== diff -u -re45524455c005d4fa1734efcbaf7ed0499302670 -r4b661aa14eff362b3ebb154e7791fcaa87d68368 --- firmware/App/Controllers/SyringePump.c (.../SyringePump.c) (revision e45524455c005d4fa1734efcbaf7ed0499302670) +++ firmware/App/Controllers/SyringePump.c (.../SyringePump.c) (revision 4b661aa14eff362b3ebb154e7791fcaa87d68368) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * -* @file SyringePump.c +* @file SyringePump.c * -* @author (last) Sean Nash -* @date (last) 02-Mar-2021 +* @author (last) Sean Nash +* @date (last) 13-Aug-2021 * -* @author (original) Sean Nash -* @date (original) 02-Mar-2021 +* @author (original) Sean Nash +* @date (original) 04-Mar-2021 * ***************************************************************************/ #include Index: firmware/App/Controllers/SyringePump.h =================================================================== diff -u -rccfd15568f1e3d304320c2babb2fd4bcf0413304 -r4b661aa14eff362b3ebb154e7791fcaa87d68368 --- firmware/App/Controllers/SyringePump.h (.../SyringePump.h) (revision ccfd15568f1e3d304320c2babb2fd4bcf0413304) +++ firmware/App/Controllers/SyringePump.h (.../SyringePump.h) (revision 4b661aa14eff362b3ebb154e7791fcaa87d68368) @@ -84,6 +84,7 @@ BOOL retractSyringePump( void ); BOOL seekSyringePlunger( void ); BOOL primeSyringePump( void ); +void resetHeparinVolumeDelivered( void ); BOOL startHeparinBolus( void ); BOOL startHeparinContinuous( void ); BOOL setSyringePumpDACVref( F32 vRef ); Index: firmware/App/HDCommon.h =================================================================== diff -u -r84e94699ac1a6236a6aba130e45149a9cf3ac5f8 -r4b661aa14eff362b3ebb154e7791fcaa87d68368 --- firmware/App/HDCommon.h (.../HDCommon.h) (revision 84e94699ac1a6236a6aba130e45149a9cf3ac5f8) +++ firmware/App/HDCommon.h (.../HDCommon.h) (revision 4b661aa14eff362b3ebb154e7791fcaa87d68368) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * -* @file HDCommon.h +* @file HDCommon.h * -* @author (last) Sean Nash -* @date (last) 14-Oct-2020 +* @author (last) Sean Nash +* @date (last) 14-Oct-2020 * -* @author (original) Sean -* @date (original) 27-Feb-2020 +* @author (original) Sean +* @date (original) 27-Feb-2020 * ***************************************************************************/ @@ -25,7 +25,7 @@ #define HD_VERSION_MAJOR 0 #define HD_VERSION_MINOR 6 #define HD_VERSION_MICRO 0 -#define HD_VERSION_BUILD 0 +#define HD_VERSION_BUILD 103 // ********** development build switches ********** @@ -57,8 +57,9 @@ #define DISABLE_PUMP_DIRECTION_CHECKS 1 // Do not error on HD pump direction checks #define DISABLE_SYRINGE_PUMP 1 // Disable syringe pump functionality #define ALWAYS_ALLOW_SYRINGE_PUMP_CMDS 1 // Allow syringe pump commands at any time except when pump is busy -// #define DISABLE_PRESSURE_CHECKS 1 // Do not error on HD pressure checks -// #define DISABLE_UF_ALARMS 1 // Do not error on HD ultrafiltration checks + #define DISABLE_UF_ALARMS 1 // Do not error on HD ultrafiltration checks + #define DISABLE_DIALYSATE_TEMP_CHECK 1 // Disable dialysate temperature check + #define DISABLE_PRESSURE_CHECKS 1 // Do not error on HD pressure checks #define DISABLE_VALVE_ALARMS 1 // Do not error on HD valve position #define SKIP_CAL_CHECK 1 // // #define RUN_PUMPS_OPEN_LOOP 1 // BP and DPi pumps will be run open loop (no flow sensor feedback) @@ -71,11 +72,11 @@ #define DISABLE_OCCLUSION_SELF_TEST 1 // Skip occlusion sensor self-test. // #define SKIP_CARTRIDGE_REMOVAL 1 // Skip cartridge removal check // #define DISABLE_FPGA_COUNTER_CHECKS 1 // Disable alarms associated with FPGA read/error counters -// #define DISABLE_VOLTAGE_MONITOR 1 // Disable voltage monitoring/alarms + #define DISABLE_VOLTAGE_MONITOR 1 // Disable voltage monitoring/alarms #define ALLOW_1_MIN_TREATMENT_DURATION 1 // Allow user to change treatment duration to as low as 1 minute #define DISABLE_SYRINGE_PUMP_ALARMS 1 // Disable some syringe pump alarms that are triggering intermittently // #define NO_PUMP_FLOW_LIMITS 1 // Allow any commanded flow rate for peristaltic pumps -// #define DISABLE_BUBBLE_ALARMS 1 // Disable bubble alarms + #define DISABLE_BUBBLE_ALARMS 1 // Disable bubble alarms #define DISABLE_UI_POST_TEST 1 // Disable the UI POST // Skip Pre-Treatment and get to treatment as soon as possible Index: firmware/App/Modes/BloodPrime.c =================================================================== diff -u -re45524455c005d4fa1734efcbaf7ed0499302670 -r4b661aa14eff362b3ebb154e7791fcaa87d68368 --- firmware/App/Modes/BloodPrime.c (.../BloodPrime.c) (revision e45524455c005d4fa1734efcbaf7ed0499302670) +++ firmware/App/Modes/BloodPrime.c (.../BloodPrime.c) (revision 4b661aa14eff362b3ebb154e7791fcaa87d68368) @@ -5,13 +5,13 @@ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * -* @file TreatmentEnd.c +* @file BloodPrime.c * -* @author (last) Sean Nash -* @date (last) 04-Feb-2021 +* @author (last) Sean Nash +* @date (last) 13-Aug-2021 * -* @author (original) Sean -* @date (original) 04-Feb-2021 +* @author (original) Sean Nash +* @date (original) 06-Feb-2021 * ***************************************************************************/ Index: firmware/App/Modes/BloodPrime.h =================================================================== diff -u -rccfd15568f1e3d304320c2babb2fd4bcf0413304 -r4b661aa14eff362b3ebb154e7791fcaa87d68368 --- firmware/App/Modes/BloodPrime.h (.../BloodPrime.h) (revision ccfd15568f1e3d304320c2babb2fd4bcf0413304) +++ firmware/App/Modes/BloodPrime.h (.../BloodPrime.h) (revision 4b661aa14eff362b3ebb154e7791fcaa87d68368) @@ -41,7 +41,7 @@ { F32 targetBloodPrimeVolumeMl; F32 deliveredBloodPrimeVolumeMl; - F32 indDeliveredBloodPrimeVolumeMl; + F32 unused; } BLOOD_PRIME_DATA_PAYLOAD_T; // ********** public function prototypes ********** @@ -54,8 +54,6 @@ BOOL testSetBloodPrimeVolumeOverride( F32 vol ); BOOL testResetBloodPrimeVolumeOverride( void ); -BOOL testSetBloodPrimeSafetyVolumeOverride( F32 vol ); -BOOL testResetBloodPrimeSafetyVolumeOverride( void ); BOOL testSetBloodPrimePublishIntervalOverride( U32 ms ); BOOL testResetBloodPrimePublishIntervalOverride( void ); Index: firmware/App/Modes/Dialysis.c =================================================================== diff -u -re45524455c005d4fa1734efcbaf7ed0499302670 -r4b661aa14eff362b3ebb154e7791fcaa87d68368 --- firmware/App/Modes/Dialysis.c (.../Dialysis.c) (revision e45524455c005d4fa1734efcbaf7ed0499302670) +++ firmware/App/Modes/Dialysis.c (.../Dialysis.c) (revision 4b661aa14eff362b3ebb154e7791fcaa87d68368) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * -* @file Dialysis.c +* @file Dialysis.c * -* @author (last) Sean Nash -* @date (last) 24-Sep-2020 +* @author (last) Sean Nash +* @date (last) 19-Aug-2021 * -* @author (original) Sean -* @date (original) 15-Jan-2020 +* @author (original) Sean +* @date (original) 15-Jan-2020 * ***************************************************************************/ Index: firmware/App/Modes/ModePreTreat.c =================================================================== diff -u -re45524455c005d4fa1734efcbaf7ed0499302670 -r4b661aa14eff362b3ebb154e7791fcaa87d68368 --- firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision e45524455c005d4fa1734efcbaf7ed0499302670) +++ firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision 4b661aa14eff362b3ebb154e7791fcaa87d68368) @@ -5,13 +5,13 @@ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * -* @file ModePreTreat.c +* @file ModePreTreat.c * -* @author (last) Sean Nash -* @date (last) 06-Oct-2020 +* @author (last) Quang Nguyen +* @date (last) 24-Aug-2021 * -* @author (original) Dara Navaei -* @date (original) 05-Nov-2019 +* @author (original) Dara Navaei +* @date (original) 05-Nov-2019 * ***************************************************************************/ @@ -388,6 +388,10 @@ case ALARM_ACTION_END_TREATMENT: if ( HD_PRE_TREATMENT_PRIME_STATE > currentPreTreatmentState ) { + if ( HD_PRE_TREATMENT_WATER_SAMPLE_STATE == currentPreTreatmentState ) + { + cmdDGSampleWater( SAMPLE_WATER_CMD_END ); + } requestNewOperationMode( MODE_STAN ); } else Index: firmware/App/Modes/ModeTreatmentParams.c =================================================================== diff -u -ra8234afee1db86505836151ab4bf061e490eadb1 -r4b661aa14eff362b3ebb154e7791fcaa87d68368 --- firmware/App/Modes/ModeTreatmentParams.c (.../ModeTreatmentParams.c) (revision a8234afee1db86505836151ab4bf061e490eadb1) +++ firmware/App/Modes/ModeTreatmentParams.c (.../ModeTreatmentParams.c) (revision 4b661aa14eff362b3ebb154e7791fcaa87d68368) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * -* @file ModeTreatmentParams.c +* @file ModeTreatmentParams.c * -* @author (last) Sean Nash -* @date (last) 14-Oct-2020 +* @author (last) Sean Nash +* @date (last) 13-Aug-2021 * -* @author (original) Sean Nash -* @date (original) 29-May-2020 +* @author (original) Sean Nash +* @date (original) 29-May-2020 * ***************************************************************************/ Index: firmware/App/Modes/Rinseback.c =================================================================== diff -u -re45524455c005d4fa1734efcbaf7ed0499302670 -r4b661aa14eff362b3ebb154e7791fcaa87d68368 --- firmware/App/Modes/Rinseback.c (.../Rinseback.c) (revision e45524455c005d4fa1734efcbaf7ed0499302670) +++ firmware/App/Modes/Rinseback.c (.../Rinseback.c) (revision 4b661aa14eff362b3ebb154e7791fcaa87d68368) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * -* @file Rinseback.c +* @file Rinseback.c * -* @author (last) Sean Nash -* @date (last) 14-Jan-2021 +* @author (last) Quang Nguyen +* @date (last) 01-Sep-2021 * -* @author (original) Sean -* @date (original) 14-Jan-2021 +* @author (original) Sean Nash +* @date (original) 20-Jan-2021 * ***************************************************************************/ Index: firmware/App/Modes/Rinseback.h =================================================================== diff -u -rccfd15568f1e3d304320c2babb2fd4bcf0413304 -r4b661aa14eff362b3ebb154e7791fcaa87d68368 --- firmware/App/Modes/Rinseback.h (.../Rinseback.h) (revision ccfd15568f1e3d304320c2babb2fd4bcf0413304) +++ firmware/App/Modes/Rinseback.h (.../Rinseback.h) (revision 4b661aa14eff362b3ebb154e7791fcaa87d68368) @@ -44,7 +44,7 @@ U32 rinsebackFlowRateMlMin; U32 timeout; U32 countdown; - F32 safetyRinsebackVolumeMl; + F32 unused; } RINSEBACK_DATA_PAYLOAD_T; #pragma pack(pop) @@ -60,8 +60,6 @@ BOOL testSetRinsebackVolumeOverride( F32 vol ); BOOL testResetRinsebackVolumeOverride( void ); -BOOL testSetRinsebackSafetyVolumeOverride( F32 vol ); -BOOL testResetRinsebackSafetyVolumeOverride( void ); BOOL testSetRinsebackPublishIntervalOverride( U32 ms ); BOOL testResetRinsebackPublishIntervalOverride( void ); Index: firmware/App/Services/SystemComm.c =================================================================== diff -u -re45524455c005d4fa1734efcbaf7ed0499302670 -r4b661aa14eff362b3ebb154e7791fcaa87d68368 --- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision e45524455c005d4fa1734efcbaf7ed0499302670) +++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 4b661aa14eff362b3ebb154e7791fcaa87d68368) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * -* @file SystemComm.c +* @file SystemComm.c * -* @author (last) Sean Nash -* @date (last) 14-Oct-2020 +* @author (last) Quang Nguyen +* @date (last) 23-Aug-2021 * -* @author (original) Dara Navaei -* @date (original) 05-Nov-2019 +* @author (original) Dara Navaei +* @date (original) 05-Nov-2019 * ***************************************************************************/ @@ -195,7 +195,7 @@ if ( TRUE == isAlarmActive( ALARM_ID_DG_COMM_TIMEOUT ) ) { - clearAlarm( ALARM_ID_DG_COMM_TIMEOUT ); + clearAlarmCondition( ALARM_ID_DG_COMM_TIMEOUT ); } } Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -re45524455c005d4fa1734efcbaf7ed0499302670 -r4b661aa14eff362b3ebb154e7791fcaa87d68368 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision e45524455c005d4fa1734efcbaf7ed0499302670) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 4b661aa14eff362b3ebb154e7791fcaa87d68368) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * -* @file SystemCommMessages.c +* @file SystemCommMessages.c * -* @author (last) Peman Montazemi -* @date (last) 18-Mar-2021 +* @author (last) Sean Nash +* @date (last) 19-Aug-2021 * -* @author (original) Dara Navaei -* @date (original) 05-Nov-2019 +* @author (original) Dara Navaei +* @date (original) 05-Nov-2019 * ***************************************************************************/ @@ -2254,7 +2254,7 @@ TEMPERATURE_SENSORS_DATA_T payload; memcpy( &payload, message->payload, sizeof( TEMPERATURE_SENSORS_DATA_T ) ); - setDialysateTemperatureReadings( payload.inletDialysate, payload.outletRedundant ); + setDialysateTemperatureReadings( payload.TDi, payload.TRo ); } // TODO - what to do if invalid payload length? // TODO - how to know if DG stops sending these? @@ -5119,6 +5119,7 @@ if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen ) { memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) ); + if ( FALSE == payload.reset ) { result = testSetBatteryRemainingPercentOverride( payload.state.u32 ); Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -re45524455c005d4fa1734efcbaf7ed0499302670 -r4b661aa14eff362b3ebb154e7791fcaa87d68368 --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision e45524455c005d4fa1734efcbaf7ed0499302670) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 4b661aa14eff362b3ebb154e7791fcaa87d68368) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * -* @file SystemCommMessages.h +* @file SystemCommMessages.h * -* @author (last) Sean Nash -* @date (last) 14-Oct-2020 +* @author (last) Sean Nash +* @date (last) 19-Aug-2021 * -* @author (original) Dara Navaei -* @date (original) 05-Nov-2019 +* @author (original) Dara Navaei +* @date (original) 05-Nov-2019 * ***************************************************************************/ @@ -23,6 +23,7 @@ #include "BloodLeak.h" #include "BloodPrime.h" #include "Bubble.h" +#include "CommBuffers.h" #include "DGInterface.h" #include "DialInFlow.h" #include "DialOutFlow.h" @@ -56,7 +57,10 @@ * @{ */ -// ********** public definitions ********** +// ********** public definitions ********** + +#define ACK_REQUIRED TRUE ///< Macro for functions that want to know if an outgoing message requires acknowledgement from receiver. +#define ACK_NOT_REQUIRED FALSE ///< Macro for functions that want to know if an outgoing message requires acknowledgement from receiver. #define ACK_REQUIRED TRUE ///< Macro for functions that want to know if an outgoing message requires acknowledgement from receiver. #define ACK_NOT_REQUIRED FALSE ///< Macro for functions that want to know if an outgoing message requires acknowledgement from receiver. @@ -67,7 +71,10 @@ U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq ); // ACK MSG -BOOL sendACKMsg( MESSAGE_T *message ); +BOOL sendACKMsg( MESSAGE_T *message ); + +// Serialize message +U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq ); // MSG_ID_DG_CHECK_IN void handleDGCheckIn( MESSAGE_T *message );