From 3c3d1032c5d87a44304826df005ac66f68568538 Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Tue, 2 Aug 2011 10:54:05 +0200 Subject: [PATCH] Correct default for contrast setting. Add alivecheck(systick blink) setting --- firmware/basic/config.c | 5 +++-- firmware/basic/config.h | 29 +++++++++++++++-------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/firmware/basic/config.c b/firmware/basic/config.c index 4393798..84f6d5a 100644 --- a/firmware/basic/config.c +++ b/firmware/basic/config.c @@ -7,7 +7,7 @@ #include "basic/random.h" #include "basic/config.h" -#define CFGVER 24 +#define CFGVER 1 struct CDESC the_config[]= { {"version", CFGVER, CFGVER, CFGVER}, @@ -19,7 +19,8 @@ struct CDESC the_config[]= { {"lcdbacklight", 50, 0, 100}, {"lcdmirror", 0, 0, 1 }, {"lcdinvert", 0, 0, 1 }, - {"lcdcontrast", 3, 0, 31 }, + {"lcdcontrast", 14, 0, 31 }, + {"alivechk", 0, 0, 2 }, {"flamemax", 255, 0, 255}, {"flamemin", 0, 0, 255}, {"flamespeed", 1, 1, 100}, diff --git a/firmware/basic/config.h b/firmware/basic/config.h index 66365f9..bcd4f98 100644 --- a/firmware/basic/config.h +++ b/firmware/basic/config.h @@ -18,20 +18,21 @@ extern struct CDESC the_config[]; extern char nickname[MAXNICK]; extern char nickfont[]; -#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 GLOBALflamemax (the_config[9].value) -#define GLOBALflamemin (the_config[10].value) -#define GLOBALflamespeed (the_config[11].value) -#define GLOBALflamemaxw (the_config[12].value) -#define GLOBALflameminw (the_config[13].value) +#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 GLOBALalivechk (the_config[ 9].value) +#define GLOBALflamemax (the_config[10].value) +#define GLOBALflamemin (the_config[11].value) +#define GLOBALflamespeed (the_config[12].value) +#define GLOBALflamemaxw (the_config[13].value) +#define GLOBALflameminw (the_config[14].value) #define GLOBALnickname (nickname) #define GLOBALnickfont (nickfont)