diff --git a/TFT_eSPI.h b/TFT_eSPI.h index 02348d8..82fe8e0 100644 --- a/TFT_eSPI.h +++ b/TFT_eSPI.h @@ -731,7 +731,7 @@ class TFT_eSPI : public Print { friend class TFT_eSprite; // Sprite class has ac // Alpha blend 2 colours, see generic "alphaBlend_Test" example // alpha = 0 = 100% background colour // alpha = 255 = 100% foreground colour - inline uint16_t alphaBlend(uint8_t alpha, uint16_t fgc, uint16_t bgc); + uint16_t alphaBlend(uint8_t alpha, uint16_t fgc, uint16_t bgc); // 16 bit colour alphaBlend with alpha dither (dither reduces colour banding) uint16_t alphaBlend(uint8_t alpha, uint16_t fgc, uint16_t bgc, uint8_t dither); // 24 bit colour alphaBlend with optional alpha dither diff --git a/Tools/Create_Smooth_Font/Create_font/Create_font.pde b/Tools/Create_Smooth_Font/Create_font/Create_font.pde index a250171..9771bfb 100644 --- a/Tools/Create_Smooth_Font/Create_font/Create_font.pde +++ b/Tools/Create_Smooth_Font/Create_font/Create_font.pde @@ -143,7 +143,7 @@ int displayFontSize = 28; boolean createHeaderFile = true; // Automaticely open the folder with created files when done -boolean openFolder = false; +boolean openFolder = true; /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Next we specify which unicode blocks from the the Basic Multilingual Plane (BMP) are included in the final font file. // diff --git a/Tools/Create_Smooth_Font/Create_font/FontFiles/Final-Frontier28.vlw b/Tools/Create_Smooth_Font/Create_font/FontFiles/Final-Frontier28.vlw deleted file mode 100644 index 3c8a5b0..0000000 Binary files a/Tools/Create_Smooth_Font/Create_font/FontFiles/Final-Frontier28.vlw and /dev/null differ diff --git a/User_Setup.h b/User_Setup.h index d1c85aa..cc03d24 100644 --- a/User_Setup.h +++ b/User_Setup.h @@ -84,6 +84,7 @@ // #define TFT_WIDTH 80 // #define TFT_WIDTH 128 // #define TFT_WIDTH 172 // ST7789 172 x 320 +// #define TFT_WIDTH 170 // ST7789 170 x 320 // #define TFT_WIDTH 240 // ST7789 240 x 240 and 240 x 320 // #define TFT_HEIGHT 160 // #define TFT_HEIGHT 128 @@ -166,10 +167,15 @@ // ###### EDIT THE PIN NUMBERS IN THE LINES FOLLOWING TO SUIT YOUR ESP8266 SETUP ###### // For NodeMCU - use pin numbers in the form PIN_Dx where Dx is the NodeMCU pin designation -#define TFT_CS PIN_D8 // Chip select control pin D8 -#define TFT_DC PIN_D3 // Data Command control pin -#define TFT_RST PIN_D4 // Reset pin (could connect to NodeMCU RST, see next line) -//#define TFT_RST -1 // Set TFT_RST to -1 if the display RESET is connected to NodeMCU RST or 3.3V +#define TFT_MISO PIN_D6 // Automatically assigned with ESP8266 if not defined +#define TFT_MOSI PIN_D7 // Automatically assigned with ESP8266 if not defined +#define TFT_SCLK PIN_D5 // Automatically assigned with ESP8266 if not defined + +#define TFT_CS PIN_D8 // Chip select control pin D8 +#define TFT_DC PIN_D3 // Data Command control pin +#define TFT_RST PIN_D4 // Reset pin (could connect to NodeMCU RST, see next line) +//#define TFT_RST -1 // Set TFT_RST to -1 if the display RESET is connected to NodeMCU RST or 3.3V + //#define TFT_BL PIN_D1 // LED back-light (only for ST7789 with backlight control pin) @@ -327,7 +333,7 @@ // For RP2040 processor and 8 or 16 bit parallel displays: // The parallel interface write cycle period is derived from a division of the CPU clock // speed so scales with the processor clock. This means that the divider ratio may need -// to be increased when overclocking. I may also need to be adjusted dependant on the +// to be increased when overclocking. It may also need to be adjusted dependant on the // display controller type (ILI94341, HX8357C etc). If RP2040_PIO_CLK_DIV is not defined // the library will set default values which may not suit your display. // The display controller data sheet will specify the minimum write cycle period. The