diff --git a/Makefile b/Makefile index 05ede9e..7ba3c5d 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ OBJS += OBJS += basic/basic.o OBJS += eeprom/eeprom.o OBJS += reinvoke_isp.o -LIBS += core/libcore.a lcd/libfont.a modules/libmodules.a +LIBS += core/libcore.a lcd/liblcd.a modules/libmodules.a ########################################################################## # GNU GCC compiler flags @@ -29,7 +29,7 @@ OBJS += $(TARGET)_handlers.o LPC1xxx_startup.o LDLIBS = -lm LDLIBS += -Lmodules -lmodules LDLIBS += -Lcore -lcore -LDLIBS += -Llcd -lfont +LDLIBS += -Llcd -llcd OCFLAGS = --strip-unneeded LD_PATH = lpc1xxx @@ -44,7 +44,7 @@ all: firmware core/libcore.a: core/projectconfig.h cd core && $(MAKE) ROOT_PATH=../$(ROOT_PATH) -lcd/libfont.a lcd/render.o lcd/display.o: +lcd/liblcd.a lcd/render.o lcd/display.o: cd lcd && $(MAKE) ROOT_PATH=../$(ROOT_PATH) modules/libmodules.a: @@ -76,5 +76,5 @@ clean: @cd modules && $(MAKE) clean -.PHONY: lcd/libfont.a modules/libmodules.a +.PHONY: lcd/liblcd.a modules/libmodules.a diff --git a/lcd/display.c b/lcd/display.c index 75b2a36..0328dc5 100644 --- a/lcd/display.c +++ b/lcd/display.c @@ -30,6 +30,7 @@ void delayms(uint32_t ms) /**************************************************************************/ uint8_t lcdBuffer[RESX*RESY_B]; +int inverted = 0; /* //TODO FIXME why doenst that work ? @@ -160,7 +161,16 @@ void lcdDisplay(uint32_t shift) uint16_t i,page; for(page=0; page 100) brightness = 100; backlightSetBrightness(brightness); - }; + } if(gpioGetValue(RB_BTN0)==0){ brightness--; if (brightness > 100) brightness = 0; backlightSetBrightness(brightness); - }; + } + + if (gpioGetValue(RB_BTN3) == 0) { + while(gpioGetValue(RB_BTN3)==0); + lcdInvert(); + } if (gpioGetValue(RB_BTN4)==0) { while(gpioGetValue(RB_BTN4)==0); DoString(0,8,"Enter ISP!"); lcdDisplay(0); ReinvokeISP(); - }; + } dx = DoString(0, yctr, "Bright:"); dx = DoInt(dx, yctr, brightness); @@ -72,3 +77,4 @@ void module_bsx(void) { return; } +