Raise version add comments for button update

This commit is contained in:
Bodmer
2020-02-06 13:38:03 +00:00
parent 7841015043
commit 15c137633a
4 changed files with 16 additions and 14 deletions

View File

@@ -2,7 +2,8 @@
// The following button class has been ported over from the Adafruit_GFX library so // The following button class has been ported over from the Adafruit_GFX library so
// should be compatible. // should be compatible.
// A slightly different implementation in this TFT_eSPI library allows the button // A slightly different implementation in this TFT_eSPI library allows the button
// legends to be in any font // legends to be in any font, allow longer labels and to adjust text positioning
// within button
***************************************************************************************/ ***************************************************************************************/
class TFT_eSPI_Button { class TFT_eSPI_Button {
@@ -20,23 +21,24 @@ class TFT_eSPI_Button {
uint16_t textcolor, char *label, uint8_t textsize); uint16_t textcolor, char *label, uint8_t textsize);
// Adjust text datum and x, y deltas // Adjust text datum and x, y deltas
void setLabelDatum(int16_t x_delta, int16_t y_delta, uint8_t datum = MC_DATUM); void setLabelDatum(int16_t x_delta, int16_t y_delta, uint8_t datum = MC_DATUM);
void drawButton(bool inverted = false, String long_name = ""); void drawButton(bool inverted = false, String long_name = "");
bool contains(int16_t x, int16_t y); bool contains(int16_t x, int16_t y);
void press(bool p); void press(bool p);
bool isPressed(); bool isPressed();
bool justPressed(); bool justPressed();
bool justReleased(); bool justReleased();
private: private:
TFT_eSPI *_gfx; TFT_eSPI *_gfx;
int16_t _x1, _y1, _xd, _yd; // Coordinates of top-left corner int16_t _x1, _y1; // Coordinates of top-left corner of button
uint16_t _w, _h; int16_t _xd, _yd; // Button text datum offsets (wrt center of button)
uint8_t _textsize, _textdatum; uint16_t _w, _h; // Width and height of button
uint8_t _textsize, _textdatum; // Text size multiplier and text datum for button
uint16_t _outlinecolor, _fillcolor, _textcolor; uint16_t _outlinecolor, _fillcolor, _textcolor;
char _label[10]; char _label[10]; // Button text is 9 chars maximum unless long_name used
bool currstate, laststate; bool currstate, laststate; // Button states
}; };

View File

@@ -16,7 +16,7 @@
#ifndef _TFT_eSPIH_ #ifndef _TFT_eSPIH_
#define _TFT_eSPIH_ #define _TFT_eSPIH_
#define TFT_ESPI_VERSION "2.0.2" #define TFT_ESPI_VERSION "2.0.3"
/*************************************************************************************** /***************************************************************************************
** Section 1: Load required header files ** Section 1: Load required header files

View File

@@ -1,6 +1,6 @@
{ {
"name": "TFT_eSPI", "name": "TFT_eSPI",
"version": "2.0.2", "version": "2.0.3",
"keywords": "Arduino, tft, ePaper, display, STM32, ESP8266, NodeMCU, ESP32, M5Stack, ILI9341, ST7735, ILI9163, S6D02A1, ILI9486, ST7789, RM68140", "keywords": "Arduino, tft, ePaper, display, STM32, ESP8266, NodeMCU, ESP32, M5Stack, ILI9341, ST7735, ILI9163, S6D02A1, ILI9486, ST7789, RM68140",
"description": "A TFT and ePaper SPI graphics library with optimisation for ESP8266, ESP32 and STM32", "description": "A TFT and ePaper SPI graphics library with optimisation for ESP8266, ESP32 and STM32",
"repository": "repository":

View File

@@ -1,5 +1,5 @@
name=TFT_eSPI name=TFT_eSPI
version=2.0.2 version=2.0.3
author=Bodmer author=Bodmer
maintainer=Bodmer maintainer=Bodmer
sentence=TFT graphics library for Arduino processors with performance optimisation for STM32, ESP8266 and ESP32 sentence=TFT graphics library for Arduino processors with performance optimisation for STM32, ESP8266 and ESP32