mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes compile error of SSD1331 with tasmota-display 

+ improves layout of DisplayMode 1.
This commit is contained in:
Jeroen Vermeulen - MageHost 2021-01-02 20:30:00 +01:00
parent dbe1f09c48
commit 3d1db430bb
5 changed files with 85 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
lib/lib_display/Adafruit_SSD1331-1.2.0/Adafruit_SPITFT_Renderer.cpp
View File

@ -1,5 +1,10 @@
/*
* This class is basically the same as Adafruit_SPITFT.
* The only difference is: it extends Renderer which extends Adafruit_GFX.
* The original Adafruit_SPITFT class directly extends Adafruit_GFX.
*/
/*! /*!
* @file Adafruit_SPITFT.cpp * @file Adafruit_SPITFT_Renderer.cpp
* *
* @mainpage Adafruit SPI TFT Displays (and some others) * @mainpage Adafruit SPI TFT Displays (and some others)
* *
@ -92,7 +97,7 @@
#endif // end USE_SPI_DMA #endif // end USE_SPI_DMA
// Possible values for Adafruit_SPITFT.connection: // Possible values for Adafruit_SPITFT_Renderer.connection:
#define TFT_HARD_SPI 0 ///< Display interface = hardware SPI #define TFT_HARD_SPI 0 ///< Display interface = hardware SPI
#define TFT_SOFT_SPI 1 ///< Display interface = software SPI #define TFT_SOFT_SPI 1 ///< Display interface = software SPI
#define TFT_PARALLEL 2 ///< Display interface = 8- or 16-bit parallel #define TFT_PARALLEL 2 ///< Display interface = 8- or 16-bit parallel
@ -101,7 +106,7 @@
// CONSTRUCTORS ------------------------------------------------------------ // CONSTRUCTORS ------------------------------------------------------------
/*! /*!
@brief Adafruit_SPITFT constructor for software (bitbang) SPI. @brief Adafruit_SPITFT_Renderer constructor for software (bitbang) SPI.
@param w Display width in pixels at default rotation setting (0). @param w Display width in pixels at default rotation setting (0).
@param h Display height in pixels at default rotation setting (0). @param h Display height in pixels at default rotation setting (0).
@param cs Arduino pin # for chip-select (-1 if unused, tie CS low). @param cs Arduino pin # for chip-select (-1 if unused, tie CS low).
@ -112,12 +117,12 @@
can be tied to MCU reset, default of -1 means unused). can be tied to MCU reset, default of -1 means unused).
@param miso Arduino pin # for bitbang SPI MISO signal (optional, @param miso Arduino pin # for bitbang SPI MISO signal (optional,
-1 default, many displays don't support SPI read). -1 default, many displays don't support SPI read).
@return Adafruit_SPITFT object. @return Adafruit_SPITFT_Renderer object.
@note Output pins are not initialized; application typically will @note Output pins are not initialized; application typically will
need to call subclass' begin() function, which in turn calls need to call subclass' begin() function, which in turn calls
this library's initSPI() function to initialize pins. this library's initSPI() function to initialize pins.
*/ */
Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, Adafruit_SPITFT_Renderer::Adafruit_SPITFT_Renderer(uint16_t w, uint16_t h,
int8_t cs, int8_t dc, int8_t mosi, int8_t sck, int8_t rst, int8_t miso) : int8_t cs, int8_t dc, int8_t mosi, int8_t sck, int8_t rst, int8_t miso) :
Renderer(w, h), connection(TFT_SOFT_SPI), _rst(rst), _cs(cs), _dc(dc) { Renderer(w, h), connection(TFT_SOFT_SPI), _rst(rst), _cs(cs), _dc(dc) {
swspi._sck = sck; swspi._sck = sck;
@ -223,7 +228,7 @@ Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h,
} }
/*! /*!
@brief Adafruit_SPITFT constructor for hardware SPI using the board's @brief Adafruit_SPITFT_Renderer constructor for hardware SPI using the board's
default SPI peripheral. default SPI peripheral.
@param w Display width in pixels at default rotation setting (0). @param w Display width in pixels at default rotation setting (0).
@param h Display height in pixels at default rotation setting (0). @param h Display height in pixels at default rotation setting (0).
@ -231,20 +236,20 @@ Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h,
@param dc Arduino pin # for data/command select (required). @param dc Arduino pin # for data/command select (required).
@param rst Arduino pin # for display reset (optional, display reset @param rst Arduino pin # for display reset (optional, display reset
can be tied to MCU reset, default of -1 means unused). can be tied to MCU reset, default of -1 means unused).
@return Adafruit_SPITFT object. @return Adafruit_SPITFT_Renderer object.
@note Output pins are not initialized; application typically will @note Output pins are not initialized; application typically will
need to call subclass' begin() function, which in turn calls need to call subclass' begin() function, which in turn calls
this library's initSPI() function to initialize pins. this library's initSPI() function to initialize pins.
*/ */
#if defined(ESP8266) // See notes below #if defined(ESP8266) // See notes below
Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, int8_t cs, Adafruit_SPITFT_Renderer::Adafruit_SPITFT_Renderer(uint16_t w, uint16_t h, int8_t cs,
int8_t dc, int8_t rst) : Renderer(w, h), int8_t dc, int8_t rst) : Renderer(w, h),
connection(TFT_HARD_SPI), _rst(rst), _cs(cs), _dc(dc) { connection(TFT_HARD_SPI), _rst(rst), _cs(cs), _dc(dc) {
hwspi._spi = &SPI; hwspi._spi = &SPI;
} }
#else // !ESP8266 #else // !ESP8266
Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, int8_t cs, Adafruit_SPITFT_Renderer::Adafruit_SPITFT_Renderer(uint16_t w, uint16_t h, int8_t cs,
int8_t dc, int8_t rst) : Adafruit_SPITFT(w, h, &SPI, cs, dc, rst) { int8_t dc, int8_t rst) : Adafruit_SPITFT_Renderer(w, h, &SPI, cs, dc, rst) {
// This just invokes the hardware SPI constructor below, // This just invokes the hardware SPI constructor below,
// passing the default SPI device (&SPI). // passing the default SPI device (&SPI).
} }
@ -258,7 +263,7 @@ Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, int8_t cs,
// but if there's any library out there that creates a 'virtual' SPIClass // but if there's any library out there that creates a 'virtual' SPIClass
// peripheral and drives it with software bitbanging, that's not supported. // peripheral and drives it with software bitbanging, that's not supported.
/*! /*!
@brief Adafruit_SPITFT constructor for hardware SPI using a specific @brief Adafruit_SPITFT_Renderer constructor for hardware SPI using a specific
SPI peripheral. SPI peripheral.
@param w Display width in pixels at default rotation (0). @param w Display width in pixels at default rotation (0).
@param h Display height in pixels at default rotation (0). @param h Display height in pixels at default rotation (0).
@ -267,7 +272,7 @@ Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, int8_t cs,
@param dc Arduino pin # for data/command select (required). @param dc Arduino pin # for data/command select (required).
@param rst Arduino pin # for display reset (optional, display reset @param rst Arduino pin # for display reset (optional, display reset
can be tied to MCU reset, default of -1 means unused). can be tied to MCU reset, default of -1 means unused).
@return Adafruit_SPITFT object. @return Adafruit_SPITFT_Renderer object.
@note Output pins are not initialized in constructor; application @note Output pins are not initialized in constructor; application
typically will need to call subclass' begin() function, which typically will need to call subclass' begin() function, which
in turn calls this library's initSPI() function to initialize in turn calls this library's initSPI() function to initialize
@ -279,7 +284,7 @@ Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, int8_t cs,
GPIO manually. Do this BEFORE calling the display-specific GPIO manually. Do this BEFORE calling the display-specific
begin or init function. Unfortunate but unavoidable. begin or init function. Unfortunate but unavoidable.
*/ */
Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, SPIClass *spiClass, Adafruit_SPITFT_Renderer::Adafruit_SPITFT_Renderer(uint16_t w, uint16_t h, SPIClass *spiClass,
int8_t cs, int8_t dc, int8_t rst) : Renderer(w, h), int8_t cs, int8_t dc, int8_t rst) : Renderer(w, h),
connection(TFT_HARD_SPI), _rst(rst), _cs(cs), _dc(dc) { connection(TFT_HARD_SPI), _rst(rst), _cs(cs), _dc(dc) {
hwspi._spi = spiClass; hwspi._spi = spiClass;
@ -344,13 +349,13 @@ Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, SPIClass *spiClass,
#endif // end !ESP8266 #endif // end !ESP8266
/*! /*!
@brief Adafruit_SPITFT constructor for parallel display connection. @brief Adafruit_SPITFT_Renderer constructor for parallel display connection.
@param w Display width in pixels at default rotation (0). @param w Display width in pixels at default rotation (0).
@param h Display height in pixels at default rotation (0). @param h Display height in pixels at default rotation (0).
@param busWidth If tft16 (enumeration in header file), is a 16-bit @param busWidth If tft16 (enumeration in header file), is a 16-bit
parallel connection, else 8-bit. parallel connection, else 8-bit.
16-bit isn't fully implemented or tested yet so 16-bit isn't fully implemented or tested yet so
applications should pass "tft8bitbus" for now...needed to applications should pass "tft8bitbus_Renderer" for now...needed to
stick a required enum argument in there to stick a required enum argument in there to
disambiguate this constructor from the soft-SPI case. disambiguate this constructor from the soft-SPI case.
Argument is ignored on 8-bit architectures (no 'wide' Argument is ignored on 8-bit architectures (no 'wide'
@ -367,7 +372,7 @@ Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, SPIClass *spiClass,
@param rst Arduino pin # for display reset (optional, display reset @param rst Arduino pin # for display reset (optional, display reset
can be tied to MCU reset, default of -1 means unused). can be tied to MCU reset, default of -1 means unused).
@param rd Arduino pin # for read strobe (optional, -1 if unused). @param rd Arduino pin # for read strobe (optional, -1 if unused).
@return Adafruit_SPITFT object. @return Adafruit_SPITFT_Renderer object.
@note Output pins are not initialized; application typically will need @note Output pins are not initialized; application typically will need
to call subclass' begin() function, which in turn calls this to call subclass' begin() function, which in turn calls this
library's initSPI() function to initialize pins. library's initSPI() function to initialize pins.
@ -375,13 +380,13 @@ Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, SPIClass *spiClass,
only SPI displays, parallel being a recent addition (but not only SPI displays, parallel being a recent addition (but not
wanting to break existing code). wanting to break existing code).
*/ */
Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, tftBusWidth busWidth, Adafruit_SPITFT_Renderer::Adafruit_SPITFT_Renderer(uint16_t w, uint16_t h, tftBusWidth_Renderer busWidth,
int8_t d0, int8_t wr, int8_t dc, int8_t cs, int8_t rst, int8_t rd) : int8_t d0, int8_t wr, int8_t dc, int8_t cs, int8_t rst, int8_t rd) :
Renderer(w, h), connection(TFT_PARALLEL), _rst(rst), _cs(cs), _dc(dc) { Renderer(w, h), connection(TFT_PARALLEL), _rst(rst), _cs(cs), _dc(dc) {
tft8._d0 = d0; tft8._d0 = d0;
tft8._wr = wr; tft8._wr = wr;
tft8._rd = rd; tft8._rd = rd;
tft8.wide = (busWidth == tft16bitbus); tft8.wide = (busWidth == tft16bitbus_Renderer);
#if defined(USE_FAST_PINIO) #if defined(USE_FAST_PINIO)
#if defined(HAS_PORT_SET_CLR) #if defined(HAS_PORT_SET_CLR)
#if defined(CORE_TEENSY) #if defined(CORE_TEENSY)
@ -523,7 +528,7 @@ Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, tftBusWidth busWidth,
could probably be made private...quite a few class functions could probably be made private...quite a few class functions
were generously put in the public section. were generously put in the public section.
*/ */
void Adafruit_SPITFT::initSPI(uint32_t freq, uint8_t spiMode) { void Adafruit_SPITFT_Renderer::initSPI(uint32_t freq, uint8_t spiMode) {
if(!freq) freq = DEFAULT_SPI_FREQ; // If no freq specified, use default if(!freq) freq = DEFAULT_SPI_FREQ; // If no freq specified, use default
@ -893,7 +898,7 @@ void Adafruit_SPITFT::initSPI(uint32_t freq, uint8_t spiMode) {
using hardware SPI and transactions are supported). Required using hardware SPI and transactions are supported). Required
for all display types; not an SPI-specific function. for all display types; not an SPI-specific function.
*/ */
void Adafruit_SPITFT::startWrite(void) { void Adafruit_SPITFT_Renderer::startWrite(void) {
SPI_BEGIN_TRANSACTION(); SPI_BEGIN_TRANSACTION();
if(_cs >= 0) SPI_CS_LOW(); if(_cs >= 0) SPI_CS_LOW();
} }
@ -904,7 +909,7 @@ void Adafruit_SPITFT::startWrite(void) {
using hardware SPI and transactions are supported). Required using hardware SPI and transactions are supported). Required
for all display types; not an SPI-specific function. for all display types; not an SPI-specific function.
*/ */
void Adafruit_SPITFT::endWrite(void) { void Adafruit_SPITFT_Renderer::endWrite(void) {
if(_cs >= 0) SPI_CS_HIGH(); if(_cs >= 0) SPI_CS_HIGH();
SPI_END_TRANSACTION(); SPI_END_TRANSACTION();
} }
@ -925,7 +930,7 @@ void Adafruit_SPITFT::endWrite(void) {
@param y Vertical position (0 = top). @param y Vertical position (0 = top).
@param color 16-bit pixel color in '565' RGB format. @param color 16-bit pixel color in '565' RGB format.
*/ */
void Adafruit_SPITFT::writePixel(int16_t x, int16_t y, uint16_t color) { void Adafruit_SPITFT_Renderer::writePixel(int16_t x, int16_t y, uint16_t color) {
if((x >= 0) && (x < _width) && (y >= 0) && (y < _height)) { if((x >= 0) && (x < _width) && (y >= 0) && (y < _height)) {
setAddrWindow(x, y, 1, 1); setAddrWindow(x, y, 1, 1);
SPI_WRITE16(color); SPI_WRITE16(color);
@ -960,7 +965,7 @@ void Adafruit_SPITFT::writePixel(int16_t x, int16_t y, uint16_t color) {
covered...this is really here only for SAMD DMA and covered...this is really here only for SAMD DMA and
much forethought on the application side. much forethought on the application side.
*/ */
void Adafruit_SPITFT::writePixels(uint16_t *colors, uint32_t len, void Adafruit_SPITFT_Renderer::writePixels(uint16_t *colors, uint32_t len,
bool block, bool bigEndian) { bool block, bool bigEndian) {
if(!len) return; // Avoid 0-byte transfers if(!len) return; // Avoid 0-byte transfers
@ -1069,7 +1074,7 @@ void Adafruit_SPITFT::writePixels(uint16_t *colors, uint32_t len,
is not enabled, and is not needed if blocking writePixels() is not enabled, and is not needed if blocking writePixels()
was used (as is the default case). was used (as is the default case).
*/ */
void Adafruit_SPITFT::dmaWait(void) { void Adafruit_SPITFT_Renderer::dmaWait(void) {
#if defined(USE_SPI_DMA) #if defined(USE_SPI_DMA)
while(dma_busy); while(dma_busy);
#if defined(__SAMD51__) || defined(_SAMD21_) #if defined(__SAMD51__) || defined(_SAMD21_)
@ -1089,7 +1094,7 @@ void Adafruit_SPITFT::dmaWait(void) {
@param color 16-bit pixel color in '565' RGB format. @param color 16-bit pixel color in '565' RGB format.
@param len Number of pixels to draw. @param len Number of pixels to draw.
*/ */
void Adafruit_SPITFT::writeColor(uint16_t color, uint32_t len) { void Adafruit_SPITFT_Renderer::writeColor(uint16_t color, uint32_t len) {
if(!len) return; // Avoid 0-byte transfers if(!len) return; // Avoid 0-byte transfers
@ -1342,7 +1347,7 @@ void Adafruit_SPITFT::writeColor(uint16_t color, uint32_t len) {
optimize for the 'if' case, not the 'else' -- avoids branches optimize for the 'if' case, not the 'else' -- avoids branches
and rejects clipped rectangles at the least-work possibility. and rejects clipped rectangles at the least-work possibility.
*/ */
void Adafruit_SPITFT::writeFillRect(int16_t x, int16_t y, void Adafruit_SPITFT_Renderer::writeFillRect(int16_t x, int16_t y,
int16_t w, int16_t h, uint16_t color) { int16_t w, int16_t h, uint16_t color) {
if(w && h) { // Nonzero width and height? if(w && h) { // Nonzero width and height?
if(w < 0) { // If negative width... if(w < 0) { // If negative width...
@ -1384,7 +1389,7 @@ void Adafruit_SPITFT::writeFillRect(int16_t x, int16_t y,
negative = point of first corner). negative = point of first corner).
@param color 16-bit line color in '565' RGB format. @param color 16-bit line color in '565' RGB format.
*/ */
void inline Adafruit_SPITFT::writeFastHLine(int16_t x, int16_t y, int16_t w, void inline Adafruit_SPITFT_Renderer::writeFastHLine(int16_t x, int16_t y, int16_t w,
uint16_t color) { uint16_t color) {
if((y >= 0) && (y < _height) && w) { // Y on screen, nonzero width if((y >= 0) && (y < _height) && w) { // Y on screen, nonzero width
if(w < 0) { // If negative width... if(w < 0) { // If negative width...
@ -1415,7 +1420,7 @@ void inline Adafruit_SPITFT::writeFastHLine(int16_t x, int16_t y, int16_t w,
negative = above first point). negative = above first point).
@param color 16-bit line color in '565' RGB format. @param color 16-bit line color in '565' RGB format.
*/ */
void inline Adafruit_SPITFT::writeFastVLine(int16_t x, int16_t y, int16_t h, void inline Adafruit_SPITFT_Renderer::writeFastVLine(int16_t x, int16_t y, int16_t h,
uint16_t color) { uint16_t color) {
if((x >= 0) && (x < _width) && h) { // X on screen, nonzero height if((x >= 0) && (x < _width) && h) { // X on screen, nonzero height
if(h < 0) { // If negative height... if(h < 0) { // If negative height...
@ -1454,7 +1459,7 @@ void inline Adafruit_SPITFT::writeFastVLine(int16_t x, int16_t y, int16_t h,
@note This is a new function, no graphics primitives besides rects @note This is a new function, no graphics primitives besides rects
and horizontal/vertical lines are written to best use this yet. and horizontal/vertical lines are written to best use this yet.
*/ */
inline void Adafruit_SPITFT::writeFillRectPreclipped(int16_t x, int16_t y, inline void Adafruit_SPITFT_Renderer::writeFillRectPreclipped(int16_t x, int16_t y,
int16_t w, int16_t h, uint16_t color) { int16_t w, int16_t h, uint16_t color) {
setAddrWindow(x, y, w, h); setAddrWindow(x, y, w, h);
writeColor(color, (uint32_t)w * h); writeColor(color, (uint32_t)w * h);
@ -1478,7 +1483,7 @@ inline void Adafruit_SPITFT::writeFillRectPreclipped(int16_t x, int16_t y,
@param y Vertical position (0 = top). @param y Vertical position (0 = top).
@param color 16-bit pixel color in '565' RGB format. @param color 16-bit pixel color in '565' RGB format.
*/ */
void Adafruit_SPITFT::drawPixel(int16_t x, int16_t y, uint16_t color) { void Adafruit_SPITFT_Renderer::drawPixel(int16_t x, int16_t y, uint16_t color) {
// Clip first... // Clip first...
if((x >= 0) && (x < _width) && (y >= 0) && (y < _height)) { if((x >= 0) && (x < _width) && (y >= 0) && (y < _height)) {
// THEN set up transaction (if needed) and draw... // THEN set up transaction (if needed) and draw...
@ -1508,7 +1513,7 @@ void Adafruit_SPITFT::drawPixel(int16_t x, int16_t y, uint16_t color) {
performed at all if the rectangle is rejected. It's really not performed at all if the rectangle is rejected. It's really not
that much code. that much code.
*/ */
void Adafruit_SPITFT::fillRect(int16_t x, int16_t y, int16_t w, int16_t h, void Adafruit_SPITFT_Renderer::fillRect(int16_t x, int16_t y, int16_t w, int16_t h,
uint16_t color) { uint16_t color) {
if(w && h) { // Nonzero width and height? if(w && h) { // Nonzero width and height?
if(w < 0) { // If negative width... if(w < 0) { // If negative width...
@ -1556,7 +1561,7 @@ void Adafruit_SPITFT::fillRect(int16_t x, int16_t y, int16_t w, int16_t h,
writeFastHLine() to handle clipping and so forth) so that the writeFastHLine() to handle clipping and so forth) so that the
transaction isn't performed at all if the line is rejected. transaction isn't performed at all if the line is rejected.
*/ */
void Adafruit_SPITFT::drawFastHLine(int16_t x, int16_t y, int16_t w, void Adafruit_SPITFT_Renderer::drawFastHLine(int16_t x, int16_t y, int16_t w,
uint16_t color) { uint16_t color) {
if((y >= 0) && (y < _height) && w) { // Y on screen, nonzero width if((y >= 0) && (y < _height) && w) { // Y on screen, nonzero width
if(w < 0) { // If negative width... if(w < 0) { // If negative width...
@ -1592,7 +1597,7 @@ void Adafruit_SPITFT::drawFastHLine(int16_t x, int16_t y, int16_t w,
writeFastVLine() to handle clipping and so forth) so that the writeFastVLine() to handle clipping and so forth) so that the
transaction isn't performed at all if the line is rejected. transaction isn't performed at all if the line is rejected.
*/ */
void Adafruit_SPITFT::drawFastVLine(int16_t x, int16_t y, int16_t h, void Adafruit_SPITFT_Renderer::drawFastVLine(int16_t x, int16_t y, int16_t h,
uint16_t color) { uint16_t color) {
if((x >= 0) && (x < _width) && h) { // X on screen, nonzero height if((x >= 0) && (x < _width) && h) { // X on screen, nonzero height
if(h < 0) { // If negative height... if(h < 0) { // If negative height...
@ -1620,7 +1625,7 @@ void Adafruit_SPITFT::drawFastVLine(int16_t x, int16_t y, int16_t h,
any user code relies on it. Consider it DEPRECATED. any user code relies on it. Consider it DEPRECATED.
@param color 16-bit pixel color in '565' RGB format. @param color 16-bit pixel color in '565' RGB format.
*/ */
void Adafruit_SPITFT::pushColor(uint16_t color) { void Adafruit_SPITFT_Renderer::pushColor(uint16_t color) {
startWrite(); startWrite();
SPI_WRITE16(color); SPI_WRITE16(color);
endWrite(); endWrite();
@ -1642,7 +1647,7 @@ void Adafruit_SPITFT::pushColor(uint16_t color) {
@param w Width of bitmap in pixels. @param w Width of bitmap in pixels.
@param h Height of bitmap in pixels. @param h Height of bitmap in pixels.
*/ */
void Adafruit_SPITFT::drawRGBBitmap(int16_t x, int16_t y, void Adafruit_SPITFT_Renderer::drawRGBBitmap(int16_t x, int16_t y,
uint16_t *pcolors, int16_t w, int16_t h) { uint16_t *pcolors, int16_t w, int16_t h) {
int16_t x2, y2; // Lower-right coord int16_t x2, y2; // Lower-right coord
@ -1685,7 +1690,7 @@ void Adafruit_SPITFT::drawRGBBitmap(int16_t x, int16_t y,
Self-contained, no transaction setup required. Self-contained, no transaction setup required.
@param i true = inverted display, false = normal display. @param i true = inverted display, false = normal display.
*/ */
void Adafruit_SPITFT::invertDisplay(bool i) { void Adafruit_SPITFT_Renderer::invertDisplay(bool i) {
startWrite(); startWrite();
writeCommand(i ? invertOnCommand : invertOffCommand); writeCommand(i ? invertOnCommand : invertOffCommand);
endWrite(); endWrite();
@ -1701,17 +1706,17 @@ void Adafruit_SPITFT::invertDisplay(bool i) {
@param blue 8-bit blue brightnesss (0 = off, 255 = max). @param blue 8-bit blue brightnesss (0 = off, 255 = max).
@return 'Packed' 16-bit color value (565 format). @return 'Packed' 16-bit color value (565 format).
*/ */
uint16_t Adafruit_SPITFT::color565(uint8_t red, uint8_t green, uint8_t blue) { uint16_t Adafruit_SPITFT_Renderer::color565(uint8_t red, uint8_t green, uint8_t blue) {
return ((red & 0xF8) << 8) | ((green & 0xFC) << 3) | (blue >> 3); return ((red & 0xF8) << 8) | ((green & 0xFC) << 3) | (blue >> 3);
} }
/*! /*!
@brief Adafruit_SPITFT Send Command handles complete sending of commands and data @brief Adafruit_SPITFT_Renderer Send Command handles complete sending of commands and data
@param commandByte The Command Byte @param commandByte The Command Byte
@param dataBytes A pointer to the Data bytes to send @param dataBytes A pointer to the Data bytes to send
@param numDataBytes The number of bytes we should send @param numDataBytes The number of bytes we should send
*/ */
void Adafruit_SPITFT::sendCommand(uint8_t commandByte, uint8_t *dataBytes, uint8_t numDataBytes) { void Adafruit_SPITFT_Renderer::sendCommand(uint8_t commandByte, uint8_t *dataBytes, uint8_t numDataBytes) {
SPI_BEGIN_TRANSACTION(); SPI_BEGIN_TRANSACTION();
if(_cs >= 0) SPI_CS_LOW(); if(_cs >= 0) SPI_CS_LOW();
@ -1729,12 +1734,12 @@ void Adafruit_SPITFT::sendCommand(uint8_t commandByte, uint8_t *dataBytes, uint8
} }
/*! /*!
@brief Adafruit_SPITFT Send Command handles complete sending of commands and const data @brief Adafruit_SPITFT_Renderer Send Command handles complete sending of commands and const data
@param commandByte The Command Byte @param commandByte The Command Byte
@param dataBytes A pointer to the Data bytes to send @param dataBytes A pointer to the Data bytes to send
@param numDataBytes The number of bytes we should send @param numDataBytes The number of bytes we should send
*/ */
void Adafruit_SPITFT::sendCommand(uint8_t commandByte, const uint8_t *dataBytes, uint8_t numDataBytes) { void Adafruit_SPITFT_Renderer::sendCommand(uint8_t commandByte, const uint8_t *dataBytes, uint8_t numDataBytes) {
SPI_BEGIN_TRANSACTION(); SPI_BEGIN_TRANSACTION();
if(_cs >= 0) SPI_CS_LOW(); if(_cs >= 0) SPI_CS_LOW();
@ -1761,7 +1766,7 @@ void Adafruit_SPITFT::sendCommand(uint8_t commandByte, const uint8_t *dataBytes,
@return Unsigned 8-bit data read from display register. @return Unsigned 8-bit data read from display register.
*/ */
/**************************************************************************/ /**************************************************************************/
uint8_t Adafruit_SPITFT::readcommand8(uint8_t commandByte, uint8_t index) { uint8_t Adafruit_SPITFT_Renderer::readcommand8(uint8_t commandByte, uint8_t index) {
uint8_t result; uint8_t result;
startWrite(); startWrite();
SPI_DC_LOW(); // Command mode SPI_DC_LOW(); // Command mode
@ -1788,7 +1793,7 @@ uint8_t Adafruit_SPITFT::readcommand8(uint8_t commandByte, uint8_t index) {
chip-select operation -- see startWrite() for a function that chip-select operation -- see startWrite() for a function that
encapsulated both actions. encapsulated both actions.
*/ */
inline void Adafruit_SPITFT::SPI_BEGIN_TRANSACTION(void) { inline void Adafruit_SPITFT_Renderer::SPI_BEGIN_TRANSACTION(void) {
if(connection == TFT_HARD_SPI) { if(connection == TFT_HARD_SPI) {
#if defined(SPI_HAS_TRANSACTION) #if defined(SPI_HAS_TRANSACTION)
hwspi._spi->beginTransaction(hwspi.settings); hwspi._spi->beginTransaction(hwspi.settings);
@ -1816,7 +1821,7 @@ inline void Adafruit_SPITFT::SPI_BEGIN_TRANSACTION(void) {
NOT include a chip-deselect operation -- see endWrite() for a NOT include a chip-deselect operation -- see endWrite() for a
function that encapsulated both actions. function that encapsulated both actions.
*/ */
inline void Adafruit_SPITFT::SPI_END_TRANSACTION(void) { inline void Adafruit_SPITFT_Renderer::SPI_END_TRANSACTION(void) {
#if defined(SPI_HAS_TRANSACTION) #if defined(SPI_HAS_TRANSACTION)
if(connection == TFT_HARD_SPI) { if(connection == TFT_HARD_SPI) {
hwspi._spi->endTransaction(); hwspi._spi->endTransaction();
@ -1833,7 +1838,7 @@ inline void Adafruit_SPITFT::SPI_END_TRANSACTION(void) {
This function is used even if display connection is parallel. This function is used even if display connection is parallel.
@param b 8-bit value to write. @param b 8-bit value to write.
*/ */
void Adafruit_SPITFT::spiWrite(uint8_t b) { void Adafruit_SPITFT_Renderer::spiWrite(uint8_t b) {
if(connection == TFT_HARD_SPI) { if(connection == TFT_HARD_SPI) {
#if defined(__AVR__) #if defined(__AVR__)
AVR_WRITESPI(b); AVR_WRITESPI(b);
@ -1869,7 +1874,7 @@ void Adafruit_SPITFT::spiWrite(uint8_t b) {
function -- just use spiWrite(). function -- just use spiWrite().
@param cmd 8-bit command to write. @param cmd 8-bit command to write.
*/ */
void Adafruit_SPITFT::writeCommand(uint8_t cmd) { void Adafruit_SPITFT_Renderer::writeCommand(uint8_t cmd) {
SPI_DC_LOW(); SPI_DC_LOW();
spiWrite(cmd); spiWrite(cmd);
SPI_DC_HIGH(); SPI_DC_HIGH();
@ -1885,7 +1890,7 @@ void Adafruit_SPITFT::writeCommand(uint8_t cmd) {
@return Unsigned 8-bit value read (always zero if USE_FAST_PINIO is @return Unsigned 8-bit value read (always zero if USE_FAST_PINIO is
not supported by the MCU architecture). not supported by the MCU architecture).
*/ */
uint8_t Adafruit_SPITFT::spiRead(void) { uint8_t Adafruit_SPITFT_Renderer::spiRead(void) {
uint8_t b = 0; uint8_t b = 0;
uint16_t w = 0; uint16_t w = 0;
if(connection == TFT_HARD_SPI) { if(connection == TFT_HARD_SPI) {
@ -1943,7 +1948,7 @@ uint8_t Adafruit_SPITFT::spiRead(void) {
/*! /*!
@brief Set the software (bitbang) SPI MOSI line HIGH. @brief Set the software (bitbang) SPI MOSI line HIGH.
*/ */
inline void Adafruit_SPITFT::SPI_MOSI_HIGH(void) { inline void Adafruit_SPITFT_Renderer::SPI_MOSI_HIGH(void) {
#if defined(USE_FAST_PINIO) #if defined(USE_FAST_PINIO)
#if defined(HAS_PORT_SET_CLR) #if defined(HAS_PORT_SET_CLR)
#if defined(KINETISK) #if defined(KINETISK)
@ -1965,7 +1970,7 @@ inline void Adafruit_SPITFT::SPI_MOSI_HIGH(void) {
/*! /*!
@brief Set the software (bitbang) SPI MOSI line LOW. @brief Set the software (bitbang) SPI MOSI line LOW.
*/ */
inline void Adafruit_SPITFT::SPI_MOSI_LOW(void) { inline void Adafruit_SPITFT_Renderer::SPI_MOSI_LOW(void) {
#if defined(USE_FAST_PINIO) #if defined(USE_FAST_PINIO)
#if defined(HAS_PORT_SET_CLR) #if defined(HAS_PORT_SET_CLR)
#if defined(KINETISK) #if defined(KINETISK)
@ -1987,7 +1992,7 @@ inline void Adafruit_SPITFT::SPI_MOSI_LOW(void) {
/*! /*!
@brief Set the software (bitbang) SPI SCK line HIGH. @brief Set the software (bitbang) SPI SCK line HIGH.
*/ */
inline void Adafruit_SPITFT::SPI_SCK_HIGH(void) { inline void Adafruit_SPITFT_Renderer::SPI_SCK_HIGH(void) {
#if defined(USE_FAST_PINIO) #if defined(USE_FAST_PINIO)
#if defined(HAS_PORT_SET_CLR) #if defined(HAS_PORT_SET_CLR)
#if defined(KINETISK) #if defined(KINETISK)
@ -2012,7 +2017,7 @@ inline void Adafruit_SPITFT::SPI_SCK_HIGH(void) {
/*! /*!
@brief Set the software (bitbang) SPI SCK line LOW. @brief Set the software (bitbang) SPI SCK line LOW.
*/ */
inline void Adafruit_SPITFT::SPI_SCK_LOW(void) { inline void Adafruit_SPITFT_Renderer::SPI_SCK_LOW(void) {
#if defined(USE_FAST_PINIO) #if defined(USE_FAST_PINIO)
#if defined(HAS_PORT_SET_CLR) #if defined(HAS_PORT_SET_CLR)
#if defined(KINETISK) #if defined(KINETISK)
@ -2038,7 +2043,7 @@ inline void Adafruit_SPITFT::SPI_SCK_LOW(void) {
@brief Read the state of the software (bitbang) SPI MISO line. @brief Read the state of the software (bitbang) SPI MISO line.
@return true if HIGH, false if LOW. @return true if HIGH, false if LOW.
*/ */
inline bool Adafruit_SPITFT::SPI_MISO_READ(void) { inline bool Adafruit_SPITFT_Renderer::SPI_MISO_READ(void) {
#if defined(USE_FAST_PINIO) #if defined(USE_FAST_PINIO)
#if defined(KINETISK) #if defined(KINETISK)
return *swspi.misoPort; return *swspi.misoPort;
@ -2060,7 +2065,7 @@ inline bool Adafruit_SPITFT::SPI_MISO_READ(void) {
that. Again, staying compatible with outside code. that. Again, staying compatible with outside code.
@param w 16-bit value to write. @param w 16-bit value to write.
*/ */
void Adafruit_SPITFT::SPI_WRITE16(uint16_t w) { void Adafruit_SPITFT_Renderer::SPI_WRITE16(uint16_t w) {
if(connection == TFT_HARD_SPI) { if(connection == TFT_HARD_SPI) {
#if defined(__AVR__) #if defined(__AVR__)
AVR_WRITESPI(w >> 8); AVR_WRITESPI(w >> 8);
@ -2107,7 +2112,7 @@ void Adafruit_SPITFT::SPI_WRITE16(uint16_t w) {
Sorry about that. Again, staying compatible with outside code. Sorry about that. Again, staying compatible with outside code.
@param l 32-bit value to write. @param l 32-bit value to write.
*/ */
void Adafruit_SPITFT::SPI_WRITE32(uint32_t l) { void Adafruit_SPITFT_Renderer::SPI_WRITE32(uint32_t l) {
if(connection == TFT_HARD_SPI) { if(connection == TFT_HARD_SPI) {
#if defined(__AVR__) #if defined(__AVR__)
AVR_WRITESPI(l >> 24); AVR_WRITESPI(l >> 24);
@ -2162,7 +2167,7 @@ void Adafruit_SPITFT::SPI_WRITE32(uint32_t l) {
@brief Set the WR line LOW, then HIGH. Used for parallel-connected @brief Set the WR line LOW, then HIGH. Used for parallel-connected
interfaces when writing data. interfaces when writing data.
*/ */
inline void Adafruit_SPITFT::TFT_WR_STROBE(void) { inline void Adafruit_SPITFT_Renderer::TFT_WR_STROBE(void) {
#if defined(USE_FAST_PINIO) #if defined(USE_FAST_PINIO)
#if defined(HAS_PORT_SET_CLR) #if defined(HAS_PORT_SET_CLR)
#if defined(KINETISK) #if defined(KINETISK)
@ -2186,7 +2191,7 @@ inline void Adafruit_SPITFT::TFT_WR_STROBE(void) {
@brief Set the RD line HIGH. Used for parallel-connected interfaces @brief Set the RD line HIGH. Used for parallel-connected interfaces
when reading data. when reading data.
*/ */
inline void Adafruit_SPITFT::TFT_RD_HIGH(void) { inline void Adafruit_SPITFT_Renderer::TFT_RD_HIGH(void) {
#if defined(USE_FAST_PINIO) #if defined(USE_FAST_PINIO)
#if defined(HAS_PORT_SET_CLR) #if defined(HAS_PORT_SET_CLR)
*tft8.rdPortSet = tft8.rdPinMask; *tft8.rdPortSet = tft8.rdPinMask;
@ -2202,7 +2207,7 @@ inline void Adafruit_SPITFT::TFT_RD_HIGH(void) {
@brief Set the RD line LOW. Used for parallel-connected interfaces @brief Set the RD line LOW. Used for parallel-connected interfaces
when reading data. when reading data.
*/ */
inline void Adafruit_SPITFT::TFT_RD_LOW(void) { inline void Adafruit_SPITFT_Renderer::TFT_RD_LOW(void) {
#if defined(USE_FAST_PINIO) #if defined(USE_FAST_PINIO)
#if defined(HAS_PORT_SET_CLR) #if defined(HAS_PORT_SET_CLR)
*tft8.rdPortClr = tft8.rdPinMask; *tft8.rdPortClr = tft8.rdPinMask;

23
lib/lib_display/Adafruit_SSD1331-1.2.0/Adafruit_SPITFT_Renderer.h
View File

@ -1,5 +1,10 @@
/*
* This class is basically the same as Adafruit_SPITFT.
* The only difference is: it extends Renderer which extends Adafruit_GFX.
* The original Adafruit_SPITFT class directly extends Adafruit_GFX.
*/
/*! /*!
* @file Adafruit_SPITFT.h * @file Adafruit_SPITFT_Renderer.h
* *
* Part of Adafruit's GFX graphics library. Originally this class was * Part of Adafruit's GFX graphics library. Originally this class was
* written to handle a range of color TFT displays connected via SPI, * written to handle a range of color TFT displays connected via SPI,
@ -17,8 +22,8 @@
* BSD license, all text here must be included in any redistribution. * BSD license, all text here must be included in any redistribution.
*/ */
#ifndef _ADAFRUIT_SPITFT_H_ #ifndef _ADAFRUIT_SPITFT_RENDERER_H_
#define _ADAFRUIT_SPITFT_H_ #define _ADAFRUIT_SPITFT_RENDERER_H_
#if !defined(__AVR_ATtiny85__) // Not for ATtiny, at all #if !defined(__AVR_ATtiny85__) // Not for ATtiny, at all
@ -100,7 +105,7 @@ typedef volatile ADAGFX_PORT_t* PORTreg_t; ///< PORT register type
// an enumerated type as the first argument: tft8 (for 8-bit parallel) or // an enumerated type as the first argument: tft8 (for 8-bit parallel) or
// tft16 (for 16-bit)...even though 16-bit isn't fully implemented or tested // tft16 (for 16-bit)...even though 16-bit isn't fully implemented or tested
// and might never be, still needed that disambiguation from soft SPI. // and might never be, still needed that disambiguation from soft SPI.
enum tftBusWidth { tft8bitbus, tft16bitbus }; ///< For first arg to parallel constructor enum tftBusWidth_Renderer { tft8bitbus_Renderer, tft16bitbus_Renderer }; ///< For first arg to parallel constructor
// CLASS DEFINITION -------------------------------------------------------- // CLASS DEFINITION --------------------------------------------------------
@ -117,7 +122,7 @@ enum tftBusWidth { tft8bitbus, tft16bitbus }; ///< For first arg to parallel con
again to avoid breaking a lot of other code. If in doubt, read again to avoid breaking a lot of other code. If in doubt, read
the comments. the comments.
*/ */
class Adafruit_SPITFT : public Renderer { class Adafruit_SPITFT_Renderer : public Renderer {
public: public:
@ -128,7 +133,7 @@ class Adafruit_SPITFT : public Renderer {
// (reset, miso). cs argument is required but can be -1 if unused -- // (reset, miso). cs argument is required but can be -1 if unused --
// rather than moving it to the optional arguments, it was done this way // rather than moving it to the optional arguments, it was done this way
// to avoid breaking existing code (-1 option was a later addition). // to avoid breaking existing code (-1 option was a later addition).
Adafruit_SPITFT(uint16_t w, uint16_t h, Adafruit_SPITFT_Renderer(uint16_t w, uint16_t h,
int8_t cs, int8_t dc, int8_t mosi, int8_t sck, int8_t cs, int8_t dc, int8_t mosi, int8_t sck,
int8_t rst = -1, int8_t miso = -1); int8_t rst = -1, int8_t miso = -1);
@ -137,14 +142,14 @@ class Adafruit_SPITFT : public Renderer {
// optional reset pin. cs is required but can be -1 if unused -- rather // optional reset pin. cs is required but can be -1 if unused -- rather
// than moving it to the optional arguments, it was done this way to // than moving it to the optional arguments, it was done this way to
// avoid breaking existing code (-1 option was a later addition). // avoid breaking existing code (-1 option was a later addition).
Adafruit_SPITFT(uint16_t w, uint16_t h, Adafruit_SPITFT_Renderer(uint16_t w, uint16_t h,
int8_t cs, int8_t dc, int8_t rst = -1); int8_t cs, int8_t dc, int8_t rst = -1);
#if !defined(ESP8266) // See notes in .cpp #if !defined(ESP8266) // See notes in .cpp
// Hardware SPI constructor using an arbitrary SPI peripheral: expects // Hardware SPI constructor using an arbitrary SPI peripheral: expects
// width & height (rotation 0), SPIClass pointer, 2 signal pins (cs, dc) // width & height (rotation 0), SPIClass pointer, 2 signal pins (cs, dc)
// and optional reset pin. cs is required but can be -1 if unused. // and optional reset pin. cs is required but can be -1 if unused.
Adafruit_SPITFT(uint16_t w, uint16_t h, SPIClass *spiClass, Adafruit_SPITFT_Renderer(uint16_t w, uint16_t h, SPIClass *spiClass,
int8_t cs, int8_t dc, int8_t rst = -1); int8_t cs, int8_t dc, int8_t rst = -1);
#endif // end !ESP8266 #endif // end !ESP8266
@ -153,7 +158,7 @@ class Adafruit_SPITFT : public Renderer {
// pins (d0, wr, dc), 3 optional pins (cs, rst, rd). 16-bit parallel // pins (d0, wr, dc), 3 optional pins (cs, rst, rd). 16-bit parallel
// isn't even fully implemented but the 'wide' flag was added as a // isn't even fully implemented but the 'wide' flag was added as a
// required argument to avoid ambiguity with other constructors. // required argument to avoid ambiguity with other constructors.
Adafruit_SPITFT(uint16_t w, uint16_t h, tftBusWidth busWidth, Adafruit_SPITFT_Renderer(uint16_t w, uint16_t h, tftBusWidth_Renderer busWidth,
int8_t d0, int8_t wr, int8_t dc, int8_t d0, int8_t wr, int8_t dc,
int8_t cs = -1, int8_t rst = -1, int8_t rd = -1); int8_t cs = -1, int8_t rst = -1, int8_t rd = -1);

8
lib/lib_display/Adafruit_SSD1331-1.2.0/Adafruit_SSD1331.cpp
View File

@ -146,7 +146,7 @@ void Adafruit_SSD1331::begin(uint32_t freq) {
/**************************************************************************/ /**************************************************************************/
Adafruit_SSD1331::Adafruit_SSD1331(int8_t cs, int8_t dc, int8_t mosi, Adafruit_SSD1331::Adafruit_SSD1331(int8_t cs, int8_t dc, int8_t mosi,
int8_t sclk, int8_t rst) int8_t sclk, int8_t rst)
: Adafruit_SPITFT(TFTWIDTH, TFTHEIGHT, cs, dc, mosi, sclk, rst, -1) {} : Adafruit_SPITFT_Renderer(TFTWIDTH, TFTHEIGHT, cs, dc, mosi, sclk, rst, -1) {}
/**************************************************************************/ /**************************************************************************/
/*! /*!
@ -157,7 +157,7 @@ Adafruit_SSD1331::Adafruit_SSD1331(int8_t cs, int8_t dc, int8_t mosi,
*/ */
/**************************************************************************/ /**************************************************************************/
Adafruit_SSD1331::Adafruit_SSD1331(int8_t cs, int8_t dc, int8_t rst) Adafruit_SSD1331::Adafruit_SSD1331(int8_t cs, int8_t dc, int8_t rst)
: Adafruit_SPITFT(TFTWIDTH, TFTHEIGHT, cs, dc, rst) {} : Adafruit_SPITFT_Renderer(TFTWIDTH, TFTHEIGHT, cs, dc, rst) {}
/**************************************************************************/ /**************************************************************************/
/*! /*!
@ -173,9 +173,9 @@ Adafruit_SSD1331::Adafruit_SSD1331(SPIClass *spi, int8_t cs, int8_t dc,
int8_t rst) int8_t rst)
: :
#if defined(ESP8266) #if defined(ESP8266)
Adafruit_SPITFT(TFTWIDTH, TFTWIDTH, cs, dc, rst) { Adafruit_SPITFT_Renderer(TFTWIDTH, TFTWIDTH, cs, dc, rst) {
#else #else
Adafruit_SPITFT(TFTWIDTH, TFTWIDTH, spi, cs, dc, rst) { Adafruit_SPITFT_Renderer(TFTWIDTH, TFTWIDTH, spi, cs, dc, rst) {
#endif #endif
} }

2
lib/lib_display/Adafruit_SSD1331-1.2.0/Adafruit_SSD1331.h
View File

@ -55,7 +55,7 @@
#define SSD1331_CMD_VCOMH 0xBE //!< Set Vcomh voltge #define SSD1331_CMD_VCOMH 0xBE //!< Set Vcomh voltge
/// Class to manage hardware interface with SSD1331 chipset /// Class to manage hardware interface with SSD1331 chipset
class Adafruit_SSD1331 : public Adafruit_SPITFT { class Adafruit_SSD1331 : public Adafruit_SPITFT_Renderer {
public: public:
Adafruit_SSD1331(int8_t cs, int8_t dc, int8_t mosi, int8_t sclk, int8_t rst); Adafruit_SSD1331(int8_t cs, int8_t dc, int8_t mosi, int8_t sclk, int8_t rst);
Adafruit_SSD1331(int8_t cs, int8_t dc, int8_t rst); Adafruit_SSD1331(int8_t cs, int8_t dc, int8_t rst);

6
tasmota/xdsp_14_SSD1331.ino
View File

@ -19,7 +19,7 @@
#ifdef USE_SPI #ifdef USE_SPI
#ifdef USE_DISPLAY #ifdef USE_DISPLAY
#ifdef USE_DISPLAY_SSD1331 #ifdef USE_DISPLAY_SSD1331 // This driver eats 5.3 K flash
#define XDSP_14 14 #define XDSP_14 14
@ -87,6 +87,7 @@ void SSD1331_InitDriver() {
renderer->setTextFont(1); renderer->setTextFont(1);
renderer->DrawStringAt(24, 27, "SSD1331", SSD1331_RED, 0); renderer->DrawStringAt(24, 27, "SSD1331", SSD1331_RED, 0);
delay(1000); delay(1000);
renderer->clearDisplay();
#endif #endif
color_type = COLOR_COLOR; color_type = COLOR_COLOR;
@ -139,10 +140,11 @@ void SSD1331Time(void) {
char line[12]; char line[12];
renderer->clearDisplay(); renderer->clearDisplay();
renderer->setCursor(0, 0);
snprintf_P(line, sizeof(line), PSTR(" %02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second); // [ 12:34:56 ] snprintf_P(line, sizeof(line), PSTR(" %02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), RtcTime.hour, RtcTime.minute, RtcTime.second); // [ 12:34:56 ]
renderer->setCursor(17, 20);
renderer->println(line); renderer->println(line);
snprintf_P(line, sizeof(line), PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%04d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year); // [01-02-2018] snprintf_P(line, sizeof(line), PSTR("%02d" D_MONTH_DAY_SEPARATOR "%02d" D_YEAR_MONTH_SEPARATOR "%04d"), RtcTime.day_of_month, RtcTime.month, RtcTime.year); // [01-02-2018]
renderer->setCursor(17, 35);
renderer->println(line); renderer->println(line);
renderer->Updateframe(); renderer->Updateframe();
} }