diff --git a/esp3d/src/core/espcmd/ESP400.cpp b/esp3d/src/core/espcmd/ESP400.cpp index 8787fa8d..8ac16897 100644 --- a/esp3d/src/core/espcmd/ESP400.cpp +++ b/esp3d/src/core/espcmd/ESP400.cpp @@ -41,7 +41,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, #if defined (WIFI_FEATURE) || defined (ETH_FEATURE) || defined(BT_FEATURE) //Hostname network/network - output->print ("{\"F\":\"network\",\"F2\":\"network\",\"P\":\""); + output->print ("{\"F\":\"networ/network\",\"P\":\""); output->print (ESP_HOSTNAME); output->print ("\",\"T\":\"S\",\"V\":\""); output->print (Settings_ESP3D::read_string(ESP_HOSTNAME)); @@ -52,7 +52,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print ("\"}"); #endif //WIFI_FEATURE || ETH_FEATURE || BT_FEATURE //radio mode network/network - output->print (",{\"F\":\"network\",\"F2\":\"network\",\"P\":\""); + output->print (",{\"F\":\"network/network\",\"P\":\""); output->print (ESP_RADIO_MODE); output->print ("\",\"T\":\"B\",\"V\":\""); output->print (Settings_ESP3D::read_byte(ESP_RADIO_MODE)); @@ -69,7 +69,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print ("]}"); #ifdef WIFI_FEATURE //STA SSID network/sta - output->print (",{\"F\":\"network\",\"F2\":\"sta\",\"P\":\""); + output->print (",{\"F\":\"network/sta\",\"P\":\""); output->print (ESP_STA_SSID); output->print ("\",\"T\":\"S\",\"V\":\""); output->print (Settings_ESP3D::read_string(ESP_STA_SSID)); @@ -80,7 +80,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print ("\"}"); //STA password - output->print (",{\"F\":\"network\",\"F2\":\"sta\",\"P\":\""); + output->print (",{\"F\":\"network/sta\",\"P\":\""); output->print (ESP_STA_PASSWORD); output->print ("\",\"T\":\"S\",\"N\":\"1\",\"V\":\""); output->print (HIDDEN_PASSWORD); @@ -93,28 +93,28 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, #endif //WIFI_FEATURE #if defined(WIFI_FEATURE) || defined(ETH_FEATURE) //STA IP mode - output->print (",{\"F\":\"network\",\"F2\":\"sta\",\"P\":\""); + output->print (",{\"F\":\"network/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\":\"ip mode\",\"O\":[{\"dhcp\":\"1\"},{\"static\":\"0\"}]}"); //STA static IP - output->print (",{\"F\":\"network\",\"F2\":\"sta\",\"P\":\""); + output->print (",{\"F\":\"network/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\":\"ip\"}"); //STA static Gateway - output->print (",{\"F\":\"network\",\"F2\":\"sta\",\"P\":\""); + output->print (",{\"F\":\"network/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\":\"gw\"}"); //STA static Mask - output->print (",{\"F\":\"network\",\"F2\":\"sta\",\"P\":\""); + output->print (",{\"F\":\"network/sta\",\"P\":\""); output->print (ESP_STA_MASK_VALUE); output->print ("\",\"T\":\"A\",\"V\":\""); output->print (Settings_ESP3D::read_IP_String(ESP_STA_MASK_VALUE)); @@ -122,7 +122,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, #endif //WIFI_FEATURE || ETH_FEATURE #if defined(WIFI_FEATURE) //AP SSID network/ap - output->print (",{\"F\":\"network\",\"F2\":\"ap\",\"P\":\""); + output->print (",{\"F\":\"network/ap\",\"P\":\""); output->print (ESP_AP_SSID); output->print ("\",\"T\":\"S\",\"V\":\""); output->print (Settings_ESP3D::read_string(ESP_AP_SSID)); @@ -133,7 +133,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print ("\"}"); //AP password - output->print (",{\"F\":\"network\",\"F2\":\"ap\",\"P\":\""); + output->print (",{\"F\":\"network/ap\",\"P\":\""); output->print (ESP_AP_PASSWORD); output->print ("\",\"T\":\"S\",\"N\":\"1\",\"V\":\""); output->print (HIDDEN_PASSWORD); @@ -144,14 +144,14 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print ("\"}"); //AP static IP - output->print (",{\"F\":\"network\",\"F2\":\"ap\",\"P\":\""); + output->print (",{\"F\":\"network/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\":\"ip\"}"); //AP Channel - output->print (",{\"F\":\"network\",\"F2\":\"ap\",\"P\":\""); + output->print (",{\"F\":\"network/ap\",\"P\":\""); output->print (ESP_AP_CHANNEL); output->print ("\",\"T\":\"B\",\"V\":\""); output->print (Settings_ESP3D::read_byte(ESP_AP_CHANNEL)); @@ -167,7 +167,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, #ifdef AUTHENTICATION_FEATURE //Admin password - output->print (",{\"F\":\"security\",\"F2\":\"security\",\"P\":\""); + output->print (",{\"F\":\"security/security\",\"P\":\""); output->print (ESP_ADMIN_PWD); output->print ("\",\"T\":\"S\",\"V\":\""); output->print (HIDDEN_PASSWORD); @@ -178,7 +178,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print ("\"}"); //User password - output->print (",{\"F\":\"security\",\"F2\":\"security\",\"P\":\""); + output->print (",{\"F\":\"security/security\",\"P\":\""); output->print (ESP_USER_PWD); output->print ("\",\"T\":\"S\",\"V\":\""); output->print (HIDDEN_PASSWORD); @@ -191,14 +191,14 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, #ifdef HTTP_FEATURE //HTTP On service/http - output->print (",{\"F\":\"service\",\"F2\":\"http\",\"P\":\""); + output->print (",{\"F\":\"service/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\",\"O\":[{\"no\":\"0\"},{\"yes\":\"1\"}]}"); //HTTP Port - output->print (",{\"F\":\"service\",\"F2\":\"http\",\"P\":\""); + output->print (",{\"F\":\"service/http\",\"P\":\""); output->print (ESP_HTTP_PORT); output->print ("\",\"T\":\"I\",\"V\":\""); output->print (Settings_ESP3D::read_uint32(ESP_HTTP_PORT)); @@ -211,14 +211,14 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, #ifdef TELNET_FEATURE //TELNET On service/telnet - output->print (",{\"F\":\"service\",\"F2\":\"telnetp\",\"P\":\""); + output->print (",{\"F\":\"service/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\",\"O\":[{\"no\":\"0\"},{\"yes\":\"1\"}]}"); //TELNET Port - output->print (",{\"F\":\"service\",\"F2\":\"telnetp\",\"P\":\""); + output->print (",{\"F\":\"service/telnetp\",\"P\":\""); output->print (ESP_TELNET_PORT); output->print ("\",\"T\":\"I\",\"V\":\""); output->print (Settings_ESP3D::read_uint32(ESP_TELNET_PORT)); @@ -231,14 +231,14 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, #ifdef FTP_FEATURE //FTP On service/ftp - output->print (",{\"F\":\"service\",\"F2\":\"ftp\",\"P\":\""); + output->print (",{\"F\":\"service/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\",\"O\":[{\"no\":\"0\"},{\"yes\":\"1\"}]}"); //FTP Ports - output->print (",{\"F\":\"service\",\"F2\":\"ftp\",\"P\":\""); + output->print (",{\"F\":\"service/ftp\",\"P\":\""); output->print (ESP_FTP_CTRL_PORT); output->print ("\",\"T\":\"I\",\"V\":\""); output->print (Settings_ESP3D::read_uint32(ESP_FTP_CTRL_PORT)); @@ -248,7 +248,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\":\"service\",\"F2\":\"ftp\",\"P\":\""); + output->print (",{\"F\":\"service/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)); @@ -258,7 +258,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\":\"service\",\"F2\":\"ftp\",\"P\":\""); + output->print (",{\"F\":\"service/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,14 +272,14 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, #ifdef TIMESTAMP_FEATURE //Internet Time - output->print (",{\"F\":\"service\",\"F2\":\"time\",\"P\":\""); + output->print (",{\"F\":\"service/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\":\"i-time\",\"O\":[{\"no\":\"0\"},{\"yes\":\"1\"}]}"); //Time zone - output->print (",{\"F\":\"service\",\"F2\":\"time\",\"P\":\""); + output->print (",{\"F\":\"service/time\",\"P\":\""); output->print (ESP_TIMEZONE); output->print("\",\"T\":\"B\",\"V\":\""); output->print ((int8_t)Settings_ESP3D::read_byte(ESP_TIMEZONE)); @@ -293,14 +293,14 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print("]}"); //DST - output->print (",{\"F\":\"service\",\"F2\":\"time\",\"P\":\""); + output->print (",{\"F\":\"service/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\":\"dst\",\"O\":[{\"no\":\"0\"},{\"yes\":\"1\"}]}"); //Time Server1 - output->print (",{\"F\":\"service\",\"F2\":\"time\",\"P\":\""); + output->print (",{\"F\":\"service/time\",\"P\":\""); output->print (ESP_TIME_SERVER1); output->print("\",\"T\":\"S\",\"V\":\""); output->print (Settings_ESP3D::read_string(ESP_TIME_SERVER1)); @@ -311,7 +311,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print ("\"}"); //27- Time Server2 - output->print (",{\"F\":\"service\",\"F2\":\"time\",\"P\":\""); + output->print (",{\"F\":\"service/time\",\"P\":\""); output->print (ESP_TIME_SERVER2); output->print("\",\"T\":\"S\",\"V\":\""); output->print (Settings_ESP3D::read_string(ESP_TIME_SERVER2)); @@ -322,7 +322,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print ("\"}"); //28- Time Server3 - output->print (",{\"F\":\"service\",\"F2\":\"time\",\"P\":\""); + output->print (",{\"F\":\"service/time\",\"P\":\""); output->print (ESP_TIME_SERVER3); output->print("\",\"T\":\"S\",\"V\":\""); output->print (Settings_ESP3D::read_string(ESP_TIME_SERVER3)); @@ -335,13 +335,13 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, #ifdef NOTIFICATION_FEATURE //Auto notification - output->print (",{\"F\":\"service\",\"F2\":\"notification\",\"P\":\""); + output->print (",{\"F\":\"service/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 notif\",\"O\":[{\"no\":\"0\"},{\"yes\":\"1\"}]}"); //Notification type - output->print (",{\"F\":\"service\",\"F2\":\"notification\",\"P\":\""); + output->print (",{\"F\":\"service/notification\",\"P\":\""); output->print (ESP_NOTIFICATION_TYPE); output->print ("\",\"T\":\"B\",\"V\":\""); output->print (Settings_ESP3D::read_byte(ESP_NOTIFICATION_TYPE)); @@ -355,7 +355,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print (ESP_TELEGRAM_NOTIFICATION); output->print ("\"}]}"); //Token 1 - output->print (",{\"F\":\"service\",\"F2\":\"notification\",\"P\":\""); + output->print (",{\"F\":\"service/notification\",\"P\":\""); output->print (ESP_NOTIFICATION_TOKEN1); output->print ("\",\"T\":\"S\",\"V\":\""); output->print (HIDDEN_PASSWORD); @@ -365,7 +365,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\":\"service\",\"F2\":\"notification\",\"P\":\""); + output->print (",{\"F\":\"service/notification\",\"P\":\""); output->print (ESP_NOTIFICATION_TOKEN2); output->print ("\",\"T\":\"S\",\"V\":\""); output->print (HIDDEN_PASSWORD); @@ -375,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_TOKEN2)); output->print ("\"}"); //Notifications Settings - output->print (",{\"F\":\"service\",\"F2\":\"notification\",\"P\":\""); + output->print (",{\"F\":\"service/notification\",\"P\":\""); output->print (ESP_NOTIFICATION_SETTINGS); output->print ("\",\"T\":\"S\",\"V\":\""); output->print ((strlen(Settings_ESP3D::read_string(ESP_NOTIFICATION_SETTINGS))==0)?" ":Settings_ESP3D::read_string(ESP_NOTIFICATION_SETTINGS)); @@ -387,7 +387,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, #endif //NOTIFICATION_FEATURE #ifdef CAMERA_DEVICE //Camera Port - output->print (",{\"F\":\"device\",\"F2\":\"camera\",\"P\":\""); + output->print (",{\"F\":\"device/camera\",\"P\":\""); output->print (ESP_CAMERA_PORT); output->print ("\",\"T\":\"I\",\"V\":\""); output->print (Settings_ESP3D::read_uint32(ESP_CAMERA_PORT)); @@ -399,7 +399,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, #endif //CAMERA_DEVICE #ifdef BUZZER_DEVICE //Buzzer state - output->print (",{\"F\":\"device\",\"F2\":\"device\",\"P\":\""); + output->print (",{\"F\":\"device/device\",\"P\":\""); output->print (ESP_BUZZER); output->print ("\",\"T\":\"B\",\"V\":\""); output->print (Settings_ESP3D::read_byte(ESP_BUZZER)); @@ -408,7 +408,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, #ifdef DHT_DEVICE //DHT type - output->print (",{\"F\":\"device\",\"F2\":\"dht\",\"P\":\""); + output->print (",{\"F\":\"device/dht\",\"P\":\""); output->print (ESP_DHT_TYPE); output->print ("\",\"T\":\"B\",\"V\":\""); output->print (Settings_ESP3D::read_byte(ESP_DHT_TYPE)); @@ -419,7 +419,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print ("\"}]}"); //DHT interval - output->print (",{\"F\":\"device\",\"F2\":\"dht\",\"P\":\""); + output->print (",{\"F\":\"device/dht\",\"P\":\""); output->print (ESP_DHT_INTERVAL); output->print ("\",\"T\":\"I\",\"V\":\""); output->print (Settings_ESP3D::read_uint32(ESP_DHT_INTERVAL)); @@ -431,21 +431,21 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, #endif //DHT_DEVICE #ifdef SD_DEVICE //Direct SD - output->print(",{\"F\":\"device\",\"F2\":\"sd\",\"P\":\""); + output->print(",{\"F\":\"device/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\":\"type\",\"O\":[{\"none\":\"0\"},{\"direct\":\"1\"},{\"dhared\":\"2\"}]}"); //SPI SD Divider - output->print(",{\"F\":\"device\",\"F2\":\"sd\",\"P\":\""); + output->print(",{\"F\":\"device/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\":\"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 (",{\"F\":\"system/system\",\"P\":\""); output->print (ESP_TARGET_FW); output->print ("\",\"T\":\"B\",\"V\":\""); output->print (Settings_ESP3D::read_byte(ESP_TARGET_FW)); @@ -465,7 +465,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print (UNKNOWN_FW); output->print ("\"}]}"); //Baud Rate - output->print (",{\"F\":\"system\",\"F2\":\"system\",\"P\":\""); + output->print (",{\"F\":\"system/system\",\"P\":\""); output->print (ESP_BAUD_RATE); output->print ("\",\"T\":\"I\",\"V\":\""); output->print (Settings_ESP3D::read_uint32(ESP_BAUD_RATE)); @@ -480,7 +480,7 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, } output->print ("]}"); //Start delay - output->print (",{\"F\":\"system\",\"F2\":\"system\",\"P\":\""); + output->print (",{\"F\":\"system/system\",\"P\":\""); output->print (ESP_BOOT_DELAY); output->print ("\",\"T\":\"I\",\"V\":\""); output->print (Settings_ESP3D::read_uint32(ESP_BOOT_DELAY)); @@ -490,7 +490,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\":\"system\",\"F2\":\"system\",\"P\":\""); + output->print (",{\"F\":\"system/system\",\"P\":\""); output->print (ESP_OUTPUT_FLAG); output->print ("\",\"T\":\"F\",\"V\":\""); output->print (Settings_ESP3D::read_byte(ESP_OUTPUT_FLAG)); diff --git a/esp3d/src/include/version.h b/esp3d/src/include/version.h index 221780d0..2fc59ad0 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.a37" +#define FW_VERSION "3.0.0.a38" #define REPOSITORY "https://github.com/luc-github/ESP3D/tree/3.0" #endif //_VERSION_ESP3D_H