From 629f94981ba7c49346877f6dd6e057f14835a72a Mon Sep 17 00:00:00 2001 From: Julien Staub Date: Thu, 2 Jun 2022 04:28:40 +0200 Subject: [PATCH] add spaces in commands because they are needed (#770) --- esp3d/command.cpp | 12 ++--- wiki/docs/Commands2_0.txt | 44 +++++++++--------- wiki/docs/Commands2_1.txt | 43 ++++++++---------- wiki/docs/Commands3.txt | 96 +++++++++++++++++++-------------------- 4 files changed, 95 insertions(+), 100 deletions(-) diff --git a/esp3d/command.cpp b/esp3d/command.cpp index 00883efb..ccfa195b 100644 --- a/esp3d/command.cpp +++ b/esp3d/command.cpp @@ -760,7 +760,7 @@ bool COMMAND::execute_command (int cmd, String cmd_params, tpipe output, level_a ESPCOM::println (String(v).c_str(), output, espresponse); } break; - + //Get full EEPROM settings content //[ESP400] case 400: { @@ -1303,8 +1303,8 @@ bool COMMAND::execute_command (int cmd, String cmd_params, tpipe output, level_a ESPCOM::print ( (const char *) CONFIG::intTostr (bbuf), output, espresponse); } ESPCOM::print (F ("\",\"H\":\"Auto notification\",\"O\":[{\"No\":\"0\"},{\"Yes\":\"1\"}]}"), output, espresponse); - - + + #endif //NOTIFICATION_FEATURE } @@ -1597,7 +1597,7 @@ bool COMMAND::execute_command (int cmd, String cmd_params, tpipe output, level_a break; //Set ESP mode //cmd is RESET, SAFEMODE, RESTART - //[ESP444]pwd= + //[ESP444] pwd= case 444: parameter = get_param (cmd_params, "", true); #ifdef AUTHENTICATION_FEATURE @@ -1667,7 +1667,7 @@ bool COMMAND::execute_command (int cmd, String cmd_params, tpipe output, level_a } #ifdef AUTHENTICATION_FEATURE //Change / Reset user password - //[ESP555]pwd= + //[ESP555] pwd= case 555: { if (auth_type == LEVEL_ADMIN) { parameter = get_param (cmd_params, "", true); @@ -1761,7 +1761,7 @@ bool COMMAND::execute_command (int cmd, String cmd_params, tpipe output, level_a } else if (parameter == "LINE") { Ntype = ESP_LINE_NOTIFICATION; } else if (parameter == "IFTTT") { - Ntype = ESP_IFTTT_NOTIFICATION; + Ntype = ESP_IFTTT_NOTIFICATION; } else { ESPCOM::println (INCORRECT_CMD_MSG, output, espresponse); return false; diff --git a/wiki/docs/Commands2_0.txt b/wiki/docs/Commands2_0.txt index 996a2178..91fb2700 100644 --- a/wiki/docs/Commands2_0.txt +++ b/wiki/docs/Commands2_0.txt @@ -1,48 +1,48 @@ -* Change STA SSID +* Change STA SSID [ESP100] if authentication is on, need admin password -[ESP100]pwd= +[ESP100] pwd= -* Change STA Password +* Change STA Password [ESP101] if authentication is on, need admin password -[ESP101]pwd= +[ESP101] pwd= -* Change Hostname +* Change Hostname [ESP102] if authentication is on, need admin password -[ESP102]pwd= +[ESP102] pwd= -* Change Wifi mode (STA/AP) +* Change Wifi mode (STA/AP) [ESP103] if authentication is on, need admin password -[ESP103]pwd= +[ESP103] pwd= -* Change STA IP mode (DHCP/STATIC) +* Change STA IP mode (DHCP/STATIC) [ESP104] if authentication is on, need admin password -[ESP104]pwd= +[ESP104] pwd= -* Change AP SSID +* Change AP SSID [ESP105] if authentication is on, need admin password -[ESP105]pwd= +[ESP105] pwd= -* Change AP Password +* Change AP Password [ESP106] if authentication is on, need admin password -[ESP106]pwd= +[ESP106] pwd= -* Change AP IP mode (DHCP/STATIC) +* Change AP IP mode (DHCP/STATIC) [ESP107] if authentication is on, need admin password -[ESP107]pwd= +[ESP107] pwd= * Set wifi on/off [ESP110] state can be ON, OFF, RESTART if authentication is on, need admin password -[ESP110]pwd= +[ESP110] pwd= * Get current IP [ESP111]
@@ -77,7 +77,7 @@ if RAW=YES do not set pinmode just read value *Get full EEPROM settings content but do not give any passwords -can filter if only need wifi or printer +can filter if only need wifi or printer [ESP400] *Set EEPROM setting @@ -130,10 +130,10 @@ output is JSON or plain text according parameter cmd can be RESET, SAFEMODE, CONFIG, RESTART [ESP444] if authentication is on, need admin password for RESET, RESTART and SAFEMODE -[ESP444]pwd= +[ESP444] pwd= * Change / Reset user password -[ESP555]pwd= +[ESP555] pwd= if no password set it use default one * Send GCode with check sum caching right line numbering @@ -141,7 +141,7 @@ if no password set it use default one * Send line checksum [ESP601] - + * Read SPIFFS file and send each line to serial [ESP700] @@ -159,5 +159,3 @@ if no password set it use default one * Check SD presence [ESP802] - - diff --git a/wiki/docs/Commands2_1.txt b/wiki/docs/Commands2_1.txt index 1c53d525..3ed962c2 100644 --- a/wiki/docs/Commands2_1.txt +++ b/wiki/docs/Commands2_1.txt @@ -1,48 +1,48 @@ -* Change STA SSID +* Change STA SSID [ESP100] if authentication is on, need admin password -[ESP100]pwd= +[ESP100] pwd= -* Change STA Password +* Change STA Password [ESP101] if authentication is on, need admin password -[ESP101]pwd= +[ESP101] pwd= -* Change Hostname +* Change Hostname [ESP102] if authentication is on, need admin password -[ESP102]pwd= +[ESP102] pwd= -* Change Wifi mode (STA/AP) +* Change Wifi mode (STA/AP) [ESP103] if authentication is on, need admin password -[ESP103]pwd= +[ESP103] pwd= -* Change STA IP mode (DHCP/STATIC) +* Change STA IP mode (DHCP/STATIC) [ESP104] if authentication is on, need admin password -[ESP104]pwd= +[ESP104] pwd= -* Change AP SSID +* Change AP SSID [ESP105] if authentication is on, need admin password -[ESP105]pwd= +[ESP105] pwd= -* Change AP Password +* Change AP Password [ESP106] if authentication is on, need admin password -[ESP106]pwd= +[ESP106] pwd= -* Change AP IP mode (DHCP/STATIC) +* Change AP IP mode (DHCP/STATIC) [ESP107] if authentication is on, need admin password -[ESP107]pwd= +[ESP107] pwd= * Set wifi on/off [ESP110] state can be ON, OFF, RESTART if authentication is on, need admin password -[ESP110]pwd= +[ESP110] pwd= * Get current IP [ESP111]
@@ -81,7 +81,7 @@ if RAW=YES do not set pinmode just read value *Get full EEPROM settings content but do not give any passwords -can filter if only need wifi or printer +can filter if only need wifi or printer [ESP400] *Set EEPROM setting @@ -134,7 +134,7 @@ output is JSON or plain text according parameter cmd can be RESET, SAFEMODE, CONFIG, RESTART [ESP444] if authentication is on, need admin password for RESET, RESTART and SAFEMODE -[ESP444]pwd= +[ESP444] pwd= * Send GCode with check sum caching right line numbering [ESP500] @@ -143,7 +143,7 @@ if authentication is on, need admin password for RESET, RESTART and SAFEMODE [ESP501] * Change / Reset user password -[ESP555]pwd= +[ESP555] pwd= if no password set it use default one * Send Notification @@ -170,6 +170,3 @@ Get will give type and settings only not the protected T1/T2 * Get state / Set Enable / Disable Serial Communication [ESP900] - - - diff --git a/wiki/docs/Commands3.txt b/wiki/docs/Commands3.txt index 60837a1a..c085e3bc 100644 --- a/wiki/docs/Commands3.txt +++ b/wiki/docs/Commands3.txt @@ -1,36 +1,36 @@ Note: 1 - add space to separate parameters -2 - if parameter has space add \ in front of space to not be seen as separator +2 - if parameter has space add \ in front of space to not be seen as separator -* Set/Get STA SSID -[ESP100]pwd= +* Set/Get STA SSID +[ESP100] pwd= -* Set STA Password -[ESP101]pwd= +* Set STA Password +[ESP101] pwd= -* Set/Get STA IP mode (DHCP/STATIC) -[ESP102]pwd= +* Set/Get STA IP mode (DHCP/STATIC) +[ESP102] pwd= -* Set/Get STA IP/Mask/GW +* Set/Get STA IP/Mask/GW [ESP103]IP= MSK= GW= pwd= * Set/Get Fallback mode which can be BT, SETUP, OFF -[ESP104]pwd= +[ESP104] pwd= -* Set/Get AP SSID -[ESP105]pwd= +* Set/Get AP SSID +[ESP105] pwd= -* Change AP Password -[ESP106]pwd= +* Change AP Password +[ESP106] pwd= -* Set/Get AP IP -[ESP107]pwd= +* Set/Get AP IP +[ESP107] pwd= -* Set/Get AP channel -[ESP108]pwd= +* Set/Get AP channel +[ESP108] pwd= * Set/Get radio state which can be WIFI-STA, WIFI-AP, BT, ETH-STA, WIFI-SETUP, OFF -[ESP110]pwd= +[ESP110] pwd= * Get current IP [ESP111]
@@ -39,19 +39,19 @@ Note: [ESP112] pwd= * Get/Set immediate network(WiFi/BT/Ethernet) state which can be ON, OFF -[ESP115]pwd= +[ESP115] pwd= * Get/Set HTTP state which can be ON, OFF -[ESP120]pwd= +[ESP120] pwd= -* Get/Set HTTP port -[ESP121]pwd= +* Get/Set HTTP port +[ESP121] pwd= * Get/Set Telnet state which can be ON, OFF, CLOSE -[ESP130]pwd= +[ESP130] pwd= -* Get/Set Telnet port -[ESP131]pwd= +* Get/Set Telnet port +[ESP131] pwd= * Sync / Set / Get current time [ESP140] pwd= @@ -60,25 +60,25 @@ Note: [ESP150]