tidy up includes

This commit is contained in:
prenticedavid
2016-09-18 16:35:00 +01:00
parent 8a2a1c5528
commit bec33db340

View File

@@ -9,19 +9,16 @@
#include "MCUFRIEND_kbv.h" #include "MCUFRIEND_kbv.h"
#if defined(USE_SERIAL) #if defined(USE_SERIAL)
//#include <SPI.h>
#include "mcufriend_serial.h" #include "mcufriend_serial.h"
//uint8_t running; //uint8_t running;
#elif defined(USE_KEIL) #elif defined(__MBED__)
#include "pin_freedom_8.h" #include "mcufriend_mbed.h"
#define CTL_INIT() { RD_OUTPUT; WR_OUTPUT; CD_OUTPUT; CS_OUTPUT; RESET_OUTPUT; } #elif defined(__CC_ARM)
#define WriteCmd(x) { CD_COMMAND; write16(x); } #include "mcufriend_keil.h"
#define WriteData(x) { CD_DATA; write16(x); }
#else #else
#include "mcufriend_shield.h" #include "mcufriend_shield.h"
#endif #endif
#define wait_ms(ms) delay(ms)
#define MIPI_DCS_REV1 (1<<0) #define MIPI_DCS_REV1 (1<<0)
#define AUTO_READINC (1<<1) #define AUTO_READINC (1<<1)
#define READ_BGR (1<<2) #define READ_BGR (1<<2)
@@ -67,11 +64,11 @@ void MCUFRIEND_kbv::reset(void)
RD_IDLE; RD_IDLE;
WR_IDLE; WR_IDLE;
RESET_IDLE; RESET_IDLE;
wait_ms(50); delay(50);
RESET_ACTIVE; RESET_ACTIVE;
wait_ms(100); delay(100);
RESET_IDLE; RESET_IDLE;
wait_ms(100); delay(100);
WriteCmdData(0xB0, 0x0000); //R61520 needs this to read ID WriteCmdData(0xB0, 0x0000); //R61520 needs this to read ID
} }