diff --git a/code/.project b/code/.project index 06fb76d..2690550 100644 --- a/code/.project +++ b/code/.project @@ -293,6 +293,11 @@ 1 /home/matthias/esp/esp-idf/components/esp_hw_support/sleep_retention.c + + build/ide/esp_idf_components/esp_hw_support/sleep_wake_stub.c + 1 + /home/matthias/esp/esp-idf/components/esp_hw_support/sleep_wake_stub.c + build/ide/esp_idf_components/esp_netif/esp_netif_defaults.c 1 @@ -438,6 +443,11 @@ 1 /home/matthias/esp/esp-idf/components/hal/aes_hal.c + + build/ide/esp_idf_components/hal/brownout_hal.c + 1 + /home/matthias/esp/esp-idf/components/hal/brownout_hal.c + build/ide/esp_idf_components/hal/cache_hal.c 1 @@ -1423,6 +1433,11 @@ 1 /home/matthias/esp/esp-idf/components/esp_hw_support/dma/gdma.c + + build/ide/esp_idf_components/esp_hw_support/port/clk_tree_common.c + 1 + /home/matthias/esp/esp-idf/components/esp_hw_support/port/clk_tree_common.c + build/ide/esp_idf_components/esp_hw_support/port/esp_memprot_conv.c 1 @@ -1498,6 +1513,11 @@ 1 /home/matthias/esp/esp-idf/components/esp_netif/lwip/esp_netif_lwip_defaults.c + + build/ide/esp_idf_components/esp_netif/lwip/esp_netif_sntp.c + 1 + /home/matthias/esp/esp-idf/components/esp_netif/lwip/esp_netif_sntp.c + build/ide/esp_idf_components/esp_phy/src/btbb_init.c 1 @@ -1763,6 +1783,11 @@ 1 /home/matthias/esp/esp-idf/components/hal/esp32c3/brownout_hal.c + + build/ide/esp_idf_components/hal/esp32c3/clk_tree_hal.c + 1 + /home/matthias/esp/esp-idf/components/hal/esp32c3/clk_tree_hal.c + build/ide/esp_idf_components/hal/esp32c3/efuse_hal.c 1 @@ -2113,6 +2138,11 @@ 1 /home/matthias/esp/esp-idf/components/esp_hw_support/port/esp32c3/chip_info.c + + build/ide/esp_idf_components/esp_hw_support/port/esp32c3/clk_tree.c + 1 + /home/matthias/esp/esp-idf/components/esp_hw_support/port/esp32c3/clk_tree.c + build/ide/esp_idf_components/esp_hw_support/port/esp32c3/esp_crypto_lock.c 1 @@ -2268,6 +2298,21 @@ 1 /home/matthias/esp/esp-idf/components/mbedtls/mbedtls/library/bignum.c + + build/ide/esp_idf_components/mbedtls/mbedtls/library/bignum_core.c + 1 + /home/matthias/esp/esp-idf/components/mbedtls/mbedtls/library/bignum_core.c + + + build/ide/esp_idf_components/mbedtls/mbedtls/library/bignum_mod.c + 1 + /home/matthias/esp/esp-idf/components/mbedtls/mbedtls/library/bignum_mod.c + + + build/ide/esp_idf_components/mbedtls/mbedtls/library/bignum_mod_raw.c + 1 + /home/matthias/esp/esp-idf/components/mbedtls/mbedtls/library/bignum_mod_raw.c + build/ide/esp_idf_components/mbedtls/mbedtls/library/camellia.c 1 @@ -2373,6 +2418,11 @@ 1 /home/matthias/esp/esp-idf/components/mbedtls/mbedtls/library/gcm.c + + build/ide/esp_idf_components/mbedtls/mbedtls/library/hash_info.c + 1 + /home/matthias/esp/esp-idf/components/mbedtls/mbedtls/library/hash_info.c + build/ide/esp_idf_components/mbedtls/mbedtls/library/hkdf.c 1 @@ -2383,6 +2433,16 @@ 1 /home/matthias/esp/esp-idf/components/mbedtls/mbedtls/library/hmac_drbg.c + + build/ide/esp_idf_components/mbedtls/mbedtls/library/lmots.c + 1 + /home/matthias/esp/esp-idf/components/mbedtls/mbedtls/library/lmots.c + + + build/ide/esp_idf_components/mbedtls/mbedtls/library/lms.c + 1 + /home/matthias/esp/esp-idf/components/mbedtls/mbedtls/library/lms.c + build/ide/esp_idf_components/mbedtls/mbedtls/library/md.c 1 @@ -2448,6 +2508,11 @@ 1 /home/matthias/esp/esp-idf/components/mbedtls/mbedtls/library/pkcs5.c + + build/ide/esp_idf_components/mbedtls/mbedtls/library/pkcs7.c + 1 + /home/matthias/esp/esp-idf/components/mbedtls/mbedtls/library/pkcs7.c + build/ide/esp_idf_components/mbedtls/mbedtls/library/pkparse.c 1 @@ -2513,6 +2578,11 @@ 1 /home/matthias/esp/esp-idf/components/mbedtls/mbedtls/library/psa_crypto_mac.c + + build/ide/esp_idf_components/mbedtls/mbedtls/library/psa_crypto_pake.c + 1 + /home/matthias/esp/esp-idf/components/mbedtls/mbedtls/library/psa_crypto_pake.c + build/ide/esp_idf_components/mbedtls/mbedtls/library/psa_crypto_rsa.c 1 diff --git a/code/main/main.cpp b/code/main/main.cpp index ec943f3..bfd8f2e 100644 --- a/code/main/main.cpp +++ b/code/main/main.cpp @@ -61,7 +61,7 @@ static const uart_port_t uartPort = UART_NUM_0; static TaskHandle_t devTaskHandle = NULL; -static void devTask(void* parameters); +static TaskHandle_t colourMapTaskHandle = NULL; // GPIOs static GPIO led_rgb_red(3, GPIO_DIRECTION_OUTPUT); @@ -102,7 +102,9 @@ static void countdown(int delay); // Timer Callback for the LEDMatrix refresh static bool timerCallback(gptimer_handle_t timer, const gptimer_alarm_event_data_t *edata, void *user_data); +static void devTask(void* parameters); +static void colourMapTask(void* parameters); // -------------------------------------------------------------------------------------------------------------------- // Function definitions // -------------------------------------------------------------------------------------------------------------------- @@ -207,6 +209,12 @@ extern "C" void app_main(void) LOGGER_ERROR("Task not created"); } + // Create the colour Map task + if(xTaskCreate(colourMapTask, "ColourTask", 2048, NULL, 3, &colourMapTaskHandle) != pdPASS) + { + LOGGER_ERROR("Task not created"); + } + Wifi wifi; wifi.start_client(); @@ -250,6 +258,28 @@ static void devTask(void* parameters) } +static void colourMapTask(void* parameters) +{ + uint8_t red = 0; + uint8_t green = 0; + uint8_t blue = 0; + + uint32_t counter = 0; + + + while (true) + { + LEDMatrix.setGlobalColour(red, green, blue); + + red = counter & 0xFF; + green = (counter >> 8) & 0xFF; + blue = (counter >> 16) & 0xFF; + counter++; + vTaskDelay(30); + } + +} + static void countdown(int delay) { map.setWord(Wordmap::Language_t::NL, "ten", true); diff --git a/code/main/src/clock.cpp b/code/main/src/clock.cpp index 08cc73f..1b138b5 100644 --- a/code/main/src/clock.cpp +++ b/code/main/src/clock.cpp @@ -61,9 +61,9 @@ 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(); - sntp_setoperatingmode(SNTP_OPMODE_POLL); - sntp_setservername(0, "pool.ntp.org"); - sntp_init(); + esp_sntp_setoperatingmode(SNTP_OPMODE_POLL); + esp_sntp_setservername(0, "pool.ntp.org"); + esp_sntp_init(); } void Clock::generateWordlist(list* wordlist) diff --git a/code/sdkconfig b/code/sdkconfig index 540bb06..3a53a56 100644 --- a/code/sdkconfig +++ b/code/sdkconfig @@ -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 # @@ -992,6 +1006,7 @@ CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y CONFIG_LWIP_LOCAL_HOSTNAME="espressif" # 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