From 60e7544266146c9d555f223e02ab290129724955 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Thu, 12 Jan 2023 17:50:16 +0100 Subject: [PATCH] Reduce tft interface --- src/tftespiimpl.h | 5 ----- src/tftinterface.h | 14 +++----------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/tftespiimpl.h b/src/tftespiimpl.h index 7ac8129..71646f8 100644 --- a/src/tftespiimpl.h +++ b/src/tftespiimpl.h @@ -38,8 +38,6 @@ public: void fillRectVGradient(int16_t x, int16_t y, int16_t w, int16_t h, uint32_t color1, uint32_t color2) override { m_tft.fillRectVGradient(x, y, w, h, color1, color2); } void fillRectHGradient(int16_t x, int16_t y, int16_t w, int16_t h, uint32_t color1, uint32_t color2) override { m_tft.fillRectHGradient(x, y, w, h, color1, color2); } - uint16_t drawPixel(int32_t x, int32_t y, uint32_t color, uint8_t alpha, uint32_t bg_color = 0x00FFFFFF) override { return m_tft.drawPixel(x, y, color, alpha, bg_color); } - void drawSpot(float ax, float ay, float r, uint32_t fg_color, uint32_t bg_color = 0x00FFFFFF) override { m_tft.drawSpot(ax, ay, r, fg_color, bg_color); } void fillSmoothCircle(int32_t x, int32_t y, int32_t r, uint32_t color, uint32_t bg_color = 0x00FFFFFF) override { m_tft.fillSmoothCircle(x, y, r, color, bg_color); } @@ -73,9 +71,6 @@ public: void pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const uint16_t *data) { m_tft.pushImage(x, y, w, h, data); } void pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const uint16_t *data, uint16_t transparent) { m_tft.pushImage(x, y, w, h, data, transparent); } - uint16_t decodeUTF8(const uint8_t *buf, uint16_t *index, uint16_t remaining) override { return m_tft.decodeUTF8(buf, index, remaining); } - uint16_t decodeUTF8(uint8_t c) override { return m_tft.decodeUTF8(c); } - void setSwapBytes(bool swap) override { m_tft.setSwapBytes(swap); } bool getSwapBytes(void) override { return m_tft.getSwapBytes(); } diff --git a/src/tftinterface.h b/src/tftinterface.h index e27d95d..42c98f7 100644 --- a/src/tftinterface.h +++ b/src/tftinterface.h @@ -25,7 +25,7 @@ public: virtual void setRotation(uint8_t r) = 0; // Set the display image orientation to 0, 1, 2 or 3 virtual uint8_t getRotation(void) const = 0; // Read the current rotation - virtual void setTextSize(uint8_t size); // Set character size multiplier (this increases pixel size) + virtual void setTextSize(uint8_t size) = 0; // Set character size multiplier (this increases pixel size) // Graphics drawing virtual void fillScreen(uint32_t color) = 0; @@ -36,10 +36,6 @@ public: virtual void fillRectVGradient(int16_t x, int16_t y, int16_t w, int16_t h, uint32_t color1, uint32_t color2) = 0; virtual void fillRectHGradient(int16_t x, int16_t y, int16_t w, int16_t h, uint32_t color1, uint32_t color2) = 0; - // Draw a pixel blended with the pixel colour on the TFT or sprite, return blended colour - // If bg_color is not included the background pixel colour will be read from TFT or sprite - virtual uint16_t drawPixel(int32_t x, int32_t y, uint32_t color, uint8_t alpha, uint32_t bg_color = 0x00FFFFFF) = 0; - // Draw a small anti-aliased filled circle at ax,ay with radius r (uses drawWideLine) // If bg_color is not included the background pixel colour will be read from TFT or sprite virtual void drawSpot(float ax, float ay, float r, uint32_t fg_color, uint32_t bg_color = 0x00FFFFFF) = 0; @@ -72,8 +68,8 @@ public: virtual void drawTriangle(int32_t x1,int32_t y1, int32_t x2,int32_t y2, int32_t x3,int32_t y3, uint32_t color) = 0; virtual void fillTriangle(int32_t x1,int32_t y1, int32_t x2,int32_t y2, int32_t x3,int32_t y3, uint32_t color) = 0; - virtual int16_t textWidth(std::string_view string, uint8_t font); // Returns pixel width of string in specified font - virtual int16_t fontHeight(int16_t font); // Returns pixel height of string in specified font + virtual int16_t textWidth(std::string_view string, uint8_t font) = 0; // Returns pixel width of string in specified font + virtual int16_t fontHeight(int16_t font) = 0; // Returns pixel height of string in specified font // Handle char arrays // Use with setTextDatum() to position string on TFT, and setTextPadding() to blank old displayed strings @@ -85,10 +81,6 @@ public: virtual void pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const uint16_t *data) = 0; virtual void pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const uint16_t *data, uint16_t transparent) = 0; - // Used by library and Smooth font class to extract Unicode point codes from a UTF8 encoded string - virtual uint16_t decodeUTF8(const uint8_t *buf, uint16_t *index, uint16_t remaining) = 0; - virtual uint16_t decodeUTF8(uint8_t c) = 0; - // Swap the byte order for pushImage() and pushPixels() - corrects endianness virtual void setSwapBytes(bool swap) = 0; virtual bool getSwapBytes(void) = 0;