From 1f6b6a42e5d581300dc3f72ebe489ea1380fe0ef Mon Sep 17 00:00:00 2001 From: Jesse Braham Date: Wed, 16 Oct 2024 12:29:51 -0700 Subject: Update support/example for ESP32-C3 to use latest versions of dependencies (#975) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update `rtic` package to use latest version of `esp32c3` dependency * Update `rtic-macros` ESP32-C3 bindings to reflect changes in HAL * Update the ESP32-C3 examples to use latest versions of all dependencies * Update changelogs * adjust expected qemu output, add compile-time checks * remove runtime checks, this is checked at compile time * fix expected qemu output * Clean up interrupt enable code a bit * Update `rtic-monotonic` to use the latest PAC for ESP32-C3 * Update `CHANGELOG.md` for `rtic-monotonic` * ci: esp32c3: Format runner.sh * ci: esp32c3: Default to silent boot export DEBUGGING while running to get verbose boot env DEBUGGING=1 cargo xtask ... * ci: esp32c3: Update expected example output --------- Co-authored-by: onsdagens Co-authored-by: Henrik Tjäder --- examples/esp32c3/runner.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'examples/esp32c3/runner.sh') diff --git a/examples/esp32c3/runner.sh b/examples/esp32c3/runner.sh index 3310aca..5dcbde4 100755 --- a/examples/esp32c3/runner.sh +++ b/examples/esp32c3/runner.sh @@ -1,8 +1,7 @@ #!/bin/bash -if [ $# -eq 0 ] - then - echo "No arguments supplied! Provide path to ELF as argument" +if [ $# -eq 0 ]; then + echo "No arguments supplied! Provide path to ELF as argument" fi outputfilenamecargo=$1 @@ -19,13 +18,20 @@ espflash save-image --chip esp32c3 --merge "$outputfilenamecargo" "$outputfilena esptool.py image_info --version 2 "$outputfilename" 1>&2 # Run in QEMU -$qemuexec -nographic -monitor tcp:127.0.0.1:55555,server,nowait -icount 3 -machine esp32c3 -drive file="$outputfilename",if=mtd,format=raw -serial file:"$logfile" & +$qemuexec -nographic -monitor tcp:127.0.0.1:55555,server,nowait -icount 3 -machine esp32c3 -drive file="$outputfilename",if=mtd,format=raw -serial file:"$logfile" & # Let it run sleep 3s # Kill QEMU nicely by sending 'q' (quit) over tcp echo q | nc -N 127.0.0.1 55555 -# Output that will be compared, remove the esp_image segments as they change -# between runs -cat "$logfile" | sed 's/esp_image: .*$/esp_image: REDACTED/' + +# Output that will be compared must be printed to stdout + +# Make boot phase silent, for debugging change, run with e.g. $ `env DEBUGGING=true` cargo xtask.... +if [ -n "${DEBUGGING}" ]; then + # Debugging: strip leading "I (xyz)" where xyz is an incrementing number, and esp_image specifics + sed -e 's/esp_image: .*$/esp_image: REDACTED/' -e 's/I\s\([0-9]*\)(.*)/\1/' < $logfile +else + tail -n +12 "$logfile" | sed -e '/I\s\([0-9]*\)(.*)/d' +fi -- cgit v1.2.3