Index: firmware/App/HDCommon.h =================================================================== diff -u -r27f3db92495948d4c1192421c1b0c20338c4a034 -r401797bd0b253f101b10df823850a942a02cdecf --- firmware/App/HDCommon.h (.../HDCommon.h) (revision 27f3db92495948d4c1192421c1b0c20338c4a034) +++ firmware/App/HDCommon.h (.../HDCommon.h) (revision 401797bd0b253f101b10df823850a942a02cdecf) @@ -23,22 +23,25 @@ // ********** version ********** #define HD_VERSION_MAJOR 0 -#define HD_VERSION_MINOR 4 +#define HD_VERSION_MINOR 6 #define HD_VERSION_MICRO 5 -#define HD_VERSION_BUILD 0 +#define HD_VERSION_BUILD 19 // ********** development build switches ********** // TODO - remove build switches before release #ifndef _RELEASE_ #ifndef _VECTORCAST_ +// #define USING_DEBUGGER 1 // Want to be able to use the debugger and have break points +// #define BOARD_WITH_NO_HARDWARE 1 // Target is a PCB w/ no hardware // #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 LIMITED_NVDATA_CRC_CHECKS 1 // Only perform POST CRC checks on nv-data records that are implemented so far - #define DISABLE_AIR_TRAP_LEVELING 1 // Disable air trap level control + #define IGNORE_CAL_TIMESTAMP 1 // Ignores calibration time stamp by setting an epoch time temporarily +// #define USE_LIBRARY_TIME_FUNCTIONS 1 // Use the C library functions mktime() and gmtime() for epoch<=>date conversions + #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 @@ -48,18 +51,36 @@ // #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_SALINE_BOLUS_CHECKS 1 // Do not error on HD saline bolus checks + #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_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 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 // #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 SKIP_SELF_TESTS 1 // Skip Pre-treatment Self-tests + #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 V2_0_SYSTEM 1 // Build for v2.0 system + #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 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 DISABLE_SYRINGE_PUMP_ALARMS 1 // Disable some syringe pump alarms that are triggering intermittently + + // 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 V1_5_SYSTEM 1 // Build for v1.5 system + #define SKIP_WET_SELF_TESTS 1 // Skip Pre-treatment prime wet self-tests #include #include