From 4538326990fad9373d4a7f65d936993d0750ed8b Mon Sep 17 00:00:00 2001 From: Djuri Baars Date: Tue, 7 Nov 2023 21:25:54 +0100 Subject: [PATCH] Everything seems to work except Improv --- .gitignore | 2 ++ CMakeLists.txt | 1 + dependencies.lock | 16 ++++++++++++++++ platformio.ini | 6 ++++++ scripts/extra_script.py | 7 +++++++ sdkconfig.defaults | 21 +++++++++++++++++---- 6 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 dependencies.lock create mode 100644 scripts/extra_script.py diff --git a/.gitignore b/.gitignore index 89cc49c..405e1b6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ .vscode/c_cpp_properties.json .vscode/launch.json .vscode/ipch +managed_components +data/build/* \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 0121688..36d853f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,4 @@ cmake_minimum_required(VERSION 3.16.0) include($ENV{IDF_PATH}/tools/cmake/project.cmake) +list(APPEND EXTRA_COMPONENT_DIRS managed_components) project(btclock_espidf) diff --git a/dependencies.lock b/dependencies.lock new file mode 100644 index 0000000..9c7b06b --- /dev/null +++ b/dependencies.lock @@ -0,0 +1,16 @@ +dependencies: + esp_littlefs: + component_hash: afa6d4544fadca368a35eb712d427cbb8334bc4f35a8f8299261b959a443c832 + source: + git: https://github.com/joltwallet/esp_littlefs.git + path: . + type: git + version: b671069b1e9e279f357736e7b51402f46e39d1b5 + idf: + component_hash: null + source: + type: idf + version: 4.4.5 +manifest_hash: 4b13ff241ec4d36ca2303b885c7088c32d74d090ef8e0ca6ea4c7d53047011d6 +target: esp32s3 +version: 1.0.0 diff --git a/platformio.ini b/platformio.ini index 938947e..d946a88 100644 --- a/platformio.ini +++ b/platformio.ini @@ -19,11 +19,14 @@ monitor_filters = esp32_exception_decoder, colorize board_build.filesystem = littlefs [btclock_base] +extra_scripts = post:scripts/extra_script.py board_build.partitions = partition.csv build_flags = + !python scripts/git_rev.py -DLAST_BUILD_TIME=$UNIX_TIME -DASYNCWEBSERVER_REGEX -D ARDUINO_USB_CDC_ON_BOOT + -fexceptions build_unflags = -fno-exceptions -Werror=all @@ -42,4 +45,7 @@ extends = btclock_base board = lolin_s3_mini build_flags = ${btclock_base.build_flags} + -D MCP_INT_PIN=8 + -D NEOPIXEL_PIN=34 + -D NEOPIXEL_COUNT=4 -D NUM_SCREENS=7 \ No newline at end of file diff --git a/scripts/extra_script.py b/scripts/extra_script.py new file mode 100644 index 0000000..18fe2c0 --- /dev/null +++ b/scripts/extra_script.py @@ -0,0 +1,7 @@ +Import("env") + +# Build web interface before building FS +def before_buildfs(source, target, env): + env.Execute("cd data && yarn && yarn build") + +env.AddPreAction("$BUILD_DIR/spiffs.bin", before_buildfs) diff --git a/sdkconfig.defaults b/sdkconfig.defaults index 125857f..9da5c75 100644 --- a/sdkconfig.defaults +++ b/sdkconfig.defaults @@ -4,10 +4,10 @@ CONFIG_FREERTOS_HZ=1000 CONFIG_MBEDTLS_PSK_MODES=y CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y -CONFIG_FREERTOS_USE_TRACE_FACILITY=y -CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS=y -CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y -CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS=y +CONFIG_FREERTOS_USE_TRACE_FACILITY=n +CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS=n +CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=n +CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS=n CONFIG_ESP_TLS_INSECURE=y CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY=y @@ -15,3 +15,16 @@ CONFIG_HEAP_CORRUPTION_DETECTION=CONFIG_HEAP_POISONING_LIGHT CONFIG_HEAP_POISONING_LIGHT=y CONFIG_ESP32S3_SPIRAM_SUPPORT=y +CONFIG_BOOTLOADER_LOG_LEVEL=0 +CONFIG_LOG_BOOTLOADER_LEVEL_NONE=y +CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y +CONFIG_ESP32S3_SPIRAM_SUPPORT=y +CONFIG_LOG_DEFAULT_LEVEL_NONE=y +CONFIG_LOG_DEFAULT_LEVEL=0 +CONFIG_LOG_MAXIMUM_LEVEL=0 +CONFIG_LOG_BOOTLOADER_LEVEL_NONE=y +CONFIG_LOG_BOOTLOADER_LEVEL=0 +CONFIG_CXX_EXCEPTIONS=y +CONFIG_COMPILER_CXX_EXCEPTIONS=n +CONFIG_BOOTLOADER_WDT_ENABLE=n +CONFIG_TASK_WDT=n