diff --git a/firmware/basic/ecc.h b/firmware/basic/ecc.h index 05b1d3b..a99c173 100644 --- a/firmware/basic/ecc.h +++ b/firmware/basic/ecc.h @@ -1,5 +1,6 @@ #ifndef _ECC_H_ #define _ECC_H_H +#include #include /******************************************************************************/ diff --git a/firmware/core/sysdefs.h b/firmware/core/sysdefs.h index bf79c8e..018c147 100644 --- a/firmware/core/sysdefs.h +++ b/firmware/core/sysdefs.h @@ -39,20 +39,12 @@ #ifndef _SYSDEFS_H_ #define _SYSDEFS_H_ +#include "../sysdefs.h" + #include #include #include -// Stay compatible with ugly "windows" style -#define BOOL bool -#define TRUE true -#define FALSE false - -typedef volatile uint8_t REG8; -typedef volatile uint16_t REG16; -typedef volatile uint32_t REG32; -typedef unsigned char byte_t; - #define pREG8 (REG8 *) #define pREG16 (REG16 *) #define pREG32 (REG32 *) diff --git a/firmware/funk/mesh.c b/firmware/funk/mesh.c index e75603e..3a15b43 100644 --- a/firmware/funk/mesh.c +++ b/firmware/funk/mesh.c @@ -46,7 +46,7 @@ int mesh_sanity(uint8_t * pkt){ if(MO_TYPE(pkt)=='T' && MO_TIME(pkt)<86400) return MP_OK; if(MO_TYPE(pkt)>='A' && MO_TYPE(pkt)<='Z'){ - if(MO_TIME(pkt)>1326409200) + if(MO_TIME(pkt)>1336159200) return MP_SEND; if(MO_TIME(pkt)<1324602000) return MP_SEND; diff --git a/firmware/l0dable/dbgmesh.c b/firmware/l0dable/dbgmesh.c index c97d9a8..83a6c2f 100644 --- a/firmware/l0dable/dbgmesh.c +++ b/firmware/l0dable/dbgmesh.c @@ -95,6 +95,7 @@ void m_time(void){ lcdPrint(":"); lcdPrint(IntToStr(tm->tm_sec,2,F_LONG|F_ZEROS)); lcdNl(); + lcdPrint(" "); lcdPrint(IntToStr(tm->tm_mday,2,F_LONG)); lcdPrint("."); lcdPrint(IntToStr(tm->tm_mon+1,2,0)); diff --git a/firmware/main.c b/firmware/main.c index 3a66d2e..e94a188 100644 --- a/firmware/main.c +++ b/firmware/main.c @@ -77,5 +77,5 @@ int main(void) { } int getrelease(void){ - return 0x00000108; + return 0x00000109; }; diff --git a/firmware/sysdefs.h b/firmware/sysdefs.h index 10ebfb4..d17cb54 100644 --- a/firmware/sysdefs.h +++ b/firmware/sysdefs.h @@ -36,10 +36,10 @@ */ /**************************************************************************/ -#ifndef _SYSDEFS_H_ -#define _SYSDEFS_H_ +#ifndef _GLOBAL_SYSDEFS_H_ +#define _GLOBAL_SYSDEFS_H_ -#include +#include #include #include @@ -53,18 +53,9 @@ typedef volatile uint16_t REG16; typedef volatile uint32_t REG32; typedef unsigned char byte_t; -#define pREG8 (REG8 *) -#define pREG16 (REG16 *) -#define pREG32 (REG32 *) - -#ifndef NULL -#define NULL ((void *) 0) -#endif - // Save some space #ifndef SIMULATOR #define memcpy memmove #endif #endif -