Basically i glued Peter Drescher and Simon Ford libs in a GraphicsDisplay class, then derived TFT or LCD class (which inherits Protocols class), then the most derived ones (Inits), which are per-display and are the only part needed to be adapted to diff hw.
Dependents: testUniGraphic_150217 maze_TFT_MMA8451Q TFT_test_frdm-kl25z TFT_test_NUCLEO-F411RE ... more
Revision 9:1749ae993cfe, committed 2015-02-17
- Comitter:
- dreschpe
- Date:
- Tue Feb 17 22:35:07 2015 +0000
- Parent:
- 8:26757296c79d
- Child:
- 10:668cf78ff93a
- Commit message:
- Add param LCDSIZE_x, LCDSIZE_Y to constructor. They are optional.
Changed in this revision
--- a/Inits/ILI9341.cpp Tue Feb 17 17:54:14 2015 +0000
+++ b/Inits/ILI9341.cpp Tue Feb 17 22:35:07 2015 +0000
@@ -10,12 +10,13 @@
// display settings ///////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////
-#define LCDSIZE_X 240 // display X pixels, TFTs are usually portrait view
-#define LCDSIZE_Y 320 // display Y pixels
+// put in constructor
+//#define LCDSIZE_X 240 // display X pixels, TFTs are usually portrait view
+//#define LCDSIZE_Y 320 // display Y pixels
-ILI9341::ILI9341(proto_t displayproto, PortName port, PinName CS, PinName reset, PinName DC, PinName WR, PinName RD, const char *name)
+ILI9341::ILI9341(proto_t displayproto, PortName port, PinName CS, PinName reset, PinName DC, PinName WR, PinName RD, const char *name, unsigned int LCDSIZE_X, unsigned int LCDSIZE_Y)
: TFT(displayproto, port, CS, reset, DC, WR, RD, LCDSIZE_X, LCDSIZE_Y, name)
{
hw_reset();
@@ -26,7 +27,7 @@
cls();
locate(0,0);
}
-ILI9341::ILI9341(proto_t displayproto, int Hz, PinName mosi, PinName miso, PinName sclk, PinName CS, PinName reset, PinName DC, const char *name)
+ILI9341::ILI9341(proto_t displayproto, int Hz, PinName mosi, PinName miso, PinName sclk, PinName CS, PinName reset, PinName DC, const char *name, unsigned int LCDSIZE_X , unsigned int LCDSIZE_Y)
: TFT(displayproto, Hz, mosi, miso, sclk, CS, reset, DC, LCDSIZE_X, LCDSIZE_Y, name)
{
hw_reset(); //TFT class forwards to Protocol class
--- a/Inits/ILI9341.h Tue Feb 17 17:54:14 2015 +0000
+++ b/Inits/ILI9341.h Tue Feb 17 22:35:07 2015 +0000
@@ -23,8 +23,11 @@
* @param WR pin connected to SDI of display
* @param RD pin connected to RS of display
* @param name The name used by the parent class to access the interface
+ * @param LCDSIZE_X x size in pixel - optional
+ * @param LCDSIZE_Y y size in pixel - optional
*/
- ILI9341(proto_t displayproto, PortName port, PinName CS, PinName reset, PinName DC, PinName WR, PinName RD, const char* name);
+ //ILI9341(proto_t displayproto, PortName port, PinName CS, PinName reset, PinName DC, PinName WR, PinName RD, const char* name);
+ ILI9341(proto_t displayproto, PortName port, PinName CS, PinName reset, PinName DC, PinName WR, PinName RD, const char* name ,const unsigned int LCDSIZE_X = 240, unsigned int LCDSIZE_Y = 320);
/** Create an SPI display interface
* @param displayproto only supports SPI_8
@@ -36,8 +39,11 @@
* @param reset pin connected to RESET of display
* @param DC pin connected to data/command of display
* @param name The name used by the parent class to access the interface
+ * @param LCDSIZE_X x size in pixel - optional
+ * @param LCDSIZE_Y y size in pixel - optional
*/
- ILI9341(proto_t displayproto, int Hz, PinName mosi, PinName miso, PinName sclk, PinName CS, PinName reset, PinName DC, const char* name);
+ //ILI9341(proto_t displayproto, int Hz, PinName mosi, PinName miso, PinName sclk, PinName CS, PinName reset, PinName DC, const char* name);
+ ILI9341(proto_t displayproto, int Hz, PinName mosi, PinName miso, PinName sclk, PinName CS, PinName reset, PinName DC, const char* name ,unsigned int LCDSIZE_X = 240, unsigned int LCDSIZE_Y = 320);
--- a/Inits/ILI9486.cpp Tue Feb 17 17:54:14 2015 +0000
+++ b/Inits/ILI9486.cpp Tue Feb 17 22:35:07 2015 +0000
@@ -9,12 +9,13 @@
// display settings ///////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////
-#define LCDSIZE_X 320 // display X pixels, TFTs are usually portrait view
-#define LCDSIZE_Y 480 // display Y pixels
+// put in constructor
+//#define LCDSIZE_X 320 // display X pixels, TFTs are usually portrait view
+//#define LCDSIZE_Y 480 // display Y pixels
-ILI9486::ILI9486(proto_t displayproto, PortName port, PinName CS, PinName reset, PinName DC, PinName WR, PinName RD, const char *name)
+ILI9486::ILI9486(proto_t displayproto, PortName port, PinName CS, PinName reset, PinName DC, PinName WR, PinName RD, const char *name , unsigned int LCDSIZE_X, unsigned int LCDSIZE_Y)
: TFT(displayproto, port, CS, reset, DC, WR, RD, LCDSIZE_X, LCDSIZE_Y, name)
{
hw_reset();
@@ -25,7 +26,7 @@
cls();
locate(0,0);
}
-ILI9486::ILI9486(proto_t displayproto, int Hz, PinName mosi, PinName miso, PinName sclk, PinName CS, PinName reset, PinName DC, const char *name)
+ILI9486::ILI9486(proto_t displayproto, int Hz, PinName mosi, PinName miso, PinName sclk, PinName CS, PinName reset, PinName DC, const char *name, unsigned int LCDSIZE_X, unsigned int LCDSIZE_Y)
: TFT(displayproto, Hz, mosi, miso, sclk, CS, reset, DC, LCDSIZE_X, LCDSIZE_Y, name)
{
hw_reset(); //TFT class forwards to Protocol class
--- a/Inits/ILI9486.h Tue Feb 17 17:54:14 2015 +0000
+++ b/Inits/ILI9486.h Tue Feb 17 22:35:07 2015 +0000
@@ -23,8 +23,10 @@
* @param WR pin connected to SDI of display
* @param RD pin connected to RS of display
* @param name The name used by the parent class to access the interface
+ * @param LCDSIZE_X x size in pixel - optional
+ * @param LCDSIZE_Y y size in pixel - optional
*/
- ILI9486(proto_t displayproto, PortName port, PinName CS, PinName reset, PinName DC, PinName WR, PinName RD, const char* name);
+ ILI9486(proto_t displayproto, PortName port, PinName CS, PinName reset, PinName DC, PinName WR, PinName RD, const char* name, unsigned int LCDSIZE_X = 320, unsigned int LCDSIZE_Y = 480);
/** Create an SPI display interface
* @param displayproto only supports SPI_8
@@ -36,8 +38,10 @@
* @param reset pin connected to RESET of display
* @param DC pin connected to data/command of display
* @param name The name used by the parent class to access the interface
+ * @param LCDSIZE_X x size in pixel - optional
+ * @param LCDSIZE_Y y size in pixel - optional
*/
- ILI9486(proto_t displayproto, int Hz, PinName mosi, PinName miso, PinName sclk, PinName CS, PinName reset, PinName DC, const char* name);
+ ILI9486(proto_t displayproto, int Hz, PinName mosi, PinName miso, PinName sclk, PinName CS, PinName reset, PinName DC, const char* name, unsigned int LCDSIZE_X = 320, unsigned int LCDSIZE_Y= 480);
--- a/Inits/IST3020.cpp Tue Feb 17 17:54:14 2015 +0000
+++ b/Inits/IST3020.cpp Tue Feb 17 22:35:07 2015 +0000
@@ -12,12 +12,13 @@
/////////////////////////////////////////////////////////////////////////
#define IC_X_SEGS 256 // IST3020 SEG has range 0-255 (255-0 if ADC=1), check your datasheet, important for the orientation
#define IC_Y_COMS 64 // IST3020 COM has range 0-63 (63-0 if SHL=1), check your datasheet, important for the orientation
-#define LCDSIZE_X 192 // display X pixels, IST3020 is advertised as 224x65 but display size could be smaller
-#define LCDSIZE_Y 64 // display Y pixels, the 65th is for accessing "icons"
+// put in constructor
+//#define LCDSIZE_X 192 // display X pixels, IST3020 is advertised as 224x65 but display size could be smaller
+//#define LCDSIZE_Y 64 // display Y pixels, the 65th is for accessing "icons"
-IST3020::IST3020(proto_t displayproto, PortName port, PinName CS, PinName reset, PinName DC, PinName WR, PinName RD, const char *name)
+IST3020::IST3020(proto_t displayproto, PortName port, PinName CS, PinName reset, PinName DC, PinName WR, PinName RD, const char *name, unsigned int LCDSIZE_X, unsigned int LCDSIZE_Y)
: LCD(displayproto, port, CS, reset, DC, WR, RD, LCDSIZE_X, LCDSIZE_Y, IC_X_SEGS, IC_Y_COMS, name)
{
hw_reset();
@@ -27,7 +28,7 @@
set_orientation(1);
locate(0,0);
}
-IST3020::IST3020(proto_t displayproto, int Hz, PinName mosi, PinName miso, PinName sclk, PinName CS, PinName reset, PinName DC, const char *name)
+IST3020::IST3020(proto_t displayproto, int Hz, PinName mosi, PinName miso, PinName sclk, PinName CS, PinName reset, PinName DC, const char *name, unsigned int LCDSIZE_X, unsigned int LCDSIZE_Y)
: LCD(displayproto, Hz, mosi, miso, sclk, CS, reset, DC, LCDSIZE_X, LCDSIZE_Y, IC_X_SEGS, IC_Y_COMS, name)
{
hw_reset();
--- a/Inits/IST3020.h Tue Feb 17 17:54:14 2015 +0000
+++ b/Inits/IST3020.h Tue Feb 17 22:35:07 2015 +0000
@@ -23,8 +23,10 @@
* @param WR pin connected to SDI of display
* @param RD pin connected to RS of display
* @param name The name used by the parent class to access the interface
+ * @param LCDSIZE_X x size in pixel - optional
+ * @param LCDSIZE_Y y size in pixel - optional
*/
- IST3020(proto_t displayproto, PortName port, PinName CS, PinName reset, PinName DC, PinName WR, PinName RD, const char* name);
+ IST3020(proto_t displayproto, PortName port, PinName CS, PinName reset, PinName DC, PinName WR, PinName RD, const char* name, unsigned int LCDSIZE_X = 192, unsigned int LCDSIZE_Y = 64);
/** Create an SPI display interface
* @param displayproto only supports SPI_8
@@ -36,8 +38,10 @@
* @param reset pin connected to RESET of display
* @param DC pin connected to data/command of display
* @param name The name used by the parent class to access the interface
+ * @param LCDSIZE_X x size in pixel - optional
+ * @param LCDSIZE_Y y size in pixel - optional
*/
- IST3020(proto_t displayproto, int Hz, PinName mosi, PinName miso, PinName sclk, PinName CS, PinName reset, PinName DC, const char* name);
+ IST3020(proto_t displayproto, int Hz, PinName mosi, PinName miso, PinName sclk, PinName CS, PinName reset, PinName DC, const char* name, unsigned int LCDSIZE_X = 192, unsigned int LCDSIZE_Y = 64);
--- a/Inits/TFT_MIPI.cpp Tue Feb 17 17:54:14 2015 +0000
+++ b/Inits/TFT_MIPI.cpp Tue Feb 17 22:35:07 2015 +0000
@@ -9,12 +9,13 @@
// display settings ///////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////
-#define LCDSIZE_X 320 // display X pixels, TFTs are usually portrait view
-#define LCDSIZE_Y 480 // display Y pixels
+// put in constructor
+//#define LCDSIZE_X 320 // display X pixels, TFTs are usually portrait view
+//#define LCDSIZE_Y 480 // display Y pixels
-TFT_MIPI::TFT_MIPI(proto_t displayproto, PortName port, PinName CS, PinName reset, PinName DC, PinName WR, PinName RD, const char *name)
+TFT_MIPI::TFT_MIPI(proto_t displayproto, PortName port, PinName CS, PinName reset, PinName DC, PinName WR, PinName RD, const char *name , unsigned int LCDSIZE_X, unsigned int LCDSIZE_Y)
: TFT(displayproto, port, CS, reset, DC, WR, RD, LCDSIZE_X, LCDSIZE_Y, name)
{
hw_reset();
@@ -26,7 +27,7 @@
cls();
locate(0,0);
}
-TFT_MIPI::TFT_MIPI(proto_t displayproto, int Hz, PinName mosi, PinName miso, PinName sclk, PinName CS, PinName reset, PinName DC, const char *name)
+TFT_MIPI::TFT_MIPI(proto_t displayproto, int Hz, PinName mosi, PinName miso, PinName sclk, PinName CS, PinName reset, PinName DC, const char *name , unsigned int LCDSIZE_X , unsigned int LCDSIZE_Y )
: TFT(displayproto, Hz, mosi, miso, sclk, CS, reset, DC, LCDSIZE_X, LCDSIZE_Y, name)
{
hw_reset(); //TFT class forwards to Protocol class
--- a/Inits/TFT_MIPI.h Tue Feb 17 17:54:14 2015 +0000
+++ b/Inits/TFT_MIPI.h Tue Feb 17 22:35:07 2015 +0000
@@ -24,8 +24,10 @@
* @param WR pin connected to SDI of display
* @param RD pin connected to RS of display
* @param name The name used by the parent class to access the interface
+ * @param LCDSIZE_X x size in pixel - optional
+ * @param LCDSIZE_Y y size in pixel - optional
*/
- TFT_MIPI(proto_t displayproto, PortName port, PinName CS, PinName reset, PinName DC, PinName WR, PinName RD, const char* name);
+ TFT_MIPI(proto_t displayproto, PortName port, PinName CS, PinName reset, PinName DC, PinName WR, PinName RD, const char* name , unsigned int LCDSIZE_X = 320, unsigned int LCDSIZE_Y = 480);
/** Create an SPI display interface
* @param displayproto only supports SPI_8
@@ -37,8 +39,10 @@
* @param reset pin connected to RESET of display
* @param DC pin connected to data/command of display
* @param name The name used by the parent class to access the interface
+ * @param LCDSIZE_X x size in pixel - optional
+ * @param LCDSIZE_Y y size in pixel - optional
*/
- TFT_MIPI(proto_t displayproto, int Hz, PinName mosi, PinName miso, PinName sclk, PinName CS, PinName reset, PinName DC, const char* name);
+ TFT_MIPI(proto_t displayproto, int Hz, PinName mosi, PinName miso, PinName sclk, PinName CS, PinName reset, PinName DC, const char* name , unsigned int LCDSIZE_X = 320, unsigned int LCDSIZE_Y = 480);
--- a/Inits/UC1608.cpp Tue Feb 17 17:54:14 2015 +0000
+++ b/Inits/UC1608.cpp Tue Feb 17 22:35:07 2015 +0000
@@ -10,12 +10,12 @@
/////////////////////////////////////////////////////////////////////////
#define IC_X_SEGS 240 // UC1608 SEG has range 0-239 (239-0 if MX=1), check your datasheet, important for the orientation
#define IC_Y_COMS 128 // UC1608 COM has range 0-127 (127-0 if MY=1), check your datasheet, important for the orientation
-#define LCDSIZE_X 240 // display X pixels
-#define LCDSIZE_Y 120 // display Y pixels, UC1608 is advertised as 240x128 but display size could be smaller
+//#define LCDSIZE_X 240 // display X pixels
+//#define LCDSIZE_Y 120 // display Y pixels, UC1608 is advertised as 240x128 but display size could be smaller
-UC1608::UC1608(proto_t displayproto, PortName port, PinName CS, PinName reset, PinName DC, PinName WR, PinName RD, const char *name)
+UC1608::UC1608(proto_t displayproto, PortName port, PinName CS, PinName reset, PinName DC, PinName WR, PinName RD, const char *name , unsigned int LCDSIZE_X, unsigned int LCDSIZE_Y)
: LCD(displayproto, port, CS, reset, DC, WR, RD, LCDSIZE_X, LCDSIZE_Y, IC_X_SEGS, IC_Y_COMS, name)
{
hw_reset();
@@ -25,7 +25,7 @@
set_orientation(1);
locate(0,0);
}
-UC1608::UC1608(proto_t displayproto, int Hz, PinName mosi, PinName miso, PinName sclk, PinName CS, PinName reset, PinName DC, const char *name)
+UC1608::UC1608(proto_t displayproto, int Hz, PinName mosi, PinName miso, PinName sclk, PinName CS, PinName reset, PinName DC, const char *name, unsigned int LCDSIZE_X, unsigned int LCDSIZE_Y)
: LCD(displayproto, Hz, mosi, miso, sclk, CS, reset, DC, LCDSIZE_X, LCDSIZE_Y, IC_X_SEGS, IC_Y_COMS, name)
{
hw_reset();
--- a/Inits/UC1608.h Tue Feb 17 17:54:14 2015 +0000
+++ b/Inits/UC1608.h Tue Feb 17 22:35:07 2015 +0000
@@ -23,8 +23,10 @@
* @param WR pin connected to SDI of display
* @param RD pin connected to RS of display
* @param name The name used by the parent class to access the interface
+ * @param LCDSIZE_X x size in pixel - optional
+ * @param LCDSIZE_Y y size in pixel - optional
*/
- UC1608(proto_t displayproto, PortName port, PinName CS, PinName reset, PinName DC, PinName WR, PinName RD, const char* name);
+ UC1608(proto_t displayproto, PortName port, PinName CS, PinName reset, PinName DC, PinName WR, PinName RD, const char* name, unsigned int LCDSIZE_X = 240, unsigned int LCDSIZE_Y = 120);
/** Create an SPI display interface
* @param displayproto only supports SPI_8
@@ -36,8 +38,10 @@
* @param reset pin connected to RESET of display
* @param DC pin connected to data/command of display
* @param name The name used by the parent class to access the interface
+ * @param LCDSIZE_X x size in pixel - optional
+ * @param LCDSIZE_Y y size in pixel - optional
*/
- UC1608(proto_t displayproto, int Hz, PinName mosi, PinName miso, PinName sclk, PinName CS, PinName reset, PinName DC, const char* name);
+ UC1608(proto_t displayproto, int Hz, PinName mosi, PinName miso, PinName sclk, PinName CS, PinName reset, PinName DC, const char* name , unsigned int LCDSIZE_X = 240, unsigned int LCDSIZE_Y = 120);
/** set the contrast of the screen
* @note here overrided because of not standard command
GraphicsDisplay