From c1e3552e321290753a068e4ded04c80b71e0c4c4 Mon Sep 17 00:00:00 2001 From: Kevin Townsend Date: Fri, 6 Apr 2012 10:39:06 +0200 Subject: [PATCH] Added IDs to drivers --- drivers/displays/tft/hw/ssd1331.c | 12 +----------- drivers/displays/tft/hw/ssd1351.c | 12 +----------- drivers/displays/tft/hw/st7735.c | 3 +-- drivers/displays/tft/hw/st7783.c | 11 +---------- 4 files changed, 4 insertions(+), 34 deletions(-) diff --git a/drivers/displays/tft/hw/ssd1331.c b/drivers/displays/tft/hw/ssd1331.c index a934ba2..b9e5d1a 100644 --- a/drivers/displays/tft/hw/ssd1331.c +++ b/drivers/displays/tft/hw/ssd1331.c @@ -109,16 +109,6 @@ uint16_t ssd1331Read(uint16_t addr) return 0; } -/**************************************************************************/ -/*! - @brief Returns the 16-bit (4-hexdigit) controller code -*/ -/**************************************************************************/ -uint16_t ssd1331Type(void) -{ - return 0x1331; -} - /**************************************************************************/ /*! @brief Sets the cursor to the specified X/Y position @@ -466,7 +456,7 @@ void lcdScroll(int16_t pixels, uint16_t fillColor) /**************************************************************************/ uint16_t lcdGetControllerID(void) { - return ssd1331Type(); + return 0x1331; } /**************************************************************************/ diff --git a/drivers/displays/tft/hw/ssd1351.c b/drivers/displays/tft/hw/ssd1351.c index 261cd7e..2c293e4 100644 --- a/drivers/displays/tft/hw/ssd1351.c +++ b/drivers/displays/tft/hw/ssd1351.c @@ -103,16 +103,6 @@ void ssd1351SendByte(uint8_t byte, uint8_t command) } } -/**************************************************************************/ -/*! - @brief Returns the 16-bit (4-hexdigit) controller code -*/ -/**************************************************************************/ -uint16_t ssd1351Type(void) -{ - return 0x1351; -} - /**************************************************************************/ /*! @brief Sets the cursor to the specified X/Y position @@ -458,7 +448,7 @@ void lcdScroll(int16_t pixels, uint16_t fillColor) /**************************************************************************/ uint16_t lcdGetControllerID(void) { - return ssd1351Type(); + return 0x1351; } /**************************************************************************/ diff --git a/drivers/displays/tft/hw/st7735.c b/drivers/displays/tft/hw/st7735.c index 939015e..db222de 100644 --- a/drivers/displays/tft/hw/st7735.c +++ b/drivers/displays/tft/hw/st7735.c @@ -433,8 +433,7 @@ void lcdScroll(int16_t pixels, uint16_t fillColor) /*************************************************/ uint16_t lcdGetControllerID(void) { - // ToDo - return 0; + return 0x7735; } /*************************************************/ diff --git a/drivers/displays/tft/hw/st7783.c b/drivers/displays/tft/hw/st7783.c index 82e9aa2..09b0dbb 100644 --- a/drivers/displays/tft/hw/st7783.c +++ b/drivers/displays/tft/hw/st7783.c @@ -148,15 +148,6 @@ void st7783Command(uint16_t command, uint16_t data) st7783WriteData(data); } -/*************************************************/ -/* Returns the 4-hexdigit controller code */ -/*************************************************/ -uint16_t st7783Type(void) -{ - st7783WriteCmd(0x0); - return st7783ReadData(); -} - /*************************************************/ void st7783SetCursor(uint16_t x, uint16_t y) { @@ -496,7 +487,7 @@ void lcdScroll(int16_t pixels, uint16_t fillColor) /*************************************************/ uint16_t lcdGetControllerID(void) { - return st7783Type(); + return 0x7783; } /*************************************************/ -- 2.20.1