display code sanitization
This commit is contained in:
1 parent
cb137109d6
commit
0af786224f
3 files changed
+122
-168
No files matched your search
+6
-7
@@ -9,8 +9,10 @@
|
||||
|
||||
#if (HAS_DISPLAY) == 1
|
||||
#include <OneBitDisplay.h>
|
||||
extern ONE_BIT_DISPLAY *dp;
|
||||
#elif (HAS_DISPLAY) == 2
|
||||
#include <TFT_eSPI.h>
|
||||
extern TFT_eSPI *dp;
|
||||
#endif
|
||||
|
||||
#define DISPLAY_PAGES (7) // number of paxcounter display pages
|
||||
@@ -40,10 +42,10 @@
|
||||
#endif
|
||||
|
||||
#ifndef MY_DISPLAY_FGCOLOR
|
||||
#define MY_DISPLAY_FGCOLOR 1 //OLED_WHITE
|
||||
#define MY_DISPLAY_FGCOLOR 1 // OLED_WHITE
|
||||
#endif
|
||||
#ifndef MY_DISPLAY_BGCOLOR
|
||||
#define MY_DISPLAY_BGCOLOR 0 //OLED_BLACK
|
||||
#define MY_DISPLAY_BGCOLOR 0 // OLED_BLACK
|
||||
#endif
|
||||
|
||||
// settings for TFT display library
|
||||
@@ -57,10 +59,10 @@
|
||||
#define MY_DISPLAY_FIRSTLINE 30
|
||||
|
||||
#ifndef MY_DISPLAY_FGCOLOR
|
||||
#define MY_DISPLAY_FGCOLOR 0xFFFF //TFT_WHITE
|
||||
#define MY_DISPLAY_FGCOLOR 0xFFFF // TFT_WHITE
|
||||
#endif
|
||||
#ifndef MY_DISPLAY_BGCOLOR
|
||||
#define MY_DISPLAY_BGCOLOR 0x0000 //TFT_BLACK
|
||||
#define MY_DISPLAY_BGCOLOR 0x0000 // TFT_BLACK
|
||||
#endif
|
||||
|
||||
#ifndef TOUCH_CS
|
||||
@@ -104,7 +106,6 @@ void dp_init(bool verbose = false);
|
||||
void dp_shutdown(void);
|
||||
void dp_message(const char *msg, int line, bool invers);
|
||||
void dp_drawPage(bool nextpage);
|
||||
void dp_printf(const char *format, ...);
|
||||
void dp_setFont(int font, int inv = 0);
|
||||
void dp_dump(uint8_t *pBuffer = NULL);
|
||||
void dp_setTextCursor(int col, int row);
|
||||
@@ -112,8 +113,6 @@ void dp_contrast(uint8_t contrast);
|
||||
void dp_clear(void);
|
||||
void dp_power(uint8_t screenon);
|
||||
void dp_printqr(uint16_t offset_x, uint16_t offset_y, const char *Message);
|
||||
void dp_fillRect(uint16_t x, uint16_t y, uint16_t width, uint16_t height,
|
||||
uint8_t bRender);
|
||||
void dp_scrollHorizontal(uint8_t *buf, const uint16_t width,
|
||||
const uint16_t height, bool left = true);
|
||||
void dp_scrollVertical(uint8_t *buf, const uint16_t width,
|
||||
|
||||
Reference in new issue
Block a user