From c8a79dbd7fc378b70cd6e2c85f184bd785afbc2e Mon Sep 17 00:00:00 2001 From: Eiren Rain Date: Tue, 27 Jul 2021 20:02:52 +0300 Subject: [PATCH] Fix setting WiFi credentials in platformio.ini --- platformio.ini | 5 ++--- src/consts.h | 3 +++ src/wifihandler.cpp | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/platformio.ini b/platformio.ini index 7829541..0125dab 100644 --- a/platformio.ini +++ b/platformio.ini @@ -14,10 +14,9 @@ lib_deps= monitor_speed = 115200 framework = arduino ;If you want to set hardcoded WiFi SSID and password, uncomment and edit the lines below -; '" - quotes are necessary! ;build_flags = -; -DWIFI_CREDS_SSID='"SSID"' -; -DWIFI_CREDS_PASSWD='"PASSWORD"' +; -DWIFI_CREDS_SSID=SSID +; -DWIFI_CREDS_PASSWD=PASSWORD ; If you want to enable OTA Updates, uncomment and set OTA password here and in credentials.h ; You can set upload_port to device's ip after it's set up for the first time diff --git a/src/consts.h b/src/consts.h index 2b06bd3..217b930 100644 --- a/src/consts.h +++ b/src/consts.h @@ -20,6 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#define STRINGIFY(s) STRINGIFY1(s) +#define STRINGIFY1(s) #s + // List of constants used in other places #define IMU_MPU9250 1 #define IMU_MPU6500 2 diff --git a/src/wifihandler.cpp b/src/wifihandler.cpp index a807887..d741da7 100644 --- a/src/wifihandler.cpp +++ b/src/wifihandler.cpp @@ -52,12 +52,12 @@ void setUpWiFi() { Serial.println("[NOTICE] Setting up WiFi"); WiFi.mode(WIFI_STA); WiFi.hostname("SlimeVR FBT Tracker"); -#if defined(WIFI_CREDS_SSID) && defined(WIFI_CREDS_PASSWD) - WiFi.begin(WIFI_CREDS_SSID, WIFI_CREDS_PASSWD); -#else #ifdef ESP32 WiFi.begin(); #endif +#if defined(WIFI_CREDS_SSID) && defined(WIFI_CREDS_PASSWD) + WiFi.begin(STRINGIFY(WIFI_CREDS_SSID), STRINGIFY(WIFI_CREDS_PASSWD)); +#else WiFi.begin(WiFi.SSID().c_str(), WiFi.psk().c_str()); #endif wifiConnectionTimeout = millis();