Index: firmware/App/Controllers/BloodFlow.c =================================================================== diff -u -r1c628bfd5d6414b74b8cbd083f66839888a8236b -r1ebbe403d260d9f65695c13d6dbafbe1a93cfdde --- firmware/App/Controllers/BloodFlow.c (.../BloodFlow.c) (revision 1c628bfd5d6414b74b8cbd083f66839888a8236b) +++ firmware/App/Controllers/BloodFlow.c (.../BloodFlow.c) (revision 1ebbe403d260d9f65695c13d6dbafbe1a93cfdde) @@ -1126,7 +1126,9 @@ if ( lastBloodPumpDirectionCount != dirErrorCnt ) { lastBloodPumpDirectionCount = dirErrorCnt; +#ifndef DISABLE_PUMP_DIRECTION_CHECKS SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR, (U32)HD_PUMP_BLOOD_PUMP ) +#endif } bpMCDir = ( getMeasuredBloodPumpMCSpeed() >= 0.0 ? MOTOR_DIR_FORWARD : MOTOR_DIR_REVERSE ); Index: firmware/App/Controllers/DialInFlow.c =================================================================== diff -u -r1c628bfd5d6414b74b8cbd083f66839888a8236b -r1ebbe403d260d9f65695c13d6dbafbe1a93cfdde --- firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision 1c628bfd5d6414b74b8cbd083f66839888a8236b) +++ firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision 1ebbe403d260d9f65695c13d6dbafbe1a93cfdde) @@ -1089,7 +1089,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 } dipMCDir = ( getMeasuredDialInPumpMCSpeed() >= 0.0 ? MOTOR_DIR_FORWARD : MOTOR_DIR_REVERSE ); Index: firmware/App/Controllers/DialOutFlow.c =================================================================== diff -u -r1c628bfd5d6414b74b8cbd083f66839888a8236b -r1ebbe403d260d9f65695c13d6dbafbe1a93cfdde --- firmware/App/Controllers/DialOutFlow.c (.../DialOutFlow.c) (revision 1c628bfd5d6414b74b8cbd083f66839888a8236b) +++ firmware/App/Controllers/DialOutFlow.c (.../DialOutFlow.c) (revision 1ebbe403d260d9f65695c13d6dbafbe1a93cfdde) @@ -798,7 +798,9 @@ if ( lastDialOutPumpDirectionCount != dirErrorCnt ) { lastDialOutPumpDirectionCount = dirErrorCnt; +#ifndef DISABLE_PUMP_DIRECTION_CHECKS SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR, (U32)HD_PUMP_DIALYSATE_OUTLET_PUMP ) +#endif } dopMCDir = ( getMeasuredDialOutPumpMCSpeed() >= 0.0 ? MOTOR_DIR_FORWARD : MOTOR_DIR_REVERSE ); Index: firmware/App/HDCommon.h =================================================================== diff -u -r8f217e3f4f171dba78c9ac69a3470af442941a89 -r1ebbe403d260d9f65695c13d6dbafbe1a93cfdde --- firmware/App/HDCommon.h (.../HDCommon.h) (revision 8f217e3f4f171dba78c9ac69a3470af442941a89) +++ firmware/App/HDCommon.h (.../HDCommon.h) (revision 1ebbe403d260d9f65695c13d6dbafbe1a93cfdde) @@ -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 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 * ***************************************************************************/ @@ -24,8 +24,8 @@ #define HD_VERSION_MAJOR 0 #define HD_VERSION_MINOR 6 -#define HD_VERSION_MICRO 0 -#define HD_VERSION_BUILD 0 +#define HD_VERSION_MICRO 5 +#define HD_VERSION_BUILD 75 // ********** development build switches ********** @@ -55,7 +55,9 @@ #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_DIALYSATE_TEMP_CHECK 1 // Disable dialysate temperature check #define DISABLE_VALVE_ALARMS 1 // Do not error on HD valve position + #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) // #define RAW_FLOW_SENSOR_DATA 1 // Test build will not filter flow sensor data @@ -68,7 +70,7 @@ #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 Index: firmware/App/Modes/ModePostTreat.c =================================================================== diff -u -r2a60f0eba906f0641e22a5d7f5c7ba1750911dcd -r1ebbe403d260d9f65695c13d6dbafbe1a93cfdde --- firmware/App/Modes/ModePostTreat.c (.../ModePostTreat.c) (revision 2a60f0eba906f0641e22a5d7f5c7ba1750911dcd) +++ firmware/App/Modes/ModePostTreat.c (.../ModePostTreat.c) (revision 1ebbe403d260d9f65695c13d6dbafbe1a93cfdde) @@ -337,6 +337,7 @@ for ( valve = VDI; valve < NUM_OF_VALVES; ++valve ) { + setValvePosition( valve, VALVE_POSITION_A_INSERT_EJECT ); homeValve( valve ); } Index: firmware/App/Services/WatchdogMgmt.c =================================================================== diff -u -r1c628bfd5d6414b74b8cbd083f66839888a8236b -r1ebbe403d260d9f65695c13d6dbafbe1a93cfdde --- firmware/App/Services/WatchdogMgmt.c (.../WatchdogMgmt.c) (revision 1c628bfd5d6414b74b8cbd083f66839888a8236b) +++ firmware/App/Services/WatchdogMgmt.c (.../WatchdogMgmt.c) (revision 1ebbe403d260d9f65695c13d6dbafbe1a93cfdde) @@ -175,7 +175,7 @@ { F32 v24 = getIntADCVoltageConverted( INT_ADC_24V_ACTUATORS ); F32 audioCurrent = getFPGABackupAlarmAudioCurrent(); - + // Verify 24V is down when w.d. expired if ( v24 > MAX_24V_LEVEL_ON_WATCHDOG_EXPIRED ) {