GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-08-05 20:56:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow to setup STA mode by default in configuration.h and use it in reset

Browse Source
This commit is contained in:
Luc 2020-04-22 09:27:19 +02:00
parent ff8251aabd
commit 31d7e5659a
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
esp3d/configuration.h
View File

@ -19,8 +19,14 @@
*/ */
#ifndef _CONFIGURATION_H #ifndef _CONFIGURATION_H
#define _CONFIGURATION_H #define _CONFIGURATION_H
//FEATURES - comment to disable ////////////////////////////////////////////////////////// //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 //SERIAL_COMMAND_FEATURE: allow to send command by serial
#define SERIAL_COMMAND_FEATURE #define SERIAL_COMMAND_FEATURE
@ -63,7 +69,6 @@
//BUZZER_DEVICE: allow to connect passive buzzer //BUZZER_DEVICE: allow to connect passive buzzer
//#define BUZZER_DEVICE //#define BUZZER_DEVICE
#if defined (DISPLAY_DEVICE) #if defined (DISPLAY_DEVICE)
//for ILI9143 edit User_Setup.h of TFT_eSPI library //for ILI9143 edit User_Setup.h of TFT_eSPI library
#if (DISPLAY_DEVICE == OLED_I2C_SSD1306) || (DISPLAY_DEVICE == OLED_I2C_SSDSH1106) #if (DISPLAY_DEVICE == OLED_I2C_SSD1306) || (DISPLAY_DEVICE == OLED_I2C_SSDSH1106)

9
esp3d/src/core/settings_esp3d.cpp
View File

@ -63,7 +63,11 @@
//default byte values //default byte values
#ifdef WIFI_FEATURE #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 #define DEFAULT_ESP_RADIO_MODE ESP_WIFI_AP
#endif //STATION_WIFI_SSID && STATION_WIFI_PASSWORD
#else //WIFI_FEATURE #else //WIFI_FEATURE
#ifdef BLUETOOTH_FEATURE #ifdef BLUETOOTH_FEATURE
#define DEFAULT_ESP_RADIO_MODE ESP_BT #define DEFAULT_ESP_RADIO_MODE ESP_BT
@ -132,8 +136,13 @@
//default string values //default string values
const char DEFAULT_AP_SSID [] = "ESP3D"; const char DEFAULT_AP_SSID [] = "ESP3D";
const char DEFAULT_AP_PASSWORD [] = "12345678"; 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_SSID [] = "ESP3D";
const char DEFAULT_STA_PASSWORD [] = "12345678"; const char DEFAULT_STA_PASSWORD [] = "12345678";
#endif //STATION_WIFI_SSID && STATION_WIFI_PASSWORD
#endif //WIFI_FEATURE #endif //WIFI_FEATURE
#if defined (BLUETOOTH_FEATURE) || defined (WIFI_FEATURE) ||defined (ETH_FEATURE) #if defined (BLUETOOTH_FEATURE) || defined (WIFI_FEATURE) ||defined (ETH_FEATURE)
const char DEFAULT_HOSTNAME [] = "esp3d"; const char DEFAULT_HOSTNAME [] = "esp3d";

4
esp3d/src/include/version.h
View File

@ -22,7 +22,7 @@
#define _VERSION_ESP3D_H #define _VERSION_ESP3D_H
//version and sources location //version and sources location
#define FW_VERSION "3.0.0.a33" #define FW_VERSION "3.0.0.a34"
#define REPOSITORY "https://github.com/luc-github/ESP3D" #define REPOSITORY "https://github.com/luc-github/ESP3D/tree/3.0"
#endif //_VERSION_ESP3D_H #endif //_VERSION_ESP3D_H