Prepare for merge

.gitignore

@@ -146,8 +146,8 @@ Marlin/*/*/readme.txt
 Marlin/*/*/*/readme.txt
 Marlin/*/*/*/*/readme.txt
 
-# WiFi Credentials
-Marlin/Configuration_creds.h
+# Secure Credentials
+Configuration_Secure.h
 
 #Visual Studio
 *.sln

Marlin/Configuration_adv.h

@@ -3023,18 +3023,19 @@
 //#define ESP3D_WIFISUPPORT   // ESP3D Library WiFi management (https://github.com/luc-github/ESP3DLib)
 
 #if EITHER(WIFISUPPORT, ESP3D_WIFISUPPORT)
+  //#define WEBSUPPORT          // Start a webserver (which may include auto-discovery)
+  //#define OTASUPPORT          // Support over-the-air firmware updates
+  //#define WIFI_CUSTOM_COMMAND // Accept feature config commands (e.g., WiFi ESP3D) from the host
+
   /**
-   * To hard-code WiFi SSID and password, put the following two #define-lines into a file called
-   * 'Configuration_creds.h', replace 'WiFi SSID' and 'WiFi Password' with your own respective SSID and password
-   * and uncomment the #include-line in this file below. 'Configuration_creds.h' is included in .gitignore to prevent
-   * accidental publishing of WiFi credentials to a (public) Git repository.
-     #define WIFI_SSID "WiFi SSID"
-     #define WIFI_PWD  "WiFi Password"
+   * To set a default WiFi SSID / Password, create a file called Configuration_Secure.h with
+   * the following defines, customized for your network. This specific file is excluded via
+   * .gitignore to prevent it from accidentally leaking to the public.
+   *
+   *   #define WIFI_SSID "WiFi SSID"
+   *   #define WIFI_PWD  "WiFi Password"
    */
-  //#include "Configuration_creds.h" // Include file with hard-coded WiFi SSID and password
-  //#define WEBSUPPORT               // Start a webserver (which may include auto-discovery)
-  //#define OTASUPPORT               // Support over-the-air firmware updates
-  //#define WIFI_CUSTOM_COMMAND      // Accept feature config commands (e.g., WiFi ESP3D) from the host
+  //#include "Configuration_Secure.h" // External file with WiFi SSID / Password
 #endif
 
 /**

buildroot/bin/opt_set

@@ -8,4 +8,5 @@ SED=$(which gsed || which sed)
 # Logic for returning nonzero based on answer here: https://stackoverflow.com/a/15966279/104648
 eval "${SED} -i '/\(\/\/\)*\([[:blank:]]*\)\(#define \b${1}\b\).*$/{s//\2\3 ${2}/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration.h" ||
 eval "${SED} -i '/\(\/\/\)*\([[:blank:]]*\)\(#define \b${1}\b\).*$/{s//\2\3 ${2}/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration_adv.h" ||
-(echo "ERROR: opt_set Can't find ${1}" >&2 && exit 9)
+eval "echo '#define ${@}' >>Marlin/Configuration_adv.h" ||
+(echo "ERROR: opt_set Can't set or add ${1}" >&2 && exit 9)

buildroot/share/tests/esp32-tests

@@ -12,8 +12,8 @@ set -e
 restore_configs
 opt_set MOTHERBOARD BOARD_ESPRESSIF_ESP32
 opt_enable WIFISUPPORT GCODE_MACROS BAUD_RATE_GCODE
-opt_set WIFI_SSID "\"ssid\""
-opt_set WIFI_PWD "\"password\""
+opt_add WIFI_SSID "\"ssid\""
+opt_add WIFI_PWD "\"password\""
 opt_set TX_BUFFER_SIZE 64
 opt_add WEBSUPPORT
 exec_test $1 $2 "ESP32 with WIFISUPPORT and WEBSUPPORT"