Index: firmware/App/Controllers/AirTrap.c =================================================================== diff -u -re050ffa462a906abfcdd80f0c5030e56a47f3fcf -r563f516a81cb41290008f93b33e7cf5e121717db --- firmware/App/Controllers/AirTrap.c (.../AirTrap.c) (revision e050ffa462a906abfcdd80f0c5030e56a47f3fcf) +++ firmware/App/Controllers/AirTrap.c (.../AirTrap.c) (revision 563f516a81cb41290008f93b33e7cf5e121717db) @@ -227,7 +227,7 @@ if ( TRUE == didTimeout( fillStartTime, fillTimeoutMS ) ) { -#ifndef DISABLE_AIR_TRAP_LEVELING +#ifndef DISABLE_AIR_TRAP_LEVELING_ALARM activateAlarmNoData( ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT ); #endif } Index: firmware/App/Controllers/BloodFlow.c =================================================================== diff -u -r326e3597e1555ef2ac4978f58786e7ce638b1287 -r563f516a81cb41290008f93b33e7cf5e121717db --- firmware/App/Controllers/BloodFlow.c (.../BloodFlow.c) (revision 326e3597e1555ef2ac4978f58786e7ce638b1287) +++ firmware/App/Controllers/BloodFlow.c (.../BloodFlow.c) (revision 563f516a81cb41290008f93b33e7cf5e121717db) @@ -444,11 +444,7 @@ HD_OP_MODE_T opMode = getCurrentOperationMode(); U16 bpRPM = getIntADCReading( INT_ADC_BLOOD_PUMP_SPEED ); U16 bpmA = getIntADCReading( INT_ADC_BLOOD_PUMP_MOTOR_CURRENT ); -#ifndef V1_5_SYSTEM F32 bpFlow = ( getFPGABloodFlow() * bloodFlowCalGain ) + bloodFlowCalOffset; -#else - F32 bpFlow = ( ( getFPGABloodFlow() * -1.0 ) * bloodFlowCalGain ) + bloodFlowCalOffset; // Blood flow sensor installed backwards on HD -#endif U08 fpReadCtr = getFPGABloodFlowFastPacketReadCounter(); U08 spReadCtr = getFPGABloodFlowSlowPacketReadCounter(); U08 flowErrorCtr = getFPGABloodFlowErrorCounter(); Index: firmware/App/Controllers/DGInterface.h =================================================================== diff -u -r316f8773970f94c9b1996a03f2235050afb514da -r563f516a81cb41290008f93b33e7cf5e121717db --- firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision 316f8773970f94c9b1996a03f2235050afb514da) +++ firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision 563f516a81cb41290008f93b33e7cf5e121717db) @@ -33,12 +33,7 @@ // ********** public definitions ********** #define DRAIN_RESERVOIR_TO_VOLUME_ML 0 ///< Drain reservoir to this volume (in mL) during treatment. -#ifndef V1_5_SYSTEM #define FILL_RESERVOIR_TO_VOLUME_ML 1700 ///< Fill reservoir to this volume (in mL) during treatment. -#else -#define FILL_RESERVOIR_TO_VOLUME_ML 1300 ///< Fill reservoir to this volume (in mL) during treatment. -#endif - #define FILL_RESERVOIR_TO_VOLUME_LOW_FLOW_ML 1300 ///< Fill reservoir to this volume (in mL) during treatment if dialysate flow is slow. #define SLOW_DIALYSATE_FLOW_ML_MIN 250 ///< Threshold for slow dialysate flow designation. Index: firmware/App/Controllers/SyringePump.c =================================================================== diff -u -r754427f339e660b7fa688e5e3becc587b30518a8 -r563f516a81cb41290008f93b33e7cf5e121717db --- firmware/App/Controllers/SyringePump.c (.../SyringePump.c) (revision 754427f339e660b7fa688e5e3becc587b30518a8) +++ firmware/App/Controllers/SyringePump.c (.../SyringePump.c) (revision 563f516a81cb41290008f93b33e7cf5e121717db) @@ -60,11 +60,7 @@ #define MIN_HEPARIN_BOLUS_RATE 1.2 ///< Minimum Heparin bolus flow rate (in mL/hr). #define MAX_HEPARIN_BOLUS_RATE 24.0 ///< Maximum Heparin bolus flow rate (in mL/hr). #define HEPARIN_BOLUS_TIME_HR ( 5.0 / MIN_PER_HOUR ) ///< Duration (in hours) of Heparin bolus. -#ifndef SLOW_SYRINGE_RETRACT -#define SYRINGE_PUMP_RETRACT_RATE 10800.0 ///< Retract rate is 15 mL/ 5 s = 3 mL/s = 10,800 mL/hr. -#else #define SYRINGE_PUMP_RETRACT_RATE 3600.0 ///< Retract rate is 5 mL/ 5 s = 1 mL/s = 3,600 mL/hr. -#endif #define SYRINGE_PUMP_SEEK_RATE 3600.0 ///< Seek plunger rate is 5 mL/ 5 s = 1 mL/s = 3,600 mL/hr. #define SYRINGE_PUMP_PRIME_RATE 635.0 ///< Prime rate is 0.5 mm ^ 2 x PI x 450 mm = 0.353 mL / 2s = 635 mL/hr. #define SYRINGE_PUMP_MAX_RATE 11000.0 ///< Maximum rate of the syringe pump (in mL/hr). Index: firmware/App/HDCommon.h =================================================================== diff -u -r4a86e82fceb9056cb5b2c7dec1b465698104ca61 -r563f516a81cb41290008f93b33e7cf5e121717db --- firmware/App/HDCommon.h (.../HDCommon.h) (revision 4a86e82fceb9056cb5b2c7dec1b465698104ca61) +++ firmware/App/HDCommon.h (.../HDCommon.h) (revision 563f516a81cb41290008f93b33e7cf5e121717db) @@ -37,10 +37,10 @@ // #define RUN_WITHOUT_DG 1 // Run HD w/o DG // #define SIMULATE_UI 1 // Build w/o requirement that UI be there // #define TASK_TIMING_OUTPUT_ENABLED 1 // Re-purposes alarm lamp pins for task timing -// #define DISABLE_ALARM_AUDIO 1 // Disable alarm audio + #define DISABLE_ALARM_AUDIO 1 // Disable alarm audio // #define SKIP_POST 1 // Skip POST tests - all pass // #define DONT_SKIP_NV_POST 1 // Do not skip NV Data POST - #define DISABLE_AIR_TRAP_LEVELING 1 // Disable air trap level control + #define DISABLE_AIR_TRAP_LEVELING_ALARM 1 // Disable air trap level control alarms // #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 @@ -65,7 +65,6 @@ #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_CONSUMABLE_TESTS 1 // Skip pre-treatment consumable Self-tests @@ -77,7 +76,6 @@ #define DISABLE_FPGA_COUNTER_CHECKS 1 // Disable alarms associated with FPGA read/error counters #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 SLOW_SYRINGE_RETRACT 1 // Slow retract speed to reduce chance of stall #define DISABLE_SYRINGE_PUMP_ALARMS 1 // Disable some syringe pump alarms that are triggering intermittently #include