Index: firmware/App/HDCommon.h =================================================================== diff -u -r62a09fa67dc30631186f3e4d7a62437c1108c31a -re13152777df58456a873789fbfc3f889813109c9 --- firmware/App/HDCommon.h (.../HDCommon.h) (revision 62a09fa67dc30631186f3e4d7a62437c1108c31a) +++ firmware/App/HDCommon.h (.../HDCommon.h) (revision e13152777df58456a873789fbfc3f889813109c9) @@ -7,8 +7,8 @@ * * @file HDCommon.h * -* @author (last) Sean Nash -* @date (last) 28-Aug-2020 +* @author (last) Dara Navaei +* @date (last) 13-Oct-2020 * * @author (original) Sean * @date (original) 27-Feb-2020 @@ -25,20 +25,24 @@ #define HD_VERSION_MAJOR 0 #define HD_VERSION_MINOR 4 #define HD_VERSION_MICRO 5 -#define HD_VERSION_BUILD 8 +#define HD_VERSION_BUILD 0 // ********** development build switches ********** #ifndef _RELEASE_ -#define UF_TEST_ENABLED 1 // ultrafiltration test build (hard codes treatment params, re-purposes off/stop buttons) -#define UF_TEST_WITH_DG 1 // ultrafiltration test build (sets up DG in standby mode) +//#define UF_TEST_ENABLED 1 // ultrafiltration test build (hard codes treatment params, re-purposes off/stop buttons) +//#define UF_TEST_WITH_DG 1 // ultrafiltration test build (sets up DG in standby mode) #ifndef _VECTORCAST_ +// #define DISABLE_UI_TREATMENT_WORKFLOW 1 // disable UI treatment workflow // #define RM46_EVAL_BOARD_TARGET 1 // limited build runs on RM46 eval board // #define BREADBOARD_TARGET 1 // old breadboard system build - no longer used? // #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 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 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_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 @@ -54,6 +58,7 @@ // #define FLOW_DEBUG 1 // test build sends flow, signal strength, and occlusion readings to debug UART // #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 V1_5_SYSTEM 1 // build for v1.5 system #include #include