Index: firmware/App/Controllers/PresOccl.c =================================================================== diff -u -r946f42bfd6606dd3d771d9a4a7b50e5678469f62 -r23575c7474e340c5b67bc3c48eaa3e774d5d9acc --- firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision 946f42bfd6606dd3d771d9a4a7b50e5678469f62) +++ firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision 23575c7474e340c5b67bc3c48eaa3e774d5d9acc) @@ -568,11 +568,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/HDCommon.h =================================================================== diff -u -r946f42bfd6606dd3d771d9a4a7b50e5678469f62 -r23575c7474e340c5b67bc3c48eaa3e774d5d9acc --- firmware/App/HDCommon.h (.../HDCommon.h) (revision 946f42bfd6606dd3d771d9a4a7b50e5678469f62) +++ firmware/App/HDCommon.h (.../HDCommon.h) (revision 23575c7474e340c5b67bc3c48eaa3e774d5d9acc) @@ -10,8 +10,8 @@ * @author (last) Sean Nash * @date (last) 12-Nov-2021 * -* @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 5 -#define HD_VERSION_BUILD 25 +#define HD_VERSION_MICRO 0 +#define HD_VERSION_BUILD 130 // ********** development build switches ********** @@ -49,20 +49,20 @@ // #define RUN_BP_OPEN_LOOP 1 // Run blood pump in open loop mode // #define RUN_DPI_OPEN_LOOP 1 // Run dialysate inlet pump in open loop mode #define WORN_OUT_CARTRIDGE 1 // Running with an old worn out cartridge (max wear) -// #define PBA_ESTIMATION 1 // Estimate arterial pressure rather than look at PBA sensor + #define PBA_ESTIMATION 1 // Estimate arterial pressure rather than look at PBA sensor #define DISABLE_MOTOR_CURRENT_CHECKS 1 // Do not error on HD pump current checks #define DISABLE_PUMP_FLOW_CHECKS 1 // Do not error on HD pump flow checks #define DISABLE_PUMP_SPEED_CHECKS 1 // Do not error on HD pump speed checks #define DISABLE_PUMP_DIRECTION_CHECKS 1 // Do not error on HD pump direction checks - #define DISABLE_SYRINGE_PUMP 1 // Disable syringe pump functionality +// #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_ARTERIAL_PRESSURE_CHECK 1 // Do not error on arterial pressure out of range #define DISABLE_VENOUS_PRESSURE_CHECK 1 // Do not error on venous pressure out of range // #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 SKIP_CAL_CHECK 1 + #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 READ_FPGA_ASYNC_DATA 1 // Test build reads non-priority register page every other time // #define EMC_TEST_BUILD 1 // EMC test build - HD/DG run separately but connected, HD pumps toggle on/off w/ stop button @@ -82,16 +82,18 @@ // #define DISABLE_UI_COMM_TO_ALARM 1 // Disable UI comm timeouts #define DISABLE_WD_AND_SFTY_POST_TESTS 1 // Disable watchdog and safety shutdown POST tests #define DISABLE_ILLEGAL_AIR_TRAP_ALARM 1 // Disable illegal state for air trap alarm + #define SKIP_RESERVOIR_ALARMS 1 // Skip reservoir management alarms // #define SKIP_RESERVOIR_ALARMS 1 // Skip reservoir management alarms #define IGNORE_BLOOD_LEAK_ALARM 1 // Skip Pre-Treatment and get to treatment as soon as possible - #define SKIP_UI_INTERACTION 1 // Skip UI interaction. - #define SKIP_SAMPLE_WATER 1 // Skip pre-treatment sample water - #define SKIP_CONSUMABLE_TESTS 1 // Skip pre-treatment consumable Self-tests - #define SKIP_DRY_SELF_TESTS 1 // Skip pre-treatment dry self-tests - #define SKIP_PRIMING 1 // Skip Pre-treatment Prime - #define SKIP_WET_SELF_TESTS 1 // Skip Pre-treatment prime wet self-tests +// #define SKIP_UI_INTERACTION 1 // Skip UI interaction. +// #define SKIP_SAMPLE_WATER 1 // Skip pre-treatment sample water +// #define SKIP_CONSUMABLE_TESTS 1 // Skip pre-treatment consumable Self-tests +// #define SKIP_DRY_SELF_TESTS 1 // Skip pre-treatment dry self-tests +// #define RUN_BLOOD_CIRCUIT_PRIME_AGAIN 1 // If this is 1st time priming, run blood circuit prime again +// #define SKIP_PRIMING 1 // Skip Pre-treatment Prime +// #define SKIP_WET_SELF_TESTS 1 // Skip Pre-treatment prime wet self-tests #include #include