GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-10-15 13:31:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add flag for general setup done or not

Browse Source
This commit is contained in:
Luc 2020-11-02 10:05:44 +01:00
parent 2b2eb474d0
commit b3f3af997f
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
esp3d/src/core/espcmd/ESP800.cpp
View File

@ -96,6 +96,18 @@ bool Commands::ESP800(const char* cmd_params, level_authenticate_type auth_type,
} else { } else {
output->print("\""); output->print("\"");
} }
//Setup done
if (plain) {
output->print("Setup:");
} else {
output->print(",\"Setup\":\"");
}
output->print(Settings_ESP3D::read_byte (ESP_SETUP) == 0?F("Enabled"):F("Disabled"));
if(plain) {
output->printLN("");
} else {
output->print("\"");
}
//SD connection //SD connection
if (plain) { if (plain) {
output->print("SD connection:"); output->print("SD connection:");

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

@ -86,6 +86,8 @@
#define DEFAULT_INTERNET_TIME 0 #define DEFAULT_INTERNET_TIME 0
#endif //TIMESTAMP_FEATURE #endif //TIMESTAMP_FEATURE
#define DEFAULT_SETUP 0
#define DEFAULT_ESP_BYTE 0 #define DEFAULT_ESP_BYTE 0
#define DEFAULT_ESP_STRING_SIZE 0 #define DEFAULT_ESP_STRING_SIZE 0
#if defined (WIFI_FEATURE) || defined (ETH_FEATURE) #if defined (WIFI_FEATURE) || defined (ETH_FEATURE)
@ -235,6 +237,9 @@ uint8_t Settings_ESP3D::get_default_byte_value(int pos)
case ESP_RADIO_MODE: case ESP_RADIO_MODE:
res = DEFAULT_ESP_RADIO_MODE; res = DEFAULT_ESP_RADIO_MODE;
break; break;
case ESP_SETUP:
res = DEFAULT_SETUP;
break;
#ifdef AUTHENTICATION_FEATURE #ifdef AUTHENTICATION_FEATURE
case ESP_SESSION_TIMEOUT: case ESP_SESSION_TIMEOUT:
res = DEFAULT_SESSION_TIMEOUT; res = DEFAULT_SESSION_TIMEOUT;
@ -1011,7 +1016,6 @@ bool Settings_ESP3D::reset()
{ {
bool res = true; bool res = true;
log_esp3d("Reset Settings"); log_esp3d("Reset Settings");
#if ESP_SAVE_SETTINGS == SETTINGS_IN_PREFERENCES #if ESP_SAVE_SETTINGS == SETTINGS_IN_PREFERENCES
log_esp3d("clear preferences"); log_esp3d("clear preferences");
Preferences prefs; Preferences prefs;
@ -1026,6 +1030,9 @@ bool Settings_ESP3D::reset()
#if ESP_SAVE_SETTINGS == SETTINGS_IN_EEPROM #if ESP_SAVE_SETTINGS == SETTINGS_IN_EEPROM
log_esp3d("clear EEPROM"); log_esp3d("clear EEPROM");
//Setup done (internal only)
Settings_ESP3D::write_byte(ESP_SETUP,Settings_ESP3D::get_default_byte_value(ESP_SETUP));
#if defined(DISPLAY_DEVICE) && defined(DISPLAY_TOUCH_DRIVER) #if defined(DISPLAY_DEVICE) && defined(DISPLAY_TOUCH_DRIVER)
//Calibration done (internal only) //Calibration done (internal only)
Settings_ESP3D::write_byte(ESP_CALIBRATION,Settings_ESP3D::get_default_byte_value(ESP_CALIBRATION)); Settings_ESP3D::write_byte(ESP_CALIBRATION,Settings_ESP3D::get_default_byte_value(ESP_CALIBRATION));

3
esp3d/src/core/settings_esp3d.h
View File

@ -86,7 +86,8 @@
#define ESP_CALIBRATION_3 993 //4 bytes = int #define ESP_CALIBRATION_3 993 //4 bytes = int
#define ESP_CALIBRATION_4 997 //4 bytes = int #define ESP_CALIBRATION_4 997 //4 bytes = int
#define ESP_CALIBRATION_5 1001 //4 bytes = int #define ESP_CALIBRATION_5 1001 //4 bytes = int
#define ESP_FREE_ENTRY 1005 //4 bytes = int #define ESP_SETUP 1005 //1 byte = flag
#define ESP_FREE_ENTRY 1006 //3 bytes
#define ESP_FTP_CTRL_PORT 1009 //4 bytes = int #define ESP_FTP_CTRL_PORT 1009 //4 bytes = int
#define ESP_FTP_DATA_ACTIVE_PORT 1013 //4 bytes = int #define ESP_FTP_DATA_ACTIVE_PORT 1013 //4 bytes = int
#define ESP_FTP_DATA_PASSIVE_PORT 1017 //4 bytes = int #define ESP_FTP_DATA_PASSIVE_PORT 1017 //4 bytes = int

2
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.a66" #define FW_VERSION "3.0.0.a67"
#define REPOSITORY "https://github.com/luc-github/ESP3D/tree/3.0" #define REPOSITORY "https://github.com/luc-github/ESP3D/tree/3.0"
#endif //_VERSION_ESP3D_H #endif //_VERSION_ESP3D_H