diff --git a/cats/cats.sh b/cats/cats.sh index d87a173..40ff5f4 100755 --- a/cats/cats.sh +++ b/cats/cats.sh @@ -1,5 +1,9 @@ #!/bin/sh +# set up the terminal for communication with the controller +stty -F /dev/ttyUSB0 speed 38400 cs8 -parenb -cstopb raw + +# clear the display all black and write some text in Hack font, and so on.. echo "c 0" > /dev/ttyUSB0 sleep 1 echo "t 20 12 h Katzen... " > /dev/ttyUSB0 @@ -9,6 +13,8 @@ echo "t 92 80 h Katzen! " > /dev/ttyUSB0 sleep 1 + +# prepare sending a BMP image file, then send the image, and so on... echo "p 0 0" > /dev/ttyUSB0 cat Chico160x128.bmp > /dev/ttyUSB0 sleep 3 diff --git a/display.h b/display.h index e971193..9a396b9 100644 --- a/display.h +++ b/display.h @@ -61,7 +61,7 @@ void writeString(row_t row, col_t col, const __flash Font *font, const char *string); /** - * Displays a demo for the awesome Unifont. + * Displays a demo for the nice Hack font. */ void hackDemo(void); diff --git a/nbproject/Makefile-Custom.mk b/nbproject/Makefile-Custom.mk index 32bd2b3..e24f966 100644 --- a/nbproject/Makefile-Custom.mk +++ b/nbproject/Makefile-Custom.mk @@ -36,12 +36,12 @@ # Object Files OBJECTFILES= \ ${OBJECTDIR}/_ext/48b9b4a1/avrtft.o \ + ${OBJECTDIR}/_ext/48b9b4a1/bmp.o \ ${OBJECTDIR}/_ext/48b9b4a1/display.o \ ${OBJECTDIR}/_ext/48b9b4a1/font.o \ ${OBJECTDIR}/_ext/48b9b4a1/hack.o \ ${OBJECTDIR}/_ext/48b9b4a1/spi.o \ - ${OBJECTDIR}/_ext/48b9b4a1/tft.o \ - ${OBJECTDIR}/bmp.o + ${OBJECTDIR}/_ext/48b9b4a1/tft.o # C Compiler Flags @@ -72,6 +72,10 @@ ${MKDIR} -p ${OBJECTDIR}/_ext/48b9b4a1 $(COMPILE.c) -g -DBAUD=9600 -DF_CPU=8000000UL -D__AVR_ATmega328P__ -D__flash=volatile -I. -std=c99 -o ${OBJECTDIR}/_ext/48b9b4a1/avrtft.o /home/dode/dev/avrtft/avrtft.c +${OBJECTDIR}/_ext/48b9b4a1/bmp.o: /home/dode/dev/avrtft/bmp.c + ${MKDIR} -p ${OBJECTDIR}/_ext/48b9b4a1 + $(COMPILE.c) -g -DBAUD=9600 -DF_CPU=8000000UL -D__AVR_ATmega328P__ -D__flash=volatile -I. -o ${OBJECTDIR}/_ext/48b9b4a1/bmp.o /home/dode/dev/avrtft/bmp.c + ${OBJECTDIR}/_ext/48b9b4a1/display.o: /home/dode/dev/avrtft/display.c ${MKDIR} -p ${OBJECTDIR}/_ext/48b9b4a1 $(COMPILE.c) -g -DBAUD=9600 -DF_CPU=8000000UL -D__AVR_ATmega328P__ -D__flash=volatile -I. -std=c99 -o ${OBJECTDIR}/_ext/48b9b4a1/display.o /home/dode/dev/avrtft/display.c @@ -92,10 +96,6 @@ ${MKDIR} -p ${OBJECTDIR}/_ext/48b9b4a1 $(COMPILE.c) -g -DBAUD=9600 -DF_CPU=8000000UL -D__AVR_ATmega328P__ -D__flash=volatile -I. -std=c99 -o ${OBJECTDIR}/_ext/48b9b4a1/tft.o /home/dode/dev/avrtft/tft.c -${OBJECTDIR}/bmp.o: bmp.c - ${MKDIR} -p ${OBJECTDIR} - $(COMPILE.c) -g -DBAUD=9600 -DF_CPU=8000000UL -D__AVR_ATmega328P__ -D__flash=volatile -I. -o ${OBJECTDIR}/bmp.o bmp.c - # Subprojects .build-subprojects: diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index 828cd08..4e79394 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -46,6 +46,10 @@ + + + + @@ -56,10 +60,6 @@ - - - -