ctdo
/
crashtest-r0ket
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:r0ket/r0ket

This commit is contained in:
iggy 2011-08-01 18:30:18 +02:00
parent f82cb8382a f48538b47c
commit 4ccd0bf18d
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/applications/tester.c
View File

@ -16,3 +16,5 @@ void main_tester(void) {
handleMenu(&mainmenu); handleMenu(&mainmenu);
gotoISP(); gotoISP();
}; };
void tick_tester(void);

2
simulat0r/gui/qsimulat0r.cc
View File

@ -100,7 +100,7 @@ public:
for (int x = 0; x < dimx; ++x) { for (int x = 0; x < dimx; ++x) {
for(int y=0; y<dimy; ++y) { for(int y=0; y<dimy; ++y) {
int color; 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 minix=0; minix<pixw; ++minix) {
for(int miniy=0; miniy<pixh; ++miniy) { for(int miniy=0; miniy<pixh; ++miniy) {

8
simulat0r/tui/Makefile
View File

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

2
simulat0r/tui/simulat0r.c
View File

@ -12,7 +12,7 @@ void simlcdDisplayUpdate() {
for(int y=0; y<RESY; ++y) { for(int y=0; y<RESY; ++y) {
for(int x=0; x<RESX; ++x) { 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); write(1,("\n"),1);
} }