From 761c56f4f23458123e8a77b7de8d3b5a07f5ad92 Mon Sep 17 00:00:00 2001
From: schneider <schneider@blinkenlichts.net>
Date: Wed, 3 Aug 2011 11:34:18 +0200
Subject: [PATCH] s.c

---
 firmware/applications/s.c | 130 +++++++-------------------------------
 1 file changed, 22 insertions(+), 108 deletions(-)

diff --git a/firmware/applications/s.c b/firmware/applications/s.c
index e6d4910..f047c80 100644
--- a/firmware/applications/s.c
+++ b/firmware/applications/s.c
@@ -5,120 +5,34 @@
 #include "lcd/render.h"
 #include "lcd/allfonts.h"
 
-void ReinvokeISP(void);
-void EnableWatchdog(uint32_t ms);
-void delayms(uint32_t ms);
+void backlightInit(void);
 
 /**************************************************************************/
 
 void main_s(void) {
-    //Make PIO1_11 an analog input
-    gpioSetDir(RB_LED3, gpioDirection_Input);
-    IOCON_PIO1_11 = 0x41;
-
-    backlightInit();
-
-    uint32_t j=0;
-
-    //disable the JTAG on PIO3_3
-    IOCON_PIO3_3 = 0x10;
-
-    int yctr=8;
-    int dx=0;
-
-    font_direction = FONT_DIR_LTR; // LeftToRight is the default
-    font = &Font_8x8;
-
-    static FONT fonts[] = {
-	 &Font_7x8, 
-	 &Font_Ubuntu18pt, // 3 byte-font
-	 &Font_8x8,
-    };
-
-    int fontctr=0;
-    yctr=18;
-
-    uint8_t trigger;
-
-#define SEND
-#ifdef SEND
-  trigger=200;
-  gpioSetDir(RB_LED0, gpioDirection_Output);
-  IOCON_JTAG_TDI_PIO0_11 = 0x11;
-#else
-  trigger=380;
-  gpioSetDir(RB_LED0, gpioDirection_Input);
-  IOCON_JTAG_TDI_PIO0_11 = 0x42;
-#endif
-
-
-    uint32_t ctr=0;
+    uint8_t key;
+    //lcdClear();
     while (1) {
-	ctr++;
-	uint32_t results;
-	lcdDisplay();
-	delayms(10);
+        uint8_t contrast = lcdRead(0xDF);
+        lcdInit(); // display
+        lcdPrint("reg=");
+        lcdPrintCharHex(contrast);
+        lcdNl();
+        lcdDisplay();
+        while(1);
+        delayms(500);
 
-	font=fonts[fontctr];
+        //key= getInputWait();
 
-	if(gpioGetValue(RB_BTN3)==0){
-		while(gpioGetValue(RB_BTN3)==0);
-		trigger +=10;
-	};
-	if(gpioGetValue(RB_BTN2)==0){
-		while(gpioGetValue(RB_BTN2)==0);
-		trigger -=10;
-	};
-	//dx=DoString(0,0,"Trig:");
-	//dx=DoInt(dx,0,trigger);
-	//DoString(dx,0," ");
-
-	if(gpioGetValue(RB_BTN0)==0){
-		while(gpioGetValue(RB_BTN0)==0);
-		DoString(0,8,"Enter ISP!");
-		lcdDisplay();
-		EnableWatchdog(1000*5);
-		ReinvokeISP();
-	};
-
-    font = &Font_Ubuntu36pt;
-    static uint8_t ctrx=0, ctry=0, dirx=1, diry=1;
-	dx=DoString(ctrx,ctry,"S");
-    if( dirx ){
-        if(ctrx++ == 60)
-            dirx = 0;
-    }else{
-        if(ctrx-- == 0)
-            dirx=1;
+        // Easy flashing
+        if(key==BTN_LEFT){
+            DoString(0,8,"Enter ISP!");
+            lcdDisplay();
+            ISPandReset();
+        }
     }
-    if( diry ){
-        if(ctry++ == 12)
-            diry = 0;
-    }else{
-        if(ctry-- == 0)
-            diry=1;
-    }
-	font = &Font_7x8;
-
-	results = adcRead(1);
-	//dx=DoString(0,yctr+28,"Voltage:");
-	results *= 10560;
-	results /= 1024;
-	//DoInt(dx,yctr+28,results);
-
-	if( results < 3500 ){
-	    DoString(0,yctr+30,"Shutdown");
-	    gpioSetValue (RB_PWR_GOOD, 0); 
-	    gpioSetValue (RB_LCD_BL, 0); 
-	    SCB_SCR |= SCB_SCR_SLEEPDEEP;
-	    PMU_PMUCTRL = PMU_PMUCTRL_DPDEN_DEEPPOWERDOWN;
-	    __asm volatile ("WFI");
-	}else{
-	    //DoString(0,yctr+30,"OK           ");
-		;
-	}
-
-    }
-
-    return;
 }
+
+void tick_minimal(void){
+    return;
+};