From 4b911bfa095c47d7154f1739e57c32b3b03ee867 Mon Sep 17 00:00:00 2001 From: tyeth Date: Fri, 25 Oct 2024 17:07:16 +0100 Subject: [PATCH] Clang format and remove ESP32-H2 ifdef --- src/Wippersnapper.cpp | 4 +--- src/Wippersnapper.h | 9 +++++---- testplan.md | 34 ---------------------------------- 3 files changed, 6 insertions(+), 41 deletions(-) delete mode 100644 testplan.md diff --git a/src/Wippersnapper.cpp b/src/Wippersnapper.cpp index c75861300..d3c7b94b2 100644 --- a/src/Wippersnapper.cpp +++ b/src/Wippersnapper.cpp @@ -2707,7 +2707,7 @@ void print_reset_reason(int reason) { } } -#if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4 +#if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4 #include "esp32/rom/rtc.h" #elif CONFIG_IDF_TARGET_ESP32S2 #include "esp32s2/rom/rtc.h" @@ -2719,8 +2719,6 @@ void print_reset_reason(int reason) { #include "esp32s3/rom/rtc.h" #elif CONFIG_IDF_TARGET_ESP32C6 #include "esp32c6/rom/rtc.h" -#elif CONFIG_IDF_TARGET_ESP32H2 -#include "esp32h2/rom/rtc.h" #else #error Target CONFIG_IDF_TARGET is not supported #endif diff --git a/src/Wippersnapper.h b/src/Wippersnapper.h index 6f666bc0f..e0c2effc8 100644 --- a/src/Wippersnapper.h +++ b/src/Wippersnapper.h @@ -254,10 +254,11 @@ class Wippersnapper { void provision(); - bool brownOutCausedReset = false; ///< True if low power reset - flash write issues - bool lockStatusNeoPixel; ///< True if status LED is using the status neopixel - bool lockStatusDotStar; ///< True if status LED is using the status dotstar - bool lockStatusLED; ///< True if status LED is using the built-in LED + bool brownOutCausedReset = + false; ///< True if low power reset - flash write issues + bool lockStatusNeoPixel; ///< True if status LED is using the status neopixel + bool lockStatusDotStar; ///< True if status LED is using the status dotstar + bool lockStatusLED; ///< True if status LED is using the built-in LED float status_pixel_brightness = STATUS_PIXEL_BRIGHTNESS_DEFAULT; ///< Global status pixel's brightness ///< (from 0.0 to 1.0) diff --git a/testplan.md b/testplan.md deleted file mode 100644 index 37f25f812..000000000 --- a/testplan.md +++ /dev/null @@ -1,34 +0,0 @@ -copy and analyse the hex difference for a corrupted file system versus freshly saved secrets + hunky dorey --- nulls for file entry - like we've erased the file and then rebooted (before writing the replacement) --- we do a lot of unnecessary file writing each boot, I'm optimising that to only if needed so normally there will be no file writes - -retest first secrets.json acces on a new device on tinyUF2 0.18.2 and WS 88, versus tinyUF2 0.20.1 and WS88, then with no-ds-format-nor-file-recreation instead of WS88 --- no-fs-format-nor-file-recreation branch has eliminated the issue - -Cleanup eraseCPFS and retest with full file system and no secrets + different bootlog contents. also move write bootlog after secrets processing if not already - -Add boot reason detection for brownouts, if so and corrupt secrets/FS then fsHalt with appropriate message for 30s then reboot. - Bad USB cables on first boot should be accounted for - brownout serial message / fsHalt - -As part of boot protection add message when write or erase attempt and suggest user manually perform action. - Secondly consider moving all serial debug output to after usb reattach so user sees it, or at least repeat? - - -then add the metro-s3 -Update step images in ws_boards for metro-s3 - -then add FT usb-to-gpio to ws_python - - -Test ws_boards c6-aVref branch (esp32 aref=1.1 instead of 3.3, and C6 from 1.1 to 2.5v) - -Fix pin numbers + names for Metro S2 (all digital etc, tx/rx and D1 [etc] seem wrong, analog5 is wrong etc) -Add guide pages for wippersnapper on metro s2 -Add guide pages for WS on C6 - -Check in on Marty's code / local mqtt issue. -Look at exception handling in mqtt library which seems biggest user hurdle -- consider capturing OSError etc and return mqtt exception? -- look at how IO fails too -- catch gai dns errors -- see what happens when no response / waiting message during loop call (people report exception but actually valid to have empty response) \ No newline at end of file