Tick Tock / Mbed 2 deprecated CANary_merge

Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341

Dependencies:   SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed

Fork of CANary by Tick Tock

Files at this revision

API Documentation at this revision

Revision 185:f45e18d7b801, committed 2014-05-17

Comitter:
TickTock
Date:
Sat May 17 13:29:40 2014 +0000
Parent:
184:5ca7b78297fe
Commit message:
Merge branch

Changed in this revision

TOUCH_TFTx2.lib Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
mbed.bld Show annotated file Show diff for this revision Revisions of this file 
diff -r 5ca7b78297fe -r f45e18d7b801 TOUCH_TFTx2.lib
--- a/TOUCH_TFTx2.lib	Tue May 06 14:43:58 2014 +0000
+++ b/TOUCH_TFTx2.lib	Sat May 17 13:29:40 2014 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/TickTock/code/TOUCH_TFTx2/#c58c98c5020a
+http://mbed.org/users/TickTock/code/TOUCH_TFTx2/#f2165aa0daa6

diff -r 5ca7b78297fe -r f45e18d7b801 main.cpp
--- a/main.cpp	Tue May 06 14:43:58 2014 +0000
+++ b/main.cpp	Sat May 17 13:29:40 2014 +0000
@@ -9,7 +9,7 @@
 // * Add tire pressure cal (40psi for me = FR 38, RR 38.2, FL 37.8, RL 38 - maybe 2psi error on my tire gauge?)
 // * Add on screen messages for heater on, etc, and use refresh feature above to clear in x seconds
 // * Be more efficient with write buffer (use msgLen instead of always storing 8 bytes)
-
+// * Merge in 9341 controller option
 // rev184
 // Fixed wh adjustment algorithm
 

diff -r 5ca7b78297fe -r f45e18d7b801 mbed.bld
--- a/mbed.bld	Tue May 06 14:43:58 2014 +0000
+++ b/mbed.bld	Sat May 17 13:29:40 2014 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/mbed_official/code/mbed/builds/10b9abbe79a6
\ No newline at end of file
+http://mbed.org/users/mbed_official/code/mbed/builds/8a40adfe8776
\ No newline at end of file