From 31d7e5659a0367e00bf11f44a1f9c8bb24da5963 Mon Sep 17 00:00:00 2001
From: Luc <8822552+luc-github@users.noreply.github.com>
Date: Wed, 22 Apr 2020 09:27:19 +0200
Subject: [PATCH] Allow to setup STA mode by default in configuration.h and use
 it in reset

---
 esp3d/configuration.h             | 7 ++++++-
 esp3d/src/core/settings_esp3d.cpp | 9 +++++++++
 esp3d/src/include/version.h       | 4 ++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/esp3d/configuration.h b/esp3d/configuration.h
index 7d324539..a87996d0 100644
--- a/esp3d/configuration.h
+++ b/esp3d/configuration.h
@@ -19,8 +19,14 @@
 */
 #ifndef _CONFIGURATION_H
 #define _CONFIGURATION_H
+
 //FEATURES - comment to disable //////////////////////////////////////////////////////////
 
+//WiFi setup station as default, use AP mode first if not done
+//Note: need both defined to enable it
+//#define STATION_WIFI_SSID "*********"
+//#define STATION_WIFI_PASSWORD "*********"
+
 //SERIAL_COMMAND_FEATURE: allow to send command by serial
 #define SERIAL_COMMAND_FEATURE
 
@@ -63,7 +69,6 @@
 //BUZZER_DEVICE: allow to connect passive buzzer
 //#define BUZZER_DEVICE
 
-
 #if defined (DISPLAY_DEVICE)
 //for ILI9143 edit User_Setup.h of TFT_eSPI library
 #if (DISPLAY_DEVICE == OLED_I2C_SSD1306) || (DISPLAY_DEVICE == OLED_I2C_SSDSH1106)
diff --git a/esp3d/src/core/settings_esp3d.cpp b/esp3d/src/core/settings_esp3d.cpp
index e9e36fbf..8e3d7e04 100644
--- a/esp3d/src/core/settings_esp3d.cpp
+++ b/esp3d/src/core/settings_esp3d.cpp
@@ -63,7 +63,11 @@
 
 //default byte values
 #ifdef WIFI_FEATURE
+#if defined(STATION_WIFI_SSID) && defined(STATION_WIFI_PASSWORD)
+#define DEFAULT_ESP_RADIO_MODE  ESP_WIFI_STA
+#else
 #define DEFAULT_ESP_RADIO_MODE  ESP_WIFI_AP
+#endif //STATION_WIFI_SSID && STATION_WIFI_PASSWORD
 #else //WIFI_FEATURE
 #ifdef BLUETOOTH_FEATURE
 #define DEFAULT_ESP_RADIO_MODE  ESP_BT
@@ -132,8 +136,13 @@
 //default string values
 const char DEFAULT_AP_SSID []   =        "ESP3D";
 const char DEFAULT_AP_PASSWORD []  =     "12345678";
+#if defined(STATION_WIFI_SSID) && defined(STATION_WIFI_PASSWORD)
+const char DEFAULT_STA_SSID []   =       STATION_WIFI_SSID;
+const char DEFAULT_STA_PASSWORD []  =    STATION_WIFI_PASSWORD;
+#else
 const char DEFAULT_STA_SSID []   =       "ESP3D";
 const char DEFAULT_STA_PASSWORD []  =    "12345678";
+#endif //STATION_WIFI_SSID && STATION_WIFI_PASSWORD
 #endif //WIFI_FEATURE
 #if defined (BLUETOOTH_FEATURE) || defined (WIFI_FEATURE) ||defined (ETH_FEATURE)
 const char DEFAULT_HOSTNAME []   =       "esp3d";
diff --git a/esp3d/src/include/version.h b/esp3d/src/include/version.h
index 305ee23d..320868b7 100644
--- a/esp3d/src/include/version.h
+++ b/esp3d/src/include/version.h
@@ -22,7 +22,7 @@
 #define _VERSION_ESP3D_H
 
 //version and sources location
-#define FW_VERSION "3.0.0.a33"
-#define REPOSITORY "https://github.com/luc-github/ESP3D"
+#define FW_VERSION "3.0.0.a34"
+#define REPOSITORY "https://github.com/luc-github/ESP3D/tree/3.0"
 
 #endif //_VERSION_ESP3D_H