diff --git a/builder/frameworks/base.py b/builder/frameworks/base.py index c9317c23a..3a4209e21 100644 --- a/builder/frameworks/base.py +++ b/builder/frameworks/base.py @@ -20,8 +20,6 @@ env.ParseCustomFlashLayout(platform, board) # Add flash layout C defines env.AddFlashLayout(board) -# Write custom header options -env.ApplyCustomOptions(platform) # Export board manifest for ltchiptool env.ExportBoardData(board) # Print information about versions and custom options diff --git a/builder/utils/libs-queue.py b/builder/utils/libs-queue.py index ddca5a27e..dc7064a07 100644 --- a/builder/utils/libs-queue.py +++ b/builder/utils/libs-queue.py @@ -184,6 +184,9 @@ def BuildLibraries(self): else: self.env.Append(CPPPATH=self.includes) + # prepend headers with custom options + self.env.ApplyCustomOptions(self.env.PioPlatform()) + # clone the environment for the whole library queue queue_env = self.env.Clone() # add private options to the cloned environment diff --git a/cores/beken-72xx/base/config/tls_config.h b/cores/beken-72xx/base/config/tls_config.h new file mode 100644 index 000000000..3806110d1 --- /dev/null +++ b/cores/beken-72xx/base/config/tls_config.h @@ -0,0 +1,9 @@ +/* Copyright (c) Kuba SzczodrzyƄski 2024-05-18. */ + +#pragma once + +#include_next "tls_config.h" + +// allow more entropy sources +#undef MBEDTLS_ENTROPY_MAX_SOURCES +#define MBEDTLS_ENTROPY_MAX_SOURCES 10 diff --git a/cores/common/base/config/lwipopts.h b/cores/common/base/config/lwipopts.h index 2557d02c8..5ce265028 100644 --- a/cores/common/base/config/lwipopts.h +++ b/cores/common/base/config/lwipopts.h @@ -15,8 +15,15 @@ // set lwIP debugging options according to LT config #if LT_DEBUG_LWIP +// enable main debugging switch #undef LWIP_DEBUG #define LWIP_DEBUG 1 +// enable all messages +#undef LWIP_DBG_MIN_LEVEL +#define LWIP_DBG_MIN_LEVEL 0 +// enable all debugging types +#undef LWIP_DBG_TYPES_ON +#define LWIP_DBG_TYPES_ON 0xF8 // make lwIP use printf() library #include #undef LWIP_PLATFORM_DIAG diff --git a/cores/common/base/lt_logger.h b/cores/common/base/lt_logger.h index 0af8f5f94..df8754c68 100644 --- a/cores/common/base/lt_logger.h +++ b/cores/common/base/lt_logger.h @@ -100,31 +100,31 @@ void lt_log_disable(); #endif // ESP32 compat -#define log_printf(...) LT_I(__VA_ARGS__) -#define log_v(...) LT_V(__VA_ARGS__) -#define log_d(...) LT_D(__VA_ARGS__) -#define log_i(...) LT_I(__VA_ARGS__) -#define log_w(...) LT_W(__VA_ARGS__) -#define log_e(...) LT_E(__VA_ARGS__) -#define log_n(...) LT_E(__VA_ARGS__) -#define isr_log_v(...) LT_V(__VA_ARGS__) -#define isr_log_d(...) LT_D(__VA_ARGS__) -#define isr_log_i(...) LT_I(__VA_ARGS__) -#define isr_log_w(...) LT_W(__VA_ARGS__) -#define isr_log_e(...) LT_E(__VA_ARGS__) -#define isr_log_n(...) LT_E(__VA_ARGS__) -#define ESP_LOGV(...) LT_V(__VA_ARGS__) -#define ESP_LOGD(...) LT_D(__VA_ARGS__) -#define ESP_LOGI(...) LT_I(__VA_ARGS__) -#define ESP_LOGW(...) LT_W(__VA_ARGS__) -#define ESP_LOGE(...) LT_E(__VA_ARGS__) -#define ESP_EARLY_LOGV(...) LT_V(__VA_ARGS__) -#define ESP_EARLY_LOGD(...) LT_D(__VA_ARGS__) -#define ESP_EARLY_LOGI(...) LT_I(__VA_ARGS__) -#define ESP_EARLY_LOGW(...) LT_W(__VA_ARGS__) -#define ESP_EARLY_LOGE(...) LT_E(__VA_ARGS__) -#define ets_printf(...) LT_I(__VA_ARGS__) -#define ETS_PRINTF(...) LT_I(__VA_ARGS__) +#define log_printf(...) LT_I(__VA_ARGS__) +#define log_v(...) LT_V(__VA_ARGS__) +#define log_d(...) LT_D(__VA_ARGS__) +#define log_i(...) LT_I(__VA_ARGS__) +#define log_w(...) LT_W(__VA_ARGS__) +#define log_e(...) LT_E(__VA_ARGS__) +#define log_n(...) LT_E(__VA_ARGS__) +#define isr_log_v(...) LT_V(__VA_ARGS__) +#define isr_log_d(...) LT_D(__VA_ARGS__) +#define isr_log_i(...) LT_I(__VA_ARGS__) +#define isr_log_w(...) LT_W(__VA_ARGS__) +#define isr_log_e(...) LT_E(__VA_ARGS__) +#define isr_log_n(...) LT_E(__VA_ARGS__) +#define ESP_LOGV(tag, ...) LT_V(__VA_ARGS__) +#define ESP_LOGD(tag, ...) LT_D(__VA_ARGS__) +#define ESP_LOGI(tag, ...) LT_I(__VA_ARGS__) +#define ESP_LOGW(tag, ...) LT_W(__VA_ARGS__) +#define ESP_LOGE(tag, ...) LT_E(__VA_ARGS__) +#define ESP_EARLY_LOGV(tag, ...) LT_V(__VA_ARGS__) +#define ESP_EARLY_LOGD(tag, ...) LT_D(__VA_ARGS__) +#define ESP_EARLY_LOGI(tag, ...) LT_I(__VA_ARGS__) +#define ESP_EARLY_LOGW(tag, ...) LT_W(__VA_ARGS__) +#define ESP_EARLY_LOGE(tag, ...) LT_E(__VA_ARGS__) +#define ets_printf(...) LT_I(__VA_ARGS__) +#define ETS_PRINTF(...) LT_I(__VA_ARGS__) #define LT_RET(ret) \ LT_E("ret=%d", ret); \ diff --git a/cores/realtek-amb/arduino/src/wiring_irq.c b/cores/realtek-amb/arduino/src/wiring_irq.c index f387fccca..34cfc2dcc 100644 --- a/cores/realtek-amb/arduino/src/wiring_irq.c +++ b/cores/realtek-amb/arduino/src/wiring_irq.c @@ -61,6 +61,9 @@ void attachInterruptParam(pin_size_t interruptNumber, voidFuncPtrParam callback, case CHANGE: #if LT_RTL8720C event = IRQ_FALL_RISE; +// Prevents Change interrupt errors on RTL8710B chips. +#elif LT_RTL8710B + event = IRQ_RISE; #else LT_W("CHANGE interrupts not supported"); #endif diff --git a/docs/dev/config.md b/docs/dev/config.md index bc668db2b..827ecd575 100644 --- a/docs/dev/config.md +++ b/docs/dev/config.md @@ -13,7 +13,10 @@ custom_fw_version = 1.2.0 # custom build options (#defines, NOT compiler flags) custom_options.lwip = - LWIP_IPV4 = 1 + # make sure to enable LT_DEBUG_LWIP as well + NETIF_DEBUG = 0x80 + IP_DEBUG = 0x80 + TCP_DEBUG = 0x80 custom_options.freertos = configUSE_TICK_HOOK = 1 @@ -82,7 +85,7 @@ To see debug messages from i.e. OTA, loglevel must also be changed. - `LT_DEBUG_OTA` (1) - OTA updates (`Update` library) - `LT_DEBUG_FDB` (0) - FlashDB debugging (macros within the library) - `LT_DEBUG_MDNS` (0) - mDNS client library -- `LT_DEBUG_LWIP` (0) - enables `LWIP_DEBUG`, provides `LWIP_PLATFORM_DIAG`; per-module options (i.e. `TCP_DEBUG`) are off by default and need to be enabled separately +- `LT_DEBUG_LWIP` (0) - enables `LWIP_DEBUG`, provides `LWIP_PLATFORM_DIAG`; per-module options (i.e. `TCP_DEBUG`) are off by default and need to be enabled separately - see example in `Project options` above - `LT_DEBUG_LWIP_ASSERT` (0) - enables assertions within lwIP (doesn't need `LT_DEBUG_LWIP`) !!! tip diff --git a/platform.json b/platform.json index c09423c32..f8b81ba2c 100644 --- a/platform.json +++ b/platform.json @@ -6,7 +6,7 @@ "type": "git", "url": "https://github.com/libretiny-eu/libretiny.git" }, - "version": "1.5.1", + "version": "1.6.0", "frameworks": { "base": { "title": "Base Framework (SDK only)",