From 5b7a675e1f5201526ad48202cfdf6679867e50f2 Mon Sep 17 00:00:00 2001
From: Stefan `Sec` Zehl <sec@42.org>
Date: Mon, 1 Aug 2011 16:09:04 +0200
Subject: [PATCH 1/3] Whoops. Make systick called again in APP=tester

---
 firmware/applications/tester.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/firmware/applications/tester.c b/firmware/applications/tester.c
index 667b335..d494e42 100644
--- a/firmware/applications/tester.c
+++ b/firmware/applications/tester.c
@@ -16,3 +16,5 @@ void main_tester(void) {
     handleMenu(&mainmenu);
     gotoISP();
 };
+
+void tick_tester(void);

From 8c4ceb16aae47dc3773334a9d5c1ba0896596e50 Mon Sep 17 00:00:00 2001
From: bernd <bernd@itfuzzi.de>
Date: Mon, 1 Aug 2011 16:51:14 +0200
Subject: [PATCH 2/3] Whoops... removed accidental Y-mirror in simulat0r

---
 simulat0r/gui/qsimulat0r.cc | 2 +-
 simulat0r/tui/simulat0r.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/simulat0r/gui/qsimulat0r.cc b/simulat0r/gui/qsimulat0r.cc
index 21d57b2..e8bbb5c 100644
--- a/simulat0r/gui/qsimulat0r.cc
+++ b/simulat0r/gui/qsimulat0r.cc
@@ -100,7 +100,7 @@ public:
     for (int x = 0; x < dimx; ++x) {
       for(int y=0; y<dimy; ++y) {
 	int color;
-	color=lcdGetPixel((GLOBAL(lcdmirror) /* LCD_MIRRORX */ )?(RESX-x-1):x,( 1 /* LCD_MIRRORY */)?(RESY-y-1):y)?colorInvertedPixelOn:colorInvertedPixelOff;
+	color=lcdGetPixel((GLOBAL(lcdmirror) /* LCD_MIRRORX */ )?(RESX-x-1):x,( 0 /* LCD_MIRRORY */)?(RESY-y-1):y)?pixelOn:pixelOff;
 	
 	for(int minix=0; minix<pixw; ++minix) {
 	  for(int miniy=0; miniy<pixh; ++miniy) {
diff --git a/simulat0r/tui/simulat0r.c b/simulat0r/tui/simulat0r.c
index 8c4fbf1..9eaced4 100644
--- a/simulat0r/tui/simulat0r.c
+++ b/simulat0r/tui/simulat0r.c
@@ -12,7 +12,7 @@ void simlcdDisplayUpdate() {
 
   for(int y=0; y<RESY; ++y) {
     for(int x=0; x<RESX; ++x) {
-      write(1,(lcdGetPixel((GLOBAL(lcdmirror) /* LCD_MIRRORX */ )?(RESX-x-1):x,(1 /* & LCD_MIRRORY */)?(RESY-y-1):y)?symbolOn:symbolOff),1);
+      write(1,(lcdGetPixel((GLOBAL(lcdmirror) /* LCD_MIRRORX */ )?(RESX-x-1):x,(0 /* & LCD_MIRRORY */)?(RESY-y-1):y)?symbolOn:symbolOff),1);
     }
       write(1,("\n"),1);
   }

From f48538b47c58b1ecf4f84072db5d2515cb583628 Mon Sep 17 00:00:00 2001
From: bernd <bernd@itfuzzi.de>
Date: Mon, 1 Aug 2011 17:33:48 +0200
Subject: [PATCH 3/3] Some Makefile fixes

---
 simulat0r/tui/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/simulat0r/tui/Makefile b/simulat0r/tui/Makefile
index 6d798d8..a66ec02 100644
--- a/simulat0r/tui/Makefile
+++ b/simulat0r/tui/Makefile
@@ -9,11 +9,8 @@ CFLAGS += -I../simcore
 OBJS+= ../firmware/basic/*.o
 OBJS+= ../firmware/core/*.o
 OBJS+= ../firmware/core/*/*.o
-LDFLAGS+= -L../firmware/applications
 LIBS+= ../firmware/applications/libapp.a
-LDFLAGS+= -L../firmware/lcd
 LIBS+= ../firmware/lcd/liblcd.a
-LDFLAGS+= -L../firmware/usb
 LIBS+= ../firmware/usb/libusb.a
 
 #LIBS += -lm
@@ -27,10 +24,13 @@ LIBS += ../firmware/basic/libbasic.a
 
 OBJS+=../simcore/simcore.o ../simcore/misc.o ../simcore/timecounter.o
 
+OBJS += simulat0r.o
+
 .PHONY : all
 all : simulat0r
 
-simulat0r : simulat0r.o $(OBJS) $(LIBS) 
+simulat0r : $(OBJS) $(LIBS)
+	$(LD) $(OBJS) $(LIBS) -lc -o $@
 
 clean:
 	$(RM) simulat0r.o