diff --git a/code/.project b/code/.project
index 2690550..66beda2 100644
--- a/code/.project
+++ b/code/.project
@@ -1778,11 +1778,6 @@
1
/home/matthias/esp/esp-idf/components/freertos/esp_additions/freertos_v8_compat.c
-
- build/ide/esp_idf_components/hal/esp32c3/brownout_hal.c
- 1
- /home/matthias/esp/esp-idf/components/hal/esp32c3/brownout_hal.c
-
build/ide/esp_idf_components/hal/esp32c3/clk_tree_hal.c
1
diff --git a/code/main/CMakeLists.txt b/code/main/CMakeLists.txt
index ac40a77..8811206 100644
--- a/code/main/CMakeLists.txt
+++ b/code/main/CMakeLists.txt
@@ -18,3 +18,4 @@ idf_component_register(
PRIV_REQUIRES # optional, list the private requirements
)
+component_compile_definitions("ESP_LWIP_COMPONENT_BUILD" "RELEASE=\"0.1\"")
diff --git a/code/main/main.cpp b/code/main/main.cpp
index bfd8f2e..816add1 100644
--- a/code/main/main.cpp
+++ b/code/main/main.cpp
@@ -42,6 +42,7 @@
#include "clock.h"
#include "wordmap.h"
+
// --------------------------------------------------------------------------------------------------------------------
// Constant and macro definitions
// --------------------------------------------------------------------------------------------------------------------
@@ -49,6 +50,7 @@
#define RMT_LED_STRIP_RESOLUTION_HZ 10000000 // 10MHz resolution, 1 tick = 0.1us (led strip needs a high resolution)
#define RMT_LED_STRIP_GPIO_NUM 0
+
// --------------------------------------------------------------------------------------------------------------------
// Type definitions
// --------------------------------------------------------------------------------------------------------------------
@@ -144,7 +146,12 @@ extern "C" void app_main(void)
//
Logger logger(10, uartPort);
- LOGGER_DEBUG("Let's start the WORDCLOCK");
+ LOGGER_PRINT("-----------------------------------------------------------------------");
+ LOGGER_PRINT("System Start");
+ LOGGER_PRINT("");
+ LOGGER_PRINT("WordClock");
+ LOGGER_PRINT("Release: %f", RELEASE);
+ LOGGER_PRINT("Compiled on %d %d", __TIME__, __DATE__);
//--------------------------------------------
diff --git a/code/main/src/clock.cpp b/code/main/src/clock.cpp
index 1b138b5..d24b129 100644
--- a/code/main/src/clock.cpp
+++ b/code/main/src/clock.cpp
@@ -61,7 +61,7 @@ Clock::Clock(Clock::mode mode)
// Start NTP
setenv("TZ", "CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00", 1);
tzset();
- esp_sntp_setoperatingmode(SNTP_OPMODE_POLL);
+ esp_sntp_setoperatingmode(ESP_SNTP_OPMODE_POLL);
esp_sntp_setservername(0, "pool.ntp.org");
esp_sntp_init();
}
diff --git a/code/sdkconfig b/code/sdkconfig
index 3a53a56..89e344a 100644
--- a/code/sdkconfig
+++ b/code/sdkconfig
@@ -1003,13 +1003,13 @@ CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
#
# LWIP
#
-CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
+CONFIG_LWIP_LOCAL_HOSTNAME="wordclock"
# CONFIG_LWIP_NETIF_API is not set
# CONFIG_LWIP_TCPIP_CORE_LOCKING is not set
# CONFIG_LWIP_CHECK_THREAD_SAFETY is not set
CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y
# CONFIG_LWIP_L2_TO_L3_COPY is not set
-# CONFIG_LWIP_IRAM_OPTIMIZATION is not set
+CONFIG_LWIP_IRAM_OPTIMIZATION=y
CONFIG_LWIP_TIMERS_ONDEMAND=y
CONFIG_LWIP_MAX_SOCKETS=10
# CONFIG_LWIP_USE_ONLY_LWIP_SELECT is not set
diff --git a/code/sdkconfig.old b/code/sdkconfig.old
index 97a81f8..c54ae17 100644
--- a/code/sdkconfig.old
+++ b/code/sdkconfig.old
@@ -5,6 +5,7 @@
CONFIG_SOC_ADC_SUPPORTED=y
CONFIG_SOC_DEDICATED_GPIO_SUPPORTED=y
CONFIG_SOC_GDMA_SUPPORTED=y
+CONFIG_SOC_GPTIMER_SUPPORTED=y
CONFIG_SOC_TWAI_SUPPORTED=y
CONFIG_SOC_BT_SUPPORTED=y
CONFIG_SOC_ASYNC_MEMCPY_SUPPORTED=y
@@ -33,6 +34,7 @@ CONFIG_SOC_DIG_SIGN_SUPPORTED=y
CONFIG_SOC_FLASH_ENC_SUPPORTED=y
CONFIG_SOC_SECURE_BOOT_SUPPORTED=y
CONFIG_SOC_MEMPROT_SUPPORTED=y
+CONFIG_SOC_BOD_SUPPORTED=y
CONFIG_SOC_XTAL_SUPPORT_40M=y
CONFIG_SOC_AES_SUPPORT_DMA=y
CONFIG_SOC_AES_GDMA=y
@@ -79,7 +81,6 @@ CONFIG_SOC_GPIO_PORT=1
CONFIG_SOC_GPIO_PIN_COUNT=22
CONFIG_SOC_GPIO_SUPPORT_PIN_GLITCH_FILTER=y
CONFIG_SOC_GPIO_FILTER_CLK_SUPPORT_APB=y
-CONFIG_SOC_GPIO_SUPPORTS_RTC_INDEPENDENT=y
CONFIG_SOC_GPIO_SUPPORT_FORCE_HOLD=y
CONFIG_SOC_GPIO_SUPPORT_DEEPSLEEP_WAKEUP=y
CONFIG_SOC_GPIO_DEEP_SLEEP_WAKE_VALID_GPIO_MASK=0
@@ -94,7 +95,7 @@ CONFIG_SOC_I2C_SUPPORT_SLAVE=y
CONFIG_SOC_I2C_SUPPORT_HW_CLR_BUS=y
CONFIG_SOC_I2C_SUPPORT_XTAL=y
CONFIG_SOC_I2C_SUPPORT_RTC=y
-CONFIG_SOC_I2S_NUM=y
+CONFIG_SOC_I2S_NUM=1
CONFIG_SOC_I2S_HW_VERSION_2=y
CONFIG_SOC_I2S_SUPPORTS_XTAL=y
CONFIG_SOC_I2S_SUPPORTS_PLL_F160M=y
@@ -147,6 +148,8 @@ CONFIG_SOC_SPI_SLAVE_SUPPORT_SEG_TRANS=y
CONFIG_SOC_SPI_SUPPORT_CD_SIG=y
CONFIG_SOC_SPI_SUPPORT_CONTINUOUS_TRANS=y
CONFIG_SOC_SPI_SUPPORT_SLAVE_HD_VER2=y
+CONFIG_SOC_SPI_SUPPORT_CLK_APB=y
+CONFIG_SOC_SPI_SUPPORT_CLK_XTAL=y
CONFIG_SOC_SPI_PERIPH_SUPPORT_CONTROL_DUMMY_OUT=y
CONFIG_SOC_MEMSPI_IS_INDEPENDENT=y
CONFIG_SOC_SPI_MAX_PRE_DIVIDER=16
@@ -179,6 +182,10 @@ CONFIG_SOC_TWAI_CLK_SUPPORT_APB=y
CONFIG_SOC_TWAI_BRP_MIN=2
CONFIG_SOC_TWAI_BRP_MAX=16384
CONFIG_SOC_TWAI_SUPPORTS_RX_STATUS=y
+CONFIG_SOC_EFUSE_DIS_PAD_JTAG=y
+CONFIG_SOC_EFUSE_DIS_USB_JTAG=y
+CONFIG_SOC_EFUSE_DIS_DIRECT_BOOT=y
+CONFIG_SOC_EFUSE_SOFT_DIS_JTAG=y
CONFIG_SOC_SECURE_BOOT_V2_RSA=y
CONFIG_SOC_EFUSE_SECURE_BOOT_KEY_DIGESTS=3
CONFIG_SOC_EFUSE_REVOKE_BOOT_KEY_DIGESTS=y
@@ -210,6 +217,7 @@ CONFIG_SOC_PM_SUPPORT_RC_FAST_PD=y
CONFIG_SOC_CLK_RC_FAST_D256_SUPPORTED=y
CONFIG_SOC_RTC_SLOW_CLK_SUPPORT_RC_FAST_D256=y
CONFIG_SOC_CLK_RC_FAST_SUPPORT_CALIBRATION=y
+CONFIG_SOC_CLK_XTAL32K_SUPPORTED=y
CONFIG_SOC_TEMPERATURE_SENSOR_SUPPORT_FAST_RC=y
CONFIG_SOC_TEMPERATURE_SENSOR_SUPPORT_XTAL=y
CONFIG_SOC_WIFI_HW_TSF=y
@@ -439,6 +447,7 @@ CONFIG_APPTRACE_LOCK_ENABLE=y
CONFIG_SPI_MASTER_ISR_IN_IRAM=y
# CONFIG_SPI_SLAVE_IN_IRAM is not set
CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
+# CONFIG_SPI_SUPPRESS_FREQ_MACRO_DEPRECATE_WARN is not set
# end of SPI Configuration
#
@@ -649,7 +658,7 @@ CONFIG_RTC_CLK_CAL_CYCLES=1024
#
# Peripheral Control
#
-# CONFIG_PERIPH_CTRL_FUNC_IN_IRAM is not set
+CONFIG_PERIPH_CTRL_FUNC_IN_IRAM=y
# end of Peripheral Control
#
@@ -702,6 +711,11 @@ CONFIG_ESP_NETIF_USES_TCPIP_WITH_BSD_API=y
# CONFIG_ESP_NETIF_BRIDGE_EN is not set
# end of ESP NETIF Adapter
+#
+# ESP_PARTITION
+#
+# end of ESP_PARTITION
+
#
# PHY
#
@@ -901,7 +915,7 @@ CONFIG_FATFS_PER_FILE_CACHE=y
#
# CONFIG_FREERTOS_SMP is not set
CONFIG_FREERTOS_UNICORE=y
-CONFIG_FREERTOS_HZ=100
+CONFIG_FREERTOS_HZ=1000
CONFIG_FREERTOS_OPTIMIZED_SCHEDULER=y
# CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE is not set
# CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL is not set
@@ -989,12 +1003,13 @@ CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
#
# LWIP
#
-CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
-# CONFIG_LWIP_NETIF_API is not set
+CONFIG_LWIP_LOCAL_HOSTNAME="wordclock"
+CONFIG_LWIP_NETIF_API=y
# CONFIG_LWIP_TCPIP_CORE_LOCKING is not set
+# CONFIG_LWIP_CHECK_THREAD_SAFETY is not set
CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y
# CONFIG_LWIP_L2_TO_L3_COPY is not set
-# CONFIG_LWIP_IRAM_OPTIMIZATION is not set
+CONFIG_LWIP_IRAM_OPTIMIZATION=y
CONFIG_LWIP_TIMERS_ONDEMAND=y
CONFIG_LWIP_MAX_SOCKETS=10
# CONFIG_LWIP_USE_ONLY_LWIP_SELECT is not set