Skip to content

Commit 309cdd6

Browse files
authored
Udisplay use library.json and folders in lib to ensure correct compile and linking (#24122)
1 parent 88c62f3 commit 309cdd6

28 files changed

+35
-23
lines changed
File renamed without changes.

lib/lib_display/UDisplay/uDisplay.h renamed to lib/lib_display/UDisplay/include/uDisplay.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <renderer.h>
66
#include <Wire.h>
77
#include <SPI.h>
8+
#include "uDisplay_config.h"
89

910
#ifdef ESP32
1011
#if __has_include("soc/soc_caps.h")
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

lib/lib_display/UDisplay/uDisplay_SPI_controller.h renamed to lib/lib_display/UDisplay/include/uDisplay_SPI_controller.h

File renamed without changes.
File renamed without changes.

lib/lib_display/UDisplay/uDisplay_config.h renamed to lib/lib_display/UDisplay/include/uDisplay_config.h

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#ifndef UDISPLAY_CONFIG_H
22
#define UDISPLAY_CONFIG_H
33

4-
// Logging system interface
4+
// Logging system interface - only declare if not building within Tasmota
5+
#ifndef _TASMOTA_H_
56
enum LoggingLevels {
67
LOG_LEVEL_NONE,
78
LOG_LEVEL_ERROR,
@@ -10,12 +11,16 @@ enum LoggingLevels {
1011
LOG_LEVEL_DEBUG_MORE
1112
};
1213

14+
// Function declarations - only if not building within Tasmota
1315
extern void AddLog(uint32_t loglevel, const char* formatP, ...);
14-
extern int32_t ESP_ResetInfoReason();
15-
extern float CharToFloat(const char *str);
16-
extern SPIClass *SpiBegin(uint32 bus);
17-
// extern int Cache_WriteBack_Addr(uint32_t addr, uint32_t size);
16+
extern uint32_t ESP_ResetInfoReason(void);
1817
extern bool UsePSRAM(void);
18+
extern float CharToFloat(const char *str);
19+
extern SPIClass *SpiBegin(uint32_t bus);
20+
#endif // _TASMOTA_H_
21+
22+
// Enable universal touch support
23+
#define USE_UNIVERSAL_TOUCH
1924

2025
enum uColorType { uCOLOR_BW, uCOLOR_COLOR };
2126

@@ -53,4 +58,4 @@ constexpr uint8_t EP_SEND_FRAME = 0x68;
5358
constexpr uint8_t EP_BREAK_RR_EQU = 0x69;
5459
constexpr uint8_t EP_BREAK_RR_NEQ = 0x6a;
5560

56-
#endif
61+
#endif

0 commit comments

Comments
 (0)