From 5d0887be714265fd57df3a819dc26217b19369ad Mon Sep 17 00:00:00 2001
From: Stefan `Sec` Zehl <sec@42.org>
Date: Mon, 1 Aug 2011 01:12:21 +0200
Subject: [PATCH] Move config stuff into own include. Iggy said its better :-)

---
 firmware/applications/mesh/config.c |  1 +
 firmware/applications/mesh/util.c   |  1 +
 firmware/basic/basic.h              | 35 ++++-------------------------
 firmware/basic/config.c             |  6 ++++-
 firmware/basic/night.c              |  1 +
 firmware/filesystem/ff.h            |  1 +
 firmware/lcd/display.c              |  1 +
 7 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/firmware/applications/mesh/config.c b/firmware/applications/mesh/config.c
index 4343198..94a20f9 100644
--- a/firmware/applications/mesh/config.c
+++ b/firmware/applications/mesh/config.c
@@ -1,6 +1,7 @@
 #include <sysinit.h>
 
 #include "basic/basic.h"
+#include "basic/config.h"
 
 #include "lcd/print.h"
 #include "lcd/display.h"
diff --git a/firmware/applications/mesh/util.c b/firmware/applications/mesh/util.c
index 8359628..a208a13 100644
--- a/firmware/applications/mesh/util.c
+++ b/firmware/applications/mesh/util.c
@@ -1,6 +1,7 @@
 #include <sysinit.h>
 
 #include "basic/basic.h"
+#include "basic/config.h"
 
 #include "lcd/lcd.h"
 #include "lcd/print.h"
diff --git a/firmware/basic/basic.h b/firmware/basic/basic.h
index 6da1410..ed67c74 100644
--- a/firmware/basic/basic.h
+++ b/firmware/basic/basic.h
@@ -186,37 +186,6 @@ void handleMenu(const struct MENU *the_menu);
 
 #include "basic/idle.h"
 
-// config.c
-
-int readConfig(void);
-int saveConfig(void);
-void applyConfig(void);
-
-
-struct CDESC {
-    char *name;
-    char value;
-    char min;
-    char max;
-};
-
-extern struct CDESC the_config[];
-
-#define GLOBALversion      (the_config[0].value)
-#define GLOBALprivacy      (the_config[1].value)
-#define GLOBALdaytrig      (the_config[2].value)
-#define GLOBALdaytrighyst  (the_config[3].value)
-#define GLOBALdayinvert    (the_config[4].value)
-#define GLOBALlcdbacklight (the_config[5].value)
-#define GLOBALlcdmirror    (the_config[6].value)
-#define GLOBALlcdinvert    (the_config[7].value)
-#define GLOBALlcdcontrast  (the_config[8].value)
-
-#define GLOBAL(x) GLOBAL ## x
-
-
-#define SYSTICKSPEED 10
-
 // itoa.c
 #define F_ZEROS  (1<<0)
 #define F_LONG   (1<<1)
@@ -229,4 +198,8 @@ const char* IntToStr(int num, unsigned int mxlen, char flag);
 
 #include "basic/simpletime.h"
 
+// global
+#define SYSTICKSPEED 10
+
+
 #endif
diff --git a/firmware/basic/config.c b/firmware/basic/config.c
index a307853..313d46e 100644
--- a/firmware/basic/config.c
+++ b/firmware/basic/config.c
@@ -4,8 +4,9 @@
 #include "lcd/print.h"
 #include "filesystem/ff.h"
 #include "basic/random.h"
+#include "basic/config.h"
 
-#define CFGVER 23
+#define CFGVER 24
 
 struct CDESC the_config[]= {
     {"version",          CFGVER, CFGVER, CFGVER},
@@ -20,6 +21,9 @@ struct CDESC the_config[]= {
     { NULL,              0,     0, 0  },
 };
 
+char nickname[MAXNICK]="anonymous";
+char nickfont[FILENAMELEN];
+
 #define CONFFILE "r0ket.cfg"
 #define CONF_ITER for(int i=0;the_config[i].name!=NULL;i++)
 
diff --git a/firmware/basic/night.c b/firmware/basic/night.c
index 8adc84c..f944246 100644
--- a/firmware/basic/night.c
+++ b/firmware/basic/night.c
@@ -1,6 +1,7 @@
 #include <sysinit.h>
 
 #include "basic/basic.h"
+#include "basic/config.h"
 
 #define SAMPCT (4)
 uint32_t light=300*SAMPCT;
diff --git a/firmware/filesystem/ff.h b/firmware/filesystem/ff.h
index 07eb8ad..352ed5c 100644
--- a/firmware/filesystem/ff.h
+++ b/firmware/filesystem/ff.h
@@ -329,6 +329,7 @@ int ff_del_syncobj (_SYNC_t);		/* Delete a sync object */
 #endif
 
 /* Utility functions */
+#define FILENAMELEN 13 // 8+1+3+1
 const char* f_get_rc_string (FRESULT rc);
 void fsInit();
 
diff --git a/firmware/lcd/display.c b/firmware/lcd/display.c
index 3ffd916..bdb1d4f 100644
--- a/firmware/lcd/display.c
+++ b/firmware/lcd/display.c
@@ -6,6 +6,7 @@
 #include "core/ssp/ssp.h"
 #include "gpio/gpio.h"
 #include "basic/basic.h"
+#include "basic/config.h"
 #include "usb/usbmsc.h"
 
 /**************************************************************************/