Index: firmware/App/Controllers/BloodFlow.c =================================================================== diff -u -r3533955f242cec0505e8826e0e2d96f7b79ad499 -rd5060b07988d9f64c3d5cad0fda25f209d23022b --- firmware/App/Controllers/BloodFlow.c (.../BloodFlow.c) (revision 3533955f242cec0505e8826e0e2d96f7b79ad499) +++ firmware/App/Controllers/BloodFlow.c (.../BloodFlow.c) (revision d5060b07988d9f64c3d5cad0fda25f209d23022b) @@ -111,7 +111,7 @@ #define MIN_FLOW_SIG_STRENGTH 0.9 ///< Minimum flow sensor signal strength (90%). /// Blood flow read timeout alarm persistence. -#define BLOOD_FLOW_READ_TIMEOUT_PERSIST ( MS_PER_SECOND ) +#define BLOOD_FLOW_READ_TIMEOUT_PERSIST ( 2 * MS_PER_SECOND ) #define BFM_SENSOR_PARAM_CORRUPT_STATUS 0x7 ///< Blood flow meter NVM parameter status. @@ -467,10 +467,10 @@ { SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BP_FLOW_READ_TIMEOUT_ERROR, (U32)BLOOD_FLOW_READ_CTR_SLOW_PACKET ) } - if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_BP_FLOW_READ_TIMEOUT_ERROR, ( stpReadCtr == lastBloodFlowStatusPacketReadCtr ) ) ) - { - SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BP_FLOW_READ_TIMEOUT_ERROR, (U32)BLOOD_FLOW_READ_CTR_STATUS_PACKET ) - } +// if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_BP_FLOW_READ_TIMEOUT_ERROR, ( stpReadCtr == lastBloodFlowStatusPacketReadCtr ) ) ) +// { +// SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BP_FLOW_READ_TIMEOUT_ERROR, (U32)BLOOD_FLOW_READ_CTR_STATUS_PACKET ) +// } #endif // Record flow read counters for next time around Index: firmware/App/Controllers/DialInFlow.c =================================================================== diff -u -r3533955f242cec0505e8826e0e2d96f7b79ad499 -rd5060b07988d9f64c3d5cad0fda25f209d23022b --- firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision 3533955f242cec0505e8826e0e2d96f7b79ad499) +++ firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision d5060b07988d9f64c3d5cad0fda25f209d23022b) @@ -113,7 +113,7 @@ #define MIN_FLOW_SIG_STRENGTH 0.9 ///< Minimum flow sensor signal strength (90%). /// Dialysate flow read timeout alarm persistence. -#define DIALYSATE_FLOW_READ_TIMEOUT_PERSIST ( MS_PER_SECOND ) +#define DIALYSATE_FLOW_READ_TIMEOUT_PERSIST ( 2 * MS_PER_SECOND ) #define DFM_SENSOR_PARAM_CORRUPT_STATUS 0x7 ///< Dialysate flow meter NVM parameter corrupt status. @@ -433,10 +433,10 @@ { SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_DP_FLOW_READ_TIMEOUT_ERROR, (U32)DIALYSATE_FLOW_READ_CTR_SLOW_PACKET ) } - if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_DP_FLOW_READ_TIMEOUT_ERROR, ( stpReadCtr == lastDialysateFlowStatusPacketReadCtr ) ) ) - { - SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_DP_FLOW_READ_TIMEOUT_ERROR, (U32)DIALYSATE_FLOW_READ_CTR_STATUS_PACKET ) - } +// if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_DP_FLOW_READ_TIMEOUT_ERROR, ( stpReadCtr == lastDialysateFlowStatusPacketReadCtr ) ) ) +// { +// SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_DP_FLOW_READ_TIMEOUT_ERROR, (U32)DIALYSATE_FLOW_READ_CTR_STATUS_PACKET ) +// } #endif // Record flow read counters for next time around Index: firmware/App/HDCommon.h =================================================================== diff -u -r9ae2110044fcacd2152246dfdafcc69c23b54660 -rd5060b07988d9f64c3d5cad0fda25f209d23022b --- firmware/App/HDCommon.h (.../HDCommon.h) (revision 9ae2110044fcacd2152246dfdafcc69c23b54660) +++ firmware/App/HDCommon.h (.../HDCommon.h) (revision d5060b07988d9f64c3d5cad0fda25f209d23022b) @@ -43,7 +43,7 @@ #define DISABLE_AIR_TRAP_LEVELING 1 // Disable air trap level control // #define DISABLE_3WAY_VALVES 1 // Disable 3-way valves // #define TST_3WAY_VALVES_ALWAYS_OPEN 1 // After POST and homing, open all 4 valves - #define DISABLE_ACCELS 1 // Disable accelerometer POST and monitoring +// #define DISABLE_ACCELS 1 // Disable accelerometer POST and monitoring // #define DISABLE_CRC_ERROR 1 // Do not error on bad CRC for CAN messages // #define DISABLE_ACK_ERRORS 1 // Do not error on failure of other node(s) to ACK a message #define DISABLE_MOTOR_CURRENT_CHECKS 1 // Do not error on HD pump current checks @@ -54,27 +54,27 @@ #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_VALVE_ALARMS 1 // Do not error on HD valve position + #define DISABLE_VALVE_ALARMS 1 // Do not error on HD valve position #define DISABLE_CAL_CHECK 1 // Disable calibration checks // #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 // #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 #define ALARMS_DEBUG 1 // Triggered alarms sent to debug UART #define ALARM_VOLUME_DEFAULT_LOW 1 // Set default alarm volume to lowest - #define TEMP_UI_ALARM_SILENCE_FIX 1 // Temporary UI fix for handling alarm silence request msg +// #define TEMP_UI_ALARM_SILENCE_FIX 1 // Temporary UI fix for handling alarm silence request msg #define SKIP_PRIMING 1 // Skip Pre-treatment Prime #define SKIP_WET_SELF_TESTS 1 // Skip Pre-treatment prime wet self-tests // #define V1_5_SYSTEM 1 // Build for v1.5 system // #define V2_0_SYSTEM 1 // Build for v2.0 system - #define SKIP_SAMPLE_WATER 1 // Skip pre-treatment sample water +// #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_UI_INTERACTION 1 // Skip UI interaction. +// #define SKIP_UI_INTERACTION 1 // Skip UI interaction. // #define DISABLE_BATT_COMM 1 // Disable battery communication. #define SKIP_AIR_BUBBLE_CHECK 1 // Skip air bubble detector self-test. #define DISABLE_OCCLUSION_SELF_TEST 1 // Skip occlusion sensor self-test. - #define SKIP_CARTRIDGE_REMOVAL 1 // Skip cartridge removal check +// #define SKIP_CARTRIDGE_REMOVAL 1 // Skip cartridge removal check #define SKIP_EMPTY_RES_CHECK 1 // Skip reservoir empty check #define DISABLE_FPGA_COUNTER_CHECKS 1 // Disable alarms associated with FPGA read/error counters Index: firmware/App/Services/FPGA.c =================================================================== diff -u -r3956c379375c22a95accfd791245e32e0782705a -rd5060b07988d9f64c3d5cad0fda25f209d23022b --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision 3956c379375c22a95accfd791245e32e0782705a) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision d5060b07988d9f64c3d5cad0fda25f209d23022b) @@ -526,7 +526,7 @@ // If retries for commands exceeds limit, fault if ( ( fpgaCommRetryCount > MAX_COMM_ERROR_RETRIES ) || ( fpgaSensorReadings.errorCountProcessor > MAX_COMM_ERROR_RETRIES ) ) { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_FPGA_COMM_TIMEOUT, fpgaCommRetryCount, (U32)fpgaSensorReadings.errorCountProcessor ) + //SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_FPGA_COMM_TIMEOUT, fpgaCommRetryCount, (U32)fpgaSensorReadings.errorCountProcessor ) } // Reset comm flags after processing incoming responses