2013-07-05 14:37:02 -04:00
|
|
|
/*
|
|
|
|
This is the core graphics library for all our displays, providing a common
|
|
|
|
set of graphics primitives (points, lines, circles, etc.). It needs to be
|
|
|
|
paired with a hardware-specific library for each display device we carry
|
|
|
|
(to handle the lower-level functions).
|
|
|
|
|
|
|
|
Adafruit invests time and resources providing this open source code, please
|
|
|
|
support Adafruit & open-source hardware by purchasing products from Adafruit!
|
2015-12-22 15:02:43 -05:00
|
|
|
|
2013-07-05 14:37:02 -04:00
|
|
|
Copyright (c) 2013 Adafruit Industries. All rights reserved.
|
|
|
|
|
|
|
|
Redistribution and use in source and binary forms, with or without
|
|
|
|
modification, are permitted provided that the following conditions are met:
|
|
|
|
|
|
|
|
- Redistributions of source code must retain the above copyright notice,
|
|
|
|
this list of conditions and the following disclaimer.
|
|
|
|
- Redistributions in binary form must reproduce the above copyright notice,
|
|
|
|
this list of conditions and the following disclaimer in the documentation
|
|
|
|
and/or other materials provided with the distribution.
|
|
|
|
|
|
|
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
|
|
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
|
|
|
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
|
|
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
|
|
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
|
|
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
|
|
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
|
|
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
|
|
POSSIBILITY OF SUCH DAMAGE.
|
2017-02-22 20:11:09 -05:00
|
|
|
*/
|
2012-03-15 15:22:34 -04:00
|
|
|
|
2016-02-22 16:20:35 -05:00
|
|
|
#include "Adafruit_GFX.h"
|
|
|
|
#include "glcdfont.c"
|
2017-02-22 20:11:09 -05:00
|
|
|
#ifdef __AVR__
|
2019-12-27 17:10:08 -05:00
|
|
|
#include <avr/pgmspace.h>
|
2017-02-22 20:11:09 -05:00
|
|
|
#elif defined(ESP8266) || defined(ESP32)
|
2019-12-27 17:10:08 -05:00
|
|
|
#include <pgmspace.h>
|
2017-02-22 20:11:09 -05:00
|
|
|
#endif
|
2016-02-22 16:20:35 -05:00
|
|
|
|
|
|
|
// Many (but maybe not all) non-AVR board installs define macros
|
|
|
|
// for compatibility with existing PROGMEM-reading AVR code.
|
|
|
|
// Do our own checks and defines here for good measure...
|
|
|
|
|
|
|
|
#ifndef pgm_read_byte
|
2019-12-27 17:10:08 -05:00
|
|
|
#define pgm_read_byte(addr) (*(const unsigned char *)(addr))
|
2016-02-22 16:20:35 -05:00
|
|
|
#endif
|
|
|
|
#ifndef pgm_read_word
|
2019-12-27 17:10:08 -05:00
|
|
|
#define pgm_read_word(addr) (*(const unsigned short *)(addr))
|
2016-02-22 16:20:35 -05:00
|
|
|
#endif
|
|
|
|
#ifndef pgm_read_dword
|
2019-12-27 17:10:08 -05:00
|
|
|
#define pgm_read_dword(addr) (*(const unsigned long *)(addr))
|
2016-02-22 16:20:35 -05:00
|
|
|
#endif
|
|
|
|
|
|
|
|
// Pointers are a peculiar case...typically 16-bit on AVR boards,
|
|
|
|
// 32 bits elsewhere. Try to accommodate both...
|
|
|
|
|
|
|
|
#if !defined(__INT_MAX__) || (__INT_MAX__ > 0xFFFF)
|
2019-12-27 17:10:08 -05:00
|
|
|
#define pgm_read_pointer(addr) ((void *)pgm_read_dword(addr))
|
2016-02-22 16:20:35 -05:00
|
|
|
#else
|
2019-12-27 17:10:08 -05:00
|
|
|
#define pgm_read_pointer(addr) ((void *)pgm_read_word(addr))
|
2013-07-05 14:37:02 -04:00
|
|
|
#endif
|
2012-03-16 14:25:07 -04:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
inline GFXglyph *pgm_read_glyph_ptr(const GFXfont *gfxFont, uint8_t c) {
|
2019-06-07 02:09:30 -04:00
|
|
|
#ifdef __AVR__
|
2019-12-27 17:10:08 -05:00
|
|
|
return &(((GFXglyph *)pgm_read_pointer(&gfxFont->glyph))[c]);
|
2019-06-07 02:09:30 -04:00
|
|
|
#else
|
2019-12-27 17:10:08 -05:00
|
|
|
// expression in __AVR__ section may generate "dereferencing type-punned
|
|
|
|
// pointer will break strict-aliasing rules" warning In fact, on other
|
|
|
|
// platforms (such as STM32) there is no need to do this pointer magic as
|
|
|
|
// program memory may be read in a usual way So expression may be simplified
|
|
|
|
return gfxFont->glyph + c;
|
2019-06-07 02:09:30 -04:00
|
|
|
#endif //__AVR__
|
|
|
|
}
|
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
inline uint8_t *pgm_read_bitmap_ptr(const GFXfont *gfxFont) {
|
2019-06-07 02:09:30 -04:00
|
|
|
#ifdef __AVR__
|
2019-12-27 17:10:08 -05:00
|
|
|
return (uint8_t *)pgm_read_pointer(&gfxFont->bitmap);
|
2019-06-07 02:09:30 -04:00
|
|
|
#else
|
2019-12-27 17:10:08 -05:00
|
|
|
// expression in __AVR__ section generates "dereferencing type-punned pointer
|
|
|
|
// will break strict-aliasing rules" warning In fact, on other platforms (such
|
|
|
|
// as STM32) there is no need to do this pointer magic as program memory may
|
|
|
|
// be read in a usual way So expression may be simplified
|
|
|
|
return gfxFont->bitmap;
|
2019-06-07 02:09:30 -04:00
|
|
|
#endif //__AVR__
|
|
|
|
}
|
|
|
|
|
2015-06-26 23:42:34 -04:00
|
|
|
#ifndef min
|
2019-12-27 17:10:08 -05:00
|
|
|
#define min(a, b) (((a) < (b)) ? (a) : (b))
|
2015-06-26 23:42:34 -04:00
|
|
|
#endif
|
|
|
|
|
2016-01-26 13:37:56 -05:00
|
|
|
#ifndef _swap_int16_t
|
2019-12-27 17:10:08 -05:00
|
|
|
#define _swap_int16_t(a, b) \
|
|
|
|
{ \
|
|
|
|
int16_t t = a; \
|
|
|
|
a = b; \
|
|
|
|
b = t; \
|
|
|
|
}
|
2016-01-26 13:37:56 -05:00
|
|
|
#endif
|
|
|
|
|
2018-07-14 15:21:57 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-12-27 17:10:08 -05:00
|
|
|
@brief Instatiate a GFX context for graphics! Can only be done by a
|
|
|
|
superclass
|
2018-07-14 15:21:57 -04:00
|
|
|
@param w Display width, in pixels
|
|
|
|
@param h Display height, in pixels
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
Adafruit_GFX::Adafruit_GFX(int16_t w, int16_t h) : WIDTH(w), HEIGHT(h) {
|
|
|
|
_width = WIDTH;
|
|
|
|
_height = HEIGHT;
|
|
|
|
rotation = 0;
|
|
|
|
cursor_y = cursor_x = 0;
|
|
|
|
textsize_x = textsize_y = 1;
|
|
|
|
textcolor = textbgcolor = 0xFFFF;
|
|
|
|
wrap = true;
|
|
|
|
_cp437 = false;
|
|
|
|
gfxFont = NULL;
|
2012-03-16 14:25:07 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Write a line. Bresenham's algorithm - thx wikpedia
|
|
|
|
@param x0 Start point x coordinate
|
|
|
|
@param y0 Start point y coordinate
|
|
|
|
@param x1 End point x coordinate
|
|
|
|
@param y1 End point y coordinate
|
|
|
|
@param color 16-bit 5-6-5 Color to draw with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2017-02-22 20:11:09 -05:00
|
|
|
void Adafruit_GFX::writeLine(int16_t x0, int16_t y0, int16_t x1, int16_t y1,
|
2019-12-27 17:10:08 -05:00
|
|
|
uint16_t color) {
|
2019-03-01 16:38:18 -05:00
|
|
|
#if defined(ESP8266)
|
2019-12-27 17:10:08 -05:00
|
|
|
yield();
|
2019-03-01 16:38:18 -05:00
|
|
|
#endif
|
2019-12-27 17:10:08 -05:00
|
|
|
int16_t steep = abs(y1 - y0) > abs(x1 - x0);
|
|
|
|
if (steep) {
|
|
|
|
_swap_int16_t(x0, y0);
|
|
|
|
_swap_int16_t(x1, y1);
|
|
|
|
}
|
2012-03-12 20:32:18 -04:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
if (x0 > x1) {
|
|
|
|
_swap_int16_t(x0, x1);
|
|
|
|
_swap_int16_t(y0, y1);
|
|
|
|
}
|
|
|
|
|
|
|
|
int16_t dx, dy;
|
|
|
|
dx = x1 - x0;
|
|
|
|
dy = abs(y1 - y0);
|
2017-02-22 20:11:09 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
int16_t err = dx / 2;
|
|
|
|
int16_t ystep;
|
2017-02-22 20:11:09 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
if (y0 < y1) {
|
|
|
|
ystep = 1;
|
|
|
|
} else {
|
|
|
|
ystep = -1;
|
|
|
|
}
|
2017-02-22 20:11:09 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
for (; x0 <= x1; x0++) {
|
|
|
|
if (steep) {
|
|
|
|
writePixel(y0, x0, color);
|
2017-02-22 20:11:09 -05:00
|
|
|
} else {
|
2019-12-27 17:10:08 -05:00
|
|
|
writePixel(x0, y0, color);
|
2012-03-15 15:54:29 -04:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
err -= dy;
|
|
|
|
if (err < 0) {
|
|
|
|
y0 += ystep;
|
|
|
|
err += dx;
|
2012-03-15 15:54:29 -04:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
}
|
2012-03-15 15:54:29 -04:00
|
|
|
}
|
2012-03-12 20:32:18 -04:00
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Start a display-writing routine, overwrite in subclasses.
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX::startWrite() {}
|
2012-03-12 20:32:18 -04:00
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Write a pixel, overwrite in subclasses if startWrite is defined!
|
|
|
|
@param x x coordinate
|
|
|
|
@param y y coordinate
|
|
|
|
@param color 16-bit 5-6-5 Color to fill with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX::writePixel(int16_t x, int16_t y, uint16_t color) {
|
|
|
|
drawPixel(x, y, color);
|
2017-02-22 20:11:09 -05:00
|
|
|
}
|
2012-03-15 15:54:29 -04:00
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-12-27 17:10:08 -05:00
|
|
|
@brief Write a perfectly vertical line, overwrite in subclasses if
|
|
|
|
startWrite is defined!
|
2018-07-14 14:24:10 -04:00
|
|
|
@param x Top-most x coordinate
|
|
|
|
@param y Top-most y coordinate
|
|
|
|
@param h Height in pixels
|
|
|
|
@param color 16-bit 5-6-5 Color to fill with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX::writeFastVLine(int16_t x, int16_t y, int16_t h,
|
|
|
|
uint16_t color) {
|
|
|
|
// Overwrite in subclasses if startWrite is defined!
|
|
|
|
// Can be just writeLine(x, y, x, y+h-1, color);
|
|
|
|
// or writeFillRect(x, y, 1, h, color);
|
|
|
|
drawFastVLine(x, y, h, color);
|
2012-03-12 20:32:18 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-12-27 17:10:08 -05:00
|
|
|
@brief Write a perfectly horizontal line, overwrite in subclasses if
|
|
|
|
startWrite is defined!
|
2018-07-14 14:24:10 -04:00
|
|
|
@param x Left-most x coordinate
|
|
|
|
@param y Left-most y coordinate
|
|
|
|
@param w Width in pixels
|
|
|
|
@param color 16-bit 5-6-5 Color to fill with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX::writeFastHLine(int16_t x, int16_t y, int16_t w,
|
|
|
|
uint16_t color) {
|
|
|
|
// Overwrite in subclasses if startWrite is defined!
|
|
|
|
// Example: writeLine(x, y, x+w-1, y, color);
|
|
|
|
// or writeFillRect(x, y, w, 1, color);
|
|
|
|
drawFastHLine(x, y, w, color);
|
2012-03-12 20:32:18 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-12-27 17:10:08 -05:00
|
|
|
@brief Write a rectangle completely with one color, overwrite in
|
|
|
|
subclasses if startWrite is defined!
|
2018-07-14 14:24:10 -04:00
|
|
|
@param x Top left corner x coordinate
|
|
|
|
@param y Top left corner y coordinate
|
|
|
|
@param w Width in pixels
|
|
|
|
@param h Height in pixels
|
|
|
|
@param color 16-bit 5-6-5 Color to fill with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2017-02-22 20:11:09 -05:00
|
|
|
void Adafruit_GFX::writeFillRect(int16_t x, int16_t y, int16_t w, int16_t h,
|
2019-12-27 17:10:08 -05:00
|
|
|
uint16_t color) {
|
|
|
|
// Overwrite in subclasses if desired!
|
|
|
|
fillRect(x, y, w, h, color);
|
2017-02-22 20:11:09 -05:00
|
|
|
}
|
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-12-27 17:10:08 -05:00
|
|
|
@brief End a display-writing routine, overwrite in subclasses if
|
|
|
|
startWrite is defined!
|
2018-07-14 14:24:10 -04:00
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX::endWrite() {}
|
2012-03-12 20:32:18 -04:00
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-12-27 17:10:08 -05:00
|
|
|
@brief Draw a perfectly vertical line (this is often optimized in a
|
|
|
|
subclass!)
|
2018-07-14 14:24:10 -04:00
|
|
|
@param x Top-most x coordinate
|
|
|
|
@param y Top-most y coordinate
|
|
|
|
@param h Height in pixels
|
|
|
|
@param color 16-bit 5-6-5 Color to fill with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX::drawFastVLine(int16_t x, int16_t y, int16_t h,
|
|
|
|
uint16_t color) {
|
|
|
|
startWrite();
|
|
|
|
writeLine(x, y, x, y + h - 1, color);
|
|
|
|
endWrite();
|
2012-03-12 20:32:18 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-12-27 17:10:08 -05:00
|
|
|
@brief Draw a perfectly horizontal line (this is often optimized in a
|
|
|
|
subclass!)
|
2018-07-14 14:24:10 -04:00
|
|
|
@param x Left-most x coordinate
|
|
|
|
@param y Left-most y coordinate
|
|
|
|
@param w Width in pixels
|
|
|
|
@param color 16-bit 5-6-5 Color to fill with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX::drawFastHLine(int16_t x, int16_t y, int16_t w,
|
|
|
|
uint16_t color) {
|
|
|
|
startWrite();
|
|
|
|
writeLine(x, y, x + w - 1, y, color);
|
|
|
|
endWrite();
|
2012-03-15 15:54:29 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-12-27 17:10:08 -05:00
|
|
|
@brief Fill a rectangle completely with one color. Update in subclasses if
|
|
|
|
desired!
|
2018-07-14 14:24:10 -04:00
|
|
|
@param x Top left corner x coordinate
|
|
|
|
@param y Top left corner y coordinate
|
|
|
|
@param w Width in pixels
|
|
|
|
@param h Height in pixels
|
|
|
|
@param color 16-bit 5-6-5 Color to fill with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2013-07-05 14:37:02 -04:00
|
|
|
void Adafruit_GFX::fillRect(int16_t x, int16_t y, int16_t w, int16_t h,
|
2019-12-27 17:10:08 -05:00
|
|
|
uint16_t color) {
|
|
|
|
startWrite();
|
|
|
|
for (int16_t i = x; i < x + w; i++) {
|
|
|
|
writeFastVLine(i, y, h, color);
|
|
|
|
}
|
|
|
|
endWrite();
|
2012-03-12 20:32:18 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-12-27 17:10:08 -05:00
|
|
|
@brief Fill the screen completely with one color. Update in subclasses if
|
|
|
|
desired!
|
2018-07-14 14:24:10 -04:00
|
|
|
@param color 16-bit 5-6-5 Color to fill with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2012-03-16 14:25:07 -04:00
|
|
|
void Adafruit_GFX::fillScreen(uint16_t color) {
|
2019-12-27 17:10:08 -05:00
|
|
|
fillRect(0, 0, _width, _height, color);
|
2017-02-22 20:11:09 -05:00
|
|
|
}
|
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Draw a line
|
|
|
|
@param x0 Start point x coordinate
|
|
|
|
@param y0 Start point y coordinate
|
|
|
|
@param x1 End point x coordinate
|
|
|
|
@param y1 End point y coordinate
|
|
|
|
@param color 16-bit 5-6-5 Color to draw with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2017-02-22 20:11:09 -05:00
|
|
|
void Adafruit_GFX::drawLine(int16_t x0, int16_t y0, int16_t x1, int16_t y1,
|
2019-12-27 17:10:08 -05:00
|
|
|
uint16_t color) {
|
|
|
|
// Update in subclasses if desired!
|
|
|
|
if (x0 == x1) {
|
|
|
|
if (y0 > y1)
|
|
|
|
_swap_int16_t(y0, y1);
|
|
|
|
drawFastVLine(x0, y0, y1 - y0 + 1, color);
|
|
|
|
} else if (y0 == y1) {
|
|
|
|
if (x0 > x1)
|
|
|
|
_swap_int16_t(x0, x1);
|
|
|
|
drawFastHLine(x0, y0, x1 - x0 + 1, color);
|
|
|
|
} else {
|
|
|
|
startWrite();
|
|
|
|
writeLine(x0, y0, x1, y1, color);
|
|
|
|
endWrite();
|
|
|
|
}
|
2017-02-22 20:11:09 -05:00
|
|
|
}
|
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Draw a circle outline
|
|
|
|
@param x0 Center-point x coordinate
|
|
|
|
@param y0 Center-point y coordinate
|
|
|
|
@param r Radius of circle
|
|
|
|
@param color 16-bit 5-6-5 Color to draw with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2017-02-22 20:11:09 -05:00
|
|
|
void Adafruit_GFX::drawCircle(int16_t x0, int16_t y0, int16_t r,
|
2019-12-27 17:10:08 -05:00
|
|
|
uint16_t color) {
|
2019-03-01 16:38:18 -05:00
|
|
|
#if defined(ESP8266)
|
2019-12-27 17:10:08 -05:00
|
|
|
yield();
|
2019-03-01 16:38:18 -05:00
|
|
|
#endif
|
2019-12-27 17:10:08 -05:00
|
|
|
int16_t f = 1 - r;
|
|
|
|
int16_t ddF_x = 1;
|
|
|
|
int16_t ddF_y = -2 * r;
|
|
|
|
int16_t x = 0;
|
|
|
|
int16_t y = r;
|
|
|
|
|
|
|
|
startWrite();
|
|
|
|
writePixel(x0, y0 + r, color);
|
|
|
|
writePixel(x0, y0 - r, color);
|
|
|
|
writePixel(x0 + r, y0, color);
|
|
|
|
writePixel(x0 - r, y0, color);
|
|
|
|
|
|
|
|
while (x < y) {
|
|
|
|
if (f >= 0) {
|
|
|
|
y--;
|
|
|
|
ddF_y += 2;
|
|
|
|
f += ddF_y;
|
2017-02-22 20:11:09 -05:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
x++;
|
|
|
|
ddF_x += 2;
|
|
|
|
f += ddF_x;
|
|
|
|
|
|
|
|
writePixel(x0 + x, y0 + y, color);
|
|
|
|
writePixel(x0 - x, y0 + y, color);
|
|
|
|
writePixel(x0 + x, y0 - y, color);
|
|
|
|
writePixel(x0 - x, y0 - y, color);
|
|
|
|
writePixel(x0 + y, y0 + x, color);
|
|
|
|
writePixel(x0 - y, y0 + x, color);
|
|
|
|
writePixel(x0 + y, y0 - x, color);
|
|
|
|
writePixel(x0 - y, y0 - x, color);
|
|
|
|
}
|
|
|
|
endWrite();
|
2017-02-22 20:11:09 -05:00
|
|
|
}
|
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2018-11-08 18:01:27 -05:00
|
|
|
@brief Quarter-circle drawer, used to do circles and roundrects
|
2018-07-14 14:24:10 -04:00
|
|
|
@param x0 Center-point x coordinate
|
|
|
|
@param y0 Center-point y coordinate
|
|
|
|
@param r Radius of circle
|
2019-12-27 17:10:08 -05:00
|
|
|
@param cornername Mask bit #1 or bit #2 to indicate which quarters of
|
|
|
|
the circle we're doing
|
2018-07-14 14:24:10 -04:00
|
|
|
@param color 16-bit 5-6-5 Color to draw with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX::drawCircleHelper(int16_t x0, int16_t y0, int16_t r,
|
|
|
|
uint8_t cornername, uint16_t color) {
|
|
|
|
int16_t f = 1 - r;
|
|
|
|
int16_t ddF_x = 1;
|
|
|
|
int16_t ddF_y = -2 * r;
|
|
|
|
int16_t x = 0;
|
|
|
|
int16_t y = r;
|
2017-02-22 20:11:09 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
while (x < y) {
|
|
|
|
if (f >= 0) {
|
|
|
|
y--;
|
|
|
|
ddF_y += 2;
|
|
|
|
f += ddF_y;
|
2017-02-22 20:11:09 -05:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
x++;
|
|
|
|
ddF_x += 2;
|
|
|
|
f += ddF_x;
|
2020-06-08 13:05:48 -04:00
|
|
|
if (cornername & 0x4) {
|
|
|
|
writePixel(x0 + x, y0 + y, color);
|
|
|
|
writePixel(x0 + y, y0 + x, color);
|
|
|
|
}
|
|
|
|
if (cornername & 0x2) {
|
|
|
|
writePixel(x0 + x, y0 - y, color);
|
|
|
|
writePixel(x0 + y, y0 - x, color);
|
|
|
|
}
|
|
|
|
if (cornername & 0x8) {
|
|
|
|
writePixel(x0 - y, y0 + x, color);
|
|
|
|
writePixel(x0 - x, y0 + y, color);
|
|
|
|
}
|
|
|
|
if (cornername & 0x1) {
|
|
|
|
writePixel(x0 - y, y0 - x, color);
|
|
|
|
writePixel(x0 - x, y0 - y, color);
|
2020-06-07 10:11:36 -04:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
}
|
2017-02-22 20:11:09 -05:00
|
|
|
}
|
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Draw a circle with filled color
|
|
|
|
@param x0 Center-point x coordinate
|
|
|
|
@param y0 Center-point y coordinate
|
|
|
|
@param r Radius of circle
|
|
|
|
@param color 16-bit 5-6-5 Color to fill with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2017-02-22 20:11:09 -05:00
|
|
|
void Adafruit_GFX::fillCircle(int16_t x0, int16_t y0, int16_t r,
|
2019-12-27 17:10:08 -05:00
|
|
|
uint16_t color) {
|
|
|
|
startWrite();
|
|
|
|
writeFastVLine(x0, y0 - r, 2 * r + 1, color);
|
|
|
|
fillCircleHelper(x0, y0, r, 3, 0, color);
|
|
|
|
endWrite();
|
2017-02-22 20:11:09 -05:00
|
|
|
}
|
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2018-11-08 18:01:27 -05:00
|
|
|
@brief Quarter-circle drawer with fill, used for circles and roundrects
|
|
|
|
@param x0 Center-point x coordinate
|
|
|
|
@param y0 Center-point y coordinate
|
|
|
|
@param r Radius of circle
|
|
|
|
@param corners Mask bits indicating which quarters we're doing
|
|
|
|
@param delta Offset from center-point, used for round-rects
|
|
|
|
@param color 16-bit 5-6-5 Color to fill with
|
2018-07-14 14:24:10 -04:00
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2017-02-22 20:11:09 -05:00
|
|
|
void Adafruit_GFX::fillCircleHelper(int16_t x0, int16_t y0, int16_t r,
|
2019-12-27 17:10:08 -05:00
|
|
|
uint8_t corners, int16_t delta,
|
|
|
|
uint16_t color) {
|
|
|
|
|
|
|
|
int16_t f = 1 - r;
|
|
|
|
int16_t ddF_x = 1;
|
|
|
|
int16_t ddF_y = -2 * r;
|
|
|
|
int16_t x = 0;
|
|
|
|
int16_t y = r;
|
|
|
|
int16_t px = x;
|
|
|
|
int16_t py = y;
|
|
|
|
|
|
|
|
delta++; // Avoid some +1's in the loop
|
|
|
|
|
|
|
|
while (x < y) {
|
|
|
|
if (f >= 0) {
|
|
|
|
y--;
|
|
|
|
ddF_y += 2;
|
|
|
|
f += ddF_y;
|
|
|
|
}
|
|
|
|
x++;
|
|
|
|
ddF_x += 2;
|
|
|
|
f += ddF_x;
|
|
|
|
// These checks avoid double-drawing certain lines, important
|
|
|
|
// for the SSD1306 library which has an INVERT drawing mode.
|
|
|
|
if (x < (y + 1)) {
|
|
|
|
if (corners & 1)
|
|
|
|
writeFastVLine(x0 + x, y0 - y, 2 * y + delta, color);
|
|
|
|
if (corners & 2)
|
|
|
|
writeFastVLine(x0 - x, y0 - y, 2 * y + delta, color);
|
|
|
|
}
|
|
|
|
if (y != py) {
|
|
|
|
if (corners & 1)
|
|
|
|
writeFastVLine(x0 + py, y0 - px, 2 * px + delta, color);
|
|
|
|
if (corners & 2)
|
|
|
|
writeFastVLine(x0 - py, y0 - px, 2 * px + delta, color);
|
|
|
|
py = y;
|
2017-02-22 20:11:09 -05:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
px = x;
|
|
|
|
}
|
2017-02-22 20:11:09 -05:00
|
|
|
}
|
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Draw a rectangle with no fill color
|
|
|
|
@param x Top left corner x coordinate
|
|
|
|
@param y Top left corner y coordinate
|
|
|
|
@param w Width in pixels
|
|
|
|
@param h Height in pixels
|
|
|
|
@param color 16-bit 5-6-5 Color to draw with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2017-02-22 20:11:09 -05:00
|
|
|
void Adafruit_GFX::drawRect(int16_t x, int16_t y, int16_t w, int16_t h,
|
2019-12-27 17:10:08 -05:00
|
|
|
uint16_t color) {
|
|
|
|
startWrite();
|
|
|
|
writeFastHLine(x, y, w, color);
|
|
|
|
writeFastHLine(x, y + h - 1, w, color);
|
|
|
|
writeFastVLine(x, y, h, color);
|
|
|
|
writeFastVLine(x + w - 1, y, h, color);
|
|
|
|
endWrite();
|
2012-03-16 14:25:07 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 13:05:06 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Draw a rounded rectangle with no fill color
|
|
|
|
@param x Top left corner x coordinate
|
|
|
|
@param y Top left corner y coordinate
|
|
|
|
@param w Width in pixels
|
|
|
|
@param h Height in pixels
|
|
|
|
@param r Radius of corner rounding
|
|
|
|
@param color 16-bit 5-6-5 Color to draw with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX::drawRoundRect(int16_t x, int16_t y, int16_t w, int16_t h,
|
|
|
|
int16_t r, uint16_t color) {
|
|
|
|
int16_t max_radius = ((w < h) ? w : h) / 2; // 1/2 minor axis
|
|
|
|
if (r > max_radius)
|
|
|
|
r = max_radius;
|
|
|
|
// smarter version
|
|
|
|
startWrite();
|
|
|
|
writeFastHLine(x + r, y, w - 2 * r, color); // Top
|
|
|
|
writeFastHLine(x + r, y + h - 1, w - 2 * r, color); // Bottom
|
|
|
|
writeFastVLine(x, y + r, h - 2 * r, color); // Left
|
|
|
|
writeFastVLine(x + w - 1, y + r, h - 2 * r, color); // Right
|
|
|
|
// draw four corners
|
|
|
|
drawCircleHelper(x + r, y + r, r, 1, color);
|
|
|
|
drawCircleHelper(x + w - r - 1, y + r, r, 2, color);
|
|
|
|
drawCircleHelper(x + w - r - 1, y + h - r - 1, r, 4, color);
|
|
|
|
drawCircleHelper(x + r, y + h - r - 1, r, 8, color);
|
|
|
|
endWrite();
|
2012-03-15 15:54:29 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 13:05:06 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Draw a rounded rectangle with fill color
|
|
|
|
@param x Top left corner x coordinate
|
|
|
|
@param y Top left corner y coordinate
|
|
|
|
@param w Width in pixels
|
|
|
|
@param h Height in pixels
|
|
|
|
@param r Radius of corner rounding
|
|
|
|
@param color 16-bit 5-6-5 Color to draw/fill with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX::fillRoundRect(int16_t x, int16_t y, int16_t w, int16_t h,
|
|
|
|
int16_t r, uint16_t color) {
|
|
|
|
int16_t max_radius = ((w < h) ? w : h) / 2; // 1/2 minor axis
|
|
|
|
if (r > max_radius)
|
|
|
|
r = max_radius;
|
|
|
|
// smarter version
|
|
|
|
startWrite();
|
|
|
|
writeFillRect(x + r, y, w - 2 * r, h, color);
|
|
|
|
// draw four corners
|
|
|
|
fillCircleHelper(x + w - r - 1, y + r, r, 1, h - 2 * r - 1, color);
|
|
|
|
fillCircleHelper(x + r, y + r, r, 2, h - 2 * r - 1, color);
|
|
|
|
endWrite();
|
2012-03-15 15:54:29 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 13:05:06 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Draw a triangle with no fill color
|
|
|
|
@param x0 Vertex #0 x coordinate
|
|
|
|
@param y0 Vertex #0 y coordinate
|
|
|
|
@param x1 Vertex #1 x coordinate
|
|
|
|
@param y1 Vertex #1 y coordinate
|
|
|
|
@param x2 Vertex #2 x coordinate
|
|
|
|
@param y2 Vertex #2 y coordinate
|
|
|
|
@param color 16-bit 5-6-5 Color to draw with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX::drawTriangle(int16_t x0, int16_t y0, int16_t x1, int16_t y1,
|
|
|
|
int16_t x2, int16_t y2, uint16_t color) {
|
|
|
|
drawLine(x0, y0, x1, y1, color);
|
|
|
|
drawLine(x1, y1, x2, y2, color);
|
|
|
|
drawLine(x2, y2, x0, y0, color);
|
2012-03-15 16:23:38 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 13:05:06 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Draw a triangle with color-fill
|
|
|
|
@param x0 Vertex #0 x coordinate
|
|
|
|
@param y0 Vertex #0 y coordinate
|
|
|
|
@param x1 Vertex #1 x coordinate
|
|
|
|
@param y1 Vertex #1 y coordinate
|
|
|
|
@param x2 Vertex #2 x coordinate
|
|
|
|
@param y2 Vertex #2 y coordinate
|
|
|
|
@param color 16-bit 5-6-5 Color to fill/draw with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX::fillTriangle(int16_t x0, int16_t y0, int16_t x1, int16_t y1,
|
|
|
|
int16_t x2, int16_t y2, uint16_t color) {
|
2017-02-22 20:11:09 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
int16_t a, b, y, last;
|
2017-02-22 20:11:09 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
// Sort coordinates by Y order (y2 >= y1 >= y0)
|
|
|
|
if (y0 > y1) {
|
|
|
|
_swap_int16_t(y0, y1);
|
|
|
|
_swap_int16_t(x0, x1);
|
|
|
|
}
|
|
|
|
if (y1 > y2) {
|
|
|
|
_swap_int16_t(y2, y1);
|
|
|
|
_swap_int16_t(x2, x1);
|
|
|
|
}
|
|
|
|
if (y0 > y1) {
|
|
|
|
_swap_int16_t(y0, y1);
|
|
|
|
_swap_int16_t(x0, x1);
|
|
|
|
}
|
2017-02-22 20:11:09 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
startWrite();
|
|
|
|
if (y0 == y2) { // Handle awkward all-on-same-line case as its own thing
|
|
|
|
a = b = x0;
|
|
|
|
if (x1 < a)
|
|
|
|
a = x1;
|
|
|
|
else if (x1 > b)
|
|
|
|
b = x1;
|
|
|
|
if (x2 < a)
|
|
|
|
a = x2;
|
|
|
|
else if (x2 > b)
|
|
|
|
b = x2;
|
|
|
|
writeFastHLine(a, y0, b - a + 1, color);
|
|
|
|
endWrite();
|
|
|
|
return;
|
|
|
|
}
|
2017-02-22 20:11:09 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
int16_t dx01 = x1 - x0, dy01 = y1 - y0, dx02 = x2 - x0, dy02 = y2 - y0,
|
|
|
|
dx12 = x2 - x1, dy12 = y2 - y1;
|
|
|
|
int32_t sa = 0, sb = 0;
|
|
|
|
|
|
|
|
// For upper part of triangle, find scanline crossings for segments
|
|
|
|
// 0-1 and 0-2. If y1=y2 (flat-bottomed triangle), the scanline y1
|
|
|
|
// is included here (and second loop will be skipped, avoiding a /0
|
|
|
|
// error there), otherwise scanline y1 is skipped here and handled
|
|
|
|
// in the second loop...which also avoids a /0 error here if y0=y1
|
|
|
|
// (flat-topped triangle).
|
|
|
|
if (y1 == y2)
|
|
|
|
last = y1; // Include y1 scanline
|
|
|
|
else
|
|
|
|
last = y1 - 1; // Skip it
|
|
|
|
|
|
|
|
for (y = y0; y <= last; y++) {
|
|
|
|
a = x0 + sa / dy01;
|
|
|
|
b = x0 + sb / dy02;
|
|
|
|
sa += dx01;
|
|
|
|
sb += dx02;
|
|
|
|
/* longhand:
|
|
|
|
a = x0 + (x1 - x0) * (y - y0) / (y1 - y0);
|
|
|
|
b = x0 + (x2 - x0) * (y - y0) / (y2 - y0);
|
|
|
|
*/
|
|
|
|
if (a > b)
|
|
|
|
_swap_int16_t(a, b);
|
|
|
|
writeFastHLine(a, y, b - a + 1, color);
|
|
|
|
}
|
2017-02-22 20:11:09 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
// For lower part of triangle, find scanline crossings for segments
|
|
|
|
// 0-2 and 1-2. This loop is skipped if y1=y2.
|
|
|
|
sa = (int32_t)dx12 * (y - y1);
|
|
|
|
sb = (int32_t)dx02 * (y - y0);
|
|
|
|
for (; y <= y2; y++) {
|
|
|
|
a = x1 + sa / dy12;
|
|
|
|
b = x0 + sb / dy02;
|
|
|
|
sa += dx12;
|
|
|
|
sb += dx02;
|
|
|
|
/* longhand:
|
|
|
|
a = x1 + (x2 - x1) * (y - y1) / (y2 - y1);
|
|
|
|
b = x0 + (x2 - x0) * (y - y0) / (y2 - y0);
|
|
|
|
*/
|
|
|
|
if (a > b)
|
|
|
|
_swap_int16_t(a, b);
|
|
|
|
writeFastHLine(a, y, b - a + 1, color);
|
|
|
|
}
|
|
|
|
endWrite();
|
2012-03-15 16:23:38 -04:00
|
|
|
}
|
2012-03-15 15:54:29 -04:00
|
|
|
|
2017-05-05 22:57:52 -04:00
|
|
|
// BITMAP / XBITMAP / GRAYSCALE / RGB BITMAP FUNCTIONS ---------------------
|
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-12-27 17:10:08 -05:00
|
|
|
@brief Draw a PROGMEM-resident 1-bit image at the specified (x,y)
|
|
|
|
position, using the specified foreground color (unset bits are transparent).
|
2018-07-14 14:24:10 -04:00
|
|
|
@param x Top left corner x coordinate
|
|
|
|
@param y Top left corner y coordinate
|
|
|
|
@param bitmap byte array with monochrome bitmap
|
|
|
|
@param w Width of bitmap in pixels
|
2019-04-29 13:24:18 -04:00
|
|
|
@param h Height of bitmap in pixels
|
2018-07-14 14:24:10 -04:00
|
|
|
@param color 16-bit 5-6-5 Color to draw with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX::drawBitmap(int16_t x, int16_t y, const uint8_t bitmap[],
|
|
|
|
int16_t w, int16_t h, uint16_t color) {
|
2012-10-02 16:52:08 -04:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
int16_t byteWidth = (w + 7) / 8; // Bitmap scanline pad = whole byte
|
|
|
|
uint8_t byte = 0;
|
2012-10-02 16:52:08 -04:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
startWrite();
|
|
|
|
for (int16_t j = 0; j < h; j++, y++) {
|
|
|
|
for (int16_t i = 0; i < w; i++) {
|
|
|
|
if (i & 7)
|
|
|
|
byte <<= 1;
|
|
|
|
else
|
|
|
|
byte = pgm_read_byte(&bitmap[j * byteWidth + i / 8]);
|
|
|
|
if (byte & 0x80)
|
|
|
|
writePixel(x + i, y, color);
|
2012-03-12 20:32:18 -04:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
}
|
|
|
|
endWrite();
|
2012-03-12 20:32:18 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-12-27 17:10:08 -05:00
|
|
|
@brief Draw a PROGMEM-resident 1-bit image at the specified (x,y)
|
|
|
|
position, using the specified foreground (for set bits) and background (unset
|
|
|
|
bits) colors.
|
2018-07-14 14:24:10 -04:00
|
|
|
@param x Top left corner x coordinate
|
|
|
|
@param y Top left corner y coordinate
|
|
|
|
@param bitmap byte array with monochrome bitmap
|
|
|
|
@param w Width of bitmap in pixels
|
2019-04-29 13:24:18 -04:00
|
|
|
@param h Height of bitmap in pixels
|
2018-07-14 14:24:10 -04:00
|
|
|
@param color 16-bit 5-6-5 Color to draw pixels with
|
|
|
|
@param bg 16-bit 5-6-5 Color to draw background with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX::drawBitmap(int16_t x, int16_t y, const uint8_t bitmap[],
|
|
|
|
int16_t w, int16_t h, uint16_t color,
|
|
|
|
uint16_t bg) {
|
2017-02-22 20:11:09 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
int16_t byteWidth = (w + 7) / 8; // Bitmap scanline pad = whole byte
|
|
|
|
uint8_t byte = 0;
|
2017-02-22 20:11:09 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
startWrite();
|
|
|
|
for (int16_t j = 0; j < h; j++, y++) {
|
|
|
|
for (int16_t i = 0; i < w; i++) {
|
|
|
|
if (i & 7)
|
|
|
|
byte <<= 1;
|
|
|
|
else
|
|
|
|
byte = pgm_read_byte(&bitmap[j * byteWidth + i / 8]);
|
|
|
|
writePixel(x + i, y, (byte & 0x80) ? color : bg);
|
2012-03-12 20:32:18 -04:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
}
|
|
|
|
endWrite();
|
2012-03-12 20:32:18 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-12-27 17:10:08 -05:00
|
|
|
@brief Draw a RAM-resident 1-bit image at the specified (x,y) position,
|
|
|
|
using the specified foreground color (unset bits are transparent).
|
2018-07-14 14:24:10 -04:00
|
|
|
@param x Top left corner x coordinate
|
|
|
|
@param y Top left corner y coordinate
|
|
|
|
@param bitmap byte array with monochrome bitmap
|
|
|
|
@param w Width of bitmap in pixels
|
2019-04-29 13:24:18 -04:00
|
|
|
@param h Height of bitmap in pixels
|
2018-07-14 14:24:10 -04:00
|
|
|
@param color 16-bit 5-6-5 Color to draw with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX::drawBitmap(int16_t x, int16_t y, uint8_t *bitmap, int16_t w,
|
|
|
|
int16_t h, uint16_t color) {
|
2015-12-28 00:29:50 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
int16_t byteWidth = (w + 7) / 8; // Bitmap scanline pad = whole byte
|
|
|
|
uint8_t byte = 0;
|
2015-12-28 00:29:50 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
startWrite();
|
|
|
|
for (int16_t j = 0; j < h; j++, y++) {
|
|
|
|
for (int16_t i = 0; i < w; i++) {
|
|
|
|
if (i & 7)
|
|
|
|
byte <<= 1;
|
|
|
|
else
|
|
|
|
byte = bitmap[j * byteWidth + i / 8];
|
|
|
|
if (byte & 0x80)
|
|
|
|
writePixel(x + i, y, color);
|
2015-12-28 00:29:50 -05:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
}
|
|
|
|
endWrite();
|
2015-12-28 00:29:50 -05:00
|
|
|
}
|
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-12-27 17:10:08 -05:00
|
|
|
@brief Draw a RAM-resident 1-bit image at the specified (x,y) position,
|
|
|
|
using the specified foreground (for set bits) and background (unset bits)
|
|
|
|
colors.
|
2018-07-14 14:24:10 -04:00
|
|
|
@param x Top left corner x coordinate
|
|
|
|
@param y Top left corner y coordinate
|
|
|
|
@param bitmap byte array with monochrome bitmap
|
|
|
|
@param w Width of bitmap in pixels
|
2019-04-29 13:24:18 -04:00
|
|
|
@param h Height of bitmap in pixels
|
2018-07-14 14:24:10 -04:00
|
|
|
@param color 16-bit 5-6-5 Color to draw pixels with
|
|
|
|
@param bg 16-bit 5-6-5 Color to draw background with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX::drawBitmap(int16_t x, int16_t y, uint8_t *bitmap, int16_t w,
|
|
|
|
int16_t h, uint16_t color, uint16_t bg) {
|
2017-02-22 20:11:09 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
int16_t byteWidth = (w + 7) / 8; // Bitmap scanline pad = whole byte
|
|
|
|
uint8_t byte = 0;
|
2017-02-22 20:11:09 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
startWrite();
|
|
|
|
for (int16_t j = 0; j < h; j++, y++) {
|
|
|
|
for (int16_t i = 0; i < w; i++) {
|
|
|
|
if (i & 7)
|
|
|
|
byte <<= 1;
|
|
|
|
else
|
|
|
|
byte = bitmap[j * byteWidth + i / 8];
|
|
|
|
writePixel(x + i, y, (byte & 0x80) ? color : bg);
|
2015-12-28 00:29:50 -05:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
}
|
|
|
|
endWrite();
|
2015-12-28 00:29:50 -05:00
|
|
|
}
|
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-06-12 16:53:17 -04:00
|
|
|
@brief Draw PROGMEM-resident XBitMap Files (*.xbm), exported from GIMP.
|
2018-07-14 14:24:10 -04:00
|
|
|
Usage: Export from GIMP to *.xbm, rename *.xbm to *.c and open in editor.
|
|
|
|
C Array can be directly used with this function.
|
|
|
|
There is no RAM-resident version of this function; if generating bitmaps
|
|
|
|
in RAM, use the format defined by drawBitmap() and call that instead.
|
|
|
|
@param x Top left corner x coordinate
|
|
|
|
@param y Top left corner y coordinate
|
|
|
|
@param bitmap byte array with monochrome bitmap
|
|
|
|
@param w Width of bitmap in pixels
|
2019-04-29 13:24:18 -04:00
|
|
|
@param h Height of bitmap in pixels
|
2018-07-14 14:24:10 -04:00
|
|
|
@param color 16-bit 5-6-5 Color to draw pixels with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX::drawXBitmap(int16_t x, int16_t y, const uint8_t bitmap[],
|
|
|
|
int16_t w, int16_t h, uint16_t color) {
|
2015-12-22 15:02:43 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
int16_t byteWidth = (w + 7) / 8; // Bitmap scanline pad = whole byte
|
|
|
|
uint8_t byte = 0;
|
2015-12-22 15:02:43 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
startWrite();
|
|
|
|
for (int16_t j = 0; j < h; j++, y++) {
|
|
|
|
for (int16_t i = 0; i < w; i++) {
|
|
|
|
if (i & 7)
|
|
|
|
byte >>= 1;
|
|
|
|
else
|
|
|
|
byte = pgm_read_byte(&bitmap[j * byteWidth + i / 8]);
|
|
|
|
// Nearly identical to drawBitmap(), only the bit order
|
|
|
|
// is reversed here (left-to-right = LSB to MSB):
|
|
|
|
if (byte & 0x01)
|
|
|
|
writePixel(x + i, y, color);
|
2017-05-05 22:57:52 -04:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
}
|
|
|
|
endWrite();
|
2017-05-05 22:57:52 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-12-27 17:10:08 -05:00
|
|
|
@brief Draw a PROGMEM-resident 8-bit image (grayscale) at the specified
|
|
|
|
(x,y) pos. Specifically for 8-bit display devices such as IS31FL3731; no
|
|
|
|
color reduction/expansion is performed.
|
2018-07-14 14:24:10 -04:00
|
|
|
@param x Top left corner x coordinate
|
|
|
|
@param y Top left corner y coordinate
|
|
|
|
@param bitmap byte array with grayscale bitmap
|
|
|
|
@param w Width of bitmap in pixels
|
2019-04-29 13:24:18 -04:00
|
|
|
@param h Height of bitmap in pixels
|
2018-07-14 14:24:10 -04:00
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2017-05-05 22:57:52 -04:00
|
|
|
void Adafruit_GFX::drawGrayscaleBitmap(int16_t x, int16_t y,
|
2019-12-27 17:10:08 -05:00
|
|
|
const uint8_t bitmap[], int16_t w,
|
|
|
|
int16_t h) {
|
|
|
|
startWrite();
|
|
|
|
for (int16_t j = 0; j < h; j++, y++) {
|
|
|
|
for (int16_t i = 0; i < w; i++) {
|
|
|
|
writePixel(x + i, y, (uint8_t)pgm_read_byte(&bitmap[j * w + i]));
|
2017-05-05 22:57:52 -04:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
}
|
|
|
|
endWrite();
|
2017-05-05 22:57:52 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-12-27 17:10:08 -05:00
|
|
|
@brief Draw a RAM-resident 8-bit image (grayscale) at the specified (x,y)
|
|
|
|
pos. Specifically for 8-bit display devices such as IS31FL3731; no color
|
|
|
|
reduction/expansion is performed.
|
2018-07-14 14:24:10 -04:00
|
|
|
@param x Top left corner x coordinate
|
|
|
|
@param y Top left corner y coordinate
|
|
|
|
@param bitmap byte array with grayscale bitmap
|
|
|
|
@param w Width of bitmap in pixels
|
2019-04-29 13:24:18 -04:00
|
|
|
@param h Height of bitmap in pixels
|
2018-07-14 14:24:10 -04:00
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX::drawGrayscaleBitmap(int16_t x, int16_t y, uint8_t *bitmap,
|
|
|
|
int16_t w, int16_t h) {
|
|
|
|
startWrite();
|
|
|
|
for (int16_t j = 0; j < h; j++, y++) {
|
|
|
|
for (int16_t i = 0; i < w; i++) {
|
|
|
|
writePixel(x + i, y, bitmap[j * w + i]);
|
2017-05-05 22:57:52 -04:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
}
|
|
|
|
endWrite();
|
2017-05-05 22:57:52 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Draw a PROGMEM-resident 8-bit image (grayscale) with a 1-bit mask
|
|
|
|
(set bits = opaque, unset bits = clear) at the specified (x,y) position.
|
|
|
|
BOTH buffers (grayscale and mask) must be PROGMEM-resident.
|
2019-12-27 17:10:08 -05:00
|
|
|
Specifically for 8-bit display devices such as IS31FL3731; no color
|
|
|
|
reduction/expansion is performed.
|
2018-07-14 14:24:10 -04:00
|
|
|
@param x Top left corner x coordinate
|
|
|
|
@param y Top left corner y coordinate
|
|
|
|
@param bitmap byte array with grayscale bitmap
|
2018-07-14 15:21:57 -04:00
|
|
|
@param mask byte array with mask bitmap
|
2018-07-14 14:24:10 -04:00
|
|
|
@param w Width of bitmap in pixels
|
|
|
|
@param h Height of bitmap in pixels
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2017-05-05 22:57:52 -04:00
|
|
|
void Adafruit_GFX::drawGrayscaleBitmap(int16_t x, int16_t y,
|
2019-12-27 17:10:08 -05:00
|
|
|
const uint8_t bitmap[],
|
|
|
|
const uint8_t mask[], int16_t w,
|
|
|
|
int16_t h) {
|
|
|
|
int16_t bw = (w + 7) / 8; // Bitmask scanline pad = whole byte
|
|
|
|
uint8_t byte = 0;
|
|
|
|
startWrite();
|
|
|
|
for (int16_t j = 0; j < h; j++, y++) {
|
|
|
|
for (int16_t i = 0; i < w; i++) {
|
|
|
|
if (i & 7)
|
|
|
|
byte <<= 1;
|
|
|
|
else
|
|
|
|
byte = pgm_read_byte(&mask[j * bw + i / 8]);
|
|
|
|
if (byte & 0x80) {
|
|
|
|
writePixel(x + i, y, (uint8_t)pgm_read_byte(&bitmap[j * w + i]));
|
|
|
|
}
|
2017-05-05 22:57:52 -04:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
}
|
|
|
|
endWrite();
|
2017-05-05 22:57:52 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Draw a RAM-resident 8-bit image (grayscale) with a 1-bit mask
|
|
|
|
(set bits = opaque, unset bits = clear) at the specified (x,y) position.
|
|
|
|
BOTH buffers (grayscale and mask) must be RAM-residentt, no mix-and-match
|
2019-12-27 17:10:08 -05:00
|
|
|
Specifically for 8-bit display devices such as IS31FL3731; no color
|
|
|
|
reduction/expansion is performed.
|
2018-07-14 14:24:10 -04:00
|
|
|
@param x Top left corner x coordinate
|
|
|
|
@param y Top left corner y coordinate
|
|
|
|
@param bitmap byte array with grayscale bitmap
|
2018-07-14 15:21:57 -04:00
|
|
|
@param mask byte array with mask bitmap
|
2018-07-14 14:24:10 -04:00
|
|
|
@param w Width of bitmap in pixels
|
|
|
|
@param h Height of bitmap in pixels
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX::drawGrayscaleBitmap(int16_t x, int16_t y, uint8_t *bitmap,
|
|
|
|
uint8_t *mask, int16_t w, int16_t h) {
|
|
|
|
int16_t bw = (w + 7) / 8; // Bitmask scanline pad = whole byte
|
|
|
|
uint8_t byte = 0;
|
|
|
|
startWrite();
|
|
|
|
for (int16_t j = 0; j < h; j++, y++) {
|
|
|
|
for (int16_t i = 0; i < w; i++) {
|
|
|
|
if (i & 7)
|
|
|
|
byte <<= 1;
|
|
|
|
else
|
|
|
|
byte = mask[j * bw + i / 8];
|
|
|
|
if (byte & 0x80) {
|
|
|
|
writePixel(x + i, y, bitmap[j * w + i]);
|
|
|
|
}
|
2017-05-05 22:57:52 -04:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
}
|
|
|
|
endWrite();
|
2017-05-05 22:57:52 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-12-27 17:10:08 -05:00
|
|
|
@brief Draw a PROGMEM-resident 16-bit image (RGB 5/6/5) at the specified
|
|
|
|
(x,y) position. For 16-bit display devices; no color reduction performed.
|
2018-07-14 14:24:10 -04:00
|
|
|
@param x Top left corner x coordinate
|
|
|
|
@param y Top left corner y coordinate
|
|
|
|
@param bitmap byte array with 16-bit color bitmap
|
|
|
|
@param w Width of bitmap in pixels
|
|
|
|
@param h Height of bitmap in pixels
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX::drawRGBBitmap(int16_t x, int16_t y, const uint16_t bitmap[],
|
|
|
|
int16_t w, int16_t h) {
|
|
|
|
startWrite();
|
|
|
|
for (int16_t j = 0; j < h; j++, y++) {
|
|
|
|
for (int16_t i = 0; i < w; i++) {
|
|
|
|
writePixel(x + i, y, pgm_read_word(&bitmap[j * w + i]));
|
2017-05-05 22:57:52 -04:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
}
|
|
|
|
endWrite();
|
2017-05-05 22:57:52 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-12-27 17:10:08 -05:00
|
|
|
@brief Draw a RAM-resident 16-bit image (RGB 5/6/5) at the specified (x,y)
|
|
|
|
position. For 16-bit display devices; no color reduction performed.
|
2018-07-14 14:24:10 -04:00
|
|
|
@param x Top left corner x coordinate
|
|
|
|
@param y Top left corner y coordinate
|
|
|
|
@param bitmap byte array with 16-bit color bitmap
|
|
|
|
@param w Width of bitmap in pixels
|
|
|
|
@param h Height of bitmap in pixels
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX::drawRGBBitmap(int16_t x, int16_t y, uint16_t *bitmap,
|
|
|
|
int16_t w, int16_t h) {
|
|
|
|
startWrite();
|
|
|
|
for (int16_t j = 0; j < h; j++, y++) {
|
|
|
|
for (int16_t i = 0; i < w; i++) {
|
|
|
|
writePixel(x + i, y, bitmap[j * w + i]);
|
2017-05-05 22:57:52 -04:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
}
|
|
|
|
endWrite();
|
2017-05-05 22:57:52 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-12-27 17:10:08 -05:00
|
|
|
@brief Draw a PROGMEM-resident 16-bit image (RGB 5/6/5) with a 1-bit mask
|
|
|
|
(set bits = opaque, unset bits = clear) at the specified (x,y) position. BOTH
|
|
|
|
buffers (color and mask) must be PROGMEM-resident. For 16-bit display
|
|
|
|
devices; no color reduction performed.
|
2018-07-14 14:24:10 -04:00
|
|
|
@param x Top left corner x coordinate
|
|
|
|
@param y Top left corner y coordinate
|
|
|
|
@param bitmap byte array with 16-bit color bitmap
|
|
|
|
@param mask byte array with monochrome mask bitmap
|
|
|
|
@param w Width of bitmap in pixels
|
|
|
|
@param h Height of bitmap in pixels
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX::drawRGBBitmap(int16_t x, int16_t y, const uint16_t bitmap[],
|
|
|
|
const uint8_t mask[], int16_t w, int16_t h) {
|
|
|
|
int16_t bw = (w + 7) / 8; // Bitmask scanline pad = whole byte
|
|
|
|
uint8_t byte = 0;
|
|
|
|
startWrite();
|
|
|
|
for (int16_t j = 0; j < h; j++, y++) {
|
|
|
|
for (int16_t i = 0; i < w; i++) {
|
|
|
|
if (i & 7)
|
|
|
|
byte <<= 1;
|
|
|
|
else
|
|
|
|
byte = pgm_read_byte(&mask[j * bw + i / 8]);
|
|
|
|
if (byte & 0x80) {
|
|
|
|
writePixel(x + i, y, pgm_read_word(&bitmap[j * w + i]));
|
|
|
|
}
|
2014-04-15 15:09:53 -04:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
}
|
|
|
|
endWrite();
|
2014-04-15 15:09:53 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-12-27 17:10:08 -05:00
|
|
|
@brief Draw a RAM-resident 16-bit image (RGB 5/6/5) with a 1-bit mask (set
|
|
|
|
bits = opaque, unset bits = clear) at the specified (x,y) position. BOTH
|
|
|
|
buffers (color and mask) must be RAM-resident. For 16-bit display devices; no
|
|
|
|
color reduction performed.
|
2018-07-14 14:24:10 -04:00
|
|
|
@param x Top left corner x coordinate
|
|
|
|
@param y Top left corner y coordinate
|
|
|
|
@param bitmap byte array with 16-bit color bitmap
|
|
|
|
@param mask byte array with monochrome mask bitmap
|
|
|
|
@param w Width of bitmap in pixels
|
|
|
|
@param h Height of bitmap in pixels
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX::drawRGBBitmap(int16_t x, int16_t y, uint16_t *bitmap,
|
|
|
|
uint8_t *mask, int16_t w, int16_t h) {
|
|
|
|
int16_t bw = (w + 7) / 8; // Bitmask scanline pad = whole byte
|
|
|
|
uint8_t byte = 0;
|
|
|
|
startWrite();
|
|
|
|
for (int16_t j = 0; j < h; j++, y++) {
|
|
|
|
for (int16_t i = 0; i < w; i++) {
|
|
|
|
if (i & 7)
|
|
|
|
byte <<= 1;
|
|
|
|
else
|
|
|
|
byte = mask[j * bw + i / 8];
|
|
|
|
if (byte & 0x80) {
|
|
|
|
writePixel(x + i, y, bitmap[j * w + i]);
|
|
|
|
}
|
2017-05-05 22:57:52 -04:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
}
|
|
|
|
endWrite();
|
2017-05-05 22:57:52 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// TEXT- AND CHARACTER-HANDLING FUNCTIONS ----------------------------------
|
|
|
|
|
2017-02-22 20:11:09 -05:00
|
|
|
// Draw a character
|
2018-07-14 14:24:10 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Draw a single character
|
|
|
|
@param x Bottom left corner x coordinate
|
|
|
|
@param y Bottom left corner y coordinate
|
|
|
|
@param c The 8-bit font-indexed character (likely ascii)
|
|
|
|
@param color 16-bit 5-6-5 Color to draw chraracter with
|
2019-12-27 17:10:08 -05:00
|
|
|
@param bg 16-bit 5-6-5 Color to fill background with (if same as color,
|
|
|
|
no background)
|
2018-07-14 14:24:10 -04:00
|
|
|
@param size Font magnification level, 1 is 'original' size
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2017-02-22 20:11:09 -05:00
|
|
|
void Adafruit_GFX::drawChar(int16_t x, int16_t y, unsigned char c,
|
2019-12-27 17:10:08 -05:00
|
|
|
uint16_t color, uint16_t bg, uint8_t size) {
|
|
|
|
drawChar(x, y, c, color, bg, size, size);
|
2019-06-12 16:53:17 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// Draw a character
|
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Draw a single character
|
|
|
|
@param x Bottom left corner x coordinate
|
|
|
|
@param y Bottom left corner y coordinate
|
|
|
|
@param c The 8-bit font-indexed character (likely ascii)
|
|
|
|
@param color 16-bit 5-6-5 Color to draw chraracter with
|
2019-12-27 17:10:08 -05:00
|
|
|
@param bg 16-bit 5-6-5 Color to fill background with (if same as color,
|
|
|
|
no background)
|
2019-06-12 16:53:17 -04:00
|
|
|
@param size_x Font magnification level in X-axis, 1 is 'original' size
|
|
|
|
@param size_y Font magnification level in Y-axis, 1 is 'original' size
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
|
|
|
void Adafruit_GFX::drawChar(int16_t x, int16_t y, unsigned char c,
|
2019-12-27 17:10:08 -05:00
|
|
|
uint16_t color, uint16_t bg, uint8_t size_x,
|
|
|
|
uint8_t size_y) {
|
|
|
|
|
|
|
|
if (!gfxFont) { // 'Classic' built-in font
|
|
|
|
|
|
|
|
if ((x >= _width) || // Clip right
|
|
|
|
(y >= _height) || // Clip bottom
|
|
|
|
((x + 6 * size_x - 1) < 0) || // Clip left
|
|
|
|
((y + 8 * size_y - 1) < 0)) // Clip top
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (!_cp437 && (c >= 176))
|
|
|
|
c++; // Handle 'classic' charset behavior
|
|
|
|
|
|
|
|
startWrite();
|
|
|
|
for (int8_t i = 0; i < 5; i++) { // Char bitmap = 5 columns
|
2020-06-08 13:05:48 -04:00
|
|
|
uint8_t line = pgm_read_byte(&font[c * 5 + i]);
|
|
|
|
for (int8_t j = 0; j < 8; j++, line >>= 1) {
|
|
|
|
if (line & 1) {
|
|
|
|
if (size_x == 1 && size_y == 1)
|
|
|
|
writePixel(x + i, y + j, color);
|
|
|
|
else
|
|
|
|
writeFillRect(x + i * size_x, y + j * size_y, size_x, size_y,
|
|
|
|
color);
|
|
|
|
} else if (bg != color) {
|
|
|
|
if (size_x == 1 && size_y == 1)
|
|
|
|
writePixel(x + i, y + j, bg);
|
|
|
|
else
|
|
|
|
writeFillRect(x + i * size_x, y + j * size_y, size_x, size_y, bg);
|
2020-06-06 18:51:57 -04:00
|
|
|
}
|
2020-06-08 13:05:48 -04:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
}
|
|
|
|
if (bg != color) { // If opaque, draw vertical line for last column
|
2020-06-08 13:05:48 -04:00
|
|
|
if (size_x == 1 && size_y == 1)
|
|
|
|
writeFastVLine(x + 5, y, 8, bg);
|
|
|
|
else
|
|
|
|
writeFillRect(x + 5 * size_x, y, size_x, 8 * size_y, bg);
|
2019-12-27 17:10:08 -05:00
|
|
|
}
|
|
|
|
endWrite();
|
2015-12-22 15:02:43 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
} else { // Custom font
|
2015-12-22 15:02:43 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
// Character is assumed previously filtered by write() to eliminate
|
|
|
|
// newlines, returns, non-printable characters, etc. Calling
|
|
|
|
// drawChar() directly with 'bad' characters of font may cause mayhem!
|
2015-12-22 15:02:43 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
c -= (uint8_t)pgm_read_byte(&gfxFont->first);
|
|
|
|
GFXglyph *glyph = pgm_read_glyph_ptr(gfxFont, c);
|
|
|
|
uint8_t *bitmap = pgm_read_bitmap_ptr(gfxFont);
|
2015-12-22 15:02:43 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
uint16_t bo = pgm_read_word(&glyph->bitmapOffset);
|
|
|
|
uint8_t w = pgm_read_byte(&glyph->width), h = pgm_read_byte(&glyph->height);
|
|
|
|
int8_t xo = pgm_read_byte(&glyph->xOffset),
|
|
|
|
yo = pgm_read_byte(&glyph->yOffset);
|
|
|
|
uint8_t xx, yy, bits = 0, bit = 0;
|
|
|
|
int16_t xo16 = 0, yo16 = 0;
|
2012-03-12 20:32:18 -04:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
if (size_x > 1 || size_y > 1) {
|
|
|
|
xo16 = xo;
|
|
|
|
yo16 = yo;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Todo: Add character clipping here
|
|
|
|
|
|
|
|
// NOTE: THERE IS NO 'BACKGROUND' COLOR OPTION ON CUSTOM FONTS.
|
|
|
|
// THIS IS ON PURPOSE AND BY DESIGN. The background color feature
|
|
|
|
// has typically been used with the 'classic' font to overwrite old
|
|
|
|
// screen contents with new data. This ONLY works because the
|
|
|
|
// characters are a uniform size; it's not a sensible thing to do with
|
|
|
|
// proportionally-spaced fonts with glyphs of varying sizes (and that
|
|
|
|
// may overlap). To replace previously-drawn text when using a custom
|
|
|
|
// font, use the getTextBounds() function to determine the smallest
|
|
|
|
// rectangle encompassing a string, erase the area with fillRect(),
|
|
|
|
// then draw new text. This WILL infortunately 'blink' the text, but
|
|
|
|
// is unavoidable. Drawing 'background' pixels will NOT fix this,
|
|
|
|
// only creates a new set of problems. Have an idea to work around
|
|
|
|
// this (a canvas object type for MCUs that can afford the RAM and
|
|
|
|
// displays supporting setAddrWindow() and pushColors()), but haven't
|
|
|
|
// implemented this yet.
|
2012-04-09 23:46:33 -04:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
startWrite();
|
|
|
|
for (yy = 0; yy < h; yy++) {
|
|
|
|
for (xx = 0; xx < w; xx++) {
|
|
|
|
if (!(bit++ & 7)) {
|
|
|
|
bits = pgm_read_byte(&bitmap[bo++]);
|
|
|
|
}
|
|
|
|
if (bits & 0x80) {
|
|
|
|
if (size_x == 1 && size_y == 1) {
|
|
|
|
writePixel(x + xo + xx, y + yo + yy, color);
|
|
|
|
} else {
|
|
|
|
writeFillRect(x + (xo16 + xx) * size_x, y + (yo16 + yy) * size_y,
|
2019-06-12 16:53:17 -04:00
|
|
|
size_x, size_y, color);
|
2019-12-27 17:10:08 -05:00
|
|
|
}
|
2017-02-22 20:11:09 -05:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
bits <<= 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
endWrite();
|
2015-12-22 15:02:43 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
} // End classic vs custom font
|
2017-02-22 20:11:09 -05:00
|
|
|
}
|
2018-07-14 13:05:06 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Print one byte/character of data, used to support print()
|
|
|
|
@param c The 8-bit ascii character to write
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2017-02-22 20:11:09 -05:00
|
|
|
size_t Adafruit_GFX::write(uint8_t c) {
|
2019-12-27 17:10:08 -05:00
|
|
|
if (!gfxFont) { // 'Classic' built-in font
|
|
|
|
|
|
|
|
if (c == '\n') { // Newline?
|
|
|
|
cursor_x = 0; // Reset x to zero,
|
|
|
|
cursor_y += textsize_y * 8; // advance y one line
|
|
|
|
} else if (c != '\r') { // Ignore carriage returns
|
|
|
|
if (wrap && ((cursor_x + textsize_x * 6) > _width)) { // Off right?
|
|
|
|
cursor_x = 0; // Reset x to zero,
|
|
|
|
cursor_y += textsize_y * 8; // advance y one line
|
|
|
|
}
|
|
|
|
drawChar(cursor_x, cursor_y, c, textcolor, textbgcolor, textsize_x,
|
|
|
|
textsize_y);
|
|
|
|
cursor_x += textsize_x * 6; // Advance x one char
|
|
|
|
}
|
2012-04-09 23:46:33 -04:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
} else { // Custom font
|
|
|
|
|
|
|
|
if (c == '\n') {
|
|
|
|
cursor_x = 0;
|
|
|
|
cursor_y +=
|
|
|
|
(int16_t)textsize_y * (uint8_t)pgm_read_byte(&gfxFont->yAdvance);
|
|
|
|
} else if (c != '\r') {
|
|
|
|
uint8_t first = pgm_read_byte(&gfxFont->first);
|
|
|
|
if ((c >= first) && (c <= (uint8_t)pgm_read_byte(&gfxFont->last))) {
|
|
|
|
GFXglyph *glyph = pgm_read_glyph_ptr(gfxFont, c - first);
|
|
|
|
uint8_t w = pgm_read_byte(&glyph->width),
|
|
|
|
h = pgm_read_byte(&glyph->height);
|
|
|
|
if ((w > 0) && (h > 0)) { // Is there an associated bitmap?
|
|
|
|
int16_t xo = (int8_t)pgm_read_byte(&glyph->xOffset); // sic
|
|
|
|
if (wrap && ((cursor_x + textsize_x * (xo + w)) > _width)) {
|
|
|
|
cursor_x = 0;
|
2019-06-12 16:53:17 -04:00
|
|
|
cursor_y += (int16_t)textsize_y *
|
2017-05-05 22:57:52 -04:00
|
|
|
(uint8_t)pgm_read_byte(&gfxFont->yAdvance);
|
2019-12-27 17:10:08 -05:00
|
|
|
}
|
|
|
|
drawChar(cursor_x, cursor_y, c, textcolor, textbgcolor, textsize_x,
|
|
|
|
textsize_y);
|
2015-12-22 15:02:43 -05:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
cursor_x +=
|
|
|
|
(uint8_t)pgm_read_byte(&glyph->xAdvance) * (int16_t)textsize_x;
|
|
|
|
}
|
2017-02-22 20:11:09 -05:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
}
|
|
|
|
return 1;
|
2012-03-12 20:32:18 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 13:05:06 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-12-27 17:10:08 -05:00
|
|
|
@brief Set text 'magnification' size. Each increase in s makes 1 pixel
|
|
|
|
that much bigger.
|
2018-07-14 13:05:06 -04:00
|
|
|
@param s Desired text size. 1 is default 6x8, 2 is 12x16, 3 is 18x24, etc
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX::setTextSize(uint8_t s) { setTextSize(s, s); }
|
2019-06-12 16:53:17 -04:00
|
|
|
|
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-12-27 17:10:08 -05:00
|
|
|
@brief Set text 'magnification' size. Each increase in s makes 1 pixel
|
|
|
|
that much bigger.
|
2019-06-12 16:53:17 -04:00
|
|
|
@param s_x Desired text width magnification level in X-axis. 1 is default
|
|
|
|
@param s_y Desired text width magnification level in Y-axis. 1 is default
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
|
|
|
void Adafruit_GFX::setTextSize(uint8_t s_x, uint8_t s_y) {
|
2019-12-27 17:10:08 -05:00
|
|
|
textsize_x = (s_x > 0) ? s_x : 1;
|
|
|
|
textsize_y = (s_y > 0) ? s_y : 1;
|
2012-03-12 20:32:18 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 13:05:06 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Set rotation setting for display
|
|
|
|
@param x 0 thru 3 corresponding to 4 cardinal rotations
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2012-03-16 14:25:07 -04:00
|
|
|
void Adafruit_GFX::setRotation(uint8_t x) {
|
2019-12-27 17:10:08 -05:00
|
|
|
rotation = (x & 3);
|
|
|
|
switch (rotation) {
|
|
|
|
case 0:
|
|
|
|
case 2:
|
|
|
|
_width = WIDTH;
|
|
|
|
_height = HEIGHT;
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
case 3:
|
|
|
|
_width = HEIGHT;
|
|
|
|
_height = WIDTH;
|
|
|
|
break;
|
|
|
|
}
|
2012-03-16 14:25:07 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 13:05:06 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Set the font to display when print()ing, either custom or default
|
|
|
|
@param f The GFXfont object, if NULL use built in 6x8 font
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2015-12-22 15:02:43 -05:00
|
|
|
void Adafruit_GFX::setFont(const GFXfont *f) {
|
2019-12-27 17:10:08 -05:00
|
|
|
if (f) { // Font struct pointer passed in?
|
|
|
|
if (!gfxFont) { // And no current font struct?
|
|
|
|
// Switching from classic to new font behavior.
|
|
|
|
// Move cursor pos down 6 pixels so it's on baseline.
|
|
|
|
cursor_y += 6;
|
2015-12-22 15:02:43 -05:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
} else if (gfxFont) { // NULL passed. Current font struct defined?
|
|
|
|
// Switching from new to classic font behavior.
|
|
|
|
// Move cursor pos up 6 pixels so it's at top-left of char.
|
|
|
|
cursor_y -= 6;
|
|
|
|
}
|
|
|
|
gfxFont = (GFXfont *)f;
|
2015-12-22 15:02:43 -05:00
|
|
|
}
|
|
|
|
|
2018-07-14 13:05:06 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2020-10-19 15:00:55 -04:00
|
|
|
@brief Helper to determine size of a character with current font/size.
|
|
|
|
Broke this out as it's used by both the PROGMEM- and RAM-resident
|
|
|
|
getTextBounds() functions.
|
|
|
|
@param c The ASCII character in question
|
|
|
|
@param x Pointer to x location of character. Value is modified by
|
|
|
|
this function to advance to next character.
|
|
|
|
@param y Pointer to y location of character. Value is modified by
|
|
|
|
this function to advance to next character.
|
|
|
|
@param minx Pointer to minimum X coordinate, passed in to AND returned
|
|
|
|
by this function -- this is used to incrementally build a
|
|
|
|
bounding rectangle for a string.
|
|
|
|
@param miny Pointer to minimum Y coord, passed in AND returned.
|
|
|
|
@param maxx Pointer to maximum X coord, passed in AND returned.
|
|
|
|
@param maxy Pointer to maximum Y coord, passed in AND returned.
|
2018-07-14 13:05:06 -04:00
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2020-05-17 12:35:25 -04:00
|
|
|
void Adafruit_GFX::charBounds(unsigned char c, int16_t *x, int16_t *y,
|
|
|
|
int16_t *minx, int16_t *miny, int16_t *maxx,
|
|
|
|
int16_t *maxy) {
|
2019-12-27 17:10:08 -05:00
|
|
|
|
|
|
|
if (gfxFont) {
|
|
|
|
|
|
|
|
if (c == '\n') { // Newline?
|
|
|
|
*x = 0; // Reset x to zero, advance y by one line
|
|
|
|
*y += textsize_y * (uint8_t)pgm_read_byte(&gfxFont->yAdvance);
|
|
|
|
} else if (c != '\r') { // Not a carriage return; is normal char
|
|
|
|
uint8_t first = pgm_read_byte(&gfxFont->first),
|
|
|
|
last = pgm_read_byte(&gfxFont->last);
|
|
|
|
if ((c >= first) && (c <= last)) { // Char present in this font?
|
|
|
|
GFXglyph *glyph = pgm_read_glyph_ptr(gfxFont, c - first);
|
|
|
|
uint8_t gw = pgm_read_byte(&glyph->width),
|
|
|
|
gh = pgm_read_byte(&glyph->height),
|
|
|
|
xa = pgm_read_byte(&glyph->xAdvance);
|
|
|
|
int8_t xo = pgm_read_byte(&glyph->xOffset),
|
|
|
|
yo = pgm_read_byte(&glyph->yOffset);
|
|
|
|
if (wrap && ((*x + (((int16_t)xo + gw) * textsize_x)) > _width)) {
|
|
|
|
*x = 0; // Reset x to zero, advance y by one line
|
|
|
|
*y += textsize_y * (uint8_t)pgm_read_byte(&gfxFont->yAdvance);
|
2017-05-05 22:57:52 -04:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
int16_t tsx = (int16_t)textsize_x, tsy = (int16_t)textsize_y,
|
|
|
|
x1 = *x + xo * tsx, y1 = *y + yo * tsy, x2 = x1 + gw * tsx - 1,
|
|
|
|
y2 = y1 + gh * tsy - 1;
|
|
|
|
if (x1 < *minx)
|
|
|
|
*minx = x1;
|
|
|
|
if (y1 < *miny)
|
|
|
|
*miny = y1;
|
|
|
|
if (x2 > *maxx)
|
|
|
|
*maxx = x2;
|
|
|
|
if (y2 > *maxy)
|
|
|
|
*maxy = y2;
|
|
|
|
*x += xa * tsx;
|
|
|
|
}
|
|
|
|
}
|
2017-05-05 22:57:52 -04:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
} else { // Default font
|
|
|
|
|
|
|
|
if (c == '\n') { // Newline?
|
|
|
|
*x = 0; // Reset x to zero,
|
|
|
|
*y += textsize_y * 8; // advance y one line
|
|
|
|
// min/max x/y unchaged -- that waits for next 'normal' character
|
|
|
|
} else if (c != '\r') { // Normal char; ignore carriage returns
|
|
|
|
if (wrap && ((*x + textsize_x * 6) > _width)) { // Off right?
|
|
|
|
*x = 0; // Reset x to zero,
|
|
|
|
*y += textsize_y * 8; // advance y one line
|
|
|
|
}
|
|
|
|
int x2 = *x + textsize_x * 6 - 1, // Lower-right pixel of char
|
|
|
|
y2 = *y + textsize_y * 8 - 1;
|
|
|
|
if (x2 > *maxx)
|
|
|
|
*maxx = x2; // Track max x, y
|
|
|
|
if (y2 > *maxy)
|
|
|
|
*maxy = y2;
|
|
|
|
if (*x < *minx)
|
|
|
|
*minx = *x; // Track min x, y
|
|
|
|
if (*y < *miny)
|
|
|
|
*miny = *y;
|
|
|
|
*x += textsize_x * 6; // Advance x one char
|
2017-05-05 22:57:52 -04:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
}
|
2017-05-05 22:57:52 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 13:05:06 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2020-10-19 15:00:55 -04:00
|
|
|
@brief Helper to determine size of a string with current font/size.
|
|
|
|
Pass string and a cursor position, returns UL corner and W,H.
|
|
|
|
@param str The ASCII string to measure
|
|
|
|
@param x The current cursor X
|
|
|
|
@param y The current cursor Y
|
|
|
|
@param x1 The boundary X coordinate, returned by function
|
|
|
|
@param y1 The boundary Y coordinate, returned by function
|
|
|
|
@param w The boundary width, returned by function
|
|
|
|
@param h The boundary height, returned by function
|
2018-07-14 13:05:06 -04:00
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2017-08-26 16:09:12 -04:00
|
|
|
void Adafruit_GFX::getTextBounds(const char *str, int16_t x, int16_t y,
|
2019-12-27 17:10:08 -05:00
|
|
|
int16_t *x1, int16_t *y1, uint16_t *w,
|
|
|
|
uint16_t *h) {
|
2020-10-19 15:00:55 -04:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
uint8_t c; // Current character
|
2020-10-19 15:00:55 -04:00
|
|
|
int16_t minx = 0x7FFF, miny = 0x7FFF, maxx = -1, maxy = -1; // Bound rect
|
|
|
|
// Bound rect is intentionally initialized inverted, so 1st char sets it
|
2017-02-22 20:11:09 -05:00
|
|
|
|
2020-10-19 15:00:55 -04:00
|
|
|
*x1 = x; // Initial position is value passed in
|
2019-12-27 17:10:08 -05:00
|
|
|
*y1 = y;
|
2020-10-19 15:00:55 -04:00
|
|
|
*w = *h = 0; // Initial size is zero
|
2017-02-22 20:11:09 -05:00
|
|
|
|
2020-10-19 15:00:55 -04:00
|
|
|
while ((c = *str++)) {
|
|
|
|
// charBounds() modifies x/y to advance for each character,
|
|
|
|
// and min/max x/y are updated to incrementally build bounding rect.
|
2019-12-27 17:10:08 -05:00
|
|
|
charBounds(c, &x, &y, &minx, &miny, &maxx, &maxy);
|
2020-10-19 15:00:55 -04:00
|
|
|
}
|
2017-05-05 22:57:52 -04:00
|
|
|
|
2020-10-19 15:00:55 -04:00
|
|
|
if (maxx >= minx) { // If legit string bounds were found...
|
|
|
|
*x1 = minx; // Update x1 to least X coord,
|
|
|
|
*w = maxx - minx + 1; // And w to bound rect width
|
2019-12-27 17:10:08 -05:00
|
|
|
}
|
2020-10-19 15:16:15 -04:00
|
|
|
if (maxy >= miny) { // Same for height
|
2019-12-27 17:10:08 -05:00
|
|
|
*y1 = miny;
|
|
|
|
*h = maxy - miny + 1;
|
|
|
|
}
|
2015-12-22 15:02:43 -05:00
|
|
|
}
|
|
|
|
|
2018-08-08 17:06:59 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-12-27 17:10:08 -05:00
|
|
|
@brief Helper to determine size of a string with current font/size. Pass
|
|
|
|
string and a cursor position, returns UL corner and W,H.
|
2018-08-08 17:06:59 -04:00
|
|
|
@param str The ascii string to measure (as an arduino String() class)
|
|
|
|
@param x The current cursor X
|
|
|
|
@param y The current cursor Y
|
|
|
|
@param x1 The boundary X coordinate, set by function
|
|
|
|
@param y1 The boundary Y coordinate, set by function
|
|
|
|
@param w The boundary width, set by function
|
|
|
|
@param h The boundary height, set by function
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2017-08-26 16:09:12 -04:00
|
|
|
void Adafruit_GFX::getTextBounds(const String &str, int16_t x, int16_t y,
|
2019-12-27 17:10:08 -05:00
|
|
|
int16_t *x1, int16_t *y1, uint16_t *w,
|
|
|
|
uint16_t *h) {
|
|
|
|
if (str.length() != 0) {
|
|
|
|
getTextBounds(const_cast<char *>(str.c_str()), x, y, x1, y1, w, h);
|
|
|
|
}
|
2017-08-26 16:09:12 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 13:05:06 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-12-27 17:10:08 -05:00
|
|
|
@brief Helper to determine size of a PROGMEM string with current
|
|
|
|
font/size. Pass string and a cursor position, returns UL corner and W,H.
|
2018-07-14 13:05:06 -04:00
|
|
|
@param str The flash-memory ascii string to measure
|
|
|
|
@param x The current cursor X
|
|
|
|
@param y The current cursor Y
|
|
|
|
@param x1 The boundary X coordinate, set by function
|
|
|
|
@param y1 The boundary Y coordinate, set by function
|
|
|
|
@param w The boundary width, set by function
|
|
|
|
@param h The boundary height, set by function
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX::getTextBounds(const __FlashStringHelper *str, int16_t x,
|
|
|
|
int16_t y, int16_t *x1, int16_t *y1,
|
|
|
|
uint16_t *w, uint16_t *h) {
|
|
|
|
uint8_t *s = (uint8_t *)str, c;
|
2017-02-22 20:11:09 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
*x1 = x;
|
|
|
|
*y1 = y;
|
|
|
|
*w = *h = 0;
|
2017-02-22 20:11:09 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
int16_t minx = _width, miny = _height, maxx = -1, maxy = -1;
|
2017-02-22 20:11:09 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
while ((c = pgm_read_byte(s++)))
|
|
|
|
charBounds(c, &x, &y, &minx, &miny, &maxx, &maxy);
|
2017-05-05 22:57:52 -04:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
if (maxx >= minx) {
|
|
|
|
*x1 = minx;
|
|
|
|
*w = maxx - minx + 1;
|
|
|
|
}
|
|
|
|
if (maxy >= miny) {
|
|
|
|
*y1 = miny;
|
|
|
|
*h = maxy - miny + 1;
|
|
|
|
}
|
2015-12-22 15:02:43 -05:00
|
|
|
}
|
|
|
|
|
2018-07-14 13:05:06 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Invert the display (ideally using built-in hardware command)
|
|
|
|
@param i True if you want to invert, false to make 'normal'
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
Change boolean to bool (#303)
* Change boolean to bool
This avoids compiler warnings such as:
In file included from /home/ed/git/dryer-arduino/ui/src/graphicstest.ino:18:
.pio/libdeps/nucleo_f446re/Adafruit GFX Library_ID13/Adafruit_GFX.h:48:39: warning: 'boolean' is deprecated [-Wdeprecated-declarations]
48 | virtual void invertDisplay(boolean i);
| ^
In file included from /home/ed/.platformio/packages/framework-arduinoststm32/cores/arduino/wiring.h:34,
from /home/ed/.platformio/packages/framework-arduinoststm32/cores/arduino/Arduino.h:32,
from /tmp/tmpvslwxjr7:1:
/home/ed/.platformio/packages/framework-arduinoststm32/cores/arduino/wiring_constants.h:110:14: note: declared here
* Fix clang format issues unrelated to this PR
Addresses the following from CI:
$ python3 ci/run-clang-format.py -e "ci/*" -e "bin/*" -r .
--- ./Adafruit_GFX.h (original)
+++ ./Adafruit_GFX.h (reformatted)
@@ -240,8 +240,8 @@
uint8_t textsize_x; ///< Desired magnification in X-axis of text to print()
uint8_t textsize_y; ///< Desired magnification in Y-axis of text to print()
uint8_t rotation; ///< Display rotation (0 thru 3)
- bool wrap; ///< If set, 'wrap' text at right edge of display
- bool _cp437; ///< If set, use correct CP437 charset (default is off)
+ bool wrap; ///< If set, 'wrap' text at right edge of display
+ bool _cp437; ///< If set, use correct CP437 charset (default is off)
GFXfont *gfxFont; ///< Pointer to special font
};
--- ./Adafruit_GFX.cpp (original)
+++ ./Adafruit_GFX.cpp (reformatted)
@@ -1713,9 +1713,7 @@
@returns True if was pressed before, now is not.
*/
/**************************************************************************/
-bool Adafruit_GFX_Button::justReleased() {
- return (!currstate && laststate);
-}
+bool Adafruit_GFX_Button::justReleased() { return (!currstate && laststate); }
// -------------------------------------------------------------------------
2020-06-15 11:20:29 -04:00
|
|
|
void Adafruit_GFX::invertDisplay(bool i) {
|
2019-12-27 17:10:08 -05:00
|
|
|
// Do nothing, must be subclassed if supported by hardware
|
2020-12-08 17:37:27 -05:00
|
|
|
(void)i; // disable -Wunused-parameter warning
|
2013-07-05 14:37:02 -04:00
|
|
|
}
|
|
|
|
|
2015-05-20 13:55:54 -04:00
|
|
|
/***************************************************************************/
|
|
|
|
|
2018-07-14 15:21:57 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Create a simple drawn button UI element
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
Adafruit_GFX_Button::Adafruit_GFX_Button(void) { _gfx = 0; }
|
2015-05-20 13:55:54 -04:00
|
|
|
|
2018-07-14 15:21:57 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Initialize button with our desired color/size/settings
|
|
|
|
@param gfx Pointer to our display so we can draw to it!
|
|
|
|
@param x The X coordinate of the center of the button
|
|
|
|
@param y The Y coordinate of the center of the button
|
|
|
|
@param w Width of the buttton
|
|
|
|
@param h Height of the buttton
|
|
|
|
@param outline Color of the outline (16-bit 5-6-5 standard)
|
|
|
|
@param fill Color of the button fill (16-bit 5-6-5 standard)
|
|
|
|
@param textcolor Color of the button label (16-bit 5-6-5 standard)
|
|
|
|
@param label Ascii string of the text inside the button
|
|
|
|
@param textsize The font magnification of the label text
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2017-03-07 13:24:06 -05:00
|
|
|
// Classic initButton() function: pass center & size
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX_Button::initButton(Adafruit_GFX *gfx, int16_t x, int16_t y,
|
|
|
|
uint16_t w, uint16_t h, uint16_t outline,
|
|
|
|
uint16_t fill, uint16_t textcolor,
|
|
|
|
char *label, uint8_t textsize) {
|
2017-03-07 13:24:06 -05:00
|
|
|
// Tweak arguments and pass to the newer initButtonUL() function...
|
2019-12-27 17:10:08 -05:00
|
|
|
initButtonUL(gfx, x - (w / 2), y - (h / 2), w, h, outline, fill, textcolor,
|
|
|
|
label, textsize);
|
2015-05-20 13:55:54 -04:00
|
|
|
}
|
|
|
|
|
2019-06-12 16:53:17 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Initialize button with our desired color/size/settings
|
|
|
|
@param gfx Pointer to our display so we can draw to it!
|
|
|
|
@param x The X coordinate of the center of the button
|
|
|
|
@param y The Y coordinate of the center of the button
|
|
|
|
@param w Width of the buttton
|
|
|
|
@param h Height of the buttton
|
|
|
|
@param outline Color of the outline (16-bit 5-6-5 standard)
|
|
|
|
@param fill Color of the button fill (16-bit 5-6-5 standard)
|
|
|
|
@param textcolor Color of the button label (16-bit 5-6-5 standard)
|
|
|
|
@param label Ascii string of the text inside the button
|
|
|
|
@param textsize_x The font magnification in X-axis of the label text
|
|
|
|
@param textsize_y The font magnification in Y-axis of the label text
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
|
|
|
// Classic initButton() function: pass center & size
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX_Button::initButton(Adafruit_GFX *gfx, int16_t x, int16_t y,
|
|
|
|
uint16_t w, uint16_t h, uint16_t outline,
|
|
|
|
uint16_t fill, uint16_t textcolor,
|
|
|
|
char *label, uint8_t textsize_x,
|
|
|
|
uint8_t textsize_y) {
|
2019-06-12 16:53:17 -04:00
|
|
|
// Tweak arguments and pass to the newer initButtonUL() function...
|
2019-12-27 17:10:08 -05:00
|
|
|
initButtonUL(gfx, x - (w / 2), y - (h / 2), w, h, outline, fill, textcolor,
|
|
|
|
label, textsize_x, textsize_y);
|
2019-06-12 16:53:17 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 15:21:57 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-12-27 17:10:08 -05:00
|
|
|
@brief Initialize button with our desired color/size/settings, with
|
|
|
|
upper-left coordinates
|
2018-07-14 15:21:57 -04:00
|
|
|
@param gfx Pointer to our display so we can draw to it!
|
|
|
|
@param x1 The X coordinate of the Upper-Left corner of the button
|
|
|
|
@param y1 The Y coordinate of the Upper-Left corner of the button
|
|
|
|
@param w Width of the buttton
|
|
|
|
@param h Height of the buttton
|
|
|
|
@param outline Color of the outline (16-bit 5-6-5 standard)
|
|
|
|
@param fill Color of the button fill (16-bit 5-6-5 standard)
|
|
|
|
@param textcolor Color of the button label (16-bit 5-6-5 standard)
|
|
|
|
@param label Ascii string of the text inside the button
|
|
|
|
@param textsize The font magnification of the label text
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX_Button::initButtonUL(Adafruit_GFX *gfx, int16_t x1,
|
|
|
|
int16_t y1, uint16_t w, uint16_t h,
|
|
|
|
uint16_t outline, uint16_t fill,
|
|
|
|
uint16_t textcolor, char *label,
|
|
|
|
uint8_t textsize) {
|
|
|
|
initButtonUL(gfx, x1, y1, w, h, outline, fill, textcolor, label, textsize,
|
|
|
|
textsize);
|
2019-06-12 16:53:17 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-12-27 17:10:08 -05:00
|
|
|
@brief Initialize button with our desired color/size/settings, with
|
|
|
|
upper-left coordinates
|
2019-06-12 16:53:17 -04:00
|
|
|
@param gfx Pointer to our display so we can draw to it!
|
|
|
|
@param x1 The X coordinate of the Upper-Left corner of the button
|
|
|
|
@param y1 The Y coordinate of the Upper-Left corner of the button
|
|
|
|
@param w Width of the buttton
|
|
|
|
@param h Height of the buttton
|
|
|
|
@param outline Color of the outline (16-bit 5-6-5 standard)
|
|
|
|
@param fill Color of the button fill (16-bit 5-6-5 standard)
|
|
|
|
@param textcolor Color of the button label (16-bit 5-6-5 standard)
|
|
|
|
@param label Ascii string of the text inside the button
|
|
|
|
@param textsize_x The font magnification in X-axis of the label text
|
|
|
|
@param textsize_y The font magnification in Y-axis of the label text
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2019-12-27 17:10:08 -05:00
|
|
|
void Adafruit_GFX_Button::initButtonUL(Adafruit_GFX *gfx, int16_t x1,
|
|
|
|
int16_t y1, uint16_t w, uint16_t h,
|
|
|
|
uint16_t outline, uint16_t fill,
|
|
|
|
uint16_t textcolor, char *label,
|
|
|
|
uint8_t textsize_x, uint8_t textsize_y) {
|
|
|
|
_x1 = x1;
|
|
|
|
_y1 = y1;
|
|
|
|
_w = w;
|
|
|
|
_h = h;
|
2015-05-20 13:55:54 -04:00
|
|
|
_outlinecolor = outline;
|
2019-12-27 17:10:08 -05:00
|
|
|
_fillcolor = fill;
|
|
|
|
_textcolor = textcolor;
|
|
|
|
_textsize_x = textsize_x;
|
|
|
|
_textsize_y = textsize_y;
|
|
|
|
_gfx = gfx;
|
2015-05-20 13:55:54 -04:00
|
|
|
strncpy(_label, label, 9);
|
2021-05-07 17:12:16 -04:00
|
|
|
_label[9] = 0; // strncpy does not place a null at the end. When 'label' is 9 characters, _label is not terminated.
|
2015-05-20 13:55:54 -04:00
|
|
|
}
|
2017-02-22 20:11:09 -05:00
|
|
|
|
2018-07-14 15:21:57 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Draw the button on the screen
|
2019-12-27 17:10:08 -05:00
|
|
|
@param inverted Whether to draw with fill/text swapped to indicate
|
|
|
|
'pressed'
|
2018-07-14 15:21:57 -04:00
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
Change boolean to bool (#303)
* Change boolean to bool
This avoids compiler warnings such as:
In file included from /home/ed/git/dryer-arduino/ui/src/graphicstest.ino:18:
.pio/libdeps/nucleo_f446re/Adafruit GFX Library_ID13/Adafruit_GFX.h:48:39: warning: 'boolean' is deprecated [-Wdeprecated-declarations]
48 | virtual void invertDisplay(boolean i);
| ^
In file included from /home/ed/.platformio/packages/framework-arduinoststm32/cores/arduino/wiring.h:34,
from /home/ed/.platformio/packages/framework-arduinoststm32/cores/arduino/Arduino.h:32,
from /tmp/tmpvslwxjr7:1:
/home/ed/.platformio/packages/framework-arduinoststm32/cores/arduino/wiring_constants.h:110:14: note: declared here
* Fix clang format issues unrelated to this PR
Addresses the following from CI:
$ python3 ci/run-clang-format.py -e "ci/*" -e "bin/*" -r .
--- ./Adafruit_GFX.h (original)
+++ ./Adafruit_GFX.h (reformatted)
@@ -240,8 +240,8 @@
uint8_t textsize_x; ///< Desired magnification in X-axis of text to print()
uint8_t textsize_y; ///< Desired magnification in Y-axis of text to print()
uint8_t rotation; ///< Display rotation (0 thru 3)
- bool wrap; ///< If set, 'wrap' text at right edge of display
- bool _cp437; ///< If set, use correct CP437 charset (default is off)
+ bool wrap; ///< If set, 'wrap' text at right edge of display
+ bool _cp437; ///< If set, use correct CP437 charset (default is off)
GFXfont *gfxFont; ///< Pointer to special font
};
--- ./Adafruit_GFX.cpp (original)
+++ ./Adafruit_GFX.cpp (reformatted)
@@ -1713,9 +1713,7 @@
@returns True if was pressed before, now is not.
*/
/**************************************************************************/
-bool Adafruit_GFX_Button::justReleased() {
- return (!currstate && laststate);
-}
+bool Adafruit_GFX_Button::justReleased() { return (!currstate && laststate); }
// -------------------------------------------------------------------------
2020-06-15 11:20:29 -04:00
|
|
|
void Adafruit_GFX_Button::drawButton(bool inverted) {
|
2015-12-22 15:02:43 -05:00
|
|
|
uint16_t fill, outline, text;
|
2015-05-20 13:55:54 -04:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
if (!inverted) {
|
|
|
|
fill = _fillcolor;
|
2015-12-22 15:02:43 -05:00
|
|
|
outline = _outlinecolor;
|
2019-12-27 17:10:08 -05:00
|
|
|
text = _textcolor;
|
2015-12-22 15:02:43 -05:00
|
|
|
} else {
|
2019-12-27 17:10:08 -05:00
|
|
|
fill = _textcolor;
|
2015-12-22 15:02:43 -05:00
|
|
|
outline = _outlinecolor;
|
2019-12-27 17:10:08 -05:00
|
|
|
text = _fillcolor;
|
2015-12-22 15:02:43 -05:00
|
|
|
}
|
2015-05-20 13:55:54 -04:00
|
|
|
|
2017-03-07 13:24:06 -05:00
|
|
|
uint8_t r = min(_w, _h) / 4; // Corner radius
|
|
|
|
_gfx->fillRoundRect(_x1, _y1, _w, _h, r, fill);
|
|
|
|
_gfx->drawRoundRect(_x1, _y1, _w, _h, r, outline);
|
2015-05-20 13:55:54 -04:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
_gfx->setCursor(_x1 + (_w / 2) - (strlen(_label) * 3 * _textsize_x),
|
|
|
|
_y1 + (_h / 2) - (4 * _textsize_y));
|
2015-12-22 15:02:43 -05:00
|
|
|
_gfx->setTextColor(text);
|
2019-06-12 16:53:17 -04:00
|
|
|
_gfx->setTextSize(_textsize_x, _textsize_y);
|
2015-12-22 15:02:43 -05:00
|
|
|
_gfx->print(_label);
|
|
|
|
}
|
2015-05-20 13:55:54 -04:00
|
|
|
|
2018-07-14 15:21:57 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-12-27 17:10:08 -05:00
|
|
|
@brief Helper to let us know if a coordinate is within the bounds of the
|
|
|
|
button
|
2018-07-14 15:21:57 -04:00
|
|
|
@param x The X coordinate to check
|
|
|
|
@param y The Y coordinate to check
|
2019-05-29 23:33:31 -04:00
|
|
|
@returns True if within button graphics outline
|
2018-07-14 15:21:57 -04:00
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
Change boolean to bool (#303)
* Change boolean to bool
This avoids compiler warnings such as:
In file included from /home/ed/git/dryer-arduino/ui/src/graphicstest.ino:18:
.pio/libdeps/nucleo_f446re/Adafruit GFX Library_ID13/Adafruit_GFX.h:48:39: warning: 'boolean' is deprecated [-Wdeprecated-declarations]
48 | virtual void invertDisplay(boolean i);
| ^
In file included from /home/ed/.platformio/packages/framework-arduinoststm32/cores/arduino/wiring.h:34,
from /home/ed/.platformio/packages/framework-arduinoststm32/cores/arduino/Arduino.h:32,
from /tmp/tmpvslwxjr7:1:
/home/ed/.platformio/packages/framework-arduinoststm32/cores/arduino/wiring_constants.h:110:14: note: declared here
* Fix clang format issues unrelated to this PR
Addresses the following from CI:
$ python3 ci/run-clang-format.py -e "ci/*" -e "bin/*" -r .
--- ./Adafruit_GFX.h (original)
+++ ./Adafruit_GFX.h (reformatted)
@@ -240,8 +240,8 @@
uint8_t textsize_x; ///< Desired magnification in X-axis of text to print()
uint8_t textsize_y; ///< Desired magnification in Y-axis of text to print()
uint8_t rotation; ///< Display rotation (0 thru 3)
- bool wrap; ///< If set, 'wrap' text at right edge of display
- bool _cp437; ///< If set, use correct CP437 charset (default is off)
+ bool wrap; ///< If set, 'wrap' text at right edge of display
+ bool _cp437; ///< If set, use correct CP437 charset (default is off)
GFXfont *gfxFont; ///< Pointer to special font
};
--- ./Adafruit_GFX.cpp (original)
+++ ./Adafruit_GFX.cpp (reformatted)
@@ -1713,9 +1713,7 @@
@returns True if was pressed before, now is not.
*/
/**************************************************************************/
-bool Adafruit_GFX_Button::justReleased() {
- return (!currstate && laststate);
-}
+bool Adafruit_GFX_Button::justReleased() { return (!currstate && laststate); }
// -------------------------------------------------------------------------
2020-06-15 11:20:29 -04:00
|
|
|
bool Adafruit_GFX_Button::contains(int16_t x, int16_t y) {
|
2019-12-27 17:10:08 -05:00
|
|
|
return ((x >= _x1) && (x < (int16_t)(_x1 + _w)) && (y >= _y1) &&
|
|
|
|
(y < (int16_t)(_y1 + _h)));
|
2015-12-22 15:02:43 -05:00
|
|
|
}
|
|
|
|
|
2018-07-14 15:21:57 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Query whether the button was pressed since we last checked state
|
|
|
|
@returns True if was not-pressed before, now is.
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
Change boolean to bool (#303)
* Change boolean to bool
This avoids compiler warnings such as:
In file included from /home/ed/git/dryer-arduino/ui/src/graphicstest.ino:18:
.pio/libdeps/nucleo_f446re/Adafruit GFX Library_ID13/Adafruit_GFX.h:48:39: warning: 'boolean' is deprecated [-Wdeprecated-declarations]
48 | virtual void invertDisplay(boolean i);
| ^
In file included from /home/ed/.platformio/packages/framework-arduinoststm32/cores/arduino/wiring.h:34,
from /home/ed/.platformio/packages/framework-arduinoststm32/cores/arduino/Arduino.h:32,
from /tmp/tmpvslwxjr7:1:
/home/ed/.platformio/packages/framework-arduinoststm32/cores/arduino/wiring_constants.h:110:14: note: declared here
* Fix clang format issues unrelated to this PR
Addresses the following from CI:
$ python3 ci/run-clang-format.py -e "ci/*" -e "bin/*" -r .
--- ./Adafruit_GFX.h (original)
+++ ./Adafruit_GFX.h (reformatted)
@@ -240,8 +240,8 @@
uint8_t textsize_x; ///< Desired magnification in X-axis of text to print()
uint8_t textsize_y; ///< Desired magnification in Y-axis of text to print()
uint8_t rotation; ///< Display rotation (0 thru 3)
- bool wrap; ///< If set, 'wrap' text at right edge of display
- bool _cp437; ///< If set, use correct CP437 charset (default is off)
+ bool wrap; ///< If set, 'wrap' text at right edge of display
+ bool _cp437; ///< If set, use correct CP437 charset (default is off)
GFXfont *gfxFont; ///< Pointer to special font
};
--- ./Adafruit_GFX.cpp (original)
+++ ./Adafruit_GFX.cpp (reformatted)
@@ -1713,9 +1713,7 @@
@returns True if was pressed before, now is not.
*/
/**************************************************************************/
-bool Adafruit_GFX_Button::justReleased() {
- return (!currstate && laststate);
-}
+bool Adafruit_GFX_Button::justReleased() { return (!currstate && laststate); }
// -------------------------------------------------------------------------
2020-06-15 11:20:29 -04:00
|
|
|
bool Adafruit_GFX_Button::justPressed() { return (currstate && !laststate); }
|
2018-07-14 15:21:57 -04:00
|
|
|
|
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Query whether the button was released since we last checked state
|
|
|
|
@returns True if was pressed before, now is not.
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
Change boolean to bool (#303)
* Change boolean to bool
This avoids compiler warnings such as:
In file included from /home/ed/git/dryer-arduino/ui/src/graphicstest.ino:18:
.pio/libdeps/nucleo_f446re/Adafruit GFX Library_ID13/Adafruit_GFX.h:48:39: warning: 'boolean' is deprecated [-Wdeprecated-declarations]
48 | virtual void invertDisplay(boolean i);
| ^
In file included from /home/ed/.platformio/packages/framework-arduinoststm32/cores/arduino/wiring.h:34,
from /home/ed/.platformio/packages/framework-arduinoststm32/cores/arduino/Arduino.h:32,
from /tmp/tmpvslwxjr7:1:
/home/ed/.platformio/packages/framework-arduinoststm32/cores/arduino/wiring_constants.h:110:14: note: declared here
* Fix clang format issues unrelated to this PR
Addresses the following from CI:
$ python3 ci/run-clang-format.py -e "ci/*" -e "bin/*" -r .
--- ./Adafruit_GFX.h (original)
+++ ./Adafruit_GFX.h (reformatted)
@@ -240,8 +240,8 @@
uint8_t textsize_x; ///< Desired magnification in X-axis of text to print()
uint8_t textsize_y; ///< Desired magnification in Y-axis of text to print()
uint8_t rotation; ///< Display rotation (0 thru 3)
- bool wrap; ///< If set, 'wrap' text at right edge of display
- bool _cp437; ///< If set, use correct CP437 charset (default is off)
+ bool wrap; ///< If set, 'wrap' text at right edge of display
+ bool _cp437; ///< If set, use correct CP437 charset (default is off)
GFXfont *gfxFont; ///< Pointer to special font
};
--- ./Adafruit_GFX.cpp (original)
+++ ./Adafruit_GFX.cpp (reformatted)
@@ -1713,9 +1713,7 @@
@returns True if was pressed before, now is not.
*/
/**************************************************************************/
-bool Adafruit_GFX_Button::justReleased() {
- return (!currstate && laststate);
-}
+bool Adafruit_GFX_Button::justReleased() { return (!currstate && laststate); }
// -------------------------------------------------------------------------
2020-06-15 11:20:29 -04:00
|
|
|
bool Adafruit_GFX_Button::justReleased() { return (!currstate && laststate); }
|
2015-12-28 13:58:40 -05:00
|
|
|
|
|
|
|
// -------------------------------------------------------------------------
|
|
|
|
|
2017-05-05 01:06:09 -04:00
|
|
|
// GFXcanvas1, GFXcanvas8 and GFXcanvas16 (currently a WIP, don't get too
|
|
|
|
// comfy with the implementation) provide 1-, 8- and 16-bit offscreen
|
|
|
|
// canvases, the address of which can be passed to drawBitmap() or
|
|
|
|
// pushColors() (the latter appears only in a couple of GFX-subclassed TFT
|
|
|
|
// libraries at this time). This is here mostly to help with the recently-
|
|
|
|
// added proportionally-spaced fonts; adds a way to refresh a section of the
|
|
|
|
// screen without a massive flickering clear-and-redraw...but maybe you'll
|
|
|
|
// find other uses too. VERY RAM-intensive, since the buffer is in MCU
|
|
|
|
// memory and not the display driver...GXFcanvas1 might be minimally useful
|
|
|
|
// on an Uno-class board, but this and the others are much more likely to
|
|
|
|
// require at least a Mega or various recent ARM-type boards (recommended,
|
|
|
|
// as the text+bitmap draw can be pokey). GFXcanvas1 requires 1 bit per
|
|
|
|
// pixel (rounded up to nearest byte per scanline), GFXcanvas8 is 1 byte
|
|
|
|
// per pixel (no scanline pad), and GFXcanvas16 uses 2 bytes per pixel (no
|
|
|
|
// scanline pad).
|
2015-12-28 13:58:40 -05:00
|
|
|
// NOT EXTENSIVELY TESTED YET. MAY CONTAIN WORST BUGS KNOWN TO HUMANKIND.
|
|
|
|
|
2019-07-13 23:21:37 -04:00
|
|
|
#ifdef __AVR__
|
|
|
|
// Bitmask tables of 0x80>>X and ~(0x80>>X), because X>>Y is slow on AVR
|
2020-06-05 14:00:20 -04:00
|
|
|
const uint8_t PROGMEM GFXcanvas1::GFXsetBit[] = {0x80, 0x40, 0x20, 0x10,
|
|
|
|
0x08, 0x04, 0x02, 0x01};
|
|
|
|
const uint8_t PROGMEM GFXcanvas1::GFXclrBit[] = {0x7F, 0xBF, 0xDF, 0xEF,
|
|
|
|
0xF7, 0xFB, 0xFD, 0xFE};
|
2019-07-13 23:21:37 -04:00
|
|
|
#endif
|
|
|
|
|
2018-07-14 15:21:57 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Instatiate a GFX 1-bit canvas context for graphics
|
|
|
|
@param w Display width, in pixels
|
|
|
|
@param h Display height, in pixels
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2015-12-28 13:58:40 -05:00
|
|
|
GFXcanvas1::GFXcanvas1(uint16_t w, uint16_t h) : Adafruit_GFX(w, h) {
|
2019-12-27 17:10:08 -05:00
|
|
|
uint16_t bytes = ((w + 7) / 8) * h;
|
|
|
|
if ((buffer = (uint8_t *)malloc(bytes))) {
|
|
|
|
memset(buffer, 0, bytes);
|
|
|
|
}
|
2015-12-28 13:58:40 -05:00
|
|
|
}
|
|
|
|
|
2018-07-14 15:21:57 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Delete the canvas, free memory
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2015-12-28 13:58:40 -05:00
|
|
|
GFXcanvas1::~GFXcanvas1(void) {
|
2019-12-27 17:10:08 -05:00
|
|
|
if (buffer)
|
|
|
|
free(buffer);
|
2015-12-28 13:58:40 -05:00
|
|
|
}
|
|
|
|
|
2018-07-14 15:21:57 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-05-29 23:33:31 -04:00
|
|
|
@brief Draw a pixel to the canvas framebuffer
|
|
|
|
@param x x coordinate
|
|
|
|
@param y y coordinate
|
2019-07-13 23:21:37 -04:00
|
|
|
@param color Binary (on or off) color to fill with
|
2018-07-14 15:21:57 -04:00
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2017-05-05 22:57:52 -04:00
|
|
|
void GFXcanvas1::drawPixel(int16_t x, int16_t y, uint16_t color) {
|
2019-12-27 17:10:08 -05:00
|
|
|
if (buffer) {
|
|
|
|
if ((x < 0) || (y < 0) || (x >= _width) || (y >= _height))
|
|
|
|
return;
|
2015-12-28 13:58:40 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
int16_t t;
|
|
|
|
switch (rotation) {
|
|
|
|
case 1:
|
|
|
|
t = x;
|
|
|
|
x = WIDTH - 1 - y;
|
|
|
|
y = t;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
x = WIDTH - 1 - x;
|
|
|
|
y = HEIGHT - 1 - y;
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
t = x;
|
|
|
|
x = y;
|
|
|
|
y = HEIGHT - 1 - t;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint8_t *ptr = &buffer[(x / 8) + y * ((WIDTH + 7) / 8)];
|
2017-05-05 01:06:09 -04:00
|
|
|
#ifdef __AVR__
|
2019-12-27 17:10:08 -05:00
|
|
|
if (color)
|
|
|
|
*ptr |= pgm_read_byte(&GFXsetBit[x & 7]);
|
|
|
|
else
|
|
|
|
*ptr &= pgm_read_byte(&GFXclrBit[x & 7]);
|
2017-05-05 01:06:09 -04:00
|
|
|
#else
|
2019-12-27 17:10:08 -05:00
|
|
|
if (color)
|
|
|
|
*ptr |= 0x80 >> (x & 7);
|
|
|
|
else
|
|
|
|
*ptr &= ~(0x80 >> (x & 7));
|
2017-05-05 01:06:09 -04:00
|
|
|
#endif
|
2019-12-27 17:10:08 -05:00
|
|
|
}
|
2015-12-28 13:58:40 -05:00
|
|
|
}
|
|
|
|
|
2019-07-13 23:21:37 -04:00
|
|
|
/**********************************************************************/
|
|
|
|
/*!
|
2020-06-05 14:00:20 -04:00
|
|
|
@brief Get the pixel color value at a given coordinate
|
|
|
|
@param x x coordinate
|
|
|
|
@param y y coordinate
|
|
|
|
@returns The desired pixel's binary color value, either 0x1 (on) or 0x0
|
|
|
|
(off)
|
2019-07-13 23:21:37 -04:00
|
|
|
*/
|
|
|
|
/**********************************************************************/
|
|
|
|
bool GFXcanvas1::getPixel(int16_t x, int16_t y) const {
|
2020-06-05 14:00:20 -04:00
|
|
|
int16_t t;
|
|
|
|
switch (rotation) {
|
|
|
|
case 1:
|
|
|
|
t = x;
|
|
|
|
x = WIDTH - 1 - y;
|
|
|
|
y = t;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
x = WIDTH - 1 - x;
|
|
|
|
y = HEIGHT - 1 - y;
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
t = x;
|
|
|
|
x = y;
|
|
|
|
y = HEIGHT - 1 - t;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return getRawPixel(x, y);
|
2019-07-13 23:21:37 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/**********************************************************************/
|
|
|
|
/*!
|
2020-06-05 14:00:20 -04:00
|
|
|
@brief Get the pixel color value at a given, unrotated coordinate.
|
2019-07-13 23:21:37 -04:00
|
|
|
This method is intended for hardware drivers to get pixel value
|
|
|
|
in physical coordinates.
|
2020-06-05 14:00:20 -04:00
|
|
|
@param x x coordinate
|
|
|
|
@param y y coordinate
|
|
|
|
@returns The desired pixel's binary color value, either 0x1 (on) or 0x0
|
|
|
|
(off)
|
2019-07-13 23:21:37 -04:00
|
|
|
*/
|
|
|
|
/**********************************************************************/
|
|
|
|
bool GFXcanvas1::getRawPixel(int16_t x, int16_t y) const {
|
2020-06-05 14:00:20 -04:00
|
|
|
if ((x < 0) || (y < 0) || (x >= WIDTH) || (y >= HEIGHT))
|
|
|
|
return 0;
|
|
|
|
if (this->getBuffer()) {
|
|
|
|
uint8_t *buffer = this->getBuffer();
|
|
|
|
uint8_t *ptr = &buffer[(x / 8) + y * ((WIDTH + 7) / 8)];
|
2019-07-13 23:21:37 -04:00
|
|
|
|
|
|
|
#ifdef __AVR__
|
2020-06-05 14:00:20 -04:00
|
|
|
return ((*ptr) & pgm_read_byte(&GFXsetBit[x & 7])) != 0;
|
2019-07-13 23:21:37 -04:00
|
|
|
#else
|
2020-06-05 14:00:20 -04:00
|
|
|
return ((*ptr) & (0x80 >> (x & 7))) != 0;
|
2019-07-13 23:21:37 -04:00
|
|
|
#endif
|
2020-06-05 14:00:20 -04:00
|
|
|
}
|
|
|
|
return 0;
|
2019-07-13 23:21:37 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 15:21:57 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-05-29 23:33:31 -04:00
|
|
|
@brief Fill the framebuffer completely with one color
|
2019-07-13 23:21:37 -04:00
|
|
|
@param color Binary (on or off) color to fill with
|
2018-07-14 15:21:57 -04:00
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2017-05-05 22:57:52 -04:00
|
|
|
void GFXcanvas1::fillScreen(uint16_t color) {
|
2019-12-27 17:10:08 -05:00
|
|
|
if (buffer) {
|
|
|
|
uint16_t bytes = ((WIDTH + 7) / 8) * HEIGHT;
|
|
|
|
memset(buffer, color ? 0xFF : 0x00, bytes);
|
|
|
|
}
|
2015-12-28 13:58:40 -05:00
|
|
|
}
|
|
|
|
|
2020-08-19 01:25:19 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2020-10-19 15:00:55 -04:00
|
|
|
@brief Speed optimized vertical line drawing
|
|
|
|
@param x Line horizontal start point
|
|
|
|
@param y Line vertical start point
|
|
|
|
@param h Length of vertical line to be drawn, including first point
|
|
|
|
@param color Color to fill with
|
2020-08-19 01:25:19 -04:00
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
|
|
|
void GFXcanvas1::drawFastVLine(int16_t x, int16_t y, int16_t h,
|
|
|
|
uint16_t color) {
|
|
|
|
|
2020-10-19 15:00:55 -04:00
|
|
|
if (h < 0) { // Convert negative heights to positive equivalent
|
2020-08-19 01:25:19 -04:00
|
|
|
h *= -1;
|
|
|
|
y -= h - 1;
|
|
|
|
if (y < 0) {
|
|
|
|
h += y;
|
|
|
|
y = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-10-19 15:00:55 -04:00
|
|
|
// Edge rejection (no-draw if totally off canvas)
|
|
|
|
if ((x < 0) || (x >= width()) || (y >= height()) || ((y + h - 1) < 0)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (y < 0) { // Clip top
|
|
|
|
h += y;
|
|
|
|
y = 0;
|
|
|
|
}
|
|
|
|
if (y + h > height()) { // Clip bottom
|
|
|
|
h = height() - y;
|
|
|
|
}
|
|
|
|
|
2020-08-19 01:25:19 -04:00
|
|
|
if (getRotation() == 0) {
|
|
|
|
drawFastRawVLine(x, y, h, color);
|
|
|
|
} else if (getRotation() == 1) {
|
|
|
|
int16_t t = x;
|
|
|
|
x = WIDTH - 1 - y;
|
|
|
|
y = t;
|
|
|
|
x -= h - 1;
|
|
|
|
drawFastRawHLine(x, y, h, color);
|
|
|
|
} else if (getRotation() == 2) {
|
|
|
|
x = WIDTH - 1 - x;
|
|
|
|
y = HEIGHT - 1 - y;
|
|
|
|
|
|
|
|
y -= h - 1;
|
|
|
|
drawFastRawVLine(x, y, h, color);
|
|
|
|
} else if (getRotation() == 3) {
|
|
|
|
int16_t t = x;
|
|
|
|
x = y;
|
|
|
|
y = HEIGHT - 1 - t;
|
|
|
|
drawFastRawHLine(x, y, h, color);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2020-10-19 15:00:55 -04:00
|
|
|
@brief Speed optimized horizontal line drawing
|
|
|
|
@param x Line horizontal start point
|
|
|
|
@param y Line vertical start point
|
|
|
|
@param w Length of horizontal line to be drawn, including first point
|
|
|
|
@param color Color to fill with
|
2020-08-19 01:25:19 -04:00
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
|
|
|
void GFXcanvas1::drawFastHLine(int16_t x, int16_t y, int16_t w,
|
|
|
|
uint16_t color) {
|
2020-10-19 15:00:55 -04:00
|
|
|
if (w < 0) { // Convert negative widths to positive equivalent
|
2020-08-19 01:25:19 -04:00
|
|
|
w *= -1;
|
|
|
|
x -= w - 1;
|
|
|
|
if (x < 0) {
|
|
|
|
w += x;
|
|
|
|
x = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-10-19 15:00:55 -04:00
|
|
|
// Edge rejection (no-draw if totally off canvas)
|
|
|
|
if ((y < 0) || (y >= height()) || (x >= width()) || ((x + w - 1) < 0)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (x < 0) { // Clip left
|
|
|
|
w += x;
|
|
|
|
x = 0;
|
|
|
|
}
|
|
|
|
if (x + w >= width()) { // Clip right
|
|
|
|
w = width() - x;
|
|
|
|
}
|
|
|
|
|
2020-08-19 01:25:19 -04:00
|
|
|
if (getRotation() == 0) {
|
|
|
|
drawFastRawHLine(x, y, w, color);
|
|
|
|
} else if (getRotation() == 1) {
|
|
|
|
int16_t t = x;
|
|
|
|
x = WIDTH - 1 - y;
|
|
|
|
y = t;
|
|
|
|
drawFastRawVLine(x, y, w, color);
|
|
|
|
} else if (getRotation() == 2) {
|
|
|
|
x = WIDTH - 1 - x;
|
|
|
|
y = HEIGHT - 1 - y;
|
|
|
|
|
|
|
|
x -= w - 1;
|
|
|
|
drawFastRawHLine(x, y, w, color);
|
|
|
|
} else if (getRotation() == 3) {
|
|
|
|
int16_t t = x;
|
|
|
|
x = y;
|
|
|
|
y = HEIGHT - 1 - t;
|
|
|
|
y -= w - 1;
|
|
|
|
drawFastRawVLine(x, y, w, color);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-08-19 02:05:17 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Speed optimized vertical line drawing into the raw canvas buffer
|
|
|
|
@param x Line horizontal start point
|
|
|
|
@param y Line vertical start point
|
|
|
|
@param h length of vertical line to be drawn, including first point
|
|
|
|
@param color Binary (on or off) color to fill with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2020-08-19 01:25:19 -04:00
|
|
|
void GFXcanvas1::drawFastRawVLine(int16_t x, int16_t y, int16_t h,
|
|
|
|
uint16_t color) {
|
|
|
|
// x & y already in raw (rotation 0) coordinates, no need to transform.
|
|
|
|
int16_t row_bytes = ((WIDTH + 7) / 8);
|
|
|
|
uint8_t *buffer = this->getBuffer();
|
|
|
|
uint8_t *ptr = &buffer[(x / 8) + y * row_bytes];
|
|
|
|
|
|
|
|
if (color > 0) {
|
|
|
|
#ifdef __AVR__
|
|
|
|
uint8_t bit_mask = pgm_read_byte(&GFXsetBit[x & 7]);
|
|
|
|
#else
|
|
|
|
uint8_t bit_mask = (0x80 >> (x & 7));
|
|
|
|
#endif
|
|
|
|
for (int16_t i = 0; i < h; i++) {
|
|
|
|
*ptr |= bit_mask;
|
|
|
|
ptr += row_bytes;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
#ifdef __AVR__
|
|
|
|
uint8_t bit_mask = pgm_read_byte(&GFXclrBit[x & 7]);
|
|
|
|
#else
|
|
|
|
uint8_t bit_mask = ~(0x80 >> (x & 7));
|
|
|
|
#endif
|
|
|
|
for (int16_t i = 0; i < h; i++) {
|
|
|
|
*ptr &= bit_mask;
|
|
|
|
ptr += row_bytes;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-08-19 02:05:17 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Speed optimized horizontal line drawing into the raw canvas buffer
|
|
|
|
@param x Line horizontal start point
|
|
|
|
@param y Line vertical start point
|
|
|
|
@param w length of horizontal line to be drawn, including first point
|
|
|
|
@param color Binary (on or off) color to fill with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2020-08-19 01:25:19 -04:00
|
|
|
void GFXcanvas1::drawFastRawHLine(int16_t x, int16_t y, int16_t w,
|
|
|
|
uint16_t color) {
|
|
|
|
// x & y already in raw (rotation 0) coordinates, no need to transform.
|
|
|
|
int16_t rowBytes = ((WIDTH + 7) / 8);
|
|
|
|
uint8_t *buffer = this->getBuffer();
|
|
|
|
uint8_t *ptr = &buffer[(x / 8) + y * rowBytes];
|
|
|
|
size_t remainingWidthBits = w;
|
|
|
|
|
|
|
|
// check to see if first byte needs to be partially filled
|
|
|
|
if ((x & 7) > 0) {
|
|
|
|
// create bit mask for first byte
|
|
|
|
uint8_t startByteBitMask = 0x00;
|
|
|
|
for (int8_t i = (x & 7); ((i < 8) && (remainingWidthBits > 0)); i++) {
|
|
|
|
#ifdef __AVR__
|
|
|
|
startByteBitMask |= pgm_read_byte(&GFXsetBit[i]);
|
|
|
|
#else
|
|
|
|
startByteBitMask |= (0x80 >> i);
|
|
|
|
#endif
|
|
|
|
remainingWidthBits--;
|
|
|
|
}
|
|
|
|
if (color > 0) {
|
|
|
|
*ptr |= startByteBitMask;
|
|
|
|
} else {
|
|
|
|
*ptr &= ~startByteBitMask;
|
|
|
|
}
|
|
|
|
|
|
|
|
ptr++;
|
|
|
|
}
|
|
|
|
|
|
|
|
// do the next remainingWidthBits bits
|
|
|
|
if (remainingWidthBits > 0) {
|
|
|
|
size_t remainingWholeBytes = remainingWidthBits / 8;
|
|
|
|
size_t lastByteBits = remainingWidthBits % 8;
|
|
|
|
uint8_t wholeByteColor = color > 0 ? 0xFF : 0x00;
|
|
|
|
|
|
|
|
memset(ptr, wholeByteColor, remainingWholeBytes);
|
|
|
|
|
|
|
|
if (lastByteBits > 0) {
|
|
|
|
uint8_t lastByteBitMask = 0x00;
|
2020-11-21 12:11:50 -05:00
|
|
|
for (size_t i = 0; i < lastByteBits; i++) {
|
2020-08-19 01:25:19 -04:00
|
|
|
#ifdef __AVR__
|
|
|
|
lastByteBitMask |= pgm_read_byte(&GFXsetBit[i]);
|
|
|
|
#else
|
|
|
|
lastByteBitMask |= (0x80 >> i);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
ptr += remainingWholeBytes;
|
|
|
|
|
|
|
|
if (color > 0) {
|
|
|
|
*ptr |= lastByteBitMask;
|
|
|
|
} else {
|
|
|
|
*ptr &= ~lastByteBitMask;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-07-14 15:21:57 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Instatiate a GFX 8-bit canvas context for graphics
|
|
|
|
@param w Display width, in pixels
|
|
|
|
@param h Display height, in pixels
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2017-05-05 01:06:09 -04:00
|
|
|
GFXcanvas8::GFXcanvas8(uint16_t w, uint16_t h) : Adafruit_GFX(w, h) {
|
2019-12-27 17:10:08 -05:00
|
|
|
uint32_t bytes = w * h;
|
|
|
|
if ((buffer = (uint8_t *)malloc(bytes))) {
|
|
|
|
memset(buffer, 0, bytes);
|
|
|
|
}
|
2017-05-05 01:06:09 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 15:21:57 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Delete the canvas, free memory
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2017-05-05 01:06:09 -04:00
|
|
|
GFXcanvas8::~GFXcanvas8(void) {
|
2019-12-27 17:10:08 -05:00
|
|
|
if (buffer)
|
|
|
|
free(buffer);
|
2017-05-05 01:06:09 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 15:21:57 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-05-29 23:33:31 -04:00
|
|
|
@brief Draw a pixel to the canvas framebuffer
|
|
|
|
@param x x coordinate
|
|
|
|
@param y y coordinate
|
2019-07-13 23:21:37 -04:00
|
|
|
@param color 8-bit Color to fill with. Only lower byte of uint16_t is used.
|
2018-07-14 15:21:57 -04:00
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2017-05-05 22:57:52 -04:00
|
|
|
void GFXcanvas8::drawPixel(int16_t x, int16_t y, uint16_t color) {
|
2019-12-27 17:10:08 -05:00
|
|
|
if (buffer) {
|
|
|
|
if ((x < 0) || (y < 0) || (x >= _width) || (y >= _height))
|
|
|
|
return;
|
2017-05-05 01:06:09 -04:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
int16_t t;
|
|
|
|
switch (rotation) {
|
|
|
|
case 1:
|
|
|
|
t = x;
|
|
|
|
x = WIDTH - 1 - y;
|
|
|
|
y = t;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
x = WIDTH - 1 - x;
|
|
|
|
y = HEIGHT - 1 - y;
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
t = x;
|
|
|
|
x = y;
|
|
|
|
y = HEIGHT - 1 - t;
|
|
|
|
break;
|
2017-05-05 01:06:09 -04:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
|
|
|
|
buffer[x + y * WIDTH] = color;
|
|
|
|
}
|
2017-05-05 01:06:09 -04:00
|
|
|
}
|
|
|
|
|
2019-07-13 23:21:37 -04:00
|
|
|
/**********************************************************************/
|
|
|
|
/*!
|
2020-06-05 14:00:20 -04:00
|
|
|
@brief Get the pixel color value at a given coordinate
|
|
|
|
@param x x coordinate
|
|
|
|
@param y y coordinate
|
|
|
|
@returns The desired pixel's 8-bit color value
|
2019-07-13 23:21:37 -04:00
|
|
|
*/
|
|
|
|
/**********************************************************************/
|
|
|
|
uint8_t GFXcanvas8::getPixel(int16_t x, int16_t y) const {
|
2020-06-05 14:00:20 -04:00
|
|
|
int16_t t;
|
|
|
|
switch (rotation) {
|
|
|
|
case 1:
|
|
|
|
t = x;
|
|
|
|
x = WIDTH - 1 - y;
|
|
|
|
y = t;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
x = WIDTH - 1 - x;
|
|
|
|
y = HEIGHT - 1 - y;
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
t = x;
|
|
|
|
x = y;
|
|
|
|
y = HEIGHT - 1 - t;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return getRawPixel(x, y);
|
2019-07-13 23:21:37 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/**********************************************************************/
|
|
|
|
/*!
|
2020-06-05 14:00:20 -04:00
|
|
|
@brief Get the pixel color value at a given, unrotated coordinate.
|
2019-07-13 23:21:37 -04:00
|
|
|
This method is intended for hardware drivers to get pixel value
|
|
|
|
in physical coordinates.
|
2020-06-05 14:00:20 -04:00
|
|
|
@param x x coordinate
|
|
|
|
@param y y coordinate
|
|
|
|
@returns The desired pixel's 8-bit color value
|
2019-07-13 23:21:37 -04:00
|
|
|
*/
|
|
|
|
/**********************************************************************/
|
|
|
|
uint8_t GFXcanvas8::getRawPixel(int16_t x, int16_t y) const {
|
2020-06-05 14:00:20 -04:00
|
|
|
if ((x < 0) || (y < 0) || (x >= WIDTH) || (y >= HEIGHT))
|
|
|
|
return 0;
|
|
|
|
if (buffer) {
|
|
|
|
return buffer[x + y * WIDTH];
|
|
|
|
}
|
|
|
|
return 0;
|
2019-07-13 23:21:37 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 15:21:57 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-05-29 23:33:31 -04:00
|
|
|
@brief Fill the framebuffer completely with one color
|
2019-07-13 23:21:37 -04:00
|
|
|
@param color 8-bit Color to fill with. Only lower byte of uint16_t is used.
|
2018-07-14 15:21:57 -04:00
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2017-05-05 22:57:52 -04:00
|
|
|
void GFXcanvas8::fillScreen(uint16_t color) {
|
2019-12-27 17:10:08 -05:00
|
|
|
if (buffer) {
|
|
|
|
memset(buffer, color, WIDTH * HEIGHT);
|
|
|
|
}
|
2017-05-05 01:06:09 -04:00
|
|
|
}
|
|
|
|
|
2020-08-19 01:25:19 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2020-10-19 15:00:55 -04:00
|
|
|
@brief Speed optimized vertical line drawing
|
|
|
|
@param x Line horizontal start point
|
|
|
|
@param y Line vertical start point
|
|
|
|
@param h Length of vertical line to be drawn, including first point
|
|
|
|
@param color 8-bit Color to fill with. Only lower byte of uint16_t is
|
|
|
|
used.
|
2020-08-19 01:25:19 -04:00
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
|
|
|
void GFXcanvas8::drawFastVLine(int16_t x, int16_t y, int16_t h,
|
|
|
|
uint16_t color) {
|
2020-10-19 15:00:55 -04:00
|
|
|
if (h < 0) { // Convert negative heights to positive equivalent
|
2020-08-19 01:25:19 -04:00
|
|
|
h *= -1;
|
|
|
|
y -= h - 1;
|
|
|
|
if (y < 0) {
|
|
|
|
h += y;
|
|
|
|
y = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-10-19 15:00:55 -04:00
|
|
|
// Edge rejection (no-draw if totally off canvas)
|
|
|
|
if ((x < 0) || (x >= width()) || (y >= height()) || ((y + h - 1) < 0)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (y < 0) { // Clip top
|
|
|
|
h += y;
|
|
|
|
y = 0;
|
|
|
|
}
|
|
|
|
if (y + h > height()) { // Clip bottom
|
|
|
|
h = height() - y;
|
|
|
|
}
|
|
|
|
|
2020-08-19 01:25:19 -04:00
|
|
|
if (getRotation() == 0) {
|
|
|
|
drawFastRawVLine(x, y, h, color);
|
|
|
|
} else if (getRotation() == 1) {
|
|
|
|
int16_t t = x;
|
|
|
|
x = WIDTH - 1 - y;
|
|
|
|
y = t;
|
|
|
|
x -= h - 1;
|
|
|
|
drawFastRawHLine(x, y, h, color);
|
|
|
|
} else if (getRotation() == 2) {
|
|
|
|
x = WIDTH - 1 - x;
|
|
|
|
y = HEIGHT - 1 - y;
|
|
|
|
|
|
|
|
y -= h - 1;
|
|
|
|
drawFastRawVLine(x, y, h, color);
|
|
|
|
} else if (getRotation() == 3) {
|
|
|
|
int16_t t = x;
|
|
|
|
x = y;
|
|
|
|
y = HEIGHT - 1 - t;
|
|
|
|
drawFastRawHLine(x, y, h, color);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2020-10-19 15:00:55 -04:00
|
|
|
@brief Speed optimized horizontal line drawing
|
|
|
|
@param x Line horizontal start point
|
|
|
|
@param y Line vertical start point
|
|
|
|
@param w Length of horizontal line to be drawn, including 1st point
|
|
|
|
@param color 8-bit Color to fill with. Only lower byte of uint16_t is
|
|
|
|
used.
|
2020-08-19 01:25:19 -04:00
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
|
|
|
void GFXcanvas8::drawFastHLine(int16_t x, int16_t y, int16_t w,
|
|
|
|
uint16_t color) {
|
2017-05-05 22:57:52 -04:00
|
|
|
|
2020-10-19 15:00:55 -04:00
|
|
|
if (w < 0) { // Convert negative widths to positive equivalent
|
2020-08-19 01:25:19 -04:00
|
|
|
w *= -1;
|
|
|
|
x -= w - 1;
|
|
|
|
if (x < 0) {
|
|
|
|
w += x;
|
|
|
|
x = 0;
|
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
}
|
|
|
|
|
2020-10-19 15:00:55 -04:00
|
|
|
// Edge rejection (no-draw if totally off canvas)
|
|
|
|
if ((y < 0) || (y >= height()) || (x >= width()) || ((x + w - 1) < 0)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (x < 0) { // Clip left
|
|
|
|
w += x;
|
|
|
|
x = 0;
|
|
|
|
}
|
|
|
|
if (x + w >= width()) { // Clip right
|
|
|
|
w = width() - x;
|
|
|
|
}
|
|
|
|
|
2020-08-19 01:25:19 -04:00
|
|
|
if (getRotation() == 0) {
|
|
|
|
drawFastRawHLine(x, y, w, color);
|
|
|
|
} else if (getRotation() == 1) {
|
|
|
|
int16_t t = x;
|
2019-12-27 17:10:08 -05:00
|
|
|
x = WIDTH - 1 - y;
|
|
|
|
y = t;
|
2020-08-19 01:25:19 -04:00
|
|
|
drawFastRawVLine(x, y, w, color);
|
|
|
|
} else if (getRotation() == 2) {
|
2019-12-27 17:10:08 -05:00
|
|
|
x = WIDTH - 1 - x;
|
|
|
|
y = HEIGHT - 1 - y;
|
2020-08-19 01:25:19 -04:00
|
|
|
|
|
|
|
x -= w - 1;
|
|
|
|
drawFastRawHLine(x, y, w, color);
|
|
|
|
} else if (getRotation() == 3) {
|
|
|
|
int16_t t = x;
|
2019-12-27 17:10:08 -05:00
|
|
|
x = y;
|
|
|
|
y = HEIGHT - 1 - t;
|
2020-08-19 01:25:19 -04:00
|
|
|
y -= w - 1;
|
|
|
|
drawFastRawVLine(x, y, w, color);
|
2019-12-27 17:10:08 -05:00
|
|
|
}
|
2020-08-19 01:25:19 -04:00
|
|
|
}
|
2017-05-05 22:57:52 -04:00
|
|
|
|
2020-08-19 02:05:17 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Speed optimized vertical line drawing into the raw canvas buffer
|
|
|
|
@param x Line horizontal start point
|
|
|
|
@param y Line vertical start point
|
|
|
|
@param h length of vertical line to be drawn, including first point
|
|
|
|
@param color 8-bit Color to fill with. Only lower byte of uint16_t is
|
|
|
|
used.
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2020-08-19 01:25:19 -04:00
|
|
|
void GFXcanvas8::drawFastRawVLine(int16_t x, int16_t y, int16_t h,
|
|
|
|
uint16_t color) {
|
|
|
|
// x & y already in raw (rotation 0) coordinates, no need to transform.
|
|
|
|
uint8_t *buffer_ptr = buffer + y * WIDTH + x;
|
|
|
|
for (int16_t i = 0; i < h; i++) {
|
|
|
|
(*buffer_ptr) = color;
|
|
|
|
buffer_ptr += WIDTH;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-08-19 02:05:17 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Speed optimized horizontal line drawing into the raw canvas buffer
|
|
|
|
@param x Line horizontal start point
|
|
|
|
@param y Line vertical start point
|
|
|
|
@param w length of horizontal line to be drawn, including first point
|
|
|
|
@param color 8-bit Color to fill with. Only lower byte of uint16_t is
|
|
|
|
used.
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2020-08-19 01:25:19 -04:00
|
|
|
void GFXcanvas8::drawFastRawHLine(int16_t x, int16_t y, int16_t w,
|
|
|
|
uint16_t color) {
|
|
|
|
// x & y already in raw (rotation 0) coordinates, no need to transform.
|
2019-12-27 17:10:08 -05:00
|
|
|
memset(buffer + y * WIDTH + x, color, w);
|
2017-05-05 22:57:52 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 15:21:57 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Instatiate a GFX 16-bit canvas context for graphics
|
|
|
|
@param w Display width, in pixels
|
|
|
|
@param h Display height, in pixels
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2015-12-28 13:58:40 -05:00
|
|
|
GFXcanvas16::GFXcanvas16(uint16_t w, uint16_t h) : Adafruit_GFX(w, h) {
|
2019-12-27 17:10:08 -05:00
|
|
|
uint32_t bytes = w * h * 2;
|
|
|
|
if ((buffer = (uint16_t *)malloc(bytes))) {
|
|
|
|
memset(buffer, 0, bytes);
|
|
|
|
}
|
2015-12-28 13:58:40 -05:00
|
|
|
}
|
|
|
|
|
2018-07-14 15:21:57 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Delete the canvas, free memory
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2015-12-28 13:58:40 -05:00
|
|
|
GFXcanvas16::~GFXcanvas16(void) {
|
2019-12-27 17:10:08 -05:00
|
|
|
if (buffer)
|
|
|
|
free(buffer);
|
2015-12-28 13:58:40 -05:00
|
|
|
}
|
|
|
|
|
2018-07-14 15:21:57 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-05-29 23:33:31 -04:00
|
|
|
@brief Draw a pixel to the canvas framebuffer
|
|
|
|
@param x x coordinate
|
|
|
|
@param y y coordinate
|
|
|
|
@param color 16-bit 5-6-5 Color to fill with
|
2018-07-14 15:21:57 -04:00
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2015-12-28 13:58:40 -05:00
|
|
|
void GFXcanvas16::drawPixel(int16_t x, int16_t y, uint16_t color) {
|
2019-12-27 17:10:08 -05:00
|
|
|
if (buffer) {
|
|
|
|
if ((x < 0) || (y < 0) || (x >= _width) || (y >= _height))
|
|
|
|
return;
|
2015-12-28 13:58:40 -05:00
|
|
|
|
2019-12-27 17:10:08 -05:00
|
|
|
int16_t t;
|
|
|
|
switch (rotation) {
|
|
|
|
case 1:
|
|
|
|
t = x;
|
|
|
|
x = WIDTH - 1 - y;
|
|
|
|
y = t;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
x = WIDTH - 1 - x;
|
|
|
|
y = HEIGHT - 1 - y;
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
t = x;
|
|
|
|
x = y;
|
|
|
|
y = HEIGHT - 1 - t;
|
|
|
|
break;
|
2015-12-28 13:58:40 -05:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
|
|
|
|
buffer[x + y * WIDTH] = color;
|
|
|
|
}
|
2015-12-28 13:58:40 -05:00
|
|
|
}
|
|
|
|
|
2019-07-13 23:21:37 -04:00
|
|
|
/**********************************************************************/
|
|
|
|
/*!
|
2020-06-05 14:00:20 -04:00
|
|
|
@brief Get the pixel color value at a given coordinate
|
|
|
|
@param x x coordinate
|
|
|
|
@param y y coordinate
|
|
|
|
@returns The desired pixel's 16-bit 5-6-5 color value
|
2019-07-13 23:21:37 -04:00
|
|
|
*/
|
|
|
|
/**********************************************************************/
|
|
|
|
uint16_t GFXcanvas16::getPixel(int16_t x, int16_t y) const {
|
2020-06-05 14:00:20 -04:00
|
|
|
int16_t t;
|
|
|
|
switch (rotation) {
|
|
|
|
case 1:
|
|
|
|
t = x;
|
|
|
|
x = WIDTH - 1 - y;
|
|
|
|
y = t;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
x = WIDTH - 1 - x;
|
|
|
|
y = HEIGHT - 1 - y;
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
t = x;
|
|
|
|
x = y;
|
|
|
|
y = HEIGHT - 1 - t;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return getRawPixel(x, y);
|
2019-07-13 23:21:37 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/**********************************************************************/
|
|
|
|
/*!
|
2020-06-05 14:00:20 -04:00
|
|
|
@brief Get the pixel color value at a given, unrotated coordinate.
|
2019-07-13 23:21:37 -04:00
|
|
|
This method is intended for hardware drivers to get pixel value
|
|
|
|
in physical coordinates.
|
2020-06-05 14:00:20 -04:00
|
|
|
@param x x coordinate
|
|
|
|
@param y y coordinate
|
|
|
|
@returns The desired pixel's 16-bit 5-6-5 color value
|
2019-07-13 23:21:37 -04:00
|
|
|
*/
|
|
|
|
/**********************************************************************/
|
|
|
|
uint16_t GFXcanvas16::getRawPixel(int16_t x, int16_t y) const {
|
2020-06-05 14:00:20 -04:00
|
|
|
if ((x < 0) || (y < 0) || (x >= WIDTH) || (y >= HEIGHT))
|
|
|
|
return 0;
|
|
|
|
if (buffer) {
|
|
|
|
return buffer[x + y * WIDTH];
|
|
|
|
}
|
|
|
|
return 0;
|
2019-07-13 23:21:37 -04:00
|
|
|
}
|
|
|
|
|
2018-07-14 15:21:57 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2019-05-29 23:33:31 -04:00
|
|
|
@brief Fill the framebuffer completely with one color
|
|
|
|
@param color 16-bit 5-6-5 Color to fill with
|
2018-07-14 15:21:57 -04:00
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2015-12-28 13:58:40 -05:00
|
|
|
void GFXcanvas16::fillScreen(uint16_t color) {
|
2019-12-27 17:10:08 -05:00
|
|
|
if (buffer) {
|
|
|
|
uint8_t hi = color >> 8, lo = color & 0xFF;
|
|
|
|
if (hi == lo) {
|
|
|
|
memset(buffer, lo, WIDTH * HEIGHT * 2);
|
|
|
|
} else {
|
|
|
|
uint32_t i, pixels = WIDTH * HEIGHT;
|
|
|
|
for (i = 0; i < pixels; i++)
|
|
|
|
buffer[i] = color;
|
2015-12-28 13:58:40 -05:00
|
|
|
}
|
2019-12-27 17:10:08 -05:00
|
|
|
}
|
2015-12-28 13:58:40 -05:00
|
|
|
}
|
|
|
|
|
2019-05-29 23:33:31 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Reverses the "endian-ness" of each 16-bit pixel within the
|
|
|
|
canvas; little-endian to big-endian, or big-endian to little.
|
|
|
|
Most microcontrollers (such as SAMD) are little-endian, while
|
|
|
|
most displays tend toward big-endianness. All the drawing
|
|
|
|
functions (including RGB bitmap drawing) take care of this
|
|
|
|
automatically, but some specialized code (usually involving
|
|
|
|
DMA) can benefit from having pixel data already in the
|
|
|
|
display-native order. Note that this does NOT convert to a
|
|
|
|
SPECIFIC endian-ness, it just flips the bytes within each word.
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
|
|
|
void GFXcanvas16::byteSwap(void) {
|
2019-12-27 17:10:08 -05:00
|
|
|
if (buffer) {
|
|
|
|
uint32_t i, pixels = WIDTH * HEIGHT;
|
|
|
|
for (i = 0; i < pixels; i++)
|
|
|
|
buffer[i] = __builtin_bswap16(buffer[i]);
|
|
|
|
}
|
2019-05-29 23:33:31 -04:00
|
|
|
}
|
2020-08-19 01:25:19 -04:00
|
|
|
|
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Speed optimized vertical line drawing
|
|
|
|
@param x Line horizontal start point
|
|
|
|
@param y Line vertical start point
|
|
|
|
@param h length of vertical line to be drawn, including first point
|
|
|
|
@param color color 16-bit 5-6-5 Color to draw line with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
|
|
|
void GFXcanvas16::drawFastVLine(int16_t x, int16_t y, int16_t h,
|
|
|
|
uint16_t color) {
|
2020-10-19 15:00:55 -04:00
|
|
|
if (h < 0) { // Convert negative heights to positive equivalent
|
2020-08-19 01:25:19 -04:00
|
|
|
h *= -1;
|
|
|
|
y -= h - 1;
|
|
|
|
if (y < 0) {
|
|
|
|
h += y;
|
|
|
|
y = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-10-19 15:00:55 -04:00
|
|
|
// Edge rejection (no-draw if totally off canvas)
|
|
|
|
if ((x < 0) || (x >= width()) || (y >= height()) || ((y + h - 1) < 0)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (y < 0) { // Clip top
|
|
|
|
h += y;
|
|
|
|
y = 0;
|
|
|
|
}
|
|
|
|
if (y + h > height()) { // Clip bottom
|
|
|
|
h = height() - y;
|
|
|
|
}
|
|
|
|
|
2020-08-19 01:25:19 -04:00
|
|
|
if (getRotation() == 0) {
|
|
|
|
drawFastRawVLine(x, y, h, color);
|
|
|
|
} else if (getRotation() == 1) {
|
|
|
|
int16_t t = x;
|
|
|
|
x = WIDTH - 1 - y;
|
|
|
|
y = t;
|
|
|
|
x -= h - 1;
|
|
|
|
drawFastRawHLine(x, y, h, color);
|
|
|
|
} else if (getRotation() == 2) {
|
|
|
|
x = WIDTH - 1 - x;
|
|
|
|
y = HEIGHT - 1 - y;
|
|
|
|
|
|
|
|
y -= h - 1;
|
|
|
|
drawFastRawVLine(x, y, h, color);
|
|
|
|
} else if (getRotation() == 3) {
|
|
|
|
int16_t t = x;
|
|
|
|
x = y;
|
|
|
|
y = HEIGHT - 1 - t;
|
|
|
|
drawFastRawHLine(x, y, h, color);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
2020-10-19 15:00:55 -04:00
|
|
|
@brief Speed optimized horizontal line drawing
|
|
|
|
@param x Line horizontal start point
|
|
|
|
@param y Line vertical start point
|
|
|
|
@param w Length of horizontal line to be drawn, including 1st point
|
|
|
|
@param color Color 16-bit 5-6-5 Color to draw line with
|
2020-08-19 01:25:19 -04:00
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
|
|
|
void GFXcanvas16::drawFastHLine(int16_t x, int16_t y, int16_t w,
|
|
|
|
uint16_t color) {
|
2020-10-19 15:00:55 -04:00
|
|
|
if (w < 0) { // Convert negative widths to positive equivalent
|
2020-08-19 01:25:19 -04:00
|
|
|
w *= -1;
|
|
|
|
x -= w - 1;
|
|
|
|
if (x < 0) {
|
|
|
|
w += x;
|
|
|
|
x = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-10-19 15:00:55 -04:00
|
|
|
// Edge rejection (no-draw if totally off canvas)
|
|
|
|
if ((y < 0) || (y >= height()) || (x >= width()) || ((x + w - 1) < 0)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (x < 0) { // Clip left
|
|
|
|
w += x;
|
|
|
|
x = 0;
|
|
|
|
}
|
|
|
|
if (x + w >= width()) { // Clip right
|
|
|
|
w = width() - x;
|
|
|
|
}
|
|
|
|
|
2020-08-19 01:25:19 -04:00
|
|
|
if (getRotation() == 0) {
|
|
|
|
drawFastRawHLine(x, y, w, color);
|
|
|
|
} else if (getRotation() == 1) {
|
|
|
|
int16_t t = x;
|
|
|
|
x = WIDTH - 1 - y;
|
|
|
|
y = t;
|
|
|
|
drawFastRawVLine(x, y, w, color);
|
|
|
|
} else if (getRotation() == 2) {
|
|
|
|
x = WIDTH - 1 - x;
|
|
|
|
y = HEIGHT - 1 - y;
|
|
|
|
|
|
|
|
x -= w - 1;
|
|
|
|
drawFastRawHLine(x, y, w, color);
|
|
|
|
} else if (getRotation() == 3) {
|
|
|
|
int16_t t = x;
|
|
|
|
x = y;
|
|
|
|
y = HEIGHT - 1 - t;
|
|
|
|
y -= w - 1;
|
|
|
|
drawFastRawVLine(x, y, w, color);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-08-19 02:05:17 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Speed optimized vertical line drawing into the raw canvas buffer
|
|
|
|
@param x Line horizontal start point
|
|
|
|
@param y Line vertical start point
|
|
|
|
@param h length of vertical line to be drawn, including first point
|
|
|
|
@param color color 16-bit 5-6-5 Color to draw line with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2020-08-19 01:25:19 -04:00
|
|
|
void GFXcanvas16::drawFastRawVLine(int16_t x, int16_t y, int16_t h,
|
|
|
|
uint16_t color) {
|
|
|
|
// x & y already in raw (rotation 0) coordinates, no need to transform.
|
|
|
|
uint16_t *buffer_ptr = buffer + y * WIDTH + x;
|
|
|
|
for (int16_t i = 0; i < h; i++) {
|
|
|
|
(*buffer_ptr) = color;
|
|
|
|
buffer_ptr += WIDTH;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-08-19 02:05:17 -04:00
|
|
|
/**************************************************************************/
|
|
|
|
/*!
|
|
|
|
@brief Speed optimized horizontal line drawing into the raw canvas buffer
|
|
|
|
@param x Line horizontal start point
|
|
|
|
@param y Line vertical start point
|
|
|
|
@param w length of horizontal line to be drawn, including first point
|
|
|
|
@param color color 16-bit 5-6-5 Color to draw line with
|
|
|
|
*/
|
|
|
|
/**************************************************************************/
|
2020-08-19 01:25:19 -04:00
|
|
|
void GFXcanvas16::drawFastRawHLine(int16_t x, int16_t y, int16_t w,
|
|
|
|
uint16_t color) {
|
|
|
|
// x & y already in raw (rotation 0) coordinates, no need to transform.
|
2020-11-21 12:11:50 -05:00
|
|
|
uint32_t buffer_index = y * WIDTH + x;
|
|
|
|
for (uint32_t i = buffer_index; i < buffer_index + w; i++) {
|
2020-08-19 01:25:19 -04:00
|
|
|
buffer[i] = color;
|
|
|
|
}
|
|
|
|
}
|