diff --git a/esp3d/configuration.h b/esp3d/configuration.h index 0c70465b..82621179 100644 --- a/esp3d/configuration.h +++ b/esp3d/configuration.h @@ -316,6 +316,20 @@ * **********************************/ //#define ESP_NO_SANITY_CHECK +/************************************ + * + * Target Firmware (default is UNKNOWN_FW) + * + * **********************************/ +//UNKNOWN_FW 0 +//GRBL 10 +//MARLIN 20 +//SMOOTHIEWARE 40 +//REPETIER 50 +///REPRAP 70 + +//#define DEFAULT_FW UNKNOWN_FW + /************************************ * * Customize ESP3D diff --git a/esp3d/src/core/settings_esp3d.cpp b/esp3d/src/core/settings_esp3d.cpp index 7a3ac776..59856e5d 100644 --- a/esp3d/src/core/settings_esp3d.cpp +++ b/esp3d/src/core/settings_esp3d.cpp @@ -104,7 +104,9 @@ #define DEFAULT_SSID_VISIBLE 1 #define DEFAULT_OUTPUT_FLAG ESP_ALL_CLIENTS #define DEFAULT_SDREADER_SPEED 4 +#ifndef DEFAULT_FW #define DEFAULT_FW UNKNOWN_FW +#endif //DEFAULT_FW #define DEFAULT_TIME_ZONE 0 #define DEFAULT_TIME_DST 0 #define DEFAULT_SD_MOUNT ESP_SD_ROOT @@ -147,7 +149,7 @@ const char DEFAULT_AP_PASSWORD [] = "12345678"; 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 [] = "NETWORK_SSID"; const char DEFAULT_STA_PASSWORD [] = "12345678"; #endif //STATION_WIFI_SSID && STATION_WIFI_PASSWORD #endif //WIFI_FEATURE @@ -175,7 +177,7 @@ const uint8_t DEFAULT_MASK_VALUE[] = {255, 255, 255, 0}; const uint8_t DEFAULT_ADDRESS_VALUE[] = {0, 0, 0, 0}; #endif //WIFI_FEATURE || ETH_FEATURE -uint8_t Settings_ESP3D::_FirmwareTarget = UNKNOWN_FW; +uint8_t Settings_ESP3D::_FirmwareTarget = DEFAULT_FW; bool Settings_ESP3D::_isverboseboot = DEFAULT_VERBOSE_BOOT; bool Settings_ESP3D::begin() diff --git a/esp3d/src/core/settings_esp3d.h b/esp3d/src/core/settings_esp3d.h index df340efc..599e7f9a 100644 --- a/esp3d/src/core/settings_esp3d.h +++ b/esp3d/src/core/settings_esp3d.h @@ -24,97 +24,6 @@ #ifndef _SETTINGS_ESP3D_H #define _SETTINGS_ESP3D_H -//Supported FW ///////////////////////////////////////////////////////////// -#define UNKNOWN_FW 0 -#define GRBL 10 -#define MARLIN 20 -#define MARLIN_EMBEDDED 30 -#define SMOOTHIEWARE 40 -#define REPETIER 50 -#define FLUIDNC 60 -#define REPRAP 70 - -//Default flags -#define DEFAULT_SERIAL_OUTPUT_FLAG 1 -#define DEFAULT_REMOTE_SCREEN_FLAG 1 -#define DEFAULT_WEBSOCKET_FLAG 1 -#define DEFAULT_TELNET_FLAG 1 -#define DEFAULT_BT_FLAG 1 -#define DEFAULT_SCREEN_FLAG 1 - -//position in EEPROM / preferences will use `P_` + to make a string : P_0 for 0 -#define ESP_RADIO_MODE 0 //1 byte = flag -#define ESP_STA_SSID 1 //33 bytes 32+1 = string ; warning does not support multibyte char like chinese -#define ESP_STA_PASSWORD 34 //65 bytes 64 +1 = string ;warning does not support multibyte char like chinese -#define ESP_STA_IP_MODE 99 //1 byte = flag -#define ESP_STA_IP_VALUE 100 //4 bytes xxx.xxx.xxx.xxx -#define ESP_STA_MASK_VALUE 104 //4 bytes xxx.xxx.xxx.xxx -#define ESP_STA_GATEWAY_VALUE 108 //4 bytes xxx.xxx.xxx.xxx -#define ESP_BAUD_RATE 112 //4 bytes = int -#define ESP_NOTIFICATION_TYPE 116 //1 byte = flag -#define ESP_CALIBRATION 117 //1 byte = flag -#define ESP_AP_CHANNEL 118 //1 byte = flag -#define ESP_BUZZER 119 //1 byte = flag -#define ESP_INTERNET_TIME 120 //1 byte = flag -#define ESP_HTTP_PORT 121 //4 bytes = int -#define ESP_TELNET_PORT 125 //4 bytes = int -#define ESP_SERIAL_FLAG 129 //1 bytes = flag -#define ESP_HOSTNAME 130 //33 bytes 32+1 = string ; warning does not support multibyte char like chinese -#define ESP_SENSOR_INTERVAL 164 //4 bytes = int -#define ESP_SETTINGS_VERSION 168 //8 bytes = 7+1 = string ESP3D + 2 digits -#define ESP_ADMIN_PWD 176 //21 bytes 20+1 = string ; warning does not support multibyte char like chinese -#define ESP_USER_PWD 197 //21 bytes 20+1 = string ; warning does not support multibyte char like chinese -#define ESP_AP_SSID 218 //33 bytes 32+1 = string ; warning does not support multibyte char like chinese -#define ESP_AP_PASSWORD 251 //65 bytes 64 +1 = string ;warning does not support multibyte char like chinese -#define ESP_AP_IP_VALUE 316 //4 bytes xxx.xxx.xxx.xxx -#define ESP_BOOT_DELAY 320 //4 bytes = int -#define ESP_WEBSOCKET_PORT 324 //4 bytes= int -#define ESP_HTTP_ON 328 //1 byte = flag -#define ESP_TELNET_ON 329 //1 byte = flag -#define ESP_WEBSOCKET_ON 330 //1 byte = flag -#define ESP_SD_SPEED_DIV 331 //1 byte = flag -#define ESP_NOTIFICATION_TOKEN1 332 //64 bytes 63+1 = string ; warning does not support multibyte char like chinese -#define ESP_NOTIFICATION_TOKEN2 396 //64 bytes 63+1 = string ; warning does not support multibyte char like chinese -#define ESP_SENSOR_TYPE 460 //1 bytes = flag -#define ESP_TARGET_FW 461 //1 bytes = flag -#define ESP_TIMEZONE 462 //1 bytes = flag -#define ESP_TIME_IS_DST 463 //1 bytes = flag -#define ESP_TIME_SERVER1 464 //129 bytes 128+1 = string ; warning does not support multibyte char like chinese -#define ESP_TIME_SERVER2 593 //129 bytes 128+1 = string ; warning does not support multibyte char like chinese -#define ESP_TIME_SERVER3 722 //129 bytes 128+1 = string ; warning does not support multibyte char like chinese -#define ESP_REMOTE_SCREEN_FLAG 851 //1 bytes = flag -#define ESP_SD_MOUNT 852 //1 bytes = flag -#define ESP_SESSION_TIMEOUT 853 //1 bytes = flag -#define ESP_WEBSOCKET_FLAG 854 //1 bytes = flag -#define ESP_SD_CHECK_UPDATE_AT_BOOT 855//1 bytes = flag -#define ESP_NOTIFICATION_SETTINGS 856 //129 bytes 128+1 = string ; warning does not support multibyte char like chinese -#define ESP_CALIBRATION_1 985 //4 bytes = int -#define ESP_CALIBRATION_2 989 //4 bytes = int -#define ESP_CALIBRATION_3 993 //4 bytes = int -#define ESP_CALIBRATION_4 997 //4 bytes = int -#define ESP_CALIBRATION_5 1001 //4 bytes = int -#define ESP_SETUP 1005 //1 byte = flag -#define ESP_TELNET_FLAG 1006 //1 byte = flag -#define ESP_BT_FLAG 1007 //1 byte = flag -#define ESP_SCREEN_FLAG 1008 //1 byte = flag -#define ESP_FTP_CTRL_PORT 1009 //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_ON 1021 //1 byte = flag -#define ESP_AUTO_NOTIFICATION 1022 //1 byte = flag -#define ESP_VERBOSE_BOOT 1023 //1 byte = flag -#define ESP_WEBDAV_ON 1024 //1 byte = flag -#define ESP_WEBDAV_PORT 1025 //4 bytes= int -#define ESP_STA_DNS_VALUE 1029 //4 bytes= int -#define ESP_SECURE_SERIAL 1033 //1 byte = flag -#define ESP_BOOT_RADIO_STATE 1034 //1 byte = flag -#define ESP_STA_FALLBACK_MODE 1035 //1 byte = flag - - -//Hidden password -#define HIDDEN_PASSWORD "********" - - #include class Settings_ESP3D diff --git a/esp3d/src/include/defines.h b/esp3d/src/include/defines.h index c87a361d..df150730 100644 --- a/esp3d/src/include/defines.h +++ b/esp3d/src/include/defines.h @@ -25,6 +25,95 @@ #define SETTINGS_IN_EEPROM 1 #define SETTINGS_IN_PREFERENCES 2 +//Supported FW ///////////////////////////////////////////////////////////// +#define UNKNOWN_FW 0 +#define GRBL 10 +#define MARLIN 20 +#define MARLIN_EMBEDDED 30 +#define SMOOTHIEWARE 40 +#define REPETIER 50 +#define FLUIDNC 60 +#define REPRAP 70 + +//Default flags +#define DEFAULT_SERIAL_OUTPUT_FLAG 1 +#define DEFAULT_REMOTE_SCREEN_FLAG 1 +#define DEFAULT_WEBSOCKET_FLAG 1 +#define DEFAULT_TELNET_FLAG 1 +#define DEFAULT_BT_FLAG 1 +#define DEFAULT_SCREEN_FLAG 1 + +//position in EEPROM / preferences will use `P_` + to make a string : P_0 for 0 +#define ESP_RADIO_MODE 0 //1 byte = flag +#define ESP_STA_SSID 1 //33 bytes 32+1 = string ; warning does not support multibyte char like chinese +#define ESP_STA_PASSWORD 34 //65 bytes 64 +1 = string ;warning does not support multibyte char like chinese +#define ESP_STA_IP_MODE 99 //1 byte = flag +#define ESP_STA_IP_VALUE 100 //4 bytes xxx.xxx.xxx.xxx +#define ESP_STA_MASK_VALUE 104 //4 bytes xxx.xxx.xxx.xxx +#define ESP_STA_GATEWAY_VALUE 108 //4 bytes xxx.xxx.xxx.xxx +#define ESP_BAUD_RATE 112 //4 bytes = int +#define ESP_NOTIFICATION_TYPE 116 //1 byte = flag +#define ESP_CALIBRATION 117 //1 byte = flag +#define ESP_AP_CHANNEL 118 //1 byte = flag +#define ESP_BUZZER 119 //1 byte = flag +#define ESP_INTERNET_TIME 120 //1 byte = flag +#define ESP_HTTP_PORT 121 //4 bytes = int +#define ESP_TELNET_PORT 125 //4 bytes = int +#define ESP_SERIAL_FLAG 129 //1 bytes = flag +#define ESP_HOSTNAME 130 //33 bytes 32+1 = string ; warning does not support multibyte char like chinese +#define ESP_SENSOR_INTERVAL 164 //4 bytes = int +#define ESP_SETTINGS_VERSION 168 //8 bytes = 7+1 = string ESP3D + 2 digits +#define ESP_ADMIN_PWD 176 //21 bytes 20+1 = string ; warning does not support multibyte char like chinese +#define ESP_USER_PWD 197 //21 bytes 20+1 = string ; warning does not support multibyte char like chinese +#define ESP_AP_SSID 218 //33 bytes 32+1 = string ; warning does not support multibyte char like chinese +#define ESP_AP_PASSWORD 251 //65 bytes 64 +1 = string ;warning does not support multibyte char like chinese +#define ESP_AP_IP_VALUE 316 //4 bytes xxx.xxx.xxx.xxx +#define ESP_BOOT_DELAY 320 //4 bytes = int +#define ESP_WEBSOCKET_PORT 324 //4 bytes= int +#define ESP_HTTP_ON 328 //1 byte = flag +#define ESP_TELNET_ON 329 //1 byte = flag +#define ESP_WEBSOCKET_ON 330 //1 byte = flag +#define ESP_SD_SPEED_DIV 331 //1 byte = flag +#define ESP_NOTIFICATION_TOKEN1 332 //64 bytes 63+1 = string ; warning does not support multibyte char like chinese +#define ESP_NOTIFICATION_TOKEN2 396 //64 bytes 63+1 = string ; warning does not support multibyte char like chinese +#define ESP_SENSOR_TYPE 460 //1 bytes = flag +#define ESP_TARGET_FW 461 //1 bytes = flag +#define ESP_TIMEZONE 462 //1 bytes = flag +#define ESP_TIME_IS_DST 463 //1 bytes = flag +#define ESP_TIME_SERVER1 464 //129 bytes 128+1 = string ; warning does not support multibyte char like chinese +#define ESP_TIME_SERVER2 593 //129 bytes 128+1 = string ; warning does not support multibyte char like chinese +#define ESP_TIME_SERVER3 722 //129 bytes 128+1 = string ; warning does not support multibyte char like chinese +#define ESP_REMOTE_SCREEN_FLAG 851 //1 bytes = flag +#define ESP_SD_MOUNT 852 //1 bytes = flag +#define ESP_SESSION_TIMEOUT 853 //1 bytes = flag +#define ESP_WEBSOCKET_FLAG 854 //1 bytes = flag +#define ESP_SD_CHECK_UPDATE_AT_BOOT 855//1 bytes = flag +#define ESP_NOTIFICATION_SETTINGS 856 //129 bytes 128+1 = string ; warning does not support multibyte char like chinese +#define ESP_CALIBRATION_1 985 //4 bytes = int +#define ESP_CALIBRATION_2 989 //4 bytes = int +#define ESP_CALIBRATION_3 993 //4 bytes = int +#define ESP_CALIBRATION_4 997 //4 bytes = int +#define ESP_CALIBRATION_5 1001 //4 bytes = int +#define ESP_SETUP 1005 //1 byte = flag +#define ESP_TELNET_FLAG 1006 //1 byte = flag +#define ESP_BT_FLAG 1007 //1 byte = flag +#define ESP_SCREEN_FLAG 1008 //1 byte = flag +#define ESP_FTP_CTRL_PORT 1009 //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_ON 1021 //1 byte = flag +#define ESP_AUTO_NOTIFICATION 1022 //1 byte = flag +#define ESP_VERBOSE_BOOT 1023 //1 byte = flag +#define ESP_WEBDAV_ON 1024 //1 byte = flag +#define ESP_WEBDAV_PORT 1025 //4 bytes= int +#define ESP_STA_DNS_VALUE 1029 //4 bytes= int +#define ESP_SECURE_SERIAL 1033 //1 byte = flag +#define ESP_BOOT_RADIO_STATE 1034 //1 byte = flag +#define ESP_STA_FALLBACK_MODE 1035 //1 byte = flag + +//Hidden password +#define HIDDEN_PASSWORD "********" + //Debug #define DEBUG_OUTPUT_SERIAL0 1 #define DEBUG_OUTPUT_SERIAL1 2