From f38fb4c1489c2806532f0faf75141e20f12e27cb Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Sun, 15 Jan 2012 14:04:26 +0100 Subject: [PATCH 1/5] Remove duplicate sydefs.h confusion. --- firmware/core/sysdefs.h | 12 ++---------- firmware/sysdefs.h | 15 +++------------ 2 files changed, 5 insertions(+), 22 deletions(-) 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/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 - From 71c9a6dc647cfe5c2b69343f866fb20383954b9a Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Sun, 15 Jan 2012 14:04:57 +0100 Subject: [PATCH 2/5] Make basic/ecc also use our global include --- firmware/basic/ecc.h | 1 + 1 file changed, 1 insertion(+) 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 /******************************************************************************/ From f8e1227cff24563b4e9ace44d173796752346b8c Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Wed, 25 Jan 2012 20:21:29 +0100 Subject: [PATCH 3/5] move date to right, so i can read it better --- firmware/l0dable/dbgmesh.c | 1 + 1 file changed, 1 insertion(+) 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)); From f5df1d1cccb0c05256dbe116cbda43d6db76c1dc Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Wed, 25 Jan 2012 20:22:04 +0100 Subject: [PATCH 4/5] move mesh break date to the future, again --- firmware/funk/mesh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From 9ea8561363d7157723b12e2d6f0d74648a0748e5 Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Wed, 25 Jan 2012 20:23:04 +0100 Subject: [PATCH 5/5] increase release no --- firmware/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; };