diff --git a/BoomCast_Waveshare_Arduino/README.md b/BoomCast_Waveshare_Arduino/README.md index 718cc9e..1388d5c 100644 --- a/BoomCast_Waveshare_Arduino/README.md +++ b/BoomCast_Waveshare_Arduino/README.md @@ -32,7 +32,7 @@ The firmware has not yet been converted to PlatformIO: Waveshare's Arduino suppo On first boot, the device generates unique setup-AP and local-management passwords and stores them in NVS. They are printed on USB serial at 115200 baud on boot; keep physical access to the serial port controlled. The sensor token is loaded from the ignored local header, or from an NVS `token` value if provisioned separately. Rotate the sensor token in Django, update the local header, and reflash, or provision the new NVS value through a trusted local maintenance process. Tokens are never logged by this firmware. -The local management UI uses HTTP Basic Auth on the device LAN and setup AP. Use trusted local networks; Basic Auth does not encrypt traffic. The Upload queue section can discard one recording or clear the backlog after confirmation; discarded clips are permanently removed from the SD card and will not reach Pending Review. Discarding a recording dated today reduces the ePaper's "Vandaag" count; successful uploads still count as captures. Clips saved without a valid clock cannot be matched to a day, so **Reset today count** can clear an old or stale total without deleting recordings. The public ePaper screen retains the short privacy message, while the owner screen shows connectivity, queue count, capture/upload state, and diagnostic counters. +The local management UI uses HTTP Basic Auth on the device LAN and setup AP. Use trusted local networks; Basic Auth does not encrypt traffic. The Upload queue section can play a queued WAV locally, discard one recording, or clear the backlog after confirmation. Audio preview is authenticated and streams from SD; it does not upload the clip. Discarded clips are permanently removed from the SD card and will not reach Pending Review. Discarding a recording dated today reduces the ePaper's "Vandaag" count; successful uploads still count as captures. Clips saved without a valid clock cannot be matched to a day, so **Reset today count** can clear an old or stale total without deleting recordings. The public ePaper screen retains the short privacy message and gives the today count its own line, while the owner screen shows connectivity, queue count, capture/upload state, and diagnostic counters. The local management UI shows the firmware version reported by the device. ## Server and queue behavior diff --git a/BoomCast_Waveshare_Arduino/boomcast_config.h b/BoomCast_Waveshare_Arduino/boomcast_config.h index 4d386d3..f5bf1ea 100644 --- a/BoomCast_Waveshare_Arduino/boomcast_config.h +++ b/BoomCast_Waveshare_Arduino/boomcast_config.h @@ -6,7 +6,7 @@ // Target: Waveshare ESP32-S3-ePaper-1.54 V2 (non-touch) // ----------------------------------------------------------------------------- -#define BOOMCAST_FIRMWARE_VERSION "0.1.0-concept" +#define BOOMCAST_FIRMWARE_VERSION "0.2.0-concept" // Set to 180 when the board is physically mounted upside-down. // Supported by this sketch: 0 or 180. diff --git a/BoomCast_Waveshare_Arduino/boomcast_display.cpp b/BoomCast_Waveshare_Arduino/boomcast_display.cpp index 4fd83ec..3dc9a86 100644 --- a/BoomCast_Waveshare_Arduino/boomcast_display.cpp +++ b/BoomCast_Waveshare_Arduino/boomcast_display.cpp @@ -10,10 +10,10 @@ BoomDisplay boomDisplay; BoomDisplay* BoomDisplay::instance_ = nullptr; static lv_point_t fireworkRays[8][2] = { - {{30, 28}, {30, 2}}, {{30, 32}, {30, 58}}, - {{28, 30}, {2, 30}}, {{32, 30}, {58, 30}}, - {{28, 28}, {8, 8}}, {{32, 32}, {52, 52}}, - {{32, 28}, {52, 8}}, {{28, 32}, {8, 52}} + {{23, 21}, {23, 2}}, {{23, 25}, {23, 44}}, + {{21, 23}, {2, 23}}, {{25, 23}, {44, 23}}, + {{21, 21}, {7, 7}}, {{25, 25}, {39, 39}}, + {{25, 21}, {39, 7}}, {{21, 25}, {7, 39}} }; static void stylePlainScreen(lv_obj_t* screen) { @@ -202,8 +202,8 @@ lv_obj_t* BoomDisplay::makeStatusChip(lv_obj_t* parent, int x, const char* initi void BoomDisplay::createFireworkMark(lv_obj_t* parent) { lv_obj_t* mark = lv_obj_create(parent); - lv_obj_set_size(mark, 60, 60); - lv_obj_set_pos(mark, 70, 40); + lv_obj_set_size(mark, 46, 46); + lv_obj_set_pos(mark, 77, 31); lv_obj_set_style_bg_opa(mark, LV_OPA_TRANSP, 0); lv_obj_set_style_border_width(mark, 0, 0); lv_obj_set_style_pad_all(mark, 0, 0); @@ -217,7 +217,7 @@ void BoomDisplay::createFireworkMark(lv_obj_t* parent) { } lv_obj_t* centre = lv_obj_create(mark); lv_obj_set_size(centre, 8, 8); - lv_obj_set_pos(centre, 26, 26); + lv_obj_set_pos(centre, 19, 19); lv_obj_set_style_radius(centre, LV_RADIUS_CIRCLE, 0); lv_obj_set_style_bg_color(centre, lv_color_black(), 0); lv_obj_set_style_border_width(centre, 0, 0); @@ -237,21 +237,25 @@ void BoomDisplay::createScreens() { lv_label_set_text(title, "Vuurwerkdetector"); lv_obj_set_width(title, 190); lv_obj_set_style_text_align(title, LV_TEXT_ALIGN_CENTER, 0); - lv_obj_align(title, LV_ALIGN_TOP_MID, 0, 102); + lv_obj_align(title, LV_ALIGN_TOP_MID, 0, 81); lv_obj_t* message = lv_label_create(publicScreen_); lv_label_set_text(message, "Luistert naar knallen,\nniet naar gesprekken.\nGeen continue opname."); lv_obj_set_width(message, 190); lv_obj_set_style_text_align(message, LV_TEXT_ALIGN_CENTER, 0); - lv_obj_align(message, LV_ALIGN_TOP_MID, 0, 122); + lv_obj_align(message, LV_ALIGN_TOP_MID, 0, 101); publicCount_ = lv_label_create(publicScreen_); lv_label_set_text(publicCount_, "Vandaag: 0"); - lv_obj_align(publicCount_, LV_ALIGN_BOTTOM_LEFT, 8, -6); + lv_obj_set_width(publicCount_, 190); + lv_obj_set_style_text_align(publicCount_, LV_TEXT_ALIGN_CENTER, 0); + lv_obj_align(publicCount_, LV_ALIGN_BOTTOM_MID, 0, -27); publicCapture_ = lv_label_create(publicScreen_); lv_label_set_text(publicCapture_, "BOOT: details"); - lv_obj_align(publicCapture_, LV_ALIGN_BOTTOM_RIGHT, -8, -6); + lv_obj_set_width(publicCapture_, 190); + lv_obj_set_style_text_align(publicCapture_, LV_TEXT_ALIGN_CENTER, 0); + lv_obj_align(publicCapture_, LV_ALIGN_BOTTOM_MID, 0, -5); // --------------------------------------------------------------------------- // Screen 2: owner / technical status diff --git a/BoomCast_Waveshare_Arduino/boomcast_web.cpp b/BoomCast_Waveshare_Arduino/boomcast_web.cpp index 8d6f45d..629aea3 100644 --- a/BoomCast_Waveshare_Arduino/boomcast_web.cpp +++ b/BoomCast_Waveshare_Arduino/boomcast_web.cpp @@ -4,6 +4,7 @@ #include "boomcast_network.h" #include "boomcast_queue.h" #include "boomcast_state.h" +#include BoomWeb boomWeb; @@ -60,6 +61,7 @@ static const char MANAGEMENT_HTML[] PROGMEM = R"BOOMHTML(
Listening for bangs, not conversations.
BoomCast keeps a rolling RAM buffer and writes a short clip to SD only around a detected event.

IP: —

Wi-Fi: —

+

Firmware: —

@@ -81,12 +83,13 @@ static const char MANAGEMENT_HTML[] PROGMEM = R"BOOMHTML(