Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-09-11 17:14:27 +00:00
Code Issues Releases Activity

[Build] Split Display into Display A and Display B

Browse Source
This commit is contained in:
Ton Huisman
2025-10-05 17:23:56 +02:00
parent 6d4d36f5f4
commit d52fa24d56
10 changed files with 300 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platformio_esp32_envs.ini
+12 -3
View File
@@ -237,15 +237,24 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags}
-DPLUGIN_ENERGY_COLLECTION
[env:display_ESP32_4M316k_LittleFS_ETH]
[env:display_A_ESP32_4M316k_LittleFS_ETH]
extends = esp32_common_LittleFS_ETH
board = esp32_4M
build_flags = ${esp32_common_LittleFS_ETH.build_flags}
-DFEATURE_ARDUINO_OTA=1
-DPLUGIN_DISPLAY_COLLECTION
-DPLUGIN_DISPLAY_A_COLLECTION
-D ST7789_EXTRA_INIT=1
-D P116_EXTRA_ST7789=1
[env:display_B_ESP32_4M316k_LittleFS_ETH]
extends = esp32_common_LittleFS_ETH
board = esp32_4M
build_flags = ${esp32_common_LittleFS_ETH.build_flags}
-DFEATURE_ARDUINO_OTA=1
-DPLUGIN_DISPLAY_B_COLLECTION
-D ST7789_EXTRA_INIT=1
-D P116_EXTRA_ST7789=1
[env:climate_ESP32_4M316k_LittleFS_ETH]
platformio_esp32c3_envs.ini
+9 -2
View File
@@ -77,10 +77,17 @@ build_flags = ${esp32c3_common_LittleFS.build_flags}
-D PLUGIN_ENERGY_COLLECTION
[env:display_ESP32c3_4M316k_LittleFS_ETH]
[env:display_A_ESP32c3_4M316k_LittleFS_ETH]
extends = esp32c3_common_LittleFS
build_flags = ${esp32c3_common_LittleFS.build_flags}
-D PLUGIN_DISPLAY_COLLECTION
-D PLUGIN_DISPLAY_A_COLLECTION
-D ST7789_EXTRA_INIT=1
-D P116_EXTRA_ST7789=1
[env:display_B_ESP32c3_4M316k_LittleFS_ETH]
extends = esp32c3_common_LittleFS
build_flags = ${esp32c3_common_LittleFS.build_flags}
-D PLUGIN_DISPLAY_B_COLLECTION
-D ST7789_EXTRA_INIT=1
-D P116_EXTRA_ST7789=1
platformio_esp32c6_envs.ini
+9 -2
View File
@@ -34,10 +34,17 @@ build_flags = ${esp32c6_common_LittleFS.build_flags}
-D PLUGIN_ENERGY_COLLECTION
[env:display_ESP32c6_4M316k_LittleFS_ETH]
[env:display_A_ESP32c6_4M316k_LittleFS_ETH]
extends = esp32c6_common_LittleFS
build_flags = ${esp32c6_common_LittleFS.build_flags}
-D PLUGIN_DISPLAY_COLLECTION
-D PLUGIN_DISPLAY_A_COLLECTION
-D ST7789_EXTRA_INIT=1
-D P116_EXTRA_ST7789=1
[env:display_B_ESP32c6_4M316k_LittleFS_ETH]
extends = esp32c6_common_LittleFS
build_flags = ${esp32c6_common_LittleFS.build_flags}
-D PLUGIN_DISPLAY_B_COLLECTION
-D ST7789_EXTRA_INIT=1
-D P116_EXTRA_ST7789=1
platformio_esp32s2_envs.ini
+10 -2
View File
@@ -112,11 +112,19 @@ board = esp32s2cdc
build_flags = ${esp32s2_common_LittleFS.build_flags}
-D PLUGIN_ENERGY_COLLECTION
[env:display_ESP32s2_4M316k_LittleFS_ETH]
[env:display_A_ESP32s2_4M316k_LittleFS_ETH]
extends = esp32s2_common_LittleFS
board = esp32s2cdc
build_flags = ${esp32s2_common_LittleFS.build_flags}
-D PLUGIN_DISPLAY_COLLECTION
-D PLUGIN_DISPLAY_A_COLLECTION
-D ST7789_EXTRA_INIT=1
-D P116_EXTRA_ST7789=1
[env:display_B_ESP32s2_4M316k_LittleFS_ETH]
extends = esp32s2_common_LittleFS
board = esp32s2cdc
build_flags = ${esp32s2_common_LittleFS.build_flags}
-D PLUGIN_DISPLAY_B_COLLECTION
-D ST7789_EXTRA_INIT=1
-D P116_EXTRA_ST7789=1
platformio_esp32s3_envs.ini
+10 -2
View File
@@ -103,11 +103,19 @@ board = esp32s3cdc-qio_qspi
build_flags = ${esp32s3_common_LittleFS.build_flags}
-D PLUGIN_ENERGY_COLLECTION
[env:display_ESP32s3_4M316k_LittleFS_ETH]
[env:display_A_ESP32s3_4M316k_LittleFS_ETH]
extends = esp32s3_common_LittleFS
board = esp32s3cdc-qio_qspi
build_flags = ${esp32s3_common_LittleFS.build_flags}
-D PLUGIN_DISPLAY_COLLECTION
-D PLUGIN_DISPLAY_A_COLLECTION
-D ST7789_EXTRA_INIT=1
-D P116_EXTRA_ST7789=1
[env:display_B_ESP32s3_4M316k_LittleFS_ETH]
extends = esp32s3_common_LittleFS
board = esp32s3cdc-qio_qspi
build_flags = ${esp32s3_common_LittleFS.build_flags}
-D PLUGIN_DISPLAY_B_COLLECTION
-D ST7789_EXTRA_INIT=1
-D P116_EXTRA_ST7789=1
platformio_esp82xx_envs.ini
+16 -2
View File
@@ -602,12 +602,26 @@ extra_scripts = ${regular_platform.extra_scripts}
; display : 4096k version ----------------------------
[env:display_ESP8266_4M1M]
[env:display_A_ESP8266_4M1M]
extends = esp8266_4M1M, regular_platform
build_flags = ${regular_platform.build_flags}
${esp8266_4M1M.build_flags}
-D BUILD_NO_DEBUG
-D PLUGIN_DISPLAY_COLLECTION
-D PLUGIN_DISPLAY_A_COLLECTION
-D WEBSERVER_USE_CDN_JS_CSS
lib_ignore = ${regular_platform.lib_ignore}
ESP8266SdFat
SD(esp8266)
SD
SDFS
LittleFS(esp8266)
[env:display_B_ESP8266_4M1M]
extends = esp8266_4M1M, regular_platform
build_flags = ${regular_platform.build_flags}
${esp8266_4M1M.build_flags}
-D BUILD_NO_DEBUG
-D PLUGIN_DISPLAY_B_COLLECTION
-D WEBSERVER_USE_CDN_JS_CSS
lib_ignore = ${regular_platform.lib_ignore}
ESP8266SdFat
platformio_special_envs.ini
+5 -2
View File
@@ -112,7 +112,8 @@ build_flags = ${esp32_base_idf5.build_flags}
${debug_pio.build_flags}
-DESP32_CLASSIC
-DUSE_LITTLEFS
-D PLUGIN_DISPLAY_COLLECTION
-D PLUGIN_DISPLAY_A_COLLECTION
-D PLUGIN_DISPLAY_B_COLLECTION
-D WEBSERVER_USE_CDN_JS_CSS
-D BUILD_NO_DEBUG
board_build.filesystem = littlefs
@@ -133,7 +134,9 @@ build_flags = ${esp32_base_idf5.build_flags}
${debug_pio.build_flags}
-DESP32_CLASSIC
-DUSE_LITTLEFS
-D PLUGIN_DISPLAY_COLLECTION
-D PLUGIN_DISPLAY_A_COLLECTION
-D PLUGIN_DISPLAY_B_COLLECTION
-D PLUGIN_NEOPIXEL_COLLECTION
-D WEBSERVER_USE_CDN_JS_CSS
-D BUILD_NO_DEBUG
board_build.filesystem = littlefs
src/src/CustomBuild/define_plugin_sets.h
+221 -88
View File
@@ -154,13 +154,14 @@ To create/register a plugin, you have to :
#endif
#endif
#if defined(PLUGIN_DISPLAY_COLLECTION)
// Display builds are getting too large, so for now disable ETH for display buikds
#if FEATURE_ETHERNET
#undef FEATURE_ETHERNET
#endif
#if defined(PLUGIN_DISPLAY_A_COLLECTION) || defined(PLUGIN_DISPLAY_B_COLLECTION)
// Display builds are getting too large, so for now disable ETH for display builds
// Update: By splitting Display into A and B, there is enough space available to enable ETH for now
// #if FEATURE_ETHERNET
// #undef FEATURE_ETHERNET
// #endif
#ifndef BUILD_NO_DEBUG
#define BUILD_NO_DEBUG
#define BUILD_NO_DEBUG
#endif
#endif
@@ -1131,8 +1132,11 @@ To create/register a plugin, you have to :
#ifndef PLUGIN_ENERGY_COLLECTION
#define PLUGIN_ENERGY_COLLECTION
#endif
#ifndef PLUGIN_DISPLAY_COLLECTION
#define PLUGIN_DISPLAY_COLLECTION
#ifndef PLUGIN_DISPLAY_A_COLLECTION
#define PLUGIN_DISPLAY_A_COLLECTION
#endif
#ifndef PLUGIN_DISPLAY_B_COLLECTION
#define PLUGIN_DISPLAY_B_COLLECTION
#endif
#ifndef PLUGIN_CLIMATE_COLLECTION
#define PLUGIN_CLIMATE_COLLECTION
@@ -1805,91 +1809,202 @@ To create/register a plugin, you have to :
#endif // ifdef PLUGIN_ENERGY_COLLECTION
// Collection of all display plugins. (also NeoPixel)
#ifdef PLUGIN_DISPLAY_COLLECTION
// Collection of display plugins, set A (non-AdaGFX_Helper).
#ifdef PLUGIN_DISPLAY_A_COLLECTION
#ifndef PLUGIN_DESCR
#define PLUGIN_DESCR "Display"
#define PLUGIN_DESCR "Display A"
#endif
#if !defined(LIMIT_BUILD_SIZE) && (defined(ESP8266) || !(ESP_IDF_VERSION_MAJOR > 3))
#ifndef PLUGIN_BUILD_MAX_ESP32
#define LIMIT_BUILD_SIZE // Reduce buildsize (on ESP8266 / pre-IDF4.x) to fit in all Display plugins
#define KEEP_I2C_MULTIPLEXER
#ifndef P036_LIMIT_BUILD_SIZE
#define P036_LIMIT_BUILD_SIZE // Reduce build size for P036 (FramedOLED) only
#endif
#ifndef P037_LIMIT_BUILD_SIZE
#define P037_LIMIT_BUILD_SIZE // Reduce build size for P037 (MQTT Import) only
#endif
#define NOTIFIER_SET_NONE
#ifdef USES_N001
#undef USES_N001 // Email
#endif
#ifdef USES_N002
#undef USES_N002 // Buzzer
#endif
#endif
#endif
#if defined(ESP8266)
#if defined(FEATURE_I2C_DEVICE_CHECK)
#undef FEATURE_I2C_DEVICE_CHECK
#endif
#define FEATURE_I2C_DEVICE_CHECK 0 // Disable I2C device check code
#if !defined(LIMIT_BUILD_SIZE) && (defined(ESP8266) || !(ESP_IDF_VERSION_MAJOR > 3))
#ifndef PLUGIN_BUILD_MAX_ESP32
#define LIMIT_BUILD_SIZE // Reduce buildsize (on ESP8266 / pre-IDF4.x) to fit in all Display plugins
#define KEEP_I2C_MULTIPLEXER
#ifndef P036_LIMIT_BUILD_SIZE
#define P036_LIMIT_BUILD_SIZE // Reduce build size for P036 (FramedOLED) only
#endif
#ifndef P037_LIMIT_BUILD_SIZE
#define P037_LIMIT_BUILD_SIZE // Reduce build size for P037 (MQTT Import) only
#endif
#define NOTIFIER_SET_NONE
#ifdef USES_N001
#undef USES_N001 // Email
#endif
#ifdef USES_N002
#undef USES_N002 // Buzzer
#endif
#endif
#endif
#if defined(ESP8266)
#if defined(FEATURE_I2C_DEVICE_CHECK)
#undef FEATURE_I2C_DEVICE_CHECK
#endif
#define FEATURE_I2C_DEVICE_CHECK 0 // Disable I2C device check code
// #if !defined(FEATURE_TARSTREAM_SUPPORT)
// #define FEATURE_TARSTREAM_SUPPORT 0 // Disable TarStream support for size
// #endif // FEATURE_TARSTREAM_SUPPORT
#endif
#if !defined(FEATURE_SD) && !defined(ESP8266)
#define FEATURE_SD 1
#endif
#ifndef USES_P012
#define USES_P012 // LCD
#endif
#ifndef USES_P023
#endif
#if !defined(FEATURE_SD) && !defined(ESP8266)
#define FEATURE_SD 1
#endif
#ifndef USES_P012
#define USES_P012 // LCD
#endif
#ifndef USES_P023
#define USES_P023 // OLED
#endif
#ifndef USES_P036
#endif
#ifndef USES_P036
#define USES_P036 // FrameOLED
#endif
#ifdef USES_P038
#endif
#ifdef USES_P038
#undef USES_P038 // DISABLE NeoPixel
#endif
#ifdef USES_P041
#endif
#ifdef USES_P041
#undef USES_P041 // DISABLE NeoClock
#endif
#ifdef USES_P042
#endif
#ifdef USES_P042
#undef USES_P042 // DISABLE Candle
#endif
#ifndef USES_P057
#endif
#ifndef USES_P057
#define USES_P057 // HT16K33_LED
#endif
#ifdef USES_P070
#endif
#ifdef USES_P070
#undef USES_P070 // DISABLE NeoPixel_Clock
#endif
#ifndef USES_P075
#endif
#ifndef USES_P075
#define USES_P075 // Nextion
#endif
#ifndef USES_P095
#define USES_P095 // TFT ILI9341
#endif
#ifndef USES_P096
#define USES_P096 // eInk (Needs lib_deps = Adafruit GFX Library, LOLIN_EPD )
#endif
#ifndef USES_P099
#define USES_P099 // XPT2046 Touchscreen
#endif
#ifndef USES_P104
#endif
// #ifndef USES_P095
// #define USES_P095 // TFT ILI9341
// #endif
// #ifndef USES_P096
// #define USES_P096 // eInk (Needs lib_deps = Adafruit GFX Library, LOLIN_EPD )
// #endif
// #ifndef USES_P099
// #define USES_P099 // XPT2046 Touchscreen
// #endif
#ifndef USES_P104
// Plugin adds over 40k to build size
#define USES_P104 // MAX7219 dot matrix
#endif
#if !defined(USES_P109) && defined(ESP32)
#define USES_P109 // ThermoOLED
#endif
#ifndef USES_P116
#define USES_P116 // ST77xx
#endif
#if !defined(USES_P123) && defined(ESP32)
#define USES_P123 // I2C Touchscreens
#endif
#endif
#if !defined(USES_P109) && defined(ESP32)
#define USES_P109 // ThermoOLED
#endif
// #ifndef USES_P116
// #define USES_P116 // ST77xx
// #endif
// #if !defined(USES_P123) && defined(ESP32)
// #define USES_P123 // I2C Touchscreens
// #endif
#if !defined(USES_P137) && defined(ESP32)
#define USES_P137 // AXP192
#endif
#if !defined(USES_P138) && defined(ESP32)
#define USES_P138 // IP5306
#endif
#if !defined(USES_P139) && defined(ESP32)
#define USES_P139 // AXP2101
#endif
// #ifndef USES_P141
// #define USES_P141 // PCD8544 Nokia 5110
// #endif
#ifndef USES_P143
#define USES_P143 // I2C Rotary encoders
#endif
#if !defined(USES_P148) && defined(ESP32)
#define USES_P148 // Sonoff POWR3xxD and THR3xxD display
#endif
// #if !defined(USES_P165) && defined(ESP32)
// #define USES_P165 // Display - NeoPixel (7-Segment)
// #endif
#if !defined(USES_P180) && defined(ESP32)
#define USES_P180 // Generic - I2C Generic
#endif
#endif // ifdef PLUGIN_DISPLAY_A_COLLECTION
// Collection of display plugins, set B (AdaGFX_Helper).
#ifdef PLUGIN_DISPLAY_B_COLLECTION
#ifndef PLUGIN_DESCR
#define PLUGIN_DESCR "Display B"
#endif
#if !defined(LIMIT_BUILD_SIZE) && (defined(ESP8266) || !(ESP_IDF_VERSION_MAJOR > 3))
#ifndef PLUGIN_BUILD_MAX_ESP32
#define LIMIT_BUILD_SIZE // Reduce buildsize (on ESP8266 / pre-IDF4.x) to fit in all Display plugins
#define KEEP_I2C_MULTIPLEXER
#ifndef P036_LIMIT_BUILD_SIZE
#define P036_LIMIT_BUILD_SIZE // Reduce build size for P036 (FramedOLED) only
#endif
#ifndef P037_LIMIT_BUILD_SIZE
#define P037_LIMIT_BUILD_SIZE // Reduce build size for P037 (MQTT Import) only
#endif
#define NOTIFIER_SET_NONE
#ifdef USES_N001
#undef USES_N001 // Email
#endif
#ifdef USES_N002
#undef USES_N002 // Buzzer
#endif
#endif
#endif
#if defined(ESP8266)
#if defined(FEATURE_I2C_DEVICE_CHECK)
#undef FEATURE_I2C_DEVICE_CHECK
#endif
#define FEATURE_I2C_DEVICE_CHECK 0 // Disable I2C device check code
// #if !defined(FEATURE_TARSTREAM_SUPPORT)
// #define FEATURE_TARSTREAM_SUPPORT 0 // Disable TarStream support for size
// #endif // FEATURE_TARSTREAM_SUPPORT
#endif
#if !defined(FEATURE_SD) && !defined(ESP8266)
#define FEATURE_SD 1
#endif
#ifdef USES_P012
#undef USES_P012 // DISABLE LCD
#endif
#ifdef USES_P023
#undef USES_P023 // DISABLE OLED
#endif
#ifndef USES_P036
#define USES_P036 // FrameOLED
#endif
#ifdef USES_P038
#undef USES_P038 // DISABLE NeoPixel
#endif
#ifdef USES_P041
#undef USES_P041 // DISABLE NeoClock
#endif
#ifdef USES_P042
#undef USES_P042 // DISABLE Candle
#endif
#ifdef USES_P057
#undef USES_P057 // DISABLE HT16K33_LED
#endif
#ifdef USES_P070
#undef USES_P070 // DISABLE NeoPixel_Clock
#endif
#ifdef USES_P075
#undef USES_P075 // DISABLE Nextion
#endif
#ifndef USES_P095
#define USES_P095 // TFT ILI9341
#endif
#ifndef USES_P096
#define USES_P096 // eInk (Needs lib_deps = Adafruit GFX Library, LOLIN_EPD )
#endif
#ifndef USES_P099
#define USES_P099 // XPT2046 Touchscreen
#endif
#ifdef USES_P104
// Plugin adds over 40k to build size
#undef USES_P104 // DISABLE MAX7219 dot matrix
#endif
#if !defined(USES_P109) && defined(ESP32)
#define USES_P109 // ThermoOLED
#endif
#ifndef USES_P116
#define USES_P116 // ST77xx
#endif
#if !defined(USES_P123) && defined(ESP32)
#define USES_P123 // I2C Touchscreens
#endif
#if !defined(USES_P137) && defined(ESP32)
#define USES_P137 // AXP192
#endif
@@ -1905,16 +2020,16 @@ To create/register a plugin, you have to :
#ifndef USES_P143
#define USES_P143 // I2C Rotary encoders
#endif
#ifndef USES_P148
#if !defined(USES_P148) && defined(ESP32)
#define USES_P148 // Sonoff POWR3xxD and THR3xxD display
#endif
#if !defined(USES_P165) && defined(ESP32)
#define USES_P165 // Display - NeoPixel (7-Segment)
#endif
// #if !defined(USES_P165) && defined(ESP32)
// #define USES_P165 // Display - NeoPixel (7-Segment)
// #endif
#if !defined(USES_P180) && defined(ESP32)
#define USES_P180 // Generic - I2C Generic
#endif
#endif // ifdef PLUGIN_DISPLAY_COLLECTION
#endif // ifdef PLUGIN_DISPLAY_B_COLLECTION
// Collection of all climate plugins.
#ifdef PLUGIN_CLIMATE_COLLECTION
@@ -2356,6 +2471,24 @@ To create/register a plugin, you have to :
#ifndef USES_P046
#define USES_P046 // VentusW266
#endif
#ifndef USES_P038
#define USES_P038 // NeoPixel
#endif
#ifndef USES_P041
#define USES_P041 // NeoClock
#endif
#ifndef USES_P042
#define USES_P042 // Candle
#endif
#ifndef USES_P057
#define USES_P057 // HT16K33_LED
#endif
#ifndef USES_P070
#define USES_P070 // NeoPixel_Clock
#endif
#ifndef USES_P075
#define USES_P075 // Nextion
#endif
#ifndef USES_P087
#define USES_P087 // Serial Proxy
#endif
@@ -2572,13 +2705,13 @@ To create/register a plugin, you have to :
#ifndef USES_P168
#define USES_P168 // Light - VEML6030/VEML7700
#endif
#ifndef USES_P170
#define USES_P170 // Input - I2C Liquid level sensor
#endif
#ifndef USES_P169
#define USES_P169 // Environment - AS3935 Lightning Detector
#endif
#ifndef USES_P170
#define USES_P170 // Input - I2C Liquid level sensor
#endif
#ifndef USES_P173
#define USES_P173 // Environment - SHTC3
#endif
@@ -2747,7 +2880,7 @@ To create/register a plugin, you have to :
// Disable Homie plugin for now in the dev build to make it fit.
#if defined(PLUGIN_DISPLAY_COLLECTION) && defined(USES_C014) && defined(ESP8266)
#if (defined(PLUGIN_DISPLAY_A_COLLECTION) || defined(PLUGIN_DISPLAY_B_COLLECTION)) && defined(USES_C014) && defined(ESP8266)
#undef USES_C014
#endif
src/src/PluginStructs/P037_data_struct.h
+2 -2
View File
@@ -60,7 +60,7 @@
// #endif
# endif // if (defined(LIMIT_BUILD_SIZE) && !defined(P037_OVERRIDE)) || defined(P037_LIMIT_BUILD_SIZE)
# ifdef PLUGIN_DISPLAY_COLLECTION
# if defined(PLUGIN_DISPLAY_A_COLLECTION) || defined(PLUGIN_DISPLAY_B_COLLECTION)
# if P037_FILTER_SUPPORT
# undef P037_FILTER_SUPPORT
# define P037_FILTER_SUPPORT 0
@@ -69,7 +69,7 @@
# undef P037_REPLACE_BY_COMMA_SUPPORT
# define P037_REPLACE_BY_COMMA_SUPPORT 0
# endif // if P037_REPLACE_BY_COMMA_SUPPORT
# endif // ifdef PLUGIN_DISPLAY_COLLECTION
# endif // if defined(PLUGIN_DISPLAY_A_COLLECTION) || defined(PLUGIN_DISPLAY_B_COLLECTION)
# endif // ifndef PLUGIN_BUILD_MAX_ESP32
# define P037_MAX_MAPPINGS 25
src/src/PluginStructs/P104_data_struct.h
+6 -4
View File
@@ -18,10 +18,12 @@
# include <vector>
// # if defined(PLUGIN_SET_MAX) || defined(PLUGIN_BUILD_CUSTOM) || (defined(PLUGIN_DISPLAY_COLLECTION) && defined(ESP32))
// # if defined(PLUGIN_SET_MAX) || defined(PLUGIN_BUILD_CUSTOM) || ((defined(PLUGIN_DISPLAY_A_COLLECTION) ||
// defined(PLUGIN_DISPLAY_B_COLLECTION)) && defined(ESP32))
# ifdef ESP32
# define P104_USE_NUMERIC_DOUBLEHEIGHT_FONT // Enables double height numeric font for double-height time/date
// # endif // if defined(PLUGIN_SET_MAX) || defined(PLUGIN_BUILD_CUSTOM) || (defined(PLUGIN_DISPLAY_COLLECTION) && defined(ESP32))
// # endif // if defined(PLUGIN_SET_MAX) || defined(PLUGIN_BUILD_CUSTOM) || ((defined(PLUGIN_DISPLAY_A_COLLECTION) ||
// defined(PLUGIN_DISPLAY_B_COLLECTION)) && defined(ESP32))
# endif // ifdef ESP32
# define P104_USE_FULL_DOUBLEHEIGHT_FONT // Enables the use of a full (lower ascii only) set double height font
# define P104_USE_VERTICAL_FONT // Enables the use of a vertical font
@@ -45,7 +47,7 @@
# endif // if FEATURE_EXTENDED_CUSTOM_SETTINGS && defined(ESP32) && defined(USE_LITTLEFS)
// To make it fit in the ESP8266 display build
# if defined(PLUGIN_DISPLAY_COLLECTION) && defined(ESP8266) && !defined(LIMIT_BUILD_SIZE)
# if (defined(PLUGIN_DISPLAY_A_COLLECTION) || defined(PLUGIN_DISPLAY_B_COLLECTION)) && defined(ESP8266) && !defined(LIMIT_BUILD_SIZE)
# ifdef P104_USE_FULL_DOUBLEHEIGHT_FONT
# undef P104_USE_FULL_DOUBLEHEIGHT_FONT
# ifndef P104_USE_NUMERIC_DOUBLEHEIGHT_FONT
@@ -83,7 +85,7 @@
# undef P104_DEBUG_DEV
# endif // ifdef P104_DEBUG_DEV
# define P104_MEDIUM_ANIMATIONS
# endif // if defined(PLUGIN_DISPLAY_COLLECTION) && defined(ESP8266)
# endif // if (defined(PLUGIN_DISPLAY_A_COLLECTION) || defined(PLUGIN_DISPLAY_B_COLLECTION)) && defined(ESP8266) && !defined(LIMIT_BUILD_SIZE)
// # define P104_MINIMAL_ANIMATIONS // disable most animations
// # define P104_MEDIUM_ANIMATIONS // disable some complex animations