Index: firmware/App/DGCommon.h =================================================================== diff -u -r8638b207699a3a48e3657e838e24ae838369c867 -r738afd1d72ec8da1c5bd347b9263a2c3ca2d8a61 --- firmware/App/DGCommon.h (.../DGCommon.h) (revision 8638b207699a3a48e3657e838e24ae838369c867) +++ firmware/App/DGCommon.h (.../DGCommon.h) (revision 738afd1d72ec8da1c5bd347b9263a2c3ca2d8a61) @@ -7,7 +7,7 @@ * * @file DGCommon.h * -* @date 27-Feb-2019 +* @date 27-Feb-2020 * @author S. Nash * * @brief Header file for common definitions, types and macros for DG firmware. @@ -22,20 +22,28 @@ // ********** version ********** #define DG_VERSION_MAJOR 0 -#define DG_VERSION_MINOR 3 +#define DG_VERSION_MINOR 4 +#define DG_VERSION_MICRO 0 #define DG_VERSION_BUILD 0 // ********** build switches ********** +#ifndef _RELEASE_ #ifndef _VECTORCAST_ // #define RM46_EVAL_BOARD_TARGET 1 // #define SIMULATE_UI 1 - - #ifdef DEBUG_ENABLED - #include - #include - #endif +// #define CAN_TEST 1 +// #define BETA_V1_BUILD 1 +// #define DISABLE_HEATERS_AND_TEMPS 1 +// #define ENABLE_DIP_SWITCHES 1 +// #define EMC_TEST_BUILD 1 + #define ALARMS_DEBUG 1 +// #define HEATERS_DEBUG 1 +// #define PRESSURES_DEBUG 1 + #include + #include #endif +#endif #include "Common.h"