From 00a491d93733d4625ad329b2ba8237f445364b3f Mon Sep 17 00:00:00 2001 From: Mirta Date: Wed, 30 Dec 2020 16:39:52 +0200 Subject: merge --- Software/Embedded_SW/Embedded/DataDef.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Software/Embedded_SW/Embedded/DataDef.h') diff --git a/Software/Embedded_SW/Embedded/DataDef.h b/Software/Embedded_SW/Embedded/DataDef.h index 001303c88..c8b1c83be 100644 --- a/Software/Embedded_SW/Embedded/DataDef.h +++ b/Software/Embedded_SW/Embedded/DataDef.h @@ -20,7 +20,7 @@ #define NO_INITIAL_HEATING #define MAX_STRING_LEN 255 //Embedded version + filter.c -#define WATCHDOG +//#define WATCHDOG //#define DISPESER_TEST //#define FPGA_WATCHDOG_DISABLE @@ -169,6 +169,7 @@ typedef enum #define LOW 0x0 #define HIGH 0x1 #define LOW_AND_HIGH 0x2 +#define HIGHEST 0x3 #define WR 0 #define RD 1 @@ -330,6 +331,8 @@ typedef enum #define BIT30 0x40000000 //0x01 << 30 #define BIT31 0x80000000 //0x01 << 31 +extern struct tm LocalTime;//Months since January - [0,11] + //LocalTimeInAScii typedef union { -- cgit v1.3.1