From b504bc9ed777912fbbd736355e0c0e3a63021fdc Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Tue, 3 Apr 2012 14:24:22 +0200 Subject: [PATCH] Do UUID init globally. Increase firmware version --- firmware/basic/uuid.c | 6 ------ firmware/main.c | 3 ++- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/firmware/basic/uuid.c b/firmware/basic/uuid.c index a61db3d..c6d59a2 100644 --- a/firmware/basic/uuid.c +++ b/firmware/basic/uuid.c @@ -36,16 +36,10 @@ uint32_t initUUID(void){ }; uint32_t GetUUID32(void){ - if(uuid32==0){ - initUUID(); - }; return uuid32; }; uint16_t GetUUID16(void){ - if(uuid32==0){ - initUUID(); - }; return uuid16; }; diff --git a/firmware/main.c b/firmware/main.c index 67c740f..277a196 100644 --- a/firmware/main.c +++ b/firmware/main.c @@ -50,6 +50,7 @@ void main(void) { // initialise basic badge functions rbInit(); + initUUID(); // Cache UUID values. lcdInit(); // display @@ -80,5 +81,5 @@ void main(void) { } int getrelease(void){ - return 0x0000010d; + return 0x0000010e; };