From 52085b91b5309ece93a315b9857cd3d9eb75d505 Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Sun, 25 Dec 2011 20:15:42 +0100 Subject: [PATCH] add rudimentary release version support --- firmware/l0dable/debug.c | 16 +++++++++++++--- firmware/l0dable/system-include-hack.h | 1 + firmware/main.c | 4 ++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/firmware/l0dable/debug.c b/firmware/l0dable/debug.c index 66c7b3f..02b9042 100644 --- a/firmware/l0dable/debug.c +++ b/firmware/l0dable/debug.c @@ -26,17 +26,19 @@ void getsp(void); void uptime(void); void uuid(void); void lcdrtest(void); +void release(void); static const struct MENU submenu_debug={ "debug", { { "ChkBattery", &ChkBattery}, { "ChkLight", &ChkLight}, { "MeshInfo", &m_time}, { "ChkFunk", &ChkFunk}, - { "Qstatus", &Qstatus}, +// { "Qstatus", &Qstatus}, // { "ShowSP", &getsp}, - { "lcdrtest", &lcdrtest}, + { "LcdRead", &lcdrtest}, { "Uptime", &uptime}, { "Uuid", &uuid}, + { "Release", &release}, {NULL,NULL} }}; @@ -126,7 +128,7 @@ void uuid(void) { lcdPrintln(IntToStrX(iap_return.Result[2],8)); lcdPrintln(IntToStrX(iap_return.Result[3],8)); lcdNl(); - lcdPrintln("Beacon ID:"); + lcdPrintln("Bacon ID:"); lcdPrintln(IntToStrX(GetUUID32(),8)); lcdRefresh(); while(!getInputRaw())work_queue(); @@ -331,3 +333,11 @@ void lcdrtest(void){ lcdRefresh(); while(!getInputRaw())delayms(10); }; + +void release(){ + lcdPrint("r0ket"); + lcdPrint("Release: "); + lcdPrintln(IntToStrX(getrelease(),8)); + lcdRefresh(); + while(!getInputRaw())work_queue(); +}; diff --git a/firmware/l0dable/system-include-hack.h b/firmware/l0dable/system-include-hack.h index f1f77e5..29ea22f 100644 --- a/firmware/l0dable/system-include-hack.h +++ b/firmware/l0dable/system-include-hack.h @@ -2,3 +2,4 @@ size_t strlen(const char *s); char strcpy(char * restrict dst, const char * restrict src); void memcpy(void *dst, const void *src, size_t len); void memset(void *s, int c, size_t n); +int getrelease(); diff --git a/firmware/main.c b/firmware/main.c index 70f4b88..538f541 100644 --- a/firmware/main.c +++ b/firmware/main.c @@ -75,3 +75,7 @@ int main(void) { wrapper(); // see module/ subdirectory } + +int getrelease(void){ + return 0x00000104; +};