From f4dee3550c5b30f1dacceb86f5faa4ba72958300 Mon Sep 17 00:00:00 2001
From: Stefan `Sec` Zehl <sec@42.org>
Date: Mon, 18 Jul 2011 22:09:31 +0200
Subject: [PATCH] Remove argument from lcdDisplay() and ISPandReset()

---
 firmware/applications/adc.c           |  4 ++--
 firmware/applications/bsx.c           |  6 +++---
 firmware/applications/cdc.c           |  2 +-
 firmware/applications/default.c       |  6 +++---
 firmware/applications/exe.c           | 10 +++++-----
 firmware/applications/executor.c      | 14 +++++++-------
 firmware/applications/font.c          | 14 +++++++-------
 firmware/applications/fs.c            |  6 +++---
 firmware/applications/funk.c          |  8 ++++----
 firmware/applications/iggy.c          |  6 +++---
 firmware/applications/lilafisch.c     | 12 ++++++------
 firmware/applications/mandelbrot.c    |  4 ++--
 firmware/applications/mandelbrot2.c   |  6 +++---
 firmware/applications/menutest.c      |  4 ++--
 firmware/applications/minimal.c       |  6 +++---
 firmware/applications/remote.c        | 14 +++++++-------
 firmware/applications/s.c             |  4 ++--
 firmware/applications/schneider.c     |  6 +++---
 firmware/applications/sec.c           |  6 +++---
 firmware/applications/spaceinvaders.c |  2 +-
 firmware/applications/vcard.c         |  4 ++--
 firmware/basic/basic.h                |  2 +-
 firmware/basic/keyin.c                |  4 ----
 firmware/basic/menu.c                 |  4 ++--
 firmware/basic/reinvoke_isp.c         |  4 ++--
 firmware/lcd/display.c                |  6 +++---
 firmware/lcd/display.h                |  2 +-
 firmware/lcd/print.c                  |  2 +-
 firmware/loadable/spaceinvaders.c     |  2 +-
 firmware/main.c                       |  2 +-
 30 files changed, 84 insertions(+), 88 deletions(-)

diff --git a/firmware/applications/adc.c b/firmware/applications/adc.c
index fefbb24..2d8b6c8 100644
--- a/firmware/applications/adc.c
+++ b/firmware/applications/adc.c
@@ -25,7 +25,7 @@ void main_adc(void) {
 
     while (1) {
         uint32_t results;
-        lcdDisplay(0);
+        lcdDisplay();
         delayms(10);
 
         if(gpioGetValue(RB_BTN1)==0){
@@ -48,7 +48,7 @@ void main_adc(void) {
         if (gpioGetValue(RB_BTN4)==0) {
             while(gpioGetValue(RB_BTN4)==0);
             DoString(0,8,"Enter ISP!");
-            lcdDisplay(0);
+            lcdDisplay();
             EnableWatchdog(1000*5);
             ReinvokeISP();
 
diff --git a/firmware/applications/bsx.c b/firmware/applications/bsx.c
index 54689ce..df4c4a6 100644
--- a/firmware/applications/bsx.c
+++ b/firmware/applications/bsx.c
@@ -21,19 +21,19 @@ void main_bsx(void) {
     font = &Font_7x8;
 
     DoString(0, 0, "bsx");
-    lcdDisplay(0);
+    lcdDisplay();
     delayms(1000);
     usbMSCInit();
 
     while (1) {
         uint32_t results;
-        lcdDisplay(0);
+        lcdDisplay();
         delayms(10);
 
         if (gpioGetValue(RB_BTN4)==0) {
             while(gpioGetValue(RB_BTN4)==0);
             DoString(0,8,"Enter ISP!");
-            lcdDisplay(0);
+            lcdDisplay();
             ReinvokeISP();
         }
     }
diff --git a/firmware/applications/cdc.c b/firmware/applications/cdc.c
index 88e3838..f26303c 100644
--- a/firmware/applications/cdc.c
+++ b/firmware/applications/cdc.c
@@ -68,7 +68,7 @@ void main_cdc(void)
             CDC_RdOutBuf (buf, &l);
             puts(buf);
             dx=DoString(dx,0,buf);
-            lcdDisplay(0);
+            lcdDisplay();
         }
         //puts("hello world\r\n");
         //delayms(1);
diff --git a/firmware/applications/default.c b/firmware/applications/default.c
index f2df310..2e41ac6 100644
--- a/firmware/applications/default.c
+++ b/firmware/applications/default.c
@@ -94,15 +94,15 @@ void main_default(void) {
     systickInit(10);
 
     if(getInputRaw()==BTN_ENTER){
-        ISPandReset(7);
+        ISPandReset();
     };
 
     font=&Font_7x8;
     if(lcdInitConfig()){
-        lcdDisplay(0);
+        lcdDisplay();
         getInputWait();
     }else{
-        lcdDisplay(0);
+        lcdDisplay();
         delayms(300);
     };
 
diff --git a/firmware/applications/exe.c b/firmware/applications/exe.c
index 7559a92..44b2d2d 100644
--- a/firmware/applications/exe.c
+++ b/firmware/applications/exe.c
@@ -20,7 +20,7 @@ void execute_menu(void){
 
 void msc_menu(void){
     DoString(0,8,"MSC Enabled.");
-    lcdDisplay(0);
+    lcdDisplay();
     usbMSCInit();
     while(!getInputRaw())delayms(10);
     DoString(0,16,"MSC Disabled.");
@@ -29,8 +29,8 @@ void msc_menu(void){
 
 void gotoISP(void) {
     DoString(0,0,"Enter ISP!");
-    lcdDisplay(0);
-    ISPandReset(5);
+    lcdDisplay();
+    ISPandReset();
 }
 
 void lcd_mirror(void) {
@@ -44,7 +44,7 @@ void adc_check(void) {
     dx=DoString(0,dy,"Voltage:");
     while ((getInputRaw())==BTN_NONE){
         DoInt(dx,dy,GetVoltage());
-        lcdDisplay(0);
+        lcdDisplay();
     };
     dy+=8;
     dx=DoString(0,dy,"Done.");
@@ -77,7 +77,7 @@ void main_exe(void) {
 
     while (1) {
         lcdFill(0); // clear display buffer
-        lcdDisplay(0);
+        lcdDisplay();
         handleMenu(&mainmenu);
         gotoISP();
     }
diff --git a/firmware/applications/executor.c b/firmware/applications/executor.c
index 5f66a58..3fdf65a 100644
--- a/firmware/applications/executor.c
+++ b/firmware/applications/executor.c
@@ -17,7 +17,7 @@ void execute (const void *function, uint16_t length){
     DoString(0,8,"Enter RAM!");
     DoIntX(0,16,(uint32_t)function);
     DoIntX(0,24,(uint32_t)dst);
-    lcdDisplay(0);
+    lcdDisplay();
 
     for(int i=0;i<length;i++){
         ((char*)dst)[i]=((char*)function)[i];
@@ -69,7 +69,7 @@ void execute_file (const char * fname){
     int dx;
     dx=DoString(0,16,"read: ");
     DoInt(dx,16,readbytes);
-    lcdDisplay(0);
+    lcdDisplay();
 
     dst=(void (*)(void)) ((uint32_t)(dst) | 1); // Enable Thumb mode!
     dst();
@@ -101,7 +101,7 @@ void main_executor(void) {
     while (1) {
         ctr++;
 
-        lcdDisplay(0);
+        lcdDisplay();
         delayms(10);
 
         key= getInput();
@@ -119,21 +119,21 @@ void main_executor(void) {
         // Easy flashing
         if(key==BTN_LEFT){
             DoString(0,8,"Enter ISP!");
-            lcdDisplay(0);
-            ISPandReset(5);
+            lcdDisplay();
+            ISPandReset();
         };
 
         // DF xecute
         if(key==BTN_RIGHT){
             DoString(0,0,"Enter RAM!");
-            lcdDisplay(0);
+            lcdDisplay();
             while(getInput()!=BTN_NONE);
 
             FATFS FatFs;          /* File system object for logical drive */
             put_rc(f_mount(0, &FatFs));
 
             execute_file("0:test.c0d");
-            lcdDisplay(0);
+            lcdDisplay();
             while(!getInput());
         };
 
diff --git a/firmware/applications/font.c b/firmware/applications/font.c
index 67881e4..25475e9 100644
--- a/firmware/applications/font.c
+++ b/firmware/applications/font.c
@@ -109,7 +109,7 @@ void f_nick(void){
         lcdPrint("x");
         lcdPrintInt(y);
 
-        lcdDisplay(0);
+        lcdDisplay();
         delayms(40);
 
         key= getInputRaw();
@@ -124,7 +124,7 @@ void f_nick(void){
         }else if (key ==BTN_ENTER){
             lcdClear();
             lcdPrintln("Done.");
-            lcdDisplay(0);
+            lcdDisplay();
             ctr++;
             break;
         };
@@ -135,8 +135,8 @@ void f_nick(void){
 
 void gotoISP(void) {
     DoString(0,0,"Enter ISP!");
-    lcdDisplay(0);
-    ISPandReset(5);
+    lcdDisplay();
+    ISPandReset();
 }
 
 void lcd_mirror(void) {
@@ -154,7 +154,7 @@ void adc_check(void) {
     dx=DoString(0,dy,"Voltage:");
     while ((getInputRaw())==BTN_NONE){
         DoInt(dx,dy,GetVoltage());
-       lcdDisplay(0);
+       lcdDisplay();
     };
     dy+=8;
     dx=DoString(0,dy,"Done.");
@@ -162,7 +162,7 @@ void adc_check(void) {
 
 void msc_menu(void){
     DoString(0,8,"MSC Enabled.");
-    lcdDisplay(0);
+    lcdDisplay();
     usbMSCInit();
     while(!getInputRaw())delayms(10);
     DoString(0,16,"MSC Disabled.");
@@ -205,7 +205,7 @@ void main_font(void) {
 
     while (1) {
         lcdFill(0); // clear display buffer
-        lcdDisplay(0);
+        lcdDisplay();
         handleMenu(&mainmenu);
         gotoISP();
     }
diff --git a/firmware/applications/fs.c b/firmware/applications/fs.c
index a376b40..30b17fe 100644
--- a/firmware/applications/fs.c
+++ b/firmware/applications/fs.c
@@ -69,7 +69,7 @@ void main_fs(void) {
     font_direction = FONT_DIR_LTR; // LeftToRight is the default
 
     while (1) {
-        lcdDisplay(0);
+        lcdDisplay();
         delayms(10);
 
         lcdFill(0); // clear display buffer
@@ -109,8 +109,8 @@ void tick_fs(void){
 
 void gotoISP(void) {
     DoString(0,0,"Enter ISP!");
-    lcdDisplay(0);
-    ISPandReset(5);
+    lcdDisplay();
+    ISPandReset();
 }
 
 void put_rc_y (FRESULT rc, int y) {
diff --git a/firmware/applications/funk.c b/firmware/applications/funk.c
index 5b4576c..0160188 100644
--- a/firmware/applications/funk.c
+++ b/firmware/applications/funk.c
@@ -163,8 +163,8 @@ void f_send(void){
 
 void gotoISP(void) {
     DoString(0,0,"Enter ISP!");
-    lcdDisplay(0);
-    ISPandReset(5);
+    lcdDisplay();
+    ISPandReset();
 }
 
 void lcd_mirror(void) {
@@ -178,7 +178,7 @@ void adc_check(void) {
     dx=DoString(0,dy,"Voltage:");
     while ((getInputRaw())==BTN_NONE){
         DoInt(dx,dy,GetVoltage());
-        lcdDisplay(0);
+        lcdDisplay();
     };
     dy+=8;
     dx=DoString(0,dy,"Done.");
@@ -230,7 +230,7 @@ void main_funk(void) {
     openbeaconSetup(0x5ec);
     while (1) {
         lcdFill(0); // clear display buffer
-        lcdDisplay(0);
+        lcdDisplay();
         handleMenu(&mainmenu);
         gotoISP();
     }
diff --git a/firmware/applications/iggy.c b/firmware/applications/iggy.c
index 154c901..539299d 100644
--- a/firmware/applications/iggy.c
+++ b/firmware/applications/iggy.c
@@ -57,7 +57,7 @@ void main_iggy(void) {
     while (1) {
 	ctr++;
 	uint32_t results;
-	lcdDisplay(j);
+	lcdDisplay();
 	delayms(10);
 
 	font=fonts[fontctr];
@@ -85,7 +85,7 @@ void main_iggy(void) {
 	if(gpioGetValue(RB_BTN0)==0){
 		while(gpioGetValue(RB_BTN0)==0);
 		DoString(0,8,"Enter ISP!");
-		lcdDisplay(0);
+		lcdDisplay();
 		EnableWatchdog(1000*5);
 		ReinvokeISP();
 	};
@@ -99,7 +99,7 @@ void main_iggy(void) {
 
 	//on = ~on;
 	//lcdSetPixel(20,20,true);
-	//lcdDisplay(0);
+	//lcdDisplay();
 	//lcdSetPixel(20,21,0);
 	//lcdSetPixel(21,20,1);
 	
diff --git a/firmware/applications/lilafisch.c b/firmware/applications/lilafisch.c
index f617feb..98497e5 100644
--- a/firmware/applications/lilafisch.c
+++ b/firmware/applications/lilafisch.c
@@ -29,11 +29,11 @@ void main_lilafisch(void) {
     lcdToggleFlag(LCD_MIRRORX);
     backlightInit();
     font_direction = FONT_DIR_LTR; // LeftToRight is the default
-    dx=DoString(0,0,"init timer"); lcdDisplay(0);
+    dx=DoString(0,0,"init timer"); lcdDisplay();
     timer32Init(0, (72E6/5E3)/2); //timer einschalten, auf 5kHz(?) setzen
-    dx=DoString(0,0,"enable timer"); lcdDisplay(0);
+    dx=DoString(0,0,"enable timer"); lcdDisplay();
     timer32Enable(0);
-    dx=DoString(0,0,"timer done"); lcdDisplay(0);
+    dx=DoString(0,0,"timer done"); lcdDisplay();
 
     while (1) {
         ton ++;
@@ -46,7 +46,7 @@ void main_lilafisch(void) {
         if (TMR_TMR32B0TC > timer){    //schneller fix wenn ton zurueckgesetzt wird, aber timer weiterlaeuft
            TMR_TMR32B0TC=0;
         }
-        lcdDisplay(0);
+        lcdDisplay();
         delayms(10);
 
         key= getInput();
@@ -56,8 +56,8 @@ void main_lilafisch(void) {
         if(key==BTN_LEFT){
             timer32Disable(0);
             DoString(0,8,"Enter ISP!");
-            lcdDisplay(0);
-            ISPandReset(5);
+            lcdDisplay();
+            ISPandReset();
         }
 
         //font = &Font_Ubuntu36pt;
diff --git a/firmware/applications/mandelbrot.c b/firmware/applications/mandelbrot.c
index 22dcde8..686a26a 100644
--- a/firmware/applications/mandelbrot.c
+++ b/firmware/applications/mandelbrot.c
@@ -113,7 +113,7 @@ void cross(char x, char y) {
     lcdSetPixel(x-2,y,false);
     lcdSetPixel(x,y+2,false);
     lcdSetPixel(x,y-2,false);
-    lcdDisplay(0);
+    lcdDisplay();
 }
 
 void blink(){
@@ -139,7 +139,7 @@ void main_mandelbrot(void) {
         mandelMove();
         
         if (mandel.dirty) mandelCalc();
-        lcdDisplay(0);
+        lcdDisplay();
         
         //TODO fix this
         if (!autozoom) {
diff --git a/firmware/applications/mandelbrot2.c b/firmware/applications/mandelbrot2.c
index 9cd59dc..5425108 100644
--- a/firmware/applications/mandelbrot2.c
+++ b/firmware/applications/mandelbrot2.c
@@ -106,7 +106,7 @@ void main_mandelbrot2(void) {
     font=&Font_7x8;
     mandelInit();
     while (1) {
-        lcdDisplay(0);
+        lcdDisplay();
         mandelMove();
         if (mandel.dirty) {
             mandelCalc();
@@ -114,8 +114,8 @@ void main_mandelbrot2(void) {
         
         if(gpioGetValue(RB_BTN0)==0 && gpioGetValue(RB_BTN4)==0){
         DoString(0,0,"Enter ISP!");
-        lcdDisplay(0);
-        ISPandReset(5);
+        lcdDisplay();
+        ISPandReset();
     }
     
     }
diff --git a/firmware/applications/menutest.c b/firmware/applications/menutest.c
index 5e96c83..7aa01b1 100644
--- a/firmware/applications/menutest.c
+++ b/firmware/applications/menutest.c
@@ -58,7 +58,7 @@ void main_menutest(void) {
     font_direction = FONT_DIR_LTR; // LeftToRight is the default
 
     while (1) {
-        lcdDisplay(0);
+        lcdDisplay();
         delayms(10);
 
         lcdFill(0); // clear display buffer
@@ -91,7 +91,7 @@ void decBacklight(void) {
 
 void gotoISP(void) {
     DoString(0,58,"Enter ISP!");
-    lcdDisplay(0);
+    lcdDisplay();
     EnableWatchdog(5000);
     ReinvokeISP();
 }
diff --git a/firmware/applications/minimal.c b/firmware/applications/minimal.c
index 076f2fc..d5f2f66 100644
--- a/firmware/applications/minimal.c
+++ b/firmware/applications/minimal.c
@@ -16,7 +16,7 @@ void main_minimal(void) {
     font_direction = FONT_DIR_LTR; // LeftToRight is the default
     while (1) {
 
-        lcdDisplay(0);
+        lcdDisplay();
         delayms(10);
 
         key= getInput();
@@ -25,8 +25,8 @@ void main_minimal(void) {
         // Easy flashing
         if(key==BTN_LEFT){
             DoString(0,8,"Enter ISP!");
-            lcdDisplay(0);
-            ISPandReset(5);
+            lcdDisplay();
+            ISPandReset();
         }
 
         //font = &Font_Ubuntu36pt;
diff --git a/firmware/applications/remote.c b/firmware/applications/remote.c
index d4bbdf0..4effc17 100644
--- a/firmware/applications/remote.c
+++ b/firmware/applications/remote.c
@@ -59,7 +59,7 @@ void f_recv(void){
         lcdPrint("ct:");lcdPrintIntHex( *(int*)(buf+ 4) ); lcdNl();
         lcdPrint("id:");lcdPrintIntHex( *(int*)(buf+ 8) ); lcdNl();
         lcdPrint("xx:");lcdPrintIntHex( *(int*)(buf+12) ); lcdNl();
-        lcdDisplay(0);
+        lcdDisplay();
     };
 };
 
@@ -101,7 +101,7 @@ void f_send(void){
         lcdPrint("F-St:"); lcdPrintInt(status); 
         if(buf[2]==BTN_ENTER)
             break;
-        lcdDisplay(0);
+        lcdDisplay();
         len=nrf_rcv_pkt_time_encr(10,sizeof(buf),buf,testkey);
         if(len>0){
             lcdPrint("Got!");
@@ -113,8 +113,8 @@ void f_send(void){
 
 void gotoISP(void) {
     DoString(0,0,"Enter ISP!");
-    lcdDisplay(0);
-    ISPandReset(5);
+    lcdDisplay();
+    ISPandReset();
 }
 
 void lcd_mirror(void) {
@@ -128,7 +128,7 @@ void adc_check(void) {
     dx=DoString(0,dy,"Voltage:");
     while ((getInputRaw())==BTN_NONE){
         DoInt(dx,dy,GetVoltage());
-       lcdDisplay(0);
+       lcdDisplay();
     };
     dy+=8;
     dx=DoString(0,dy,"Done.");
@@ -136,7 +136,7 @@ void adc_check(void) {
 
 void msc_menu(void){
     DoString(0,8,"MSC Enabled.");
-    lcdDisplay(0);
+    lcdDisplay();
     usbMSCInit();
     while(!getInputRaw())delayms(10);
     DoString(0,16,"MSC Disabled.");
@@ -177,7 +177,7 @@ void main_remote(void) {
 
     while (1) {
         lcdFill(0); // clear display buffer
-        lcdDisplay(0);
+        lcdDisplay();
         handleMenu(&mainmenu);
         gotoISP();
     }
diff --git a/firmware/applications/s.c b/firmware/applications/s.c
index 89a044e..e6d4910 100644
--- a/firmware/applications/s.c
+++ b/firmware/applications/s.c
@@ -56,7 +56,7 @@ void main_s(void) {
     while (1) {
 	ctr++;
 	uint32_t results;
-	lcdDisplay(j);
+	lcdDisplay();
 	delayms(10);
 
 	font=fonts[fontctr];
@@ -76,7 +76,7 @@ void main_s(void) {
 	if(gpioGetValue(RB_BTN0)==0){
 		while(gpioGetValue(RB_BTN0)==0);
 		DoString(0,8,"Enter ISP!");
-		lcdDisplay(0);
+		lcdDisplay();
 		EnableWatchdog(1000*5);
 		ReinvokeISP();
 	};
diff --git a/firmware/applications/schneider.c b/firmware/applications/schneider.c
index 80a2948..9e7ec11 100644
--- a/firmware/applications/schneider.c
+++ b/firmware/applications/schneider.c
@@ -34,15 +34,15 @@ void main_schneider(void) {
         // Easy flashing
         if(key==BTN_LEFT){
             DoString(0,8,"Enter ISP!");
-            lcdDisplay(0);
-            ISPandReset(5);
+            lcdDisplay();
+            ISPandReset();
         };
 
         // Display nickname
         //font = &Font_Ubuntu36pt;
         dx=DoString(0,0,"Test");
         dx=DoInt(dx,0,ctr++);
-        lcdDisplay(0);
+        lcdDisplay();
         encryption_decryption_demo("This is encrypted",
                         "1c56d302cf642a8e1ba4b48cc4fbe2845ee32dce7", 
                         "45f46eb303edf2e62f74bd68368d979e265ee3c03",
diff --git a/firmware/applications/sec.c b/firmware/applications/sec.c
index b4dab2f..84b29dd 100644
--- a/firmware/applications/sec.c
+++ b/firmware/applications/sec.c
@@ -30,7 +30,7 @@ void main_sec(void) {
     while (1) {
         ctr++;
 
-        lcdDisplay(0);
+        lcdDisplay();
         delayms(10);
 
         key= getInput();
@@ -48,8 +48,8 @@ void main_sec(void) {
         // Easy flashing
         if(key==BTN_LEFT){
             DoString(0,8,"Enter ISP!");
-            lcdDisplay(0);
-            ISPandReset(5);
+            lcdDisplay();
+            ISPandReset();
         };
 
         // Display nickname
diff --git a/firmware/applications/spaceinvaders.c b/firmware/applications/spaceinvaders.c
index 599a665..c774fd4 100644
--- a/firmware/applications/spaceinvaders.c
+++ b/firmware/applications/spaceinvaders.c
@@ -222,7 +222,7 @@ void main_spaceinvaders(void) {
         draw_enemy();
         draw_shot();
         draw_status();
-        lcdDisplay(0);
+        lcdDisplay();
         delayms(10);
     }
     return;
diff --git a/firmware/applications/vcard.c b/firmware/applications/vcard.c
index b9298f4..6cbda10 100644
--- a/firmware/applications/vcard.c
+++ b/firmware/applications/vcard.c
@@ -311,8 +311,8 @@ void main_vcard(void) {
         // Easy flashing
         if(key==BTN_LEFT){
             DoString(0,8,"Enter ISP!");
-            lcdDisplay(0);
-            ISPandReset(5);
+            lcdDisplay();
+            ISPandReset();
         }else if(key==BTN_UP){
             //lcdClear();
             //lcdPrintln("Generating...");
diff --git a/firmware/basic/basic.h b/firmware/basic/basic.h
index 8aacbca..f754f18 100644
--- a/firmware/basic/basic.h
+++ b/firmware/basic/basic.h
@@ -126,7 +126,7 @@ void rbInit(void);
 // reinvoke_isp.c
 void ReinvokeISP(void);
 void EnableWatchdog(uint32_t ms);
-void ISPandReset(int delay);
+void ISPandReset(void);
 
 // delayms.c
 void delayms(uint32_t ms);
diff --git a/firmware/basic/keyin.c b/firmware/basic/keyin.c
index 1beea2d..69254be 100644
--- a/firmware/basic/keyin.c
+++ b/firmware/basic/keyin.c
@@ -29,10 +29,6 @@ uint8_t getInput(void) {
         result += BTN_RIGHT;
     }
 
-    if (result == (BTN_LEFT+BTN_UP+BTN_ENTER)){ /* Development hack */
-        ISPandReset(5);
-    }
-
     return result;
 }
 
diff --git a/firmware/basic/menu.c b/firmware/basic/menu.c
index 64e9474..818972f 100644
--- a/firmware/basic/menu.c
+++ b/firmware/basic/menu.c
@@ -41,7 +41,7 @@ void handleMenu(const struct MENU *the_menu) {
             }
             line += font->u8Height;
         }
-        lcdDisplay(0);
+        lcdDisplay();
 
         switch (getInput()) {
             case BTN_UP:
@@ -78,7 +78,7 @@ void handleMenu(const struct MENU *the_menu) {
                 lcdRefresh();
                 if (the_menu->entries[menuselection]->callback!=NULL)
                     the_menu->entries[menuselection]->callback();
-                lcdDisplay(0);
+                lcdDisplay();
                 getInputWait();
 
                 break;
diff --git a/firmware/basic/reinvoke_isp.c b/firmware/basic/reinvoke_isp.c
index 84f05b4..2b3a6f3 100644
--- a/firmware/basic/reinvoke_isp.c
+++ b/firmware/basic/reinvoke_isp.c
@@ -74,14 +74,14 @@ void EnableWatchdog(uint32_t ms){
 	WDT_WDFEED = WDT_WDFEED_FEED2;
 };
 
-void ISPandReset(int delay){
+void ISPandReset(void){
 #if CFG_USBMSC
     if(usbMSCenabled){
         usbMSCOff();
         delayms(500);
     };
 #endif
-    EnableWatchdog(1000*delay);
+    EnableWatchdog(1000*5);
     ReinvokeISP();
 };
 
diff --git a/firmware/lcd/display.c b/firmware/lcd/display.c
index c4565ac..23e0b04 100644
--- a/firmware/lcd/display.c
+++ b/firmware/lcd/display.c
@@ -126,7 +126,7 @@ bool lcdGetPixel(char x, char y){
     return byte & (1 << y_off);
 }
 
-void lcdDisplay(uint32_t shift) {
+void lcdDisplay(void) {
     char byte;
     select();
 
@@ -137,9 +137,9 @@ void lcdDisplay(uint32_t shift) {
     for(page=0; page<RESY_B;page++) {
         for(i=0; i<RESX; i++) {
             if (lcd_layout & LCD_MIRRORX)
-                byte=lcdBuffer[page*RESX+RESX-1-((i+shift)%RESX)];
+                byte=lcdBuffer[page*RESX+RESX-1-(i)];
             else
-                byte=lcdBuffer[page*RESX+((i+shift)%RESX)];
+                byte=lcdBuffer[page*RESX+(i)];
 
             if (lcd_layout & LCD_INVERTED)
                 byte=~byte;
diff --git a/firmware/lcd/display.h b/firmware/lcd/display.h
index 91f977e..b27ca59 100644
--- a/firmware/lcd/display.h
+++ b/firmware/lcd/display.h
@@ -22,7 +22,7 @@ extern uint8_t lcdBuffer[RESX*RESY_B];
 
 void lcdInit(void);
 void lcdFill(char f);
-void lcdDisplay(uint32_t shift);
+void lcdDisplay(void);
 void lcdInvert(void);
 void lcdToggleFlag(int flag);
 void lcdSetPixel(char x, char y, bool f);
diff --git a/firmware/lcd/print.c b/firmware/lcd/print.c
index 96c39cc..6eb241e 100644
--- a/firmware/lcd/print.c
+++ b/firmware/lcd/print.c
@@ -41,7 +41,7 @@ void lcdClear(){
 };
 
 void lcdRefresh(){
-    lcdDisplay(0);
+    lcdDisplay();
 };
 
 void lcdMoveCrsr(signed int dx,signed int dy){
diff --git a/firmware/loadable/spaceinvaders.c b/firmware/loadable/spaceinvaders.c
index a868004..432c1a9 100644
--- a/firmware/loadable/spaceinvaders.c
+++ b/firmware/loadable/spaceinvaders.c
@@ -52,7 +52,7 @@ void ram(void) {
         draw_enemy();
         draw_shot();
         draw_status();
-        lcdDisplay(0);
+        lcdDisplay();
         delayms(10);
     }
     return;
diff --git a/firmware/main.c b/firmware/main.c
index f476e50..94c5a13 100644
--- a/firmware/main.c
+++ b/firmware/main.c
@@ -26,7 +26,7 @@ int main(void) {
     lcdInit(); // display
 
     lcdFill(0);
-    lcdDisplay(0);
+    lcdDisplay();
 
 	wrapper(); // see module/ subdirectory
 }