From: Kevin Townsend Date: Fri, 23 Mar 2012 04:27:14 +0000 (+0100) Subject: v1.0.0 reorg X-Git-Url: http://git.rohieb.name/hackover2013-badge-firmware.git/commitdiff_plain/274836ae6ac5d2ae4d876af42cfe9b8fe75652fb?ds=inline v1.0.0 reorg --- diff --git a/ChangeLog.txt b/ChangeLog.txt index 4e95f7e..5f6d3e7 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -5,26 +5,37 @@ v1.0.0 - Ongoing - *** Renamed '/drivers/spiflash' to '/drivers/storage/spiflash' *** - *** Renamed '/drivers/eeprom' to '/drivers/storage/eeprom' *** - *** Renamed '/drivers/lcd' to '/drivers/display' *** +- Moved all color conversion and manipulation functions + to '/drivers/displays/tft/colors.c', and added a + few new functions: colorsDim(), etc. +- Added code to render antialiased fonts, based on + lookup tables (fast) or alpha-blending (mixed color + backgrounds). Support for AA2 (2-bit) and AA4 + (4-bit) anti-aliased fonts included. Alpha-blending + only possible on displays where pixels can be read + back. +- Added drawGradient() to drawing.c - Removed height parameter from drawButton. It's now calculated based on the font height, and centered. - Added bell to CLI when backspace is pressed beyond the starting position (cosmetic, but still useful) - Removed dependency on /core/libc files in Crossworks when redirecting printf (added printf replacement - to sysinit.c) + to sysinit.c instead) - Added basic AS1115 driver for segment displays - Added driver for HX8340-B based LCDs - Added flag to projectconfig.h to disable the default - GPIO IRQ Handler functions in code/gpio/gpio.c + GPIO IRQ Handler functions in code/gpio/gpio.c (in + case you want to make your own ISR elsewhere) - Added driver for Samsung VFD displays from Adafruit -- Added average sampling option to projectconfig.h. +- Added ADC average sampling option to projectconfig.h. This allows you to take several readings from the - ADC and return the average. Helps reduces one-off - peaks and valleys in the ADC at the expense of - slower reads. + ADC and return the average. Helps reduces peaks and + valleys in the ADC due to noisen but at the expense + of slower reads. See: "tools/validation/adctest" for more info - Added I2C driver for PN532 -- Updated and added PN532 examples at +- Updated and added PN532 examples to /tools/examples/sensors/PN532 - updated touchscreen.h to be a bit clearer during calibration, though it can still be much better diff --git a/Makefile b/Makefile index 9ded9b6..c52e557 100644 --- a/Makefile +++ b/Makefile @@ -63,14 +63,25 @@ VPATH += drivers/rtc/isl12022m OBJS += isl12022m.o # TFT LCD support -VPATH += drivers/displays/tft drivers/displays/tft/hw drivers/displays/tft/fonts +VPATH += drivers/displays/tft drivers/displays/tft/hw VPATH += drivers/displays/tft/dialogues -OBJS += drawing.o touchscreen.o bmp.o alphanumeric.o +OBJS += drawing.o touchscreen.o colors.o bmp.o alphanumeric.o + +# Bitmap (non-AA) fonts +VPATH += drivers/displays/tft/fonts +OBJS += fonts.o OBJS += dejavusans9.o dejavusansbold9.o dejavusanscondensed9.o OBJS += dejavusansmono8.o dejavusansmonobold8.o OBJS += verdana9.o verdana14.o verdanabold14.o +# Anti-aliased fonts +VPATH += drivers/displays/tft/aafonts/aa2 drivers/displays/tft/aafonts/aa4 +OBJS += aafonts.o +OBJS += DejaVuSansCondensed14_AA2.o DejaVuSansCondensedBold14_AA2.o +OBJS += DejaVuSansMono10_AA2.o DejaVuSansMono13_AA2.o DejaVuSansMono14_AA2.o + # LCD Driver (Only one can be included at a time!) +# OBJS += hx8340b.o OBJS += ILI9328.o # OBJS += ILI9325.o # OBJS += ssd1331.o diff --git a/build/codelite/LPC1343 Workspace.workspace.session b/build/codelite/LPC1343 Workspace.workspace.session index 1c9cbf6..22197ed 100644 --- a/build/codelite/LPC1343 Workspace.workspace.session +++ b/build/codelite/LPC1343 Workspace.workspace.session @@ -1,24 +1,24 @@ - + - - + + - - + + - - + + diff --git a/build/codelite/LPC1343_CodeBase.project b/build/codelite/LPC1343_CodeBase.project index 66cb644..ad75d70 100644 --- a/build/codelite/LPC1343_CodeBase.project +++ b/build/codelite/LPC1343_CodeBase.project @@ -143,7 +143,6 @@ - @@ -182,6 +181,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/build/crossworks/LPC1343_CodeBase.hzp b/build/crossworks/LPC1343_CodeBase.hzp index dfad83d..b44c622 100644 --- a/build/crossworks/LPC1343_CodeBase.hzp +++ b/build/crossworks/LPC1343_CodeBase.hzp @@ -1,7 +1,7 @@ - + @@ -103,19 +103,6 @@ - - - - - - - - - - - - - @@ -147,7 +134,12 @@ - + + + + + + @@ -159,19 +151,16 @@ - - - - - + + - + @@ -182,6 +171,10 @@ + + + + @@ -198,13 +191,31 @@ - + + + - + + + + + + + + + + + + + + + + + @@ -336,7 +347,9 @@ - + + + @@ -373,7 +386,7 @@ - + diff --git a/build/crossworks/LPC1343_CodeBase.hzs b/build/crossworks/LPC1343_CodeBase.hzs index e583c29..6e8f274 100644 --- a/build/crossworks/LPC1343_CodeBase.hzs +++ b/build/crossworks/LPC1343_CodeBase.hzs @@ -1,16 +1,7 @@ - - - - - - - - - - + @@ -33,9 +24,16 @@ + + + + + + + - + @@ -67,8 +65,6 @@ - - - - + +