From f567fd2f024de227904b30a13bc0782e8a4d12ec Mon Sep 17 00:00:00 2001 From: KTOWN Date: Mon, 14 Oct 2013 21:34:50 +0200 Subject: [PATCH] Minor cleanup --- Adafruit_RA8875.cpp | 30 +++++++++++++++--------------- Adafruit_RA8875.h | 13 +++++++------ 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/Adafruit_RA8875.cpp b/Adafruit_RA8875.cpp index 140419b..7cd737e 100644 --- a/Adafruit_RA8875.cpp +++ b/Adafruit_RA8875.cpp @@ -368,6 +368,21 @@ void Adafruit_RA8875::graphicsMode(void) { writeData(temp); } +/**************************************************************************/ +/*! + Sets the current X/Y position on the display before drawing + + @args x[in] The 0-based x location + @args y[in] The 0-base y location +*/ +/**************************************************************************/ +void Adafruit_RA8875::setXY(uint16_t x, uint16_t y) { + writeReg(RA8875_CURH0, x); + writeReg(RA8875_CURH1, x >> 8); + writeReg(RA8875_CURV0, y); + writeReg(RA8875_CURV1, y >> 8); +} + /**************************************************************************/ /*! HW accelerated function to push a chunk of raw pixel data @@ -386,21 +401,6 @@ void Adafruit_RA8875::pushPixels(uint32_t num, uint16_t p) { digitalWrite(_cs, HIGH); } -/**************************************************************************/ -/*! - Sets the current X/Y position on the display before drawing - - @args x[in] The 0-based x location - @args y[in] The 0-base y location -*/ -/**************************************************************************/ -void Adafruit_RA8875::setXY(uint16_t x, uint16_t y) { - writeReg(RA8875_CURH0, x); - writeReg(RA8875_CURH1, x >> 8); - writeReg(RA8875_CURV0, y); - writeReg(RA8875_CURV1, y >> 8); -} - /**************************************************************************/ /*! diff --git a/Adafruit_RA8875.h b/Adafruit_RA8875.h index 45d87f7..b7132fc 100644 --- a/Adafruit_RA8875.h +++ b/Adafruit_RA8875.h @@ -67,22 +67,23 @@ class Adafruit_RA8875 : public Adafruit_GFX { void textTransparent(uint16_t foreColor); void textEnlarge(uint8_t scale); void textWrite(uint8_t* buffer, uint16_t len); - - void pushPixels(uint32_t num, uint16_t p); + + /* Graphics functions */ void graphicsMode(void); void setXY(uint16_t x, uint16_t y); + void pushPixels(uint32_t num, uint16_t p); void fillRect(void); /* Adafruit_GFX functions */ void drawPixel(int16_t x, int16_t y, uint16_t color); - void drawLine(int16_t x0, int16_t y0, int16_t x1, int16_t y1, uint16_t color); void drawFastVLine(int16_t x, int16_t y, int16_t h, uint16_t color); void drawFastHLine(int16_t x, int16_t y, int16_t w, uint16_t color); - void drawRect(int16_t x, int16_t y, int16_t w, int16_t h, uint16_t color); - void fillRect(int16_t x, int16_t y, int16_t w, int16_t h, uint16_t color); - void fillScreen(uint16_t color); /* HW accelerated wrapper functions (override Adafruit_GFX prototypes) */ + void fillScreen(uint16_t color); + void drawLine(int16_t x0, int16_t y0, int16_t x1, int16_t y1, uint16_t color); + void drawRect(int16_t x, int16_t y, int16_t w, int16_t h, uint16_t color); + void fillRect(int16_t x, int16_t y, int16_t w, int16_t h, uint16_t color); void drawCircle(int16_t x0, int16_t y0, int16_t r, uint16_t color); void fillCircle(int16_t x0, int16_t y0, int16_t r, uint16_t color); void drawTriangle(int16_t x0, int16_t y0, int16_t x1, int16_t y1, int16_t x2, int16_t y2, uint16_t color);