From 250ea3213f91730c4e747f78640eb1ce0eebe2d8 Mon Sep 17 00:00:00 2001
From: Stefan `Sec` Zehl <sec@42.org>
Date: Wed, 27 Jul 2011 01:15:52 +0200
Subject: [PATCH] Make backlight and lcd-state config vars actually work

---
 firmware/applications/default.c       |  2 +-
 firmware/applications/tester/config.c |  3 ++-
 firmware/applications/tester/util.c   |  5 +++--
 firmware/basic/config.c               |  4 ----
 firmware/basic/night.c                | 12 ++++++------
 firmware/lcd/display.c                |  2 +-
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/firmware/applications/default.c b/firmware/applications/default.c
index 4b25ee3..4e145ee 100644
--- a/firmware/applications/default.c
+++ b/firmware/applications/default.c
@@ -39,7 +39,7 @@ void tick_default(void) {
     };
 
     if(isNight())
-        backlightSetBrightness(100);
+        backlightSetBrightness(globalconfig.backlightvalue);
     else
         backlightSetBrightness(0);
 
diff --git a/firmware/applications/tester/config.c b/firmware/applications/tester/config.c
index 9e0efa4..0d8df7c 100644
--- a/firmware/applications/tester/config.c
+++ b/firmware/applications/tester/config.c
@@ -3,6 +3,7 @@
 #include "basic/basic.h"
 
 #include "lcd/print.h"
+#include "lcd/display.h"
 
 #include "filesystem/ff.h"
 
@@ -33,5 +34,5 @@ void show(void){
 };
 
 void lcdmirror(void){
-    globalconfig.lcdstate^=2;
+    lcdToggleFlag(LCD_MIRRORX);
 };
diff --git a/firmware/applications/tester/util.c b/firmware/applications/tester/util.c
index 1d2a49c..8747264 100644
--- a/firmware/applications/tester/util.c
+++ b/firmware/applications/tester/util.c
@@ -33,10 +33,11 @@ void adc_light(void) {
     int dx=0;
     int dy=8;
     dx=DoString(0,dy,"Light:");
-    DoString(0,dy+8,"Night:");
+    DoString(0,dy+16,"Night:");
     while ((getInputRaw())==BTN_NONE){
         DoInt(dx,dy,GetLight());
-        DoInt(dx,dy+8,isNight());
+        DoInt(dx,dy+16,isNight());
+        DoInt(dx,dy+8,globalconfig.backlighttrigger);
         lcdDisplay();
     };
     dy+=8;
diff --git a/firmware/basic/config.c b/firmware/basic/config.c
index 0a9284c..eea1936 100644
--- a/firmware/basic/config.c
+++ b/firmware/basic/config.c
@@ -77,9 +77,5 @@ int readConfig(void){
 };
 
 int applyConfig(){
-    if(globalconfig.lcdstate & LCD_INVERTED)
-        lcdToggleFlag(LCD_INVERTED);
-    if(globalconfig.lcdstate & LCD_MIRRORX)
-        lcdToggleFlag(LCD_MIRRORX);
 	return 0;
 };
diff --git a/firmware/basic/night.c b/firmware/basic/night.c
index 8e7e60f..6110818 100644
--- a/firmware/basic/night.c
+++ b/firmware/basic/night.c
@@ -7,6 +7,8 @@
 uint32_t light=300*HYST;
 char _isnight=1;
 
+#define threshold globalconfig.backlighttrigger
+
 void LightCheck(void){
     int iocon;
     char iodir;
@@ -25,16 +27,14 @@ void LightCheck(void){
     gpioSetDir(RB_LED3, iodir);
     IOCON_PIO1_11=iocon;
 
-    static uint16_t threshold=0;
-    if(threshold==0){
-        // read threshold from config
-        threshold=320 * HYST;
+    if(threshold==0){ // uninitialized?
+        threshold=320;
     };
 
-    if(_isnight && light>(threshold+RANGE*HYST))
+    if(_isnight && light/HYST>(threshold+RANGE))
         _isnight=0;
 
-    if(!_isnight && light<threshold)
+    if(!_isnight && light/HYST<threshold)
         _isnight=1;
 };
 
diff --git a/firmware/lcd/display.c b/firmware/lcd/display.c
index ec28981..fbb6150 100644
--- a/firmware/lcd/display.c
+++ b/firmware/lcd/display.c
@@ -13,7 +13,7 @@
 /**************************************************************************/
 
 uint8_t lcdBuffer[RESX*RESY_B];
-int lcd_layout = 0;
+#define lcd_layout globalconfig.lcdstate
 uint32_t intstatus; // Caches USB interrupt state
                     // (need to disable MSC while displaying)