Commit 7cbf6fe0 authored by Bodmer's avatar Bodmer

Make some variables public

To allow access to variables that can be set via functions anyway.
parent 4d181d7a
...@@ -603,10 +603,15 @@ class TFT_eSPI : public Print { ...@@ -603,10 +603,15 @@ class TFT_eSPI : public Print {
void getSetup(setup_t& tft_settings); // Sketch provides the instance to populate void getSetup(setup_t& tft_settings); // Sketch provides the instance to populate
int32_t cursor_x, cursor_y; int32_t cursor_x, cursor_y, padX;
uint32_t textcolor, textbgcolor; uint32_t textcolor, textbgcolor;
uint32_t bitmap_fg, bitmap_bg; uint32_t bitmap_fg, bitmap_bg;
uint8_t textfont, // Current selected font
textsize, // Current font size multiplier
textdatum, // Text reference datum
rotation; // Display rotation (0-3)
private: private:
...@@ -631,7 +636,7 @@ class TFT_eSPI : public Print { ...@@ -631,7 +636,7 @@ class TFT_eSPI : public Print {
protected: protected:
int32_t win_xe, win_ye, padX; int32_t win_xe, win_ye;
uint32_t _init_width, _init_height; // Display w/h as input, used by setRotation() uint32_t _init_width, _init_height; // Display w/h as input, used by setRotation()
uint32_t _width, _height; // Display w/h as modified by current rotation uint32_t _width, _height; // Display w/h as modified by current rotation
...@@ -640,11 +645,7 @@ class TFT_eSPI : public Print { ...@@ -640,11 +645,7 @@ class TFT_eSPI : public Print {
uint32_t fontsloaded; uint32_t fontsloaded;
uint8_t glyph_ab, // glyph height above baseline uint8_t glyph_ab, // glyph height above baseline
glyph_bb, // glyph height below baseline glyph_bb; // glyph height below baseline
textfont, // Current selected font
textsize, // Current font size multiplier
textdatum, // Text reference datum
rotation; // Display rotation (0-3)
bool textwrapX, textwrapY; // If set, 'wrap' text at right and optionally bottom edge of display bool textwrapX, textwrapY; // If set, 'wrap' text at right and optionally bottom edge of display
bool _swapBytes; // Swap the byte order for TFT pushImage() bool _swapBytes; // Swap the byte order for TFT pushImage()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment