From c361a726fe6939a5f93f73b8abc0c5868dbcc5ac Mon Sep 17 00:00:00 2001
From: Jan Umbach <jan@umbach.dev>
Date: Sun, 20 Aug 2023 18:05:16 +0200
Subject: [PATCH] update

---
 .vscode/settings.json |  4 +++-
 components/jannex     |  2 +-
 publish_firmware.sh   |  7 +++++-
 sdkconfig             | 53 +++++++++++++++++++++++++++++++------------
 sdkconfig.old         | 30 +++++++++++++++++-------
 version.txt           |  1 -
 version.txt.backup    |  1 -
 7 files changed, 70 insertions(+), 28 deletions(-)
 delete mode 100644 version.txt
 delete mode 100644 version.txt.backup

diff --git a/.vscode/settings.json b/.vscode/settings.json
index ce4f296..06b5432 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -41,7 +41,9 @@
     "initstorage.h": "c",
     "json_parser.h": "c",
     "start.h": "c",
-    "base64.h": "c"
+    "base64.h": "c",
+    "panic_reason.h": "c",
+    "esp_debug_helpers.h": "c"
   },
   "idf.flashType": "UART"
 }
diff --git a/components/jannex b/components/jannex
index 8dab6c3..ab80aeb 160000
--- a/components/jannex
+++ b/components/jannex
@@ -1 +1 @@
-Subproject commit 8dab6c3de4a2b1f301a780315bc5f2d03286b399
+Subproject commit ab80aebf0450ac29f380673c46511dae8d78175b
diff --git a/publish_firmware.sh b/publish_firmware.sh
index 5462a5a..5efb49f 100644
--- a/publish_firmware.sh
+++ b/publish_firmware.sh
@@ -5,4 +5,9 @@ cd "$BASEDIR"
 
 cd "components/jannex"
 
-sh get_publisher.sh
+# pass -y if it was passed to this script
+if [ "$1" = "-y" ]; then
+    sh get_publisher.sh -y
+else
+    sh get_publisher.sh
+fi
diff --git a/sdkconfig b/sdkconfig
index af3dada..d33ee2d 100644
--- a/sdkconfig
+++ b/sdkconfig
@@ -435,7 +435,8 @@ CONFIG_HTTP_SERVER_PORT=80
 CONFIG_HTTP_SERVER_ENABLE_DEBUG_MODE=y
 CONFIG_HTTP_SERVER_DEBUG_URL="ws://con.ex.umbach.dev/mcu"
 CONFIG_HTTP_SERVER_DEBUG_PORT=50088
-CONFIG_HTTP_SERVER_DEBUG_CACHE_LENGTH=4000
+CONFIG_HTTP_SERVER_DEBUG_CACHE_LENGTH=4096
+CONFIG_DEBUG_SEND_COREDUMP=y
 CONFIG_NTP_SERVER="0.de.pool.ntp.org"
 # end of Jannex Configuration
 
@@ -473,7 +474,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
@@ -873,13 +873,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
@@ -989,9 +993,16 @@ CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT=y
 #
 # Core dump
 #
-# CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH is not set
+CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH=y
 # CONFIG_ESP_COREDUMP_ENABLE_TO_UART is not set
-CONFIG_ESP_COREDUMP_ENABLE_TO_NONE=y
+# CONFIG_ESP_COREDUMP_ENABLE_TO_NONE is not set
+# CONFIG_ESP_COREDUMP_DATA_FORMAT_BIN is not set
+CONFIG_ESP_COREDUMP_DATA_FORMAT_ELF=y
+CONFIG_ESP_COREDUMP_CHECKSUM_CRC32=y
+CONFIG_ESP_COREDUMP_CHECK_BOOT=y
+CONFIG_ESP_COREDUMP_ENABLE=y
+CONFIG_ESP_COREDUMP_MAX_TASKS_NUM=64
+CONFIG_ESP_COREDUMP_STACK_SIZE=0
 # end of Core dump
 
 #
@@ -1314,8 +1325,8 @@ CONFIG_MBEDTLS_PKCS7_C=y
 # Certificate Bundle
 #
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y
-CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL=y
-# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN is not set
+# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL is not set
+CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN=y
 # CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_NONE is not set
 # CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE is not set
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS=200
@@ -1739,10 +1750,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
@@ -1806,9 +1823,15 @@ CONFIG_WPA_MBEDTLS_TLS_CLIENT=y
 # CONFIG_WPA_WPS_STRICT is not set
 # CONFIG_WPA_DEBUG_PRINT is not set
 # CONFIG_WPA_TESTING_OPTIONS is not set
-# CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set
+CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH=y
 # CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set
-CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y
+# CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE is not set
+# CONFIG_ESP32_COREDUMP_DATA_FORMAT_BIN is not set
+CONFIG_ESP32_COREDUMP_DATA_FORMAT_ELF=y
+CONFIG_ESP32_COREDUMP_CHECKSUM_CRC32=y
+CONFIG_ESP32_ENABLE_COREDUMP=y
+CONFIG_ESP32_CORE_DUMP_MAX_TASKS_NUM=64
+CONFIG_ESP32_CORE_DUMP_STACK_SIZE=0
 CONFIG_TIMER_TASK_PRIORITY=1
 CONFIG_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_TIMER_QUEUE_LENGTH=10
diff --git a/sdkconfig.old b/sdkconfig.old
index a556456..8d7b536 100644
--- a/sdkconfig.old
+++ b/sdkconfig.old
@@ -1,6 +1,6 @@
 #
 # Automatically generated file. DO NOT EDIT.
-# Espressif IoT Development Framework (ESP-IDF)  Project Configuration
+# Espressif IoT Development Framework (ESP-IDF) 5.1.0 Project Configuration
 #
 CONFIG_SOC_ADC_SUPPORTED=y
 CONFIG_SOC_DAC_SUPPORTED=y
@@ -435,7 +435,8 @@ CONFIG_HTTP_SERVER_PORT=80
 CONFIG_HTTP_SERVER_ENABLE_DEBUG_MODE=y
 CONFIG_HTTP_SERVER_DEBUG_URL="ws://con.ex.umbach.dev/mcu"
 CONFIG_HTTP_SERVER_DEBUG_PORT=50088
-CONFIG_HTTP_SERVER_DEBUG_CACHE_LENGTH=4000
+CONFIG_HTTP_SERVER_DEBUG_CACHE_LENGTH=4096
+# CONFIG_DEBUG_SEND_COREDUMP is not set
 CONFIG_NTP_SERVER="0.de.pool.ntp.org"
 # end of Jannex Configuration
 
@@ -992,9 +993,16 @@ CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT=y
 #
 # Core dump
 #
-# CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH is not set
+CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH=y
 # CONFIG_ESP_COREDUMP_ENABLE_TO_UART is not set
-CONFIG_ESP_COREDUMP_ENABLE_TO_NONE=y
+# CONFIG_ESP_COREDUMP_ENABLE_TO_NONE is not set
+# CONFIG_ESP_COREDUMP_DATA_FORMAT_BIN is not set
+CONFIG_ESP_COREDUMP_DATA_FORMAT_ELF=y
+CONFIG_ESP_COREDUMP_CHECKSUM_CRC32=y
+CONFIG_ESP_COREDUMP_CHECK_BOOT=y
+CONFIG_ESP_COREDUMP_ENABLE=y
+CONFIG_ESP_COREDUMP_MAX_TASKS_NUM=64
+CONFIG_ESP_COREDUMP_STACK_SIZE=0
 # end of Core dump
 
 #
@@ -1317,8 +1325,8 @@ CONFIG_MBEDTLS_PKCS7_C=y
 # Certificate Bundle
 #
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y
-CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL=y
-# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN is not set
+# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL is not set
+CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN=y
 # CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_NONE is not set
 # CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE is not set
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS=200
@@ -1815,9 +1823,15 @@ CONFIG_WPA_MBEDTLS_TLS_CLIENT=y
 # CONFIG_WPA_WPS_STRICT is not set
 # CONFIG_WPA_DEBUG_PRINT is not set
 # CONFIG_WPA_TESTING_OPTIONS is not set
-# CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set
+CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH=y
 # CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set
-CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y
+# CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE is not set
+# CONFIG_ESP32_COREDUMP_DATA_FORMAT_BIN is not set
+CONFIG_ESP32_COREDUMP_DATA_FORMAT_ELF=y
+CONFIG_ESP32_COREDUMP_CHECKSUM_CRC32=y
+CONFIG_ESP32_ENABLE_COREDUMP=y
+CONFIG_ESP32_CORE_DUMP_MAX_TASKS_NUM=64
+CONFIG_ESP32_CORE_DUMP_STACK_SIZE=0
 CONFIG_TIMER_TASK_PRIORITY=1
 CONFIG_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_TIMER_QUEUE_LENGTH=10
diff --git a/version.txt b/version.txt
deleted file mode 100644
index d3827e7..0000000
--- a/version.txt
+++ /dev/null
@@ -1 +0,0 @@
-1.0
diff --git a/version.txt.backup b/version.txt.backup
deleted file mode 100644
index d3827e7..0000000
--- a/version.txt.backup
+++ /dev/null
@@ -1 +0,0 @@
-1.0