mirror of
https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git
synced 2025-08-03 22:30:42 +08:00
Reorg ESP400 output to add better filters and sub filter
This commit is contained in:
Luc
parent
eabab7d57b
commit
b8a266351c
@ -38,25 +38,10 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
|
||||
(void)cmd_params;
|
||||
//Start JSON
|
||||
output->print ("{\"Settings\":[");
|
||||
//1- Baud Rate
|
||||
output->print ("{\"F\":\"printer\",\"P\":\"");
|
||||
output->print (ESP_BAUD_RATE);
|
||||
output->print ("\",\"T\":\"I\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_uint32(ESP_BAUD_RATE));
|
||||
output->print ("\",\"H\":\"Baud Rate\",\"O\":[");
|
||||
uint8_t count = 0;
|
||||
const long *bl = serial_service.get_baudratelist(&count);
|
||||
for (uint8_t i = 0 ; i < count ; i++) {
|
||||
if (i > 0) {
|
||||
output->print (",");
|
||||
}
|
||||
output->printf("{\"%ld\":\"%ld\"}", bl[i], bl[i]);
|
||||
}
|
||||
output->print ("]}");
|
||||
|
||||
#if defined (WIFI_FEATURE) || defined (ETH_FEATURE) || defined(BT_FEATURE)
|
||||
//2 - Hostname
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
//Hostname network/network
|
||||
output->print ("{\"F\":\"network\",\"F2\":\"network\",\"P\":\"");
|
||||
output->print (ESP_HOSTNAME);
|
||||
output->print ("\",\"T\":\"S\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_string(ESP_HOSTNAME));
|
||||
@ -66,8 +51,8 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
|
||||
output->print (Settings_ESP3D::get_min_string_size(ESP_HOSTNAME));
|
||||
output->print ("\"}");
|
||||
#endif //WIFI_FEATURE || ETH_FEATURE || BT_FEATURE
|
||||
//3 - radio mode
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
//radio mode network/network
|
||||
output->print (",{\"F\":\"network\",\"F2\":\"network\",\"P\":\"");
|
||||
output->print (ESP_RADIO_MODE);
|
||||
output->print ("\",\"T\":\"B\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_byte(ESP_RADIO_MODE));
|
||||
@ -83,8 +68,8 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
|
||||
#endif //ETH_FEATURE
|
||||
output->print ("]}");
|
||||
#ifdef WIFI_FEATURE
|
||||
//4 - STA SSID
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
//STA SSID network/sta
|
||||
output->print (",{\"F\":\"network\",\"F2\":\"sta\",\"P\":\"");
|
||||
output->print (ESP_STA_SSID);
|
||||
output->print ("\",\"T\":\"S\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_string(ESP_STA_SSID));
|
||||
@ -94,10 +79,10 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
|
||||
output->print (Settings_ESP3D::get_min_string_size(ESP_STA_SSID));
|
||||
output->print ("\"}");
|
||||
|
||||
//5 - STA password
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
//STA password
|
||||
output->print (",{\"F\":\"network\",\"F2\":\"sta\",\"P\":\"");
|
||||
output->print (ESP_STA_PASSWORD);
|
||||
output->print ("\",\"T\":\"S\",\"V\":\"");
|
||||
output->print ("\",\"T\":\"S\",\"N\":\"1\",\"V\":\"");
|
||||
output->print (HIDDEN_PASSWORD);
|
||||
output->print ("\",\"S\":\"");
|
||||
output->print (Settings_ESP3D::get_max_string_size(ESP_STA_PASSWORD));
|
||||
@ -119,37 +104,37 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
|
||||
//output->print ("\"}]}");
|
||||
#endif //WIFI_FEATURE
|
||||
#if defined(WIFI_FEATURE) || defined(ETH_FEATURE)
|
||||
// 7 - STA IP mode
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
//STA IP mode
|
||||
output->print (",{\"F\":\"network\",\"F2\":\"sta\",\"P\":\"");
|
||||
output->print (ESP_STA_IP_MODE);
|
||||
output->print ("\",\"T\":\"B\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_byte(ESP_STA_IP_MODE));
|
||||
output->print ("\",\"H\":\"Station IP Mode\",\"O\":[{\"DHCP\":\"0\"},{\"Static\":\"1\"}]}");
|
||||
|
||||
//8-STA static IP
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
//STA static IP
|
||||
output->print (",{\"F\":\"network\",\"F2\":\"sta\",\"P\":\"");
|
||||
output->print (ESP_STA_IP_VALUE);
|
||||
output->print ("\",\"T\":\"A\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_IP_String(ESP_STA_IP_VALUE));
|
||||
output->print ("\",\"H\":\"Station Static IP\"}");
|
||||
|
||||
//9-STA static Gateway
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
//STA static Gateway
|
||||
output->print (",{\"F\":\"network\",\"F2\":\"sta\",\"P\":\"");
|
||||
output->print (ESP_STA_GATEWAY_VALUE);
|
||||
output->print ("\",\"T\":\"A\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_IP_String(ESP_STA_GATEWAY_VALUE));
|
||||
output->print ("\",\"H\":\"Station Static Gateway\"}");
|
||||
|
||||
//10-STA static Mask
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
//STA static Mask
|
||||
output->print (",{\"F\":\"network\",\"F2\":\"sta\",\"P\":\"");
|
||||
output->print (ESP_STA_MASK_VALUE);
|
||||
output->print ("\",\"T\":\"A\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_IP_String(ESP_STA_MASK_VALUE));
|
||||
output->print ("\",\"H\":\"Station Static Mask\"}");
|
||||
#endif //WIFI_FEATURE || ETH_FEATURE
|
||||
#if defined(WIFI_FEATURE)
|
||||
//11 - AP SSID
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
//AP SSID network/ap
|
||||
output->print (",{\"F\":\"network\",\"F2\":\"ap\",\"P\":\"");
|
||||
output->print (ESP_AP_SSID);
|
||||
output->print ("\",\"T\":\"S\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_string(ESP_AP_SSID));
|
||||
@ -159,26 +144,26 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
|
||||
output->print (Settings_ESP3D::get_min_string_size(ESP_AP_SSID));
|
||||
output->print ("\"}");
|
||||
|
||||
//12 - AP password
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
//AP password
|
||||
output->print (",{\"F\":\"network\",\"F2\":\"ap\",\"P\":\"");
|
||||
output->print (ESP_AP_PASSWORD);
|
||||
output->print ("\",\"T\":\"S\",\"V\":\"");
|
||||
output->print ("\",\"T\":\"S\",\"N\":\"1\",\"V\":\"");
|
||||
output->print (HIDDEN_PASSWORD);
|
||||
output->print ("\",\"S\":\"");
|
||||
output->print (Settings_ESP3D::get_max_string_size(ESP_AP_PASSWORD));
|
||||
output->print ("\",\"H\":\"AP Password\",\"M\":\"");
|
||||
output->print (Settings_ESP3D::get_max_string_size(ESP_AP_PASSWORD));
|
||||
output->print (Settings_ESP3D::get_min_string_size(ESP_AP_PASSWORD));
|
||||
output->print ("\"}");
|
||||
|
||||
//13 - AP static IP
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
//AP static IP
|
||||
output->print (",{\"F\":\"network\",\"F2\":\"ap\",\"P\":\"");
|
||||
output->print (ESP_AP_IP_VALUE);
|
||||
output->print ("\",\"T\":\"A\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_IP_String(ESP_AP_IP_VALUE));
|
||||
output->print ("\",\"H\":\"AP Static IP\"}");
|
||||
|
||||
//14 - AP Channel
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
//AP Channel
|
||||
output->print (",{\"F\":\"network\",\"F2\":\"ap\",\"P\":\"");
|
||||
output->print (ESP_AP_CHANNEL);
|
||||
output->print ("\",\"T\":\"B\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_byte(ESP_AP_CHANNEL));
|
||||
@ -192,16 +177,40 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
|
||||
output->print ("]}");
|
||||
#endif //WIFI_FEATURE
|
||||
|
||||
#ifdef AUTHENTICATION_FEATURE
|
||||
//22-Admin password
|
||||
output->print (",{\"F\":\"security\",\"F2\":\"security\",\"P\":\"");
|
||||
output->print (ESP_ADMIN_PWD);
|
||||
output->print ("\",\"T\":\"S\",\"V\":\"");
|
||||
output->print (HIDDEN_PASSWORD);
|
||||
output->print ("\",\"S\":\"");
|
||||
output->print (Settings_ESP3D::get_max_string_size(ESP_ADMIN_PWD));
|
||||
output->print ("\",\"H\":\"Admin Password\",\"M\":\"");
|
||||
output->print (Settings_ESP3D::get_min_string_size(ESP_ADMIN_PWD));
|
||||
output->print ("\"}");
|
||||
|
||||
//23-User password
|
||||
output->print (",{\"F\":\"security\",\"F2\":\"security\",\"P\":\"");
|
||||
output->print (ESP_USER_PWD);
|
||||
output->print ("\",\"T\":\"S\",\"V\":\"");
|
||||
output->print (HIDDEN_PASSWORD);
|
||||
output->print ("\",\"S\":\"");
|
||||
output->print (Settings_ESP3D::get_max_string_size(ESP_USER_PWD));
|
||||
output->print ("\",\"H\":\"User Password\",\"M\":\"");
|
||||
output->print (Settings_ESP3D::get_min_string_size(ESP_USER_PWD));
|
||||
output->print ("\"}");
|
||||
#endif //AUTHENTICATION_FEATURE
|
||||
|
||||
#ifdef HTTP_FEATURE
|
||||
//18-HTTP On
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
//HTTP On service/http
|
||||
output->print (",{\"F\":\"service\",\"F2\":\"http\",\"P\":\"");
|
||||
output->print (ESP_HTTP_ON);
|
||||
output->print ("\",\"T\":\"B\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_byte(ESP_HTTP_ON));
|
||||
output->print ("\",\"H\":\"Enable HTTP\",\"O\":[{\"No\":\"0\"},{\"Yes\":\"1\"}]}");
|
||||
|
||||
//19-HTTP Port
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
//HTTP Port
|
||||
output->print (",{\"F\":\"service\",\"F2\":\"http\",\"P\":\"");
|
||||
output->print (ESP_HTTP_PORT);
|
||||
output->print ("\",\"T\":\"I\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_uint32(ESP_HTTP_PORT));
|
||||
@ -213,15 +222,15 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
|
||||
#endif //HTTP_FEATURE
|
||||
|
||||
#ifdef TELNET_FEATURE
|
||||
//20-TELNET On
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
//TELNET On service/telnet
|
||||
output->print (",{\"F\":\"service\",\"F2\":\"telnet\",\"P\":\"");
|
||||
output->print (ESP_TELNET_ON);
|
||||
output->print ("\",\"T\":\"B\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_byte(ESP_TELNET_ON));
|
||||
output->print ("\",\"H\":\"Enable Telnet\",\"O\":[{\"No\":\"0\"},{\"Yes\":\"1\"}]}");
|
||||
|
||||
//21-TELNET Port
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
//TELNET Port
|
||||
output->print (",{\"F\":\"service\",\"F2\":\"telnet\",\"P\":\"");
|
||||
output->print (ESP_TELNET_PORT);
|
||||
output->print ("\",\"T\":\"I\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_uint32(ESP_TELNET_PORT));
|
||||
@ -233,15 +242,15 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
|
||||
#endif //TELNET
|
||||
|
||||
#ifdef FTP_FEATURE
|
||||
//FTP On
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
//FTP On service/ftp
|
||||
output->print (",{\"F\":\"service\",\"F2\":\"ftp\",\"P\":\"");
|
||||
output->print (ESP_FTP_ON);
|
||||
output->print ("\",\"T\":\"B\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_byte(ESP_FTP_ON));
|
||||
output->print ("\",\"H\":\"Enable Ftp\",\"O\":[{\"No\":\"0\"},{\"Yes\":\"1\"}]}");
|
||||
|
||||
//FTP Ports
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
output->print (",{\"F\":\"service\",\"F2\":\"ftp\",\"P\":\"");
|
||||
output->print (ESP_FTP_CTRL_PORT);
|
||||
output->print ("\",\"T\":\"I\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_uint32(ESP_FTP_CTRL_PORT));
|
||||
@ -251,7 +260,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
|
||||
output->print (Settings_ESP3D::get_min_int32_value(ESP_FTP_CTRL_PORT));
|
||||
output->print ("\"}");
|
||||
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
output->print (",{\"F\":\"service\",\"F2\":\"ftp\",\"P\":\"");
|
||||
output->print (ESP_FTP_DATA_ACTIVE_PORT);
|
||||
output->print ("\",\"T\":\"I\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_uint32(ESP_FTP_DATA_ACTIVE_PORT));
|
||||
@ -261,7 +270,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
|
||||
output->print (Settings_ESP3D::get_min_int32_value(ESP_FTP_DATA_ACTIVE_PORT));
|
||||
output->print ("\"}");
|
||||
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
output->print (",{\"F\":\"service\",\"F2\":\"ftp\",\"P\":\"");
|
||||
output->print (ESP_FTP_DATA_PASSIVE_PORT);
|
||||
output->print ("\",\"T\":\"I\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_uint32(ESP_FTP_DATA_PASSIVE_PORT));
|
||||
@ -272,54 +281,17 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
|
||||
output->print ("\"}");
|
||||
#endif //FTP_FEATURE
|
||||
|
||||
#ifdef CAMERA_DEVICE
|
||||
//Camera Port
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
output->print (ESP_CAMERA_PORT);
|
||||
output->print ("\",\"T\":\"I\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_uint32(ESP_CAMERA_PORT));
|
||||
output->print ("\",\"H\":\"Camera Port\",\"S\":\"");
|
||||
output->print (Settings_ESP3D::get_max_int32_value(ESP_CAMERA_PORT));
|
||||
output->print ("\",\"M\":\"");
|
||||
output->print (Settings_ESP3D::get_min_int32_value(ESP_CAMERA_PORT));
|
||||
output->print ("\"}");
|
||||
#endif //CAMERA_DEVICE
|
||||
|
||||
#ifdef AUTHENTICATION_FEATURE
|
||||
//22-Admin password
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
output->print (ESP_ADMIN_PWD);
|
||||
output->print ("\",\"T\":\"S\",\"V\":\"");
|
||||
output->print (HIDDEN_PASSWORD);
|
||||
output->print ("\",\"S\":\"");
|
||||
output->print (Settings_ESP3D::get_max_string_size(ESP_ADMIN_PWD));
|
||||
output->print ("\",\"H\":\"Admin Password\",\"M\":\"");
|
||||
output->print (Settings_ESP3D::get_min_string_size(ESP_ADMIN_PWD));
|
||||
output->print ("\"}");
|
||||
|
||||
//23-User password
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
output->print (ESP_USER_PWD);
|
||||
output->print ("\",\"T\":\"S\",\"V\":\"");
|
||||
output->print (HIDDEN_PASSWORD);
|
||||
output->print ("\",\"S\":\"");
|
||||
output->print (Settings_ESP3D::get_max_string_size(ESP_USER_PWD));
|
||||
output->print ("\",\"H\":\"User Password\",\"M\":\"");
|
||||
output->print (Settings_ESP3D::get_min_string_size(ESP_USER_PWD));
|
||||
output->print ("\"}");
|
||||
#endif //AUTHENTICATION_FEATURE
|
||||
|
||||
#ifdef TIMESTAMP_FEATURE
|
||||
|
||||
//24a-Time zone
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
//Internet Time
|
||||
output->print (",{\"F\":\"service\",\"F2\":\"time\",\"P\":\"");
|
||||
output->print (ESP_INTERNET_TIME);
|
||||
output->print("\",\"T\":\"B\",\"V\":\"");
|
||||
output->print ((int8_t)Settings_ESP3D::read_byte(ESP_INTERNET_TIME));
|
||||
output->print("\",\"H\":\"Internet Time\",\"O\":[{\"No\":\"0\"},{\"Yes\":\"1\"}]}");
|
||||
|
||||
//24b-Time zone
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
//Time zone
|
||||
output->print (",{\"F\":\"service\",\"F2\":\"time\",\"P\":\"");
|
||||
output->print (ESP_TIMEZONE);
|
||||
output->print("\",\"T\":\"B\",\"V\":\"");
|
||||
output->print ((int8_t)Settings_ESP3D::read_byte(ESP_TIMEZONE));
|
||||
@ -332,15 +304,15 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
|
||||
}
|
||||
output->print("]}");
|
||||
|
||||
//25- DST
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
//DST
|
||||
output->print (",{\"F\":\"service\",\"F2\":\"time\",\"P\":\"");
|
||||
output->print (ESP_TIME_IS_DST);
|
||||
output->print("\",\"T\":\"B\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_byte(ESP_TIME_IS_DST));
|
||||
output->print("\",\"H\":\"Day Saving Time\",\"O\":[{\"No\":\"0\"},{\"Yes\":\"1\"}]}");
|
||||
|
||||
//26- Time Server1
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
//Time Server1
|
||||
output->print (",{\"F\":\"service\",\"F2\":\"time\",\"P\":\"");
|
||||
output->print (ESP_TIME_SERVER1);
|
||||
output->print("\",\"T\":\"S\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_string(ESP_TIME_SERVER1));
|
||||
@ -351,7 +323,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
|
||||
output->print ("\"}");
|
||||
|
||||
//27- Time Server2
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
output->print (",{\"F\":\"service\",\"F2\":\"time\",\"P\":\"");
|
||||
output->print (ESP_TIME_SERVER2);
|
||||
output->print("\",\"T\":\"S\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_string(ESP_TIME_SERVER2));
|
||||
@ -362,7 +334,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
|
||||
output->print ("\"}");
|
||||
|
||||
//28- Time Server3
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
output->print (",{\"F\":\"service\",\"F2\":\"time\",\"P\":\"");
|
||||
output->print (ESP_TIME_SERVER3);
|
||||
output->print("\",\"T\":\"S\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_string(ESP_TIME_SERVER3));
|
||||
@ -372,15 +344,16 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
|
||||
output->print (Settings_ESP3D::get_min_string_size(ESP_TIME_SERVER3));
|
||||
output->print ("\"}");
|
||||
#endif //TIMESTAMP_FEATURE
|
||||
|
||||
#ifdef NOTIFICATION_FEATURE
|
||||
//Auto notification
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
output->print (",{\"F\":\"service\",\"F2\":\"notification\",\"P\":\"");
|
||||
output->print (ESP_AUTO_NOTIFICATION);
|
||||
output->print("\",\"T\":\"B\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_byte(ESP_AUTO_NOTIFICATION));
|
||||
output->print("\",\"H\":\"Auto notification\",\"O\":[{\"No\":\"0\"},{\"Yes\":\"1\"}]}");
|
||||
//Notification type
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
output->print (",{\"F\":\"service\",\"F2\":\"notification\",\"P\":\"");
|
||||
output->print (ESP_NOTIFICATION_TYPE);
|
||||
output->print ("\",\"T\":\"B\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_byte(ESP_NOTIFICATION_TYPE));
|
||||
@ -392,7 +365,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
|
||||
output->print (ESP_LINE_NOTIFICATION);
|
||||
output->print ("\"}]}");
|
||||
//Token 1
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
output->print (",{\"F\":\"service\",\"F2\":\"notification\",\"P\":\"");
|
||||
output->print (ESP_NOTIFICATION_TOKEN1);
|
||||
output->print ("\",\"T\":\"S\",\"V\":\"");
|
||||
output->print (HIDDEN_PASSWORD);
|
||||
@ -402,7 +375,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
|
||||
output->print (Settings_ESP3D::get_min_string_size(ESP_NOTIFICATION_TOKEN1));
|
||||
output->print ("\"}");
|
||||
//Token 2
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
output->print (",{\"F\":\"service\",\"F2\":\"notification\",\"P\":\"");
|
||||
output->print (ESP_NOTIFICATION_TOKEN2);
|
||||
output->print ("\",\"T\":\"S\",\"V\":\"");
|
||||
output->print (HIDDEN_PASSWORD);
|
||||
@ -412,7 +385,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
|
||||
output->print (Settings_ESP3D::get_min_string_size(ESP_NOTIFICATION_TOKEN2));
|
||||
output->print ("\"}");
|
||||
//Notifications Settings
|
||||
output->print (",{\"F\":\"network\",\"P\":\"");
|
||||
output->print (",{\"F\":\"service\",\"F2\":\"notification\",\"P\":\"");
|
||||
output->print (ESP_NOTIFICATION_SETTINGS);
|
||||
output->print ("\",\"T\":\"S\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_string(ESP_NOTIFICATION_SETTINGS));
|
||||
@ -422,16 +395,67 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
|
||||
output->print (Settings_ESP3D::get_min_string_size(ESP_NOTIFICATION_SETTINGS));
|
||||
output->print ("\"}");
|
||||
#endif //NOTIFICATION_FEATURE
|
||||
#ifdef CAMERA_DEVICE
|
||||
//Camera Port
|
||||
output->print (",{\"F\":\"device\",\"F2\":\"camera\",\"P\":\"");
|
||||
output->print (ESP_CAMERA_PORT);
|
||||
output->print ("\",\"T\":\"I\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_uint32(ESP_CAMERA_PORT));
|
||||
output->print ("\",\"H\":\"Camera Port\",\"S\":\"");
|
||||
output->print (Settings_ESP3D::get_max_int32_value(ESP_CAMERA_PORT));
|
||||
output->print ("\",\"M\":\"");
|
||||
output->print (Settings_ESP3D::get_min_int32_value(ESP_CAMERA_PORT));
|
||||
output->print ("\"}");
|
||||
#endif //CAMERA_DEVICE
|
||||
#ifdef BUZZER_DEVICE
|
||||
//Buzzer state
|
||||
output->print (",{\"F\":\"printer\",\"P\":\"");
|
||||
output->print (",{\"F\":\"device\",\"F2\":\"device\",\"P\":\"");
|
||||
output->print (ESP_BUZZER);
|
||||
output->print ("\",\"T\":\"B\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_byte(ESP_BUZZER));
|
||||
output->print ("\",\"H\":\"Buzzer\",\"O\":[{\"No\":\"0\"},{\"Yes\":\"1\"}]}");
|
||||
#endif //BUZZER_DEVICE
|
||||
|
||||
#ifdef DHT_DEVICE
|
||||
//DHT type
|
||||
output->print (",{\"F\":\"device\",\"F2\":\"dht\",\"P\":\"");
|
||||
output->print (ESP_DHT_TYPE);
|
||||
output->print ("\",\"T\":\"B\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_byte(ESP_DHT_TYPE));
|
||||
output->print ("\",\"H\":\"DHT Type\",\"O\":[{\"None\":\"0\"},{\"DHT11\":\"");
|
||||
output->print (DHT11_DEVICE);
|
||||
output->print ("\"},{\"DHT22\":\"");
|
||||
output->print (DHT22_DEVICE);
|
||||
output->print ("\"}]}");
|
||||
|
||||
//DHT interval
|
||||
output->print (",{\"F\":\"device\",\"F2\":\"dht\",\"P\":\"");
|
||||
output->print (ESP_DHT_INTERVAL);
|
||||
output->print ("\",\"T\":\"I\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_uint32(ESP_DHT_INTERVAL));
|
||||
output->print ("\",\"H\":\"DHT interval (millisec)\",\"S\":\"");
|
||||
output->print (Settings_ESP3D::get_max_int32_value(ESP_DHT_INTERVAL));
|
||||
output->print ("\",\"M\":\"");
|
||||
output->print (Settings_ESP3D::get_min_int32_value(ESP_DHT_INTERVAL));
|
||||
output->print ("\"}");
|
||||
#endif //DHT_DEVICE
|
||||
#ifdef SD_DEVICE
|
||||
//Direct SD
|
||||
output->print(",{\"F\":\"device\",\"F2\":\"sd\",\"P\":\"");
|
||||
output->print(ESP_SD_DEVICE_TYPE);
|
||||
output->print("\",\"T\":\"B\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_byte(ESP_SD_DEVICE_TYPE));
|
||||
//hard coded for readibility but should use ESP_NO_SD / ESP_DIRECT_SD / ESP_SHARED_SD
|
||||
output->print("\",\"H\":\"SD Device\",\"O\":[{\"None\":\"0\"},{\"Direct\":\"1\"},{\"Shared\":\"2\"}]}");
|
||||
//SPI SD Divider
|
||||
output->print(",{\"F\":\"device\",\"F2\":\"sd\",\"P\":\"");
|
||||
output->print(ESP_SD_SPEED_DIV);
|
||||
output->print("\",\"T\":\"B\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_byte(ESP_SD_SPEED_DIV));
|
||||
output->print("\",\"H\":\"SD speed divider\",\"O\":[{\"1\":\"1\"},{\"2\":\"2\"},{\"3\":\"3\"},{\"4\":\"4\"},{\"6\":\"6\"},{\"8\":\"8\"},{\"16\":\"16\"},{\"32\":\"32\"}]}");
|
||||
#endif //SD_DEVICE
|
||||
//Target FW
|
||||
output->print (",{\"F\":\"printer\",\"P\":\"");
|
||||
output->print (",{\"F\":\"system\",\"F2\":\"system\",\"P\":\"");
|
||||
output->print (ESP_TARGET_FW);
|
||||
output->print ("\",\"T\":\"B\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_byte(ESP_TARGET_FW));
|
||||
@ -450,31 +474,23 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
|
||||
output->print ("\"},{\"Unknown\":\"");
|
||||
output->print (UNKNOWN_FW);
|
||||
output->print ("\"}]}");
|
||||
#ifdef DHT_DEVICE
|
||||
//DHT type
|
||||
output->print (",{\"F\":\"printer\",\"P\":\"");
|
||||
output->print (ESP_DHT_TYPE);
|
||||
output->print ("\",\"T\":\"B\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_byte(ESP_DHT_TYPE));
|
||||
output->print ("\",\"H\":\"DHT Type\",\"O\":[{\"None\":\"0\"},{\"DHT11\":\"");
|
||||
output->print (DHT11_DEVICE);
|
||||
output->print ("\"},{\"DHT22\":\"");
|
||||
output->print (DHT22_DEVICE);
|
||||
output->print ("\"}]}");
|
||||
|
||||
//DHT interval
|
||||
output->print (",{\"F\":\"printer\",\"P\":\"");
|
||||
output->print (ESP_DHT_INTERVAL);
|
||||
//Baud Rate
|
||||
output->print (",{\"F\":\"system\",\"F2\":\"system\",\"P\":\"");
|
||||
output->print (ESP_BAUD_RATE);
|
||||
output->print ("\",\"T\":\"I\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_uint32(ESP_DHT_INTERVAL));
|
||||
output->print ("\",\"H\":\"DHT interval (millisec)\",\"S\":\"");
|
||||
output->print (Settings_ESP3D::get_max_int32_value(ESP_DHT_INTERVAL));
|
||||
output->print ("\",\"M\":\"");
|
||||
output->print (Settings_ESP3D::get_min_int32_value(ESP_DHT_INTERVAL));
|
||||
output->print ("\"}");
|
||||
#endif //DHT_DEVICE
|
||||
output->print (Settings_ESP3D::read_uint32(ESP_BAUD_RATE));
|
||||
output->print ("\",\"H\":\"Baud Rate\",\"O\":[");
|
||||
uint8_t count = 0;
|
||||
const long *bl = serial_service.get_baudratelist(&count);
|
||||
for (uint8_t i = 0 ; i < count ; i++) {
|
||||
if (i > 0) {
|
||||
output->print (",");
|
||||
}
|
||||
output->printf("{\"%ld\":\"%ld\"}", bl[i], bl[i]);
|
||||
}
|
||||
output->print ("]}");
|
||||
//Start delay
|
||||
output->print (",{\"F\":\"printer\",\"P\":\"");
|
||||
output->print (",{\"F\":\"system\",\"F2\":\"system\",\"P\":\"");
|
||||
output->print (ESP_BOOT_DELAY);
|
||||
output->print ("\",\"T\":\"I\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_uint32(ESP_BOOT_DELAY));
|
||||
@ -484,7 +500,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
|
||||
output->print (Settings_ESP3D::get_min_int32_value(ESP_BOOT_DELAY));
|
||||
output->print ("\"}");
|
||||
//Output flag
|
||||
output->print (",{\"F\":\"printer\",\"P\":\"");
|
||||
output->print (",{\"F\":\"system\",\"F2\":\"system\",\"P\":\"");
|
||||
output->print (ESP_OUTPUT_FLAG);
|
||||
output->print ("\",\"T\":\"F\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_byte(ESP_TARGET_FW));
|
||||
@ -503,21 +519,6 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type,
|
||||
output->printf (",{\"Telnet\":\"%d\"}", ESP_TELNET_CLIENT);
|
||||
#endif //TELNET_FEATURE
|
||||
output->print ("]}");
|
||||
#ifdef SD_DEVICE
|
||||
//Direct SD
|
||||
output->print(",{\"F\":\"printer\",\"P\":\"");
|
||||
output->print(ESP_SD_DEVICE_TYPE);
|
||||
output->print("\",\"T\":\"B\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_byte(ESP_SD_DEVICE_TYPE));
|
||||
//hard coded for readibility but should use ESP_NO_SD / ESP_DIRECT_SD / ESP_SHARED_SD
|
||||
output->print("\",\"H\":\"SD Device\",\"O\":[{\"None\":\"0\"},{\"Direct\":\"1\"},{\"Shared\":\"2\"}]}");
|
||||
//SPI SD Divider
|
||||
output->print(",{\"F\":\"printer\",\"P\":\"");
|
||||
output->print(ESP_SD_SPEED_DIV);
|
||||
output->print("\",\"T\":\"B\",\"V\":\"");
|
||||
output->print (Settings_ESP3D::read_byte(ESP_SD_SPEED_DIV));
|
||||
output->print("\",\"H\":\"SD speed divider\",\"O\":[{\"1\":\"1\"},{\"2\":\"2\"},{\"3\":\"3\"},{\"4\":\"4\"},{\"6\":\"6\"},{\"8\":\"8\"},{\"16\":\"16\"},{\"32\":\"32\"}]}");
|
||||
#endif //SD_DEVICE
|
||||
|
||||
output->print ("]}");
|
||||
return true;
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
#define _VERSION_ESP3D_H
|
||||
|
||||
//version and sources location
|
||||
#define FW_VERSION "3.0.0.a27"
|
||||
#define FW_VERSION "3.0.0.a28"
|
||||
#define REPOSITORY "https://github.com/luc-github/ESP3D"
|
||||
|
||||
#endif //_VERSION_ESP3D_H
|
||||
|
||||
@ -37,8 +37,8 @@ WebSocket_Server websocket_data_server;
|
||||
void WebSocket_Server::pushMSG (const char * data)
|
||||
{
|
||||
if (_websocket_server) {
|
||||
_websocket_server->broadcastTXT(data);
|
||||
log_esp3d("[%u]Broadcast %s", _current_id,data);
|
||||
_websocket_server->broadcastTXT(data);
|
||||
log_esp3d("[%u]Broadcast %s", _current_id,data);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user