Everything seems to work except Improv

This commit is contained in:
Djuri Baars 2023-11-07 21:25:54 +01:00
parent 562348b5ea
commit 4538326990
6 changed files with 49 additions and 4 deletions

2
.gitignore vendored
View File

@ -3,3 +3,5 @@
.vscode/c_cpp_properties.json .vscode/c_cpp_properties.json
.vscode/launch.json .vscode/launch.json
.vscode/ipch .vscode/ipch
managed_components
data/build/*

View File

@ -1,3 +1,4 @@
cmake_minimum_required(VERSION 3.16.0) cmake_minimum_required(VERSION 3.16.0)
include($ENV{IDF_PATH}/tools/cmake/project.cmake) include($ENV{IDF_PATH}/tools/cmake/project.cmake)
list(APPEND EXTRA_COMPONENT_DIRS managed_components)
project(btclock_espidf) project(btclock_espidf)

16
dependencies.lock Normal file
View File

@ -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

View File

@ -19,11 +19,14 @@ monitor_filters = esp32_exception_decoder, colorize
board_build.filesystem = littlefs board_build.filesystem = littlefs
[btclock_base] [btclock_base]
extra_scripts = post:scripts/extra_script.py
board_build.partitions = partition.csv board_build.partitions = partition.csv
build_flags = build_flags =
!python scripts/git_rev.py
-DLAST_BUILD_TIME=$UNIX_TIME -DLAST_BUILD_TIME=$UNIX_TIME
-DASYNCWEBSERVER_REGEX -DASYNCWEBSERVER_REGEX
-D ARDUINO_USB_CDC_ON_BOOT -D ARDUINO_USB_CDC_ON_BOOT
-fexceptions
build_unflags = build_unflags =
-fno-exceptions -fno-exceptions
-Werror=all -Werror=all
@ -42,4 +45,7 @@ extends = btclock_base
board = lolin_s3_mini board = lolin_s3_mini
build_flags = build_flags =
${btclock_base.build_flags} ${btclock_base.build_flags}
-D MCP_INT_PIN=8
-D NEOPIXEL_PIN=34
-D NEOPIXEL_COUNT=4
-D NUM_SCREENS=7 -D NUM_SCREENS=7

7
scripts/extra_script.py Normal file
View File

@ -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)

View File

@ -4,10 +4,10 @@ CONFIG_FREERTOS_HZ=1000
CONFIG_MBEDTLS_PSK_MODES=y CONFIG_MBEDTLS_PSK_MODES=y
CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
CONFIG_FREERTOS_USE_TRACE_FACILITY=y CONFIG_FREERTOS_USE_TRACE_FACILITY=n
CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS=y CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS=n
CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=n
CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS=y CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS=n
CONFIG_ESP_TLS_INSECURE=y CONFIG_ESP_TLS_INSECURE=y
CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY=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_HEAP_POISONING_LIGHT=y
CONFIG_ESP32S3_SPIRAM_SUPPORT=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