From 30a12b8aa634df519eca7757b2a1414d4594b190 Mon Sep 17 00:00:00 2001 From: Jan Umbach Date: Mon, 14 Aug 2023 22:30:56 +0200 Subject: [PATCH] update --- .gitignore | 3 ++- .vscode/settings.json | 3 ++- changelog_en.txt | 1 + components/jannex | 2 +- sdkconfig | 8 +++++--- sdkconfig.old | 37 ++++++++++++++++++++++++------------- 6 files changed, 35 insertions(+), 19 deletions(-) create mode 100644 changelog_en.txt diff --git a/.gitignore b/.gitignore index 6710114..cff7421 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .devcontainer/* -build/* \ No newline at end of file +build/* +managed_components/* diff --git a/.vscode/settings.json b/.vscode/settings.json index bdf6a79..ce4f296 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -40,7 +40,8 @@ "string.h": "c", "initstorage.h": "c", "json_parser.h": "c", - "start.h": "c" + "start.h": "c", + "base64.h": "c" }, "idf.flashType": "UART" } diff --git a/changelog_en.txt b/changelog_en.txt new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/changelog_en.txt @@ -0,0 +1 @@ + diff --git a/components/jannex b/components/jannex index 1c43125..3c8fca8 160000 --- a/components/jannex +++ b/components/jannex @@ -1 +1 @@ -Subproject commit 1c4312596e2352299183077bf930bc57b16bb5b0 +Subproject commit 3c8fca81162a6f5deebd8caa7702202d64b4e7c2 diff --git a/sdkconfig b/sdkconfig index 92a15a6..af3dada 100644 --- a/sdkconfig +++ b/sdkconfig @@ -308,7 +308,8 @@ CONFIG_BOOTLOADER_REGION_PROTECTION_ENABLE=y CONFIG_BOOTLOADER_WDT_ENABLE=y # CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE is not set CONFIG_BOOTLOADER_WDT_TIME_MS=9000 -# CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE is not set +CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y +# CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK is not set # CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP is not set # CONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON is not set # CONFIG_BOOTLOADER_SKIP_VALIDATE_ALWAYS is not set @@ -1069,7 +1070,7 @@ CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y CONFIG_FREERTOS_TLSP_DELETION_CALLBACKS=y # CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y -CONFIG_FREERTOS_ISR_STACKSIZE=1536 +CONFIG_FREERTOS_ISR_STACKSIZE=2096 CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y CONFIG_FREERTOS_TICK_SUPPORT_CORETIMER=y CONFIG_FREERTOS_CORETIMER_0=y @@ -1678,7 +1679,8 @@ CONFIG_LOG_BOOTLOADER_LEVEL_INFO=y # CONFIG_LOG_BOOTLOADER_LEVEL_DEBUG is not set # CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE is not set CONFIG_LOG_BOOTLOADER_LEVEL=3 -# CONFIG_APP_ROLLBACK_ENABLE is not set +CONFIG_APP_ROLLBACK_ENABLE=y +# CONFIG_APP_ANTI_ROLLBACK is not set # CONFIG_FLASH_ENCRYPTION_ENABLED is not set # CONFIG_FLASHMODE_QIO is not set # CONFIG_FLASHMODE_QOUT is not set diff --git a/sdkconfig.old b/sdkconfig.old index 41cd9b2..a556456 100644 --- a/sdkconfig.old +++ b/sdkconfig.old @@ -1,6 +1,6 @@ # # Automatically generated file. DO NOT EDIT. -# Espressif IoT Development Framework (ESP-IDF) 5.1.0 Project Configuration +# Espressif IoT Development Framework (ESP-IDF) Project Configuration # CONFIG_SOC_ADC_SUPPORTED=y CONFIG_SOC_DAC_SUPPORTED=y @@ -308,7 +308,8 @@ CONFIG_BOOTLOADER_REGION_PROTECTION_ENABLE=y CONFIG_BOOTLOADER_WDT_ENABLE=y # CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE is not set CONFIG_BOOTLOADER_WDT_TIME_MS=9000 -# CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE is not set +CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y +# CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK is not set # CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP is not set # CONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON is not set # CONFIG_BOOTLOADER_SKIP_VALIDATE_ALWAYS is not set @@ -428,7 +429,7 @@ CONFIG_ESP_WIFI_PASSWORD="wlanpass2" # CONFIG_ESP_WIFI_AP is not set CONFIG_ESP_OTA_SERVER="mcu.ex.umbach.dev" CONFIG_FIRMWARE_UPDATE_SCAN=y -CONFIG_FIRMWARE_UPDATE_SCAN_SECONDS=60 +CONFIG_FIRMWARE_UPDATE_SCAN_SECONDS=1 CONFIG_HTTP_SERVER=y CONFIG_HTTP_SERVER_PORT=80 CONFIG_HTTP_SERVER_ENABLE_DEBUG_MODE=y @@ -472,7 +473,6 @@ CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y # # CONFIG_APPTRACE_DEST_JTAG is not set CONFIG_APPTRACE_DEST_NONE=y -# CONFIG_APPTRACE_DEST_UART0 is not set # CONFIG_APPTRACE_DEST_UART1 is not set CONFIG_APPTRACE_DEST_UART_NONE=y CONFIG_APPTRACE_UART_TASK_PRIO=1 @@ -872,13 +872,17 @@ CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y CONFIG_ESP_MAIN_TASK_AFFINITY=0x0 CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048 # CONFIG_ESP_CONSOLE_UART_DEFAULT is not set -CONFIG_ESP_CONSOLE_USB_CDC=y -# CONFIG_ESP_CONSOLE_UART_CUSTOM is not set +# CONFIG_ESP_CONSOLE_USB_CDC is not set +CONFIG_ESP_CONSOLE_UART_CUSTOM=y # CONFIG_ESP_CONSOLE_NONE is not set +CONFIG_ESP_CONSOLE_UART=y CONFIG_ESP_CONSOLE_MULTIPLE_UART=y -CONFIG_ESP_CONSOLE_UART_NUM=-1 -CONFIG_ESP_CONSOLE_USB_CDC_RX_BUF_SIZE=64 -# CONFIG_ESP_CONSOLE_USB_CDC_SUPPORT_ETS_PRINTF is not set +CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y +# CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_1 is not set +CONFIG_ESP_CONSOLE_UART_NUM=0 +CONFIG_ESP_CONSOLE_UART_TX_GPIO=4 +CONFIG_ESP_CONSOLE_UART_RX_GPIO=5 +CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200 CONFIG_ESP_INT_WDT=y CONFIG_ESP_INT_WDT_TIMEOUT_MS=300 CONFIG_ESP_TASK_WDT_EN=y @@ -1069,7 +1073,7 @@ CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y CONFIG_FREERTOS_TLSP_DELETION_CALLBACKS=y # CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y -CONFIG_FREERTOS_ISR_STACKSIZE=1536 +CONFIG_FREERTOS_ISR_STACKSIZE=2096 CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y CONFIG_FREERTOS_TICK_SUPPORT_CORETIMER=y CONFIG_FREERTOS_CORETIMER_0=y @@ -1678,7 +1682,8 @@ CONFIG_LOG_BOOTLOADER_LEVEL_INFO=y # CONFIG_LOG_BOOTLOADER_LEVEL_DEBUG is not set # CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE is not set CONFIG_LOG_BOOTLOADER_LEVEL=3 -# CONFIG_APP_ROLLBACK_ENABLE is not set +CONFIG_APP_ROLLBACK_ENABLE=y +# CONFIG_APP_ANTI_ROLLBACK is not set # CONFIG_FLASH_ENCRYPTION_ENABLED is not set # CONFIG_FLASHMODE_QIO is not set # CONFIG_FLASHMODE_QOUT is not set @@ -1737,10 +1742,16 @@ CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32 CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304 CONFIG_MAIN_TASK_STACK_SIZE=3584 # CONFIG_CONSOLE_UART_DEFAULT is not set -# CONFIG_CONSOLE_UART_CUSTOM is not set +CONFIG_CONSOLE_UART_CUSTOM=y # CONFIG_CONSOLE_UART_NONE is not set # CONFIG_ESP_CONSOLE_UART_NONE is not set -CONFIG_CONSOLE_UART_NUM=-1 +CONFIG_CONSOLE_UART=y +CONFIG_CONSOLE_UART_CUSTOM_NUM_0=y +# CONFIG_CONSOLE_UART_CUSTOM_NUM_1 is not set +CONFIG_CONSOLE_UART_NUM=0 +CONFIG_CONSOLE_UART_TX_GPIO=4 +CONFIG_CONSOLE_UART_RX_GPIO=5 +CONFIG_CONSOLE_UART_BAUDRATE=115200 CONFIG_INT_WDT=y CONFIG_INT_WDT_TIMEOUT_MS=300 CONFIG_TASK_WDT=y