Index: firmware/App/HDCommon.h =================================================================== diff -u -r848865316d989b1e541b234aefcb99891c92a481 -r0eab62b07bcc4ef786f9e1479056ed8ca2d2ea38 --- firmware/App/HDCommon.h (.../HDCommon.h) (revision 848865316d989b1e541b234aefcb99891c92a481) +++ firmware/App/HDCommon.h (.../HDCommon.h) (revision 0eab62b07bcc4ef786f9e1479056ed8ca2d2ea38) @@ -1,18 +1,19 @@ -/**********************************************************************//** +/************************************************************************** * -* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. * -* THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN -* WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. +* THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN +* WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * -* @file HDCommon.h +* @file HDCommon.h * -* @date 27-Feb-2019 -* @author S. Nash +* @author (last) Dara Navaei +* @date (last) 13-Oct-2020 * -* @brief Header file for common definitions, types and macros for HD firmware. +* @author (original) Sean +* @date (original) 27-Feb-2020 * -**************************************************************************/ +***************************************************************************/ #ifndef __HD_COMMON_H__ #define __HD_COMMON_H__ @@ -24,32 +25,37 @@ #define HD_VERSION_MAJOR 0 #define HD_VERSION_MINOR 4 #define HD_VERSION_MICRO 5 -#define HD_VERSION_BUILD 0 +#define HD_VERSION_BUILD 10 -// ********** build switches ********** +// ********** development build switches ********** #ifndef _RELEASE_ -#define UF_TEST_ENABLED 1 -#define UF_TEST_WITH_DG 1 +#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 RM46_EVAL_BOARD_TARGET 1 -// #define BREADBOARD_TARGET 1 -// #define SIMULATE_UI 1 - #define SKIP_POST 1 - #define DISABLE_CRC_ERROR 1 - #define DISABLE_ACK_ERRORS 1 - #define DISABLE_MOTOR_CURRENT_CHECKS 1 - #define DISABLE_PUMP_FLOW_CHECKS 1 - #define DISABLE_PUMP_SPEED_CHECKS 1 - #define DISABLE_PUMP_DIRECTION_CHECKS 1 - #define DISABLE_PRESSURE_CHECKS 1 - #define DISABLE_UF_ALARMS 1 -// #define RAW_FLOW_SENSOR_DATA 1 -// #define SHOW_LOAD_CELL_IN_ROTOR_RPM 1 -// #define READ_FPGA_ASYNC_DATA 1 -// #define FLOW_DEBUG 1 -// #define EMC_TEST_BUILD 1 - #define ALARMS_DEBUG 1 +// #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 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_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 + #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_PRESSURE_CHECKS 1 // do not error on HD pressure checks + #define DISABLE_UF_ALARMS 1 // do not error on HD ultrafiltration 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 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 #include #include @@ -68,13 +74,10 @@ // **** Common Definitions **** - // **** Common Macros **** - /**@}*/ - // **** VectorCAST Definitions **** #ifdef _VECTORCAST_