Index: firmware/App/DGCommon.h =================================================================== diff -u -rbd7df978ca5b65a730ea0164d8b2ab24e135e661 -r27422b2be7749c80f77796506e369afa946a9137 --- firmware/App/DGCommon.h (.../DGCommon.h) (revision bd7df978ca5b65a730ea0164d8b2ab24e135e661) +++ firmware/App/DGCommon.h (.../DGCommon.h) (revision 27422b2be7749c80f77796506e369afa946a9137) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +* Copyright (c) 2020-2023 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. * -* @file DGCommon.h +* @file DGCommon.h * -* @author (last) Sean Nash -* @date (last) 24-Jun-2020 +* @author (last) Dara Navaei +* @date (last) 27-Oct-2023 * -* @author (original) Sean -* @date (original) 27-Feb-2020 +* @author (original) Sean +* @date (original) 27-Feb-2020 * ***************************************************************************/ @@ -23,25 +23,17 @@ // ********** version ********** #define DG_VERSION_MAJOR 0 -#define DG_VERSION_MINOR 4 -#define DG_VERSION_MICRO 5 -#define DG_VERSION_BUILD 0 +#define DG_VERSION_MINOR 9 +#define DG_VERSION_MICRO 0 +#define DG_VERSION_BUILD 24 // ********** build switches ********** #ifndef _RELEASE_ #ifndef _VECTORCAST_ -// #define RM46_EVAL_BOARD_TARGET 1 -// #define SIMULATE_UI 1 -// #define TASK_TIMING_OUTPUT_ENABLED 1 // re-purposes drain pump enable pin for task timing -// #define DISABLE_HEATERS_AND_TEMPS 1 -// #define DISABLE_ACCELS 1 - #define SKIP_POST 1 - #define ENABLE_DIP_SWITCHES 1 - #define EMC_TEST_BUILD 1 - #define ALARMS_DEBUG 1 -// #define HEATERS_DEBUG 1 -// #define PRESSURES_DEBUG 1 +// #define BOARD_WITH_NO_HARDWARE 1 // Build switch +// #define TASK_TIMING_OUTPUT_ENABLED 1 // Build switch // re-purposes drain pump enable pin for task timing + #include #include #endif @@ -59,6 +51,21 @@ // **** Common Definitions **** +#pragma pack(push,1) +/// DG version struct. +typedef struct +{ + U08 major; ///< DG version major revision + U08 minor; ///< DG version major revision + U08 micro; ///< DG version micro revision + U16 build; ///< DG build version + U08 fpgaId; ///< DG FPGA ID + U08 fpgaMajor; ///< DG FPGA major revision + U08 fpgaMinor; ///< DG FPGA minor revision + U08 fpgaLab; ///< DG FPGA lab revision + U32 compatibilityRev; ///< DG compatibility revision +} DG_VERSIONS_T; +#pragma pack(pop) // **** Common Macros ****