Dual CANbus monitor and instrumentation cluster supporting ILI9341 display controller

Dependencies:   SPI_TFTx2_ILI9341 TOUCH_TFTx2_ILI9341 TFT_fonts mbed

Fork of CANary by Tick Tock

Files at this revision

API Documentation at this revision

Comitter:
TickTock
Date:
Mon May 12 03:19:11 2014 +0000
Parent:
185:69cc7adc29a3
Child:
187:447874df5cbe
Commit message:
works

Changed in this revision

SPI_TFTx2.lib Show diff for this revision Revisions of this file
SPI_TFTx2_ILI9341.lib Show annotated file Show diff for this revision Revisions of this file
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
utility.h Show annotated file Show diff for this revision Revisions of this file
--- a/SPI_TFTx2.lib	Mon May 12 00:55:19 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-http://mbed.org/users/TickTock/code/SPI_TFTx2/#11d7980e7e1c
--- a/SPI_TFTx2_ILI9341.lib	Mon May 12 00:55:19 2014 +0000
+++ b/SPI_TFTx2_ILI9341.lib	Mon May 12 03:19:11 2014 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/TickTock/code/SPI_TFTx2_ILI9341/#66cf46ec1225
+http://mbed.org/users/TickTock/code/SPI_TFTx2_ILI9341/#522e742e62eb
--- a/TOUCH_TFTx2.lib	Mon May 12 00:55:19 2014 +0000
+++ b/TOUCH_TFTx2.lib	Mon May 12 03:19:11 2014 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/TickTock/code/TOUCH_TFTx2/#c58c98c5020a
+http://mbed.org/users/TickTock/code/TOUCH_TFTx2/#f2165aa0daa6
--- a/main.cpp	Mon May 12 00:55:19 2014 +0000
+++ b/main.cpp	Mon May 12 03:19:11 2014 +0000
@@ -49,7 +49,7 @@
 CAN can2(p30, p29);     // CAN2 (CAR) uses pins 30 and 29 (rx, tx) and pin 28 (rs)
 DigitalOut can2SleepMode(p28);     // Use pin 28 to control the sleep mode of can1
 AnalogIn mon12V(p15);
-TOUCH_TFTx2 tt(p16, p17, p19, p20, p11, p12, p13, p6, p7, p5, "TFT"); // x+,x-,y+,y-,mosi, miso, sclk, cs0, cs1, reset
+TOUCH_TFTx2 tt(p16, p17, p19, p20, p11, p12, p13, p6, p7, p5, p14, "TFT"); // x+, x-, y+, y-, mosi, miso, sclk, cs0, cs1, reset, dc
 PwmOut dled(p23);
 PwmOut spkr(p21);
 
--- a/utility.h	Mon May 12 00:55:19 2014 +0000
+++ b/utility.h	Mon May 12 03:19:11 2014 +0000
@@ -158,10 +158,10 @@
 //8:    CAN1:Sleep -->  8:CAN1:RS
 //9:    CAN1:RX    -->  4:CAN1:R
 //10:   CAN1:TX    -->  1:CAN1:D
-//11:   SPI:MOSI
-//12:   SPI:MISO
-//13:   SPI:SCLK
-//14:       NC:Ain
+//11:   SPI:MOSI-->SDI
+//12:   SPI:MISO-->SDO
+//13:   SPI:SCLK-->RS
+//14:   SPI:DC-->WR
 //15:   MON12V     -->  4K to 12V, 1K to VSS  (To be implemented)
 //16:   TOUCH_X+
 //17:   TOUCH_X-