aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Saunders <trsaunders@gmail.com>2012-06-22 10:26:41 +0100
committerThomas Saunders <trsaunders@gmail.com>2012-06-22 10:26:41 +0100
commitd0e3a0636e052594bc0f2794527a9e0f0b9aa43a (patch)
tree88780d435cd45dd8d7801fc462be52b1b320dc92
parent427346aaf231e91b2c025f62152380d36e7ea6a5 (diff)
downloaduGFX-d0e3a0636e052594bc0f2794527a9e0f0b9aa43a.tar.gz
uGFX-d0e3a0636e052594bc0f2794527a9e0f0b9aa43a.tar.bz2
uGFX-d0e3a0636e052594bc0f2794527a9e0f0b9aa43a.zip
removed glcdconf.h
it makes more sense for this config to be in the board file / application header / chconf.h
-rw-r--r--drivers/lcd/s6d1121_lld.h1
-rw-r--r--drivers/lcd/ssd1289_lld.h1
-rw-r--r--drivers/touchpad/ads7843_lld.h2
-rw-r--r--drivers/touchpad/xpt2046_lld.h2
-rw-r--r--glcdconf.h21
5 files changed, 2 insertions, 25 deletions
diff --git a/drivers/lcd/s6d1121_lld.h b/drivers/lcd/s6d1121_lld.h
index edc6da33..24e207e8 100644
--- a/drivers/lcd/s6d1121_lld.h
+++ b/drivers/lcd/s6d1121_lld.h
@@ -2,7 +2,6 @@
#define S6D1121_H
#include "glcd.h"
-#include "glcdconf.h"
#ifdef LCD_USE_S6D1121
diff --git a/drivers/lcd/ssd1289_lld.h b/drivers/lcd/ssd1289_lld.h
index 3cedcc90..f1f07937 100644
--- a/drivers/lcd/ssd1289_lld.h
+++ b/drivers/lcd/ssd1289_lld.h
@@ -2,7 +2,6 @@
#define SSD1289_H
#include "glcd.h"
-#include "glcdconf.h"
#ifdef LCD_USE_SSD1289
diff --git a/drivers/touchpad/ads7843_lld.h b/drivers/touchpad/ads7843_lld.h
index 388aacc8..121e6288 100644
--- a/drivers/touchpad/ads7843_lld.h
+++ b/drivers/touchpad/ads7843_lld.h
@@ -1,7 +1,7 @@
#ifndef ADS7843_LLD_H
#define ADS7843_LLD_H
-#include "glcdconf.h"
+#include "glcd.h"
#include "touchpad.h"
#ifdef TOUCHPAD_USE_ADS7843
diff --git a/drivers/touchpad/xpt2046_lld.h b/drivers/touchpad/xpt2046_lld.h
index ed7a0d09..c3a12077 100644
--- a/drivers/touchpad/xpt2046_lld.h
+++ b/drivers/touchpad/xpt2046_lld.h
@@ -1,7 +1,7 @@
#ifndef XPT2046_LLD_H
#define XPT2046_LLD_H
-#include "glcdconf.h"
+#include "glcd.h"
#include "touchpad.h"
#ifdef TOUCHPAD_USE_XPT2046
diff --git a/glcdconf.h b/glcdconf.h
deleted file mode 100644
index 657ee32d..00000000
--- a/glcdconf.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef GLCDCONF_H
-#define GLCDCONF_H
-
-
-/***** LCD CONTROLLER *****/
-#define LCD_USE_SSD1289
-// #define LCD_USE_S6D1121
-
-
-/***** LCD INTERFACE *****/
-#define LCD_USE_GPIO
-// #define LCD_USE_SPI
-// #define LCD_USE_FSMC
-
-
-/***** TOUCHPAD CONTROLLER *****/
-// #define TOUCHPAD_USE_ADS7843
-#define TOUCHPAD_USE_XPT2046
-
-
-#endif