From b6c36de2a370902ac7046024e446a5026fb50247 Mon Sep 17 00:00:00 2001 From: brentru Date: Fri, 2 May 2025 16:03:55 -0400 Subject: [PATCH] Remove requirement for secrets.json config default for offline mode --- src/provisioning/tinyusb/Wippersnapper_FS.cpp | 21 ------------------- src/provisioning/tinyusb/Wippersnapper_FS.h | 1 - 2 files changed, 22 deletions(-) diff --git a/src/provisioning/tinyusb/Wippersnapper_FS.cpp b/src/provisioning/tinyusb/Wippersnapper_FS.cpp index c0398b02d..642cf1776 100644 --- a/src/provisioning/tinyusb/Wippersnapper_FS.cpp +++ b/src/provisioning/tinyusb/Wippersnapper_FS.cpp @@ -142,25 +142,6 @@ Wippersnapper_FS::Wippersnapper_FS() { setStatusLEDColor(RED); HaltFilesystem("FATAL ERROR: Could not write filesystem contents!"); } - - // If we wrote a fresh secrets.json file, halt until user edits the file and - // RESETs the device Signal to user that action must be taken (edit - // secrets.json) - if (_is_secrets_file_empty) { - WriteFileBoot( - "Please edit the secrets.json file. Then, reset your board.\n"); -#ifdef USE_DISPLAY - WsV2._ui_helper->show_scr_error( - "INVALID SETTINGS FILE", - "The settings.json file on the WIPPER drive contains default values. " - "Please edit it to reflect your Adafruit IO and network credentials. " - "When you're done, press RESET on the board."); -#endif - HaltFilesystem( - "The settings.json file on the WIPPER drive contains default " - "values\n. Using a text editor, edit it to reflect your Adafruit IO " - "and WiFi credentials. Then, reset the board."); - } } /************************************************************/ @@ -256,9 +237,7 @@ bool Wippersnapper_FS::MakeDefaultFilesystem() { // Check if secrets.json file already exists if (!GetFileSecrets()) { - // Create new secrets.json file and halt CreateFileSecrets(); - _is_secrets_file_empty = true; } CreateFileConfig(); diff --git a/src/provisioning/tinyusb/Wippersnapper_FS.h b/src/provisioning/tinyusb/Wippersnapper_FS.h index f548e85f9..07cf56af7 100644 --- a/src/provisioning/tinyusb/Wippersnapper_FS.h +++ b/src/provisioning/tinyusb/Wippersnapper_FS.h @@ -71,7 +71,6 @@ class Wippersnapper_FS { // getter for _doc_cfg JsonDocument &GetDocCfg() { return _doc_cfg; } private: - bool _is_secrets_file_empty = false; JsonDocument _doc_cfg; }; extern Wippersnapper_V2 WsV2;