Index: firmware/App/DGCommon.h =================================================================== diff -u -r97eb7ff2d2b3640ec1d8c80d3749a2741c2b308c -r895a73f4a467670cde592078416a3fef0076f7b4 --- firmware/App/DGCommon.h (.../DGCommon.h) (revision 97eb7ff2d2b3640ec1d8c80d3749a2741c2b308c) +++ firmware/App/DGCommon.h (.../DGCommon.h) (revision 895a73f4a467670cde592078416a3fef0076f7b4) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved. +* Copyright (c) 2020-2022 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 * * @author (last) Dara Navaei -* @date (last) 05-Jan-2022 +* @date (last) 24-May-2022 * * @author (original) Sean * @date (original) 27-Feb-2020 @@ -25,7 +25,7 @@ #define DG_VERSION_MAJOR 0 #define DG_VERSION_MINOR 6 #define DG_VERSION_MICRO 0 -#define DG_VERSION_BUILD 18 +#define DG_VERSION_BUILD 27 // ********** build switches ********** @@ -34,34 +34,12 @@ // TODO: Removed debug build flags when release build is ready // #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 -// #define DISABLE_HEATERS_AND_TEMPS 1 // Implement -// #define DISABLE_ACCELS 1 // Implement -// #define SKIP_POST 1 // Not needed - #define SKIP_CAL_CHECK 1 // Implement -// #define ENABLE_DIP_SWITCHES 1 // Not needed -// #define EMC_TEST_BUILD 1 // Build switch - #define ALARMS_DEBUG 1 // Not needed -// #define HEATERS_DEBUG 1 // Not needed -// #define PRESSURES_DEBUG 1 // Not needed - // #define IGNORE_DRAIN_PUMP_MONITOR 1 // Build switch - #define IGNORE_HEATERS_MONITOR 1 // Build switch - #define IGNORE_RO_PUMP_MONITOR 1 // Build switch - #define DISABLE_RO_RATIO_CHECK 1 // Implement - #define DISABLE_COND_SENSOR_CHECK 1 // Disabled for Tom // Implement - #define DISABLE_WATER_QUALITY_CHECK 1 // Disabled for Tom // Implement - #define DISABLE_RTC_CONFIG 1 // Not needed + #define DISABLE_ACK_ALARM 1 // Build switch #define THD_USING_TRO_CONNECTOR 1 // Build switch - #define DISABLE_FLOW_CHECK_IN_FILL 1 // Implement - #define IGNORE_CONC_PUMP_IN_HEAT_DISINFECT 1 // Not needed -// #define NEW_FMD_FLOW_SENSOR 1 // Not needed - #define DISABLE_HEATERS_EFFICIENCY 1 - #define DISABLE_HEAT_DISINFECT_CONDUCTIVITY 1 // Implement + #define DISABLE_COND_STATUS_CHECK 1 // Build switch +// #define EMC_TEST_BUILD 1 // Build switch - // Turn these flags on to disable dialysate mixing - #define DISABLE_DIALYSATE_CHECK 1 // Disabled for Tom // Implement -// #define DISABLE_MIXING 1 // Implement - //#define DISABLE_FLOW_CONTROL_TREATMENT 1 // Not needed - #define DISABLE_ACK_ALARM 1 // Build switch + #define DISABLE_RTC_CONFIG 1 // Not needed TODO investigate and remove #include #include @@ -92,6 +70,7 @@ 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)