This commit is contained in:
Jason2866 2021-11-21 13:53:03 +01:00 committed by GitHub
parent ced7aa5a08
commit 366ee8f263
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 12 deletions

View File

@ -61,13 +61,12 @@ lib_extra_dirs = lib/libesp32
[env:tasmota32-odroidgo]
extends = env:tasmota32_base
board = esp32-odroid
build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_ODROID_GO
lib_extra_dirs = lib/libesp32, lib/lib_basic, lib/lib_i2c, lib/lib_rf, lib/lib_div, lib/lib_ssl, lib/lib_display
build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_ODROID_GO -DUSE_UNIVERSAL_DISPLAY -DUSE_AUTOCONF
[env:tasmota32-core2]
extends = env:tasmota32_base
board = esp32-m5core2
build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_M5STACK_CORE2 -DUSE_UNIVERSAL_DISPLAY
build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_M5STACK_CORE2 -DUSE_UNIVERSAL_DISPLAY -DUSE_AUTOCONF
lib_extra_dirs = lib/libesp32, lib/libesp32_lvgl, lib/lib_basic, lib/lib_i2c, lib/lib_rf, lib/lib_div, lib/lib_ssl, lib/lib_display, lib/lib_audio
[env:tasmota32-bluetooth]

View File

@ -75,13 +75,18 @@
#undef USE_HOME_ASSISTANT
#define USE_ADC
#define USE_I2C
#define USE_SPI
#define USE_DISPLAY // Add SPI Display Support (+2k code)
#define USE_DISPLAY
#define SHOW_SPLASH
#ifndef USE_UNIVERSAL_DISPLAY
#define USE_DISPLAY_ILI9341 // [DisplayModel 4] Enable ILI9341 Tft 480x320 display (+19k code)
#endif
#ifdef USE_UNIVERSAL_DISPLAY
#define USE_LVGL
#define USE_LVGL_FREETYPE
// #define USE_DISPLAY_LVGL_ONLY
#else
#define USE_DISPLAY_ILI9341 // [DisplayModel 4] Enable ILI9341 Tft 480x320 display (+19k code)
#define USE_DISPLAY_MODES1TO5
#endif
//#define USE_BLE_ESP32 // Enable new BLE driver
//#define USE_MI_ESP32 // (ESP32 only) Add support for ESP32 as a BLE-bridge (+9k2 mem, +292k flash)
#endif // FIRMWARE_ODROID_GO

View File

@ -21,9 +21,9 @@
#if defined(USE_FT5206) || defined(USE_XPT2046) || defined(USE_LILYGO47) || defined(USE_TOUCH_BUTTONS)
// #ifdef USE_DISPLAY_LVGL_ONLY
// #undef USE_TOUCH_BUTTONS
// #endif
#ifdef USE_DISPLAY_LVGL_ONLY
#undef USE_TOUCH_BUTTONS
#endif
#include <renderer.h>
@ -317,5 +317,9 @@ bool Xdrv55(uint8_t function) {
}
return result;
}
#else
// dummy for LVGL without a touch controller
uint32_t Touch_Status(uint32_t sel) {
return 0;
}
#endif // USE_TOUCH