diff --git a/esp3d/configuration.h b/esp3d/configuration.h index 8251c76e..7d324539 100644 --- a/esp3d/configuration.h +++ b/esp3d/configuration.h @@ -206,7 +206,7 @@ //DEBUG_OUTPUT_SERIAL2 3 //DEBUG_OUTPUT_TELNET 4 //DEBUG_OUTPUT_WEBSOCKET 5 -#define ESP_DEBUG_FEATURE DEBUG_OUTPUT_SERIAL0 +//#define ESP_DEBUG_FEATURE DEBUG_OUTPUT_SERIAL0 #ifdef ESP_DEBUG_FEATURE #define DEBUG_ESP3D_OUTPUT_PORT 8000 diff --git a/esp3d/src/core/espcmd/ESP400.cpp b/esp3d/src/core/espcmd/ESP400.cpp index 88df26d8..7fa15d6d 100644 --- a/esp3d/src/core/espcmd/ESP400.cpp +++ b/esp3d/src/core/espcmd/ESP400.cpp @@ -45,7 +45,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print (ESP_HOSTNAME); output->print ("\",\"T\":\"S\",\"V\":\""); output->print (Settings_ESP3D::read_string(ESP_HOSTNAME)); - output->print ("\",\"H\":\"Hostname\" ,\"S\":\""); + output->print ("\",\"H\":\"hostname\" ,\"S\":\""); output->print (Settings_ESP3D::get_max_string_size(ESP_HOSTNAME)); output->print ("\", \"M\":\""); output->print (Settings_ESP3D::get_min_string_size(ESP_HOSTNAME)); @@ -56,15 +56,15 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print (ESP_RADIO_MODE); output->print ("\",\"T\":\"B\",\"V\":\""); output->print (Settings_ESP3D::read_byte(ESP_RADIO_MODE)); - output->print ("\",\"H\":\"Radio mode\",\"O\":[{\"None\":\"0\"}"); + output->print ("\",\"H\":\"radio mode\",\"O\":[{\"none\":\"0\"}"); #ifdef WIFI_FEATURE - output->print (",{\"STA\":\"1\"},{\"AP\":\"2\"}"); + output->print (",{\"sta\":\"1\"},{\"ap\":\"2\"}"); #endif //WIFI_FEATURE #ifdef BLUETOOTH_FEATURE - output->print (",{\"BT\":\"3\"}"); + output->print (",{\"bt\":\"3\"}"); #endif //BLUETOOTH_FEATURE #ifdef ETH_FEATURE - output->print (",{\"ETH-STA\":\"4\"}"); + output->print (",{\"eth-sta\":\"4\"}"); #endif //ETH_FEATURE output->print ("]}"); #ifdef WIFI_FEATURE @@ -75,7 +75,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print (Settings_ESP3D::read_string(ESP_STA_SSID)); output->print ("\",\"S\":\""); output->print (Settings_ESP3D::get_max_string_size(ESP_STA_SSID)); - output->print ("\",\"H\":\"Station SSID\",\"M\":\""); + output->print ("\",\"H\":\"SSID\",\"M\":\""); output->print (Settings_ESP3D::get_min_string_size(ESP_STA_SSID)); output->print ("\"}"); @@ -86,22 +86,10 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print (HIDDEN_PASSWORD); output->print ("\",\"S\":\""); output->print (Settings_ESP3D::get_max_string_size(ESP_STA_PASSWORD)); - output->print ("\",\"H\":\"Station Password\",\"M\":\""); + output->print ("\",\"H\":\"pwd\",\"M\":\""); output->print (Settings_ESP3D::get_min_string_size(ESP_STA_PASSWORD)); output->print ("\"}"); - //6-Station Network Mode - //output->print (",{\"F\":\"network\",\"P\":\""); - //output->print (ESP_STA_PHY_MODE); - //output->print ("\",\"T\":\"B\",\"V\":\""); - //output->print (Settings_ESP3D::read_byte(ESP_STA_PHY_MODE)); - //output->print ("\",\"H\":\"Station Network Mode\",\"O\":[{\"11b\":\""); - //output->print (WIFI_PHY_MODE_11B); - //output->print ("\"},{\"11g\":\""); - //output->print (WIFI_PHY_MODE_11G); - //output->print ("\"},{\"11n\":\""); - //output->print (WIFI_PHY_MODE_11N); - //output->print ("\"}]}"); #endif //WIFI_FEATURE #if defined(WIFI_FEATURE) || defined(ETH_FEATURE) //STA IP mode @@ -109,28 +97,28 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, 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\"}]}"); + output->print ("\",\"H\":\"ip mode\",\"O\":[{\"dhcp\":\"0\"},{\"static\":\"1\"}]}"); //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\"}"); + output->print ("\",\"H\":\"ip\"}"); //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\"}"); + output->print ("\",\"H\":\"gw\"}"); //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\"}"); + output->print ("\",\"H\":\"msk\"}"); #endif //WIFI_FEATURE || ETH_FEATURE #if defined(WIFI_FEATURE) //AP SSID network/ap @@ -140,7 +128,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print (Settings_ESP3D::read_string(ESP_AP_SSID)); output->print ("\",\"S\":\""); output->print (Settings_ESP3D::get_max_string_size(ESP_AP_SSID)); - output->print ("\",\"H\":\"AP SSID\",\"M\":\""); + output->print ("\",\"H\":\"SSID\",\"M\":\""); output->print (Settings_ESP3D::get_min_string_size(ESP_AP_SSID)); output->print ("\"}"); @@ -151,7 +139,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, 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 ("\",\"H\":\"pwd\",\"M\":\""); output->print (Settings_ESP3D::get_min_string_size(ESP_AP_PASSWORD)); output->print ("\"}"); @@ -160,14 +148,14 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, 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\"}"); + output->print ("\",\"H\":\"ip\"}"); //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)); - output->print ("\",\"H\":\"AP Channel\",\"O\":["); + output->print ("\",\"H\":\"channel\",\"O\":["); for (uint8_t i = Settings_ESP3D::get_min_byte(ESP_AP_CHANNEL); i <= Settings_ESP3D::get_max_byte(ESP_AP_CHANNEL) ; i++) { if (i > 1) { output->print (","); @@ -178,25 +166,25 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, #endif //WIFI_FEATURE #ifdef AUTHENTICATION_FEATURE - //22-Admin password + //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 ("\",\"H\":\"adm pwd\",\"M\":\""); output->print (Settings_ESP3D::get_min_string_size(ESP_ADMIN_PWD)); output->print ("\"}"); - //23-User password + //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 ("\",\"H\":\"user pwd\",\"M\":\""); output->print (Settings_ESP3D::get_min_string_size(ESP_USER_PWD)); output->print ("\"}"); #endif //AUTHENTICATION_FEATURE @@ -207,14 +195,14 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, 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\"}]}"); + output->print ("\",\"H\":\"enable\",\"O\":[{\"no\":\"0\"},{\"yes\":\"1\"}]}"); //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)); - output->print ("\",\"H\":\"HTTP Port\",\"S\":\""); + output->print ("\",\"H\":\"port\",\"S\":\""); output->print (Settings_ESP3D::get_max_int32_value(ESP_HTTP_PORT)); output->print ("\",\"M\":\""); output->print (Settings_ESP3D::get_min_int32_value(ESP_HTTP_PORT)); @@ -223,18 +211,18 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, #ifdef TELNET_FEATURE //TELNET On service/telnet - output->print (",{\"F\":\"service\",\"F2\":\"telnet\",\"P\":\""); + output->print (",{\"F\":\"service\",\"F2\":\"telnetp\",\"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\"}]}"); + output->print ("\",\"H\":\"enable\",\"O\":[{\"no\":\"0\"},{\"yes\":\"1\"}]}"); //TELNET Port - output->print (",{\"F\":\"service\",\"F2\":\"telnet\",\"P\":\""); + output->print (",{\"F\":\"service\",\"F2\":\"telnetp\",\"P\":\""); output->print (ESP_TELNET_PORT); output->print ("\",\"T\":\"I\",\"V\":\""); output->print (Settings_ESP3D::read_uint32(ESP_TELNET_PORT)); - output->print ("\",\"H\":\"Telnet Port\",\"S\":\""); + output->print ("\",\"H\":\"port\",\"S\":\""); output->print (Settings_ESP3D::get_max_int32_value(ESP_TELNET_PORT)); output->print ("\",\"M\":\""); output->print (Settings_ESP3D::get_min_int32_value(ESP_TELNET_PORT)); @@ -247,14 +235,14 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, 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\"}]}"); + output->print ("\",\"H\":\"enable\",\"O\":[{\"no\":\"0\"},{\"yes\":\"1\"}]}"); //FTP Ports 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)); - output->print ("\",\"H\":\"Ftp Control Port\",\"S\":\""); + output->print ("\",\"H\":\"control port\",\"S\":\""); output->print (Settings_ESP3D::get_max_int32_value(ESP_FTP_CTRL_PORT)); output->print ("\",\"M\":\""); output->print (Settings_ESP3D::get_min_int32_value(ESP_FTP_CTRL_PORT)); @@ -264,7 +252,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print (ESP_FTP_DATA_ACTIVE_PORT); output->print ("\",\"T\":\"I\",\"V\":\""); output->print (Settings_ESP3D::read_uint32(ESP_FTP_DATA_ACTIVE_PORT)); - output->print ("\",\"H\":\"FTP Active Port\",\"S\":\""); + output->print ("\",\"H\":\"active port\",\"S\":\""); output->print (Settings_ESP3D::get_max_int32_value(ESP_FTP_DATA_ACTIVE_PORT)); output->print ("\",\"M\":\""); output->print (Settings_ESP3D::get_min_int32_value(ESP_FTP_DATA_ACTIVE_PORT)); @@ -274,7 +262,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print (ESP_FTP_DATA_PASSIVE_PORT); output->print ("\",\"T\":\"I\",\"V\":\""); output->print (Settings_ESP3D::read_uint32(ESP_FTP_DATA_PASSIVE_PORT)); - output->print ("\",\"H\":\"FTP Passive Port\",\"S\":\""); + output->print ("\",\"H\":\"passive port\",\"S\":\""); output->print (Settings_ESP3D::get_max_int32_value(ESP_FTP_DATA_PASSIVE_PORT)); output->print ("\",\"M\":\""); output->print (Settings_ESP3D::get_min_int32_value(ESP_FTP_DATA_PASSIVE_PORT)); @@ -288,14 +276,14 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, 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\"}]}"); + output->print("\",\"H\":\"i-time\",\"O\":[{\"no\":\"0\"},{\"yes\":\"1\"}]}"); //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)); - output->print("\",\"H\":\"Time Zone\",\"O\":["); + output->print("\",\"H\":\"tzone\",\"O\":["); for (int8_t i = Settings_ESP3D::get_min_byte(ESP_TIMEZONE); i <= Settings_ESP3D::get_max_byte(ESP_TIMEZONE) ; i++) { if (i > 1) { output->print (","); @@ -309,7 +297,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, 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\"}]}"); + output->print("\",\"H\":\"dst\",\"O\":[{\"no\":\"0\"},{\"yes\":\"1\"}]}"); //Time Server1 output->print (",{\"F\":\"service\",\"F2\":\"time\",\"P\":\""); @@ -318,7 +306,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print (Settings_ESP3D::read_string(ESP_TIME_SERVER1)); output->print ("\",\"S\":\""); output->print (Settings_ESP3D::get_max_string_size(ESP_TIME_SERVER1)); - output->print ("\",\"H\":\"Time Server 1\",\"M\":\""); + output->print ("\",\"H\":\"t-server\",\"M\":\""); output->print (Settings_ESP3D::get_min_string_size(ESP_TIME_SERVER1)); output->print ("\"}"); @@ -329,7 +317,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print (Settings_ESP3D::read_string(ESP_TIME_SERVER2)); output->print ("\",\"S\":\""); output->print (Settings_ESP3D::get_max_string_size(ESP_TIME_SERVER2)); - output->print ("\",\"H\":\"Time Server 2\",\"M\":\""); + output->print ("\",\"H\":\"t-server\",\"M\":\""); output->print (Settings_ESP3D::get_min_string_size(ESP_TIME_SERVER2)); output->print ("\"}"); @@ -340,7 +328,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print (Settings_ESP3D::read_string(ESP_TIME_SERVER3)); output->print ("\",\"S\":\""); output->print (Settings_ESP3D::get_max_string_size(ESP_TIME_SERVER3)); - output->print ("\",\"H\":\"Time Server 3\",\"M\":\""); + output->print ("\",\"H\":\"t-server\",\"M\":\""); output->print (Settings_ESP3D::get_min_string_size(ESP_TIME_SERVER3)); output->print ("\"}"); #endif //TIMESTAMP_FEATURE @@ -351,17 +339,17 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, 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\"}]}"); + output->print("\",\"H\":\"auto notif\",\"O\":[{\"no\":\"0\"},{\"yes\":\"1\"}]}"); //Notification type 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)); - output->print ("\",\"H\":\"Notification\",\"O\":[{\"None\":\"0\"},{\"Pushover\":\""); + output->print ("\",\"H\":\"notification\",\"O\":[{\"none\":\"0\"},{\"pushover\":\""); output->print (ESP_PUSHOVER_NOTIFICATION); - output->print ("\"},{\"Email\":\""); + output->print ("\"},{\"email\":\""); output->print (ESP_EMAIL_NOTIFICATION); - output->print ("\"},{\"Line\":\""); + output->print ("\"},{\"line\":\""); output->print (ESP_LINE_NOTIFICATION); output->print ("\"}]}"); //Token 1 @@ -371,7 +359,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print (HIDDEN_PASSWORD); output->print ("\",\"S\":\""); output->print (Settings_ESP3D::get_max_string_size(ESP_NOTIFICATION_TOKEN1)); - output->print ("\",\"H\":\"Token 1\",\"M\":\""); + output->print ("\",\"H\":\"t1\",\"M\":\""); output->print (Settings_ESP3D::get_min_string_size(ESP_NOTIFICATION_TOKEN1)); output->print ("\"}"); //Token 2 @@ -381,7 +369,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print (HIDDEN_PASSWORD); output->print ("\",\"S\":\""); output->print (Settings_ESP3D::get_max_string_size(ESP_NOTIFICATION_TOKEN2)); - output->print ("\",\"H\":\"Token 2\",\"M\":\""); + output->print ("\",\"H\":\"t2\",\"M\":\""); output->print (Settings_ESP3D::get_min_string_size(ESP_NOTIFICATION_TOKEN2)); output->print ("\"}"); //Notifications Settings @@ -391,7 +379,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print (Settings_ESP3D::read_string(ESP_NOTIFICATION_SETTINGS)); output->print ("\",\"S\":\""); output->print (Settings_ESP3D::get_max_string_size(ESP_NOTIFICATION_SETTINGS)); - output->print ("\",\"H\":\"Notifications Settings\",\"M\":\""); + output->print ("\",\"H\":\"ts\",\"M\":\""); output->print (Settings_ESP3D::get_min_string_size(ESP_NOTIFICATION_SETTINGS)); output->print ("\"}"); #endif //NOTIFICATION_FEATURE @@ -401,7 +389,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, 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 ("\",\"H\":\"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)); @@ -413,7 +401,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, 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\"}]}"); + output->print ("\",\"H\":\"buzzer\",\"O\":[{\"no\":\"0\"},{\"yes\":\"1\"}]}"); #endif //BUZZER_DEVICE #ifdef DHT_DEVICE @@ -422,9 +410,9 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, 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 ("\",\"H\":\"type\",\"O\":[{\"none\":\"0\"},{\"11\":\""); output->print (DHT11_DEVICE); - output->print ("\"},{\"DHT22\":\""); + output->print ("\"},{\"22\":\""); output->print (DHT22_DEVICE); output->print ("\"}]}"); @@ -433,7 +421,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, 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 ("\",\"H\":\"intervalms\",\"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)); @@ -446,32 +434,32 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_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\"}]}"); + output->print("\",\"H\":\"type\",\"O\":[{\"none\":\"0\"},{\"direct\":\"1\"},{\"dhared\":\"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\"}]}"); + output->print("\",\"H\":\"speedx\",\"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\":\"system\",\"F2\":\"system\",\"P\":\""); output->print (ESP_TARGET_FW); output->print ("\",\"T\":\"B\",\"V\":\""); output->print (Settings_ESP3D::read_byte(ESP_TARGET_FW)); - output->print ("\",\"H\":\"Target FW\",\"O\":[{\"Repetier\":\""); + output->print ("\",\"H\":\"targetfw\",\"O\":[{\"repetier\":\""); output->print (REPETIER); - output->print ("\"},{\"Repetier for Davinci\":\""); + output->print ("\"},{\"repetier4davinci\":\""); output->print (REPETIER4DV); - output->print ("\"},{\"Marlin\":\""); + output->print ("\"},{\"marlin\":\""); output->print (MARLIN); - output->print ("\"},{\"Marlin Kimbra\":\""); + output->print ("\"},{\"marlinkimbra\":\""); output->print (MARLINKIMBRA); - output->print ("\"},{\"Smoothieware\":\""); + output->print ("\"},{\"smoothieware\":\""); output->print (SMOOTHIEWARE); - output->print ("\"},{\"Grbl\":\""); + output->print ("\"},{\"grbl\":\""); output->print (GRBL); - output->print ("\"},{\"Unknown\":\""); + output->print ("\"},{\"unknown\":\""); output->print (UNKNOWN_FW); output->print ("\"}]}"); //Baud Rate @@ -479,7 +467,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, 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\":["); + output->print ("\",\"H\":\"baud\",\"O\":["); uint8_t count = 0; const long *bl = serial_service.get_baudratelist(&count); for (uint8_t i = 0 ; i < count ; i++) { @@ -494,7 +482,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print (ESP_BOOT_DELAY); output->print ("\",\"T\":\"I\",\"V\":\""); output->print (Settings_ESP3D::read_uint32(ESP_BOOT_DELAY)); - output->print ("\",\"H\":\"Start delay\",\"S\":\""); + output->print ("\",\"H\":\"bootdelay\",\"S\":\""); output->print (Settings_ESP3D::get_max_int32_value(ESP_BOOT_DELAY)); output->print ("\",\"M\":\""); output->print (Settings_ESP3D::get_min_int32_value(ESP_BOOT_DELAY)); @@ -504,19 +492,19 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print (ESP_OUTPUT_FLAG); output->print ("\",\"T\":\"F\",\"V\":\""); output->print (Settings_ESP3D::read_byte(ESP_TARGET_FW)); - output->printf ("\",\"H\":\"Output msg\",\"O\":[{\"M117\":\"%d\"}", ESP_PRINTER_LCD_CLIENT); + output->printf ("\",\"H\":\"outputmsg\",\"O\":[{\"M117\":\"%d\"}", ESP_PRINTER_LCD_CLIENT); #ifdef DISPLAY_DEVICE - output->printf (",{\"Screen\":\"%d\"}", ESP_SCREEN_CLIENT); + output->printf (",{\"screen\":\"%d\"}", ESP_SCREEN_CLIENT); #endif //DISPLAY_DEVICE - output->printf (",{\"Serial\":\"%d\"}", ESP_SERIAL_CLIENT); + output->printf (",{\"serial\":\"%d\"}", ESP_SERIAL_CLIENT); #ifdef WS_DATA_FEATURE - output->printf (",{\"Web Socket\":\"%d\"}", ESP_WEBSOCKET_CLIENT); + output->printf (",{\"ws\":\"%d\"}", ESP_WEBSOCKET_CLIENT); #endif //WS_DATA_FEATURE #ifdef BLUETOOTH_FEATURE - output->printf (",{\"Bluetooth\":\"%d\"}", ESP_BT_CLIENT); + output->printf (",{\"bt\":\"%d\"}", ESP_BT_CLIENT); #endif //BLUETOOTH_FEATURE #ifdef TELNET_FEATURE - output->printf (",{\"Telnet\":\"%d\"}", ESP_TELNET_CLIENT); + output->printf (",{\"telnet\":\"%d\"}", ESP_TELNET_CLIENT); #endif //TELNET_FEATURE output->print ("]}"); diff --git a/esp3d/src/core/espcmd/ESP420.cpp b/esp3d/src/core/espcmd/ESP420.cpp index 7180980f..28a2ff39 100644 --- a/esp3d/src/core/espcmd/ESP420.cpp +++ b/esp3d/src/core/espcmd/ESP420.cpp @@ -93,7 +93,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print ("{\"id\":\""); } - output->print ("Chip ID"); + output->print ("chip id"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -109,7 +109,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("CPU Frequency"); + output->print ("CPU Freq"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -126,13 +126,13 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("CPU Temperature"); + output->print ("CPU Temp"); if (!plain) { output->print ("\",\"value\":\""); } else { output->print (": "); } - output->printf("%s %s",String (Hal::temperature(), 1).c_str(), (output->client() == ESP_HTTP_CLIENT)?"°C":"C"); + output->printf("%s C",String (Hal::temperature(), 1).c_str()); if (!plain) { output->print ("\"}"); } else { @@ -143,7 +143,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Free memory"); + output->print ("free mem"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -175,7 +175,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Flash Size"); + output->print ("flash size"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -193,7 +193,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Available Size for update"); + output->print ("size for update"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -211,7 +211,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Filesystem type"); + output->print ("FS type"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -227,7 +227,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Filesystem usage"); + output->print ("FS usage"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -246,7 +246,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Baud rate"); + output->print ("baud"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -264,7 +264,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Sleep mode"); + output->print ("sleep mode"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -283,13 +283,13 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("WiFi"); + output->print ("wifi"); if (!plain) { output->print ("\",\"value\":\""); } else { output->print (": "); } - output->print ((WiFi.getMode() == WIFI_OFF)?"Disabled":"Enabled"); + output->print ((WiFi.getMode() == WIFI_OFF)?"OFF":"ON"); if (!plain) { output->print ("\"}"); } else { @@ -300,13 +300,13 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Ethernet"); + output->print ("ethernet"); if (!plain) { output->print ("\",\"value\":\""); } else { output->print (": "); } - output->print ((EthConfig::started())?"Enabled":"Disabled"); + output->print ((EthConfig::started())?"ON":"OFF"); if (!plain) { output->print ("\"}"); } else { @@ -318,13 +318,13 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print("Bluetooth"); + output->print("bt"); if (!plain) { output->print ("\",\"value\":\""); } else { output->print (": "); } - output->print ((bt_service.started())?"Enabled":"Disabled"); + output->print ((bt_service.started())?"ONN":"OFF"); if (!plain) { output->print ("\"}"); } else { @@ -335,7 +335,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Hostname"); + output->print ("hostname"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -410,7 +410,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Ftp ports (ctrl, active, passive)"); + output->print ("Ftp ports"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -504,15 +504,14 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Current BT mode"); + output->print ("bt"); if (!plain) { output->print ("\",\"value\":\""); } else { output->print (": "); } - output->print ("Serial ("); output->print (BTService::macAddress()); - output->print(")"); + if (!plain) { output->print ("\"}"); } else { @@ -528,7 +527,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, } else { output->print (": "); } - output->print ((bt_service.isConnected())?"Connected":"Disconnected"); + output->print ((bt_service.isConnected())?"connected":"disconnected"); if (bt_service.isConnected()) { output->print (" (client: "); output->print (BTService::clientmacAddress()); @@ -547,15 +546,13 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Current Ethernet mode"); + output->print ("ethernet"); if (!plain) { output->print ("\",\"value\":\""); } else { output->print (": "); } - output->print ("Client("); output->print (ETH.macAddress().c_str()); - output->printLN(")"); if (!plain) { output->print ("\"}"); } else { @@ -565,13 +562,13 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Ethernet cable"); + output->print ("cable"); if (!plain) { output->print ("\",\"value\":\""); } else { output->print (": "); } - output->print ((ETH.linkUp())?"Connected":"Disconnected"); + output->print ((ETH.linkUp())?"connected":"disconnected"); if(ETH.linkUp()) { output->print (" ("); output->print (ETH.linkSpeed()); @@ -586,13 +583,13 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("IP Mode"); + output->print ("ip mode"); if (!plain) { output->print ("\",\"value\":\""); } else { output->print (": "); } - output->print ((NetConfig::isIPModeDHCP(ESP_ETH_STA))?"DHCP":"Static"); + output->print ((NetConfig::isIPModeDHCP(ESP_ETH_STA))?"dhcp":"static"); if (!plain) { output->print ("\"}"); } else { @@ -602,7 +599,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("IP"); + output->print ("ip"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -618,7 +615,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Gateway"); + output->print ("gw"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -634,7 +631,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Mask"); + output->print ("msk"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -670,30 +667,46 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Current WiFi Mode"); + if (WiFi.getMode() == WIFI_STA) { + output->print ("sta"); + } else if (WiFi.getMode() == WIFI_AP) { + output->print ("ap"); + } else if (WiFi.getMode() == WIFI_AP_STA) { //we should not be in this state but just in case .... + output->print ("mixed"); + } else { + output->print ("unknown"); + } + + if (!plain) { + output->print ("\",\"value\":\""); + } else { + output->print (": "); + } + output->print ("ON"); + if (!plain) { + output->print ("\"}"); + } else { + output->printLN(""); + } + + //WiFi mac + if (!plain) { + output->print (",{\"id\":\""); + } + output->print ("mac"); if (!plain) { output->print ("\",\"value\":\""); } else { output->print (": "); } if (WiFi.getMode() == WIFI_STA) { - output->print ("STA ("); output->print ( WiFi.macAddress().c_str()); - output->print (")"); } else if (WiFi.getMode() == WIFI_AP) { - output->print ("AP ("); output->print (WiFi.softAPmacAddress().c_str()); - output->print (")"); } else if (WiFi.getMode() == WIFI_AP_STA) { //we should not be in this state but just in case .... - output->print ("Mixed"); - output->printLN(""); - output->print ("STA ("); output->print (WiFi.macAddress().c_str()); - output->print (")"); - output->printLN(""); - output->print ("AP ("); + output->print ("/"); output->print (WiFi.softAPmacAddress().c_str()); - output->print (")"); } else { output->print ("???"); } @@ -702,13 +715,14 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, } else { output->printLN(""); } + //WiFi Station if (WiFi.getMode() == WIFI_STA) { //Connected to SSID if (!plain) { output->print (",{\"id\":\""); } - output->print ("Connected to"); + output->print ("SSID"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -727,7 +741,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Signal"); + output->print ("signal"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -743,7 +757,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Phy Mode"); + output->print ("phy mode"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -759,7 +773,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Channel"); + output->print ("channel"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -775,13 +789,13 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("IP Mode"); + output->print ("ip mode"); if (!plain) { output->print ("\",\"value\":\""); } else { output->print (": "); } - output->print ((NetConfig::isIPModeDHCP(ESP_WIFI_STA))?"DHCP":"Static"); + output->print ((NetConfig::isIPModeDHCP(ESP_WIFI_STA))?"dhcp":"static"); if (!plain) { output->print ("\"}"); } else { @@ -791,7 +805,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("IP"); + output->print ("ip"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -807,7 +821,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Gateway"); + output->print ("gw"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -823,7 +837,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Mask"); + output->print ("msk"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -856,15 +870,30 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Disabled Mode"); + output->print ("ap"); + + if (!plain) { + output->print ("\",\"value\":\""); + } else { + output->print (": "); + } + output->print ("OFF"); + if (!plain) { + output->print ("\"}"); + } else { + output->printLN(""); + } + //Disabled Mode + if (!plain) { + output->print (",{\"id\":\""); + } + output->print ("mac"); if (!plain) { output->print ("\",\"value\":\""); } else { output->print (": "); } - output->print ("AP ("); output->print (WiFi.softAPmacAddress().c_str()); - output->print (")"); if (!plain) { output->print ("\"}"); } else { @@ -891,13 +920,13 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Visible"); + output->print ("visible"); if (!plain) { output->print ("\",\"value\":\""); } else { output->print (": "); } - output->print ((WiFiConfig::is_AP_visible()) ? "Yes" : "No"); + output->print ((WiFiConfig::is_AP_visible()) ? "yes" : "no"); if (!plain) { output->print ("\"}"); } else { @@ -907,7 +936,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Authentication"); + output->print ("authentication"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -929,7 +958,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, } else { output->print (": "); } - output->print ((NetConfig::isDHCPServer (ESP_WIFI_AP))?"Started":"Stopped"); + output->print ((NetConfig::isDHCPServer (ESP_WIFI_AP))?"ON":"OFF"); if (!plain) { output->print ("\"}"); } else { @@ -939,7 +968,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("IP"); + output->print ("ip"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -955,7 +984,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Gateway"); + output->print ("gw"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -971,7 +1000,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Mask"); + output->print ("msk"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -990,7 +1019,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Connected clients"); + output->print ("clients"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -1007,7 +1036,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->printf ("Client %d",i); + output->printf ("# %d",i); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -1026,20 +1055,36 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Disabled Mode"); + output->print ("sta"); + if (!plain) { output->print ("\",\"value\":\""); } else { output->print (": "); } - output->print ("STA ("); - output->print (WiFi.macAddress().c_str()); - output->print (")"); + output->print ("OFF"); if (!plain) { output->print ("\"}"); } else { output->printLN(""); } + //Disabled Mode + if (!plain) { + output->print (",{\"id\":\""); + } + output->print ("mac"); + if (!plain) { + output->print ("\",\"value\":\""); + } else { + output->print (": "); + } + output->print (WiFi.macAddress().c_str()); + if (!plain) { + output->print ("\"}"); + } else { + output->printLN(""); + } + } } #endif //WIFI_FEATURE @@ -1048,13 +1093,13 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Time client"); + output->print ("i-time"); if (!plain) { output->print ("\",\"value\":\""); } else { output->print (": "); } - output->print (timeserver.started()?"Started":"Disabled"); + output->print (timeserver.started()?"ON":"OFF"); if (!plain) { output->print ("\"}"); } else { @@ -1064,13 +1109,13 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Serial communication"); + output->print ("serial"); if (!plain) { output->print ("\",\"value\":\""); } else { output->print (": "); } - output->print (serial_service.started()?"Enabled":"Disabled"); + output->print (serial_service.started()?"ON":"OFF"); if (!plain) { output->print ("\"}"); } else { @@ -1080,13 +1125,13 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Notification"); + output->print ("notification"); if (!plain) { output->print ("\",\"value\":\""); } else { output->print (": "); } - output->print (notificationsservice.started()?"Enabled":"Disabled"); + output->print (notificationsservice.started()?"ON":"OFF"); if (notificationsservice.started()) { output->print ("("); output->print (notificationsservice.getTypeString()); @@ -1102,13 +1147,13 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("SD Card"); + output->print ("sd"); if (!plain) { output->print ("\",\"value\":\""); } else { output->print (": "); } - output->print ((Settings_ESP3D::GetSDDevice() == ESP_DIRECT_SD)?"Direct":(Settings_ESP3D::GetSDDevice() == ESP_SHARED_SD)?"Shared":"None"); + output->print ((Settings_ESP3D::GetSDDevice() == ESP_DIRECT_SD)?"direct":(Settings_ESP3D::GetSDDevice() == ESP_SHARED_SD)?"shared":"none"); output->print ("("); output->print (ESP_SD::FilesystemName()); output->print (")"); @@ -1122,13 +1167,13 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("DHT sensor"); + output->print ("dht"); if (!plain) { output->print ("\",\"value\":\""); } else { output->print (": "); } - output->print (esp3d_DHT.started()?"Enabled":"Disabled"); + output->print (esp3d_DHT.started()?"ON":"OFF"); output->print ("("); output->print (esp3d_DHT.GetModelString()); output->print (")"); @@ -1142,13 +1187,13 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Buzzer"); + output->print ("buzzer"); if (!plain) { output->print ("\",\"value\":\""); } else { output->print (": "); } - output->print (esp3d_buzzer.started()?"Enabled":"Disabled"); + output->print (esp3d_buzzer.started()?"ON":"OFF"); if (!plain) { output->print ("\"}"); } else { @@ -1160,7 +1205,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("Debug"); + output->print ("debug"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -1191,7 +1236,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, if (!plain) { output->print (",{\"id\":\""); } - output->print ("FW version"); + output->print ("FW ver"); if (!plain) { output->print ("\",\"value\":\""); } else { @@ -1207,7 +1252,7 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type, output->print (",{\"id\":\""); } //FW architecture - output->print ("FW architecture"); + output->print ("FW arch"); if (!plain) { output->print ("\",\"value\":\""); } else { diff --git a/esp3d/src/core/espcmd/ESP800.cpp b/esp3d/src/core/espcmd/ESP800.cpp index 0177a021..d8393839 100644 --- a/esp3d/src/core/espcmd/ESP800.cpp +++ b/esp3d/src/core/espcmd/ESP800.cpp @@ -107,7 +107,7 @@ bool Commands::ESP800(const char* cmd_params, level_authenticate_type auth_type, } else if (Settings_ESP3D::GetSDDevice() == ESP_SHARED_SD) { output->print("shared"); } else { - output->print("None"); + output->print("none"); } if(plain) { output->printLN(""); @@ -235,7 +235,7 @@ bool Commands::ESP800(const char* cmd_params, level_authenticate_type auth_type, #if defined(FILESYSTEM_FEATURE) output->print(ESP_FileSystem::FilesystemName()); #else - output->print("None"); + output->print("none"); #endif //FILESYSTEM_FEATURE if(plain) { output->printLN(""); @@ -251,7 +251,7 @@ bool Commands::ESP800(const char* cmd_params, level_authenticate_type auth_type, #ifdef TIMESTAMP_FEATURE output->print(tparm.c_str()); #else - output->print("None"); + output->print("none"); #endif //TIMESTAMP_FEATURE if(plain) { output->printLN(""); diff --git a/esp3d/src/include/version.h b/esp3d/src/include/version.h index d18c153c..8039c3ef 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.a28" +#define FW_VERSION "3.0.0.a29" #define REPOSITORY "https://github.com/luc-github/ESP3D" #endif //_VERSION_ESP3D_H diff --git a/esp3d/src/modules/notifications/notifications_service.cpp b/esp3d/src/modules/notifications/notifications_service.cpp index 8bbd3b0f..86bdc149 100644 --- a/esp3d/src/modules/notifications/notifications_service.cpp +++ b/esp3d/src/modules/notifications/notifications_service.cpp @@ -138,15 +138,15 @@ const char * NotificationsService::getTypeString() { switch(_notificationType) { case ESP_PUSHOVER_NOTIFICATION: - return "Pushover"; + return "pushover"; case ESP_EMAIL_NOTIFICATION: - return "Email"; + return "email"; case ESP_LINE_NOTIFICATION: - return "Line"; + return "line"; default: break; } - return "None"; + return "none"; } bool NotificationsService::sendMSG(const char * title, const char * message) diff --git a/esp3d/src/modules/wifi/wificonfig.cpp b/esp3d/src/modules/wifi/wificonfig.cpp index 47dd6c61..d2c7f8b3 100644 --- a/esp3d/src/modules/wifi/wificonfig.cpp +++ b/esp3d/src/modules/wifi/wificonfig.cpp @@ -330,21 +330,21 @@ const char* WiFiConfig::getSleepModeString () { #ifdef ARDUINO_ARCH_ESP32 if (WiFi.getSleep()) { - return "Modem"; + return "modem"; } else { - return "None"; + return "none"; } #endif //ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP8266 WiFiSleepType_t ps_type = WiFi.getSleepMode(); if (ps_type == WIFI_NONE_SLEEP) { - return "None"; + return "none"; } else if (ps_type == WIFI_LIGHT_SLEEP) { - return "Light"; + return "light"; } else if (ps_type == WIFI_MODEM_SLEEP) { - return "Modem"; + return "modem"; } else { - return "???"; + return "unknown"; } #endif //ARDUINO_ARCH_ESP8266 } @@ -366,7 +366,7 @@ const char* WiFiConfig::getPHYModeString (uint8_t wifimode) } else if (PhyMode == (WIFI_PHY_MODE_11N) ) { return "11n"; } else { - return "???"; + return "unknown"; } } @@ -415,7 +415,7 @@ const char * WiFiConfig::AP_Auth_String() mode = apconfig.authmode; #endif //ARDUINO_ARCH_ESP8266 if (mode == AUTH_OPEN) { - return "None"; + return "none"; } else if (mode == AUTH_WEP) { return "WEP"; } else if (mode == AUTH_WPA_PSK) {