Index: firmware/App/Controllers/DialysatePumps.c =================================================================== diff -u -r3417933e6edf61a914c428e2fa944b3b349272a4 -rb83b525617ddffecc06b81c97e2534cdd3446c47 --- firmware/App/Controllers/DialysatePumps.c (.../DialysatePumps.c) (revision 3417933e6edf61a914c428e2fa944b3b349272a4) +++ firmware/App/Controllers/DialysatePumps.c (.../DialysatePumps.c) (revision b83b525617ddffecc06b81c97e2534cdd3446c47) @@ -237,6 +237,17 @@ } #endif + // Init the dialysate pump with valid PWM while motor is disabled. + // when enable triggers, we dont want invlid RPM set that triggers alarm in motor controller. + setFPGAD12PumpSpeed( MIN_DIALYSATE_PUMP_RPM ); + setFPGAD48PumpSpeed( MIN_DIALYSATE_PUMP_RPM ); + +#ifdef __PITEST__ + for ( i = 0; i < NUM_OF_CONTROLLER_SIGNAL; i++ ) + { + pIControlSignal[ i ] = 0.0F; + } +#endif // Initialize the persistent alarms for fresh dialysate pump initPersistentAlarm( ALARM_ID_DD_D12_PUMP_RPM_OUT_OF_RANGE, RPM_OUT_OF_RANGE_TIME_OUT, RPM_OUT_OF_RANGE_TIME_OUT ); initPersistentAlarm( ALARM_ID_DD_D12_PUMP_OFF_FAULT, SAFETY_SHUTDOWN_TIMEOUT, SAFETY_SHUTDOWN_TIMEOUT ); Index: firmware/App/Controllers/DialysatePumps.h =================================================================== diff -u -r3417933e6edf61a914c428e2fa944b3b349272a4 -rb83b525617ddffecc06b81c97e2534cdd3446c47 --- firmware/App/Controllers/DialysatePumps.h (.../DialysatePumps.h) (revision 3417933e6edf61a914c428e2fa944b3b349272a4) +++ firmware/App/Controllers/DialysatePumps.h (.../DialysatePumps.h) (revision b83b525617ddffecc06b81c97e2534cdd3446c47) @@ -7,7 +7,7 @@ * * @file DialysatePumps.h * -* @author (last) Vinayakam Mani +* @date (last) 13-May-2025 * @date (last) 13-Nov-2025 * * @author (original) Vinayakam Mani Index: firmware/App/DDCommon.h =================================================================== diff -u -r9ab7b54451573c9db555fcefe47ee868a4c73458 -rb83b525617ddffecc06b81c97e2534cdd3446c47 --- firmware/App/DDCommon.h (.../DDCommon.h) (revision 9ab7b54451573c9db555fcefe47ee868a4c73458) +++ firmware/App/DDCommon.h (.../DDCommon.h) (revision b83b525617ddffecc06b81c97e2534cdd3446c47) @@ -25,7 +25,7 @@ #define DD_VERSION_MAJOR 0 #define DD_VERSION_MINOR 0 #define DD_VERSION_MICRO 0 -#define DD_VERSION_BUILD 24 +#define DD_VERSION_BUILD 34 // ********** development build switches ********** @@ -45,19 +45,15 @@ //Uncomment below once characterization/study completed //#define ENABLE_ALARM_2 +//Uncomment below to disable heaters debug message +#define __HEATERS_DEBUG__ 1 + //Uncomment below for spent chamber filling //#define __SPENT_CHAMBER_FILL__ 1 //Uncomment below for bicarb chamber filling //#define __BICARB_CHAMBER_FILL__ 1 -//Uncomment below for Maxon controller speed change -//#define __MAXON_SPEED_UPDATE__ 1 - -//Uncomment below to disable heaters debug message -#define __HEATERS_DEBUG__ 1 - - #include #include #endif Index: firmware/App/Drivers/TemperatureSensors.c =================================================================== diff -u -r3417933e6edf61a914c428e2fa944b3b349272a4 -rb83b525617ddffecc06b81c97e2534cdd3446c47 --- firmware/App/Drivers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 3417933e6edf61a914c428e2fa944b3b349272a4) +++ firmware/App/Drivers/TemperatureSensors.c (.../TemperatureSensors.c) (revision b83b525617ddffecc06b81c97e2534cdd3446c47) @@ -34,6 +34,8 @@ // ********** private definitions ********** +#define USE_PT_100 1 ///< flag to check PT100 use in calculations + #define PRIMARY_HEATER_TEMP_SENSORS_GAIN 8U ///< Primary heater temperature sensors gain. #define PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE 20000 ///< Primary heater temperature sensors reference resistance. #define PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE 1000U ///< Primary heater temperature sensors zero degree resistance. Index: firmware/App/Modes/FPModes/FlushFilter.c =================================================================== diff -u -r2475e55c224cbd841d61b76f1618451efe6be1f5 -rb83b525617ddffecc06b81c97e2534cdd3446c47 --- firmware/App/Modes/FPModes/FlushFilter.c (.../FlushFilter.c) (revision 2475e55c224cbd841d61b76f1618451efe6be1f5) +++ firmware/App/Modes/FPModes/FlushFilter.c (.../FlushFilter.c) (revision b83b525617ddffecc06b81c97e2534cdd3446c47) @@ -7,8 +7,13 @@ * * @file FlushFilter.c * +<<<<<<< HEAD +* @author (last) “Raghu +* @date (last) 14-Oct-2025 +======= * @author (last) “rkallala” * @date (last) 09-Dec-2025 +>>>>>>> LDT-618-dd-add-ability-to-override-fixes * * @author (original) Michael Garthwaite * @date (original) 08-Sep-2025 Index: firmware/App/Modes/ModeStandby.c =================================================================== diff -u -r2475e55c224cbd841d61b76f1618451efe6be1f5 -rb83b525617ddffecc06b81c97e2534cdd3446c47 --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 2475e55c224cbd841d61b76f1618451efe6be1f5) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision b83b525617ddffecc06b81c97e2534cdd3446c47) @@ -172,6 +172,11 @@ { execBalancingChamberControl(); } + //Test request to handle only balancing chamber switching + else if ( TRUE == pendingBalanceChamberSwOnlyRequest ) + { + execBalancingChamberControl(); + } // else if ( TRUE == pendingStartDDFlushRequest ) // { // pendingStartDDFlushRequest = FALSE; Index: firmware/App/Monitors/Temperature.c =================================================================== diff -u -r3417933e6edf61a914c428e2fa944b3b349272a4 -rb83b525617ddffecc06b81c97e2534cdd3446c47 --- firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 3417933e6edf61a914c428e2fa944b3b349272a4) +++ firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision b83b525617ddffecc06b81c97e2534cdd3446c47) @@ -460,13 +460,10 @@ TEMPERATURE_SENSORS_DD_DATA_T data; data.d1Temp = getTemperatureValue( D1_TEMP ); - data.d78Temp = getTemperatureValue( D78_TEMP ); + data.d78Temp = getTemperatureValue( D78_TEMP ); data.d4Temp = getTemperatureValue( D4_TEMP ); data.d50Temp = getTemperatureValue( D50_TEMP ); data.boardTemp = getTemperatureValue( BRD_TEMP ); - // TODO: update the following lines after Baro Sensor data is read from TD - data.baroTemp = 0.0F; -// data.baroTemp = getTemperatureValue( BARO_TEMP ); data.d16CondTemp = getConductivityTemperatureValue( D17_COND ); data.d28CondTemp = getConductivityTemperatureValue( D27_COND ); data.d30CondTemp = getConductivityTemperatureValue( D29_COND ); Index: firmware/App/Monitors/Temperature.h =================================================================== diff -u -r3417933e6edf61a914c428e2fa944b3b349272a4 -rb83b525617ddffecc06b81c97e2534cdd3446c47 --- firmware/App/Monitors/Temperature.h (.../Temperature.h) (revision 3417933e6edf61a914c428e2fa944b3b349272a4) +++ firmware/App/Monitors/Temperature.h (.../Temperature.h) (revision b83b525617ddffecc06b81c97e2534cdd3446c47) @@ -39,7 +39,6 @@ F32 d4Temp; ///< Hydraulics primary heater temperature sensor F32 d50Temp; ///< Trimmer heater temperature sensor F32 boardTemp; ///< Board temperature sensor - F32 baroTemp; ///< Barometric temperature sensor F32 d16CondTemp; ///< D16 temperature value F32 d28CondTemp; ///< D28 temperature value F32 d30CondTemp; ///< D30 temperature value Index: firmware/App/Monitors/WaterQualityMonitor.h =================================================================== diff -u -r2475e55c224cbd841d61b76f1618451efe6be1f5 -rb83b525617ddffecc06b81c97e2534cdd3446c47 --- firmware/App/Monitors/WaterQualityMonitor.h (.../WaterQualityMonitor.h) (revision 2475e55c224cbd841d61b76f1618451efe6be1f5) +++ firmware/App/Monitors/WaterQualityMonitor.h (.../WaterQualityMonitor.h) (revision b83b525617ddffecc06b81c97e2534cdd3446c47) @@ -8,7 +8,7 @@ * @file WaterQualityMonitor.h * * @author (last) “rkallala” -* @date (last) 09-Dec-2025 +* @date (last) 23-Oct-2025 * * @author (original) Michael Garthwaite * @date (original) 08-Sep-2025 Index: firmware/App/Services/Messaging.c =================================================================== diff -u -r2475e55c224cbd841d61b76f1618451efe6be1f5 -rb83b525617ddffecc06b81c97e2534cdd3446c47 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision 2475e55c224cbd841d61b76f1618451efe6be1f5) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision b83b525617ddffecc06b81c97e2534cdd3446c47) @@ -176,9 +176,6 @@ { MSG_ID_FW_VERSIONS_REQUEST, &handleVersionRequestMessage }, { MSG_ID_DD_SAFETY_SHUTDOWN_OVERRIDE_REQUEST, &testSetResetSafetyShutdownOverride }, { MSG_ID_DD_UF_DATA_PUBLISH_OVERRIDE_REQUEST, &testDDUFDataPublishIntervalOverride }, - { MSG_ID_DD_SET_TEST_CONFIGURATION, &testSetTestConfiguration }, - { MSG_ID_DD_GET_TEST_CONFIGURATION, &testGetTestConfiguration }, - { MSG_ID_DD_RESET_ALL_TEST_CONFIGURATIONS, &testResetAllTestConfigurations }, { MSG_ID_DD_SPENT_CHAMB_FILL_DATA_PUBLISH_OVERRIDE_REQUEST, &testDDSpentChamberFillDataPublishIntervalOverride }, { MSG_ID_DD_BLOOD_LEAK_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testBloodLeakDataPublishIntervalOverride }, { MSG_ID_DD_BLOOD_LEAK_STATUS_OVERRIDE_REQUEST, &testBloodLeakStatusOverride },