GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-08-12 11:19:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

add spaces in commands because they are needed (#770)

Browse Source
This commit is contained in:
Julien Staub 2022-06-02 04:28:40 +02:00 committed by GitHub
parent 3f223a4dc6
commit 629f94981b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 95 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
esp3d/command.cpp
View File

@ -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); ESPCOM::println (String(v).c_str(), output, espresponse);
} }
break; break;
//Get full EEPROM settings content //Get full EEPROM settings content
//[ESP400] //[ESP400]
case 400: { 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 ( (const char *) CONFIG::intTostr (bbuf), output, espresponse);
} }
ESPCOM::print (F ("\",\"H\":\"Auto notification\",\"O\":[{\"No\":\"0\"},{\"Yes\":\"1\"}]}"), output, espresponse); ESPCOM::print (F ("\",\"H\":\"Auto notification\",\"O\":[{\"No\":\"0\"},{\"Yes\":\"1\"}]}"), output, espresponse);
#endif //NOTIFICATION_FEATURE #endif //NOTIFICATION_FEATURE
} }
@ -1597,7 +1597,7 @@ bool COMMAND::execute_command (int cmd, String cmd_params, tpipe output, level_a
break; break;
//Set ESP mode //Set ESP mode
//cmd is RESET, SAFEMODE, RESTART //cmd is RESET, SAFEMODE, RESTART
//[ESP444]<cmd>pwd=<admin password> //[ESP444]<cmd> pwd=<admin password>
case 444: case 444:
parameter = get_param (cmd_params, "", true); parameter = get_param (cmd_params, "", true);
#ifdef AUTHENTICATION_FEATURE #ifdef AUTHENTICATION_FEATURE
@ -1667,7 +1667,7 @@ bool COMMAND::execute_command (int cmd, String cmd_params, tpipe output, level_a
} }
#ifdef AUTHENTICATION_FEATURE #ifdef AUTHENTICATION_FEATURE
//Change / Reset user password //Change / Reset user password
//[ESP555]<password>pwd=<admin password> //[ESP555]<password> pwd=<admin password>
case 555: { case 555: {
if (auth_type == LEVEL_ADMIN) { if (auth_type == LEVEL_ADMIN) {
parameter = get_param (cmd_params, "", true); 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") { } else if (parameter == "LINE") {
Ntype = ESP_LINE_NOTIFICATION; Ntype = ESP_LINE_NOTIFICATION;
} else if (parameter == "IFTTT") { } else if (parameter == "IFTTT") {
Ntype = ESP_IFTTT_NOTIFICATION; Ntype = ESP_IFTTT_NOTIFICATION;
} else { } else {
ESPCOM::println (INCORRECT_CMD_MSG, output, espresponse); ESPCOM::println (INCORRECT_CMD_MSG, output, espresponse);
return false; return false;

44
wiki/docs/Commands2_0.txt
View File

@ -1,48 +1,48 @@
* Change STA SSID * Change STA SSID
[ESP100]<SSID> [ESP100]<SSID>
if authentication is on, need admin password if authentication is on, need admin password
[ESP100]<SSID>pwd=<admin password> [ESP100]<SSID> pwd=<admin password>
* Change STA Password * Change STA Password
[ESP101]<Password> [ESP101]<Password>
if authentication is on, need admin password if authentication is on, need admin password
[ESP101]<Password>pwd=<admin password> [ESP101]<Password> pwd=<admin password>
* Change Hostname * Change Hostname
[ESP102]<hostname> [ESP102]<hostname>
if authentication is on, need admin password if authentication is on, need admin password
[ESP102]<hostname>pwd=<admin password> [ESP102]<hostname> pwd=<admin password>
* Change Wifi mode (STA/AP) * Change Wifi mode (STA/AP)
[ESP103]<mode> [ESP103]<mode>
if authentication is on, need admin password if authentication is on, need admin password
[ESP103]<mode>pwd=<admin password> [ESP103]<mode> pwd=<admin password>
* Change STA IP mode (DHCP/STATIC) * Change STA IP mode (DHCP/STATIC)
[ESP104]<mode> [ESP104]<mode>
if authentication is on, need admin password if authentication is on, need admin password
[ESP104]<mode>pwd=<admin password> [ESP104]<mode> pwd=<admin password>
* Change AP SSID * Change AP SSID
[ESP105]<SSID> [ESP105]<SSID>
if authentication is on, need admin password if authentication is on, need admin password
[ESP105]<SSID>pwd=<admin password> [ESP105]<SSID> pwd=<admin password>
* Change AP Password * Change AP Password
[ESP106]<Password> [ESP106]<Password>
if authentication is on, need admin password if authentication is on, need admin password
[ESP106]<Password>pwd=<admin password> [ESP106]<Password> pwd=<admin password>
* Change AP IP mode (DHCP/STATIC) * Change AP IP mode (DHCP/STATIC)
[ESP107]<mode> [ESP107]<mode>
if authentication is on, need admin password if authentication is on, need admin password
[ESP107]<mode>pwd=<admin password> [ESP107]<mode> pwd=<admin password>
* Set wifi on/off * Set wifi on/off
[ESP110]<state> [ESP110]<state>
state can be ON, OFF, RESTART state can be ON, OFF, RESTART
if authentication is on, need admin password if authentication is on, need admin password
[ESP110]<state>pwd=<admin password> [ESP110]<state> pwd=<admin password>
* Get current IP * Get current IP
[ESP111]<header answer> [ESP111]<header answer>
@ -77,7 +77,7 @@ if RAW=YES do not set pinmode just read value
*Get full EEPROM settings content *Get full EEPROM settings content
but do not give any passwords but do not give any passwords
can filter if only need wifi or printer can filter if only need wifi or printer
[ESP400]<network/printer> [ESP400]<network/printer>
*Set EEPROM setting *Set EEPROM setting
@ -130,10 +130,10 @@ output is JSON or plain text according parameter
cmd can be RESET, SAFEMODE, CONFIG, RESTART cmd can be RESET, SAFEMODE, CONFIG, RESTART
[ESP444]<cmd> [ESP444]<cmd>
if authentication is on, need admin password for RESET, RESTART and SAFEMODE if authentication is on, need admin password for RESET, RESTART and SAFEMODE
[ESP444]<cmd>pwd=<admin password> [ESP444]<cmd> pwd=<admin password>
* Change / Reset user password * Change / Reset user password
[ESP555]<password>pwd=<admin password> [ESP555]<password> pwd=<admin password>
if no password set it use default one if no password set it use default one
* Send GCode with check sum caching right line numbering * Send GCode with check sum caching right line numbering
@ -141,7 +141,7 @@ if no password set it use default one
* Send line checksum * Send line checksum
[ESP601]<line> [ESP601]<line>
* Read SPIFFS file and send each line to serial * Read SPIFFS file and send each line to serial
[ESP700]<filename> [ESP700]<filename>
@ -159,5 +159,3 @@ if no password set it use default one
* Check SD presence * Check SD presence
[ESP802] [ESP802]

43
wiki/docs/Commands2_1.txt
View File

@ -1,48 +1,48 @@
* Change STA SSID * Change STA SSID
[ESP100]<SSID> [ESP100]<SSID>
if authentication is on, need admin password if authentication is on, need admin password
[ESP100]<SSID>pwd=<admin password> [ESP100]<SSID> pwd=<admin password>
* Change STA Password * Change STA Password
[ESP101]<Password> [ESP101]<Password>
if authentication is on, need admin password if authentication is on, need admin password
[ESP101]<Password>pwd=<admin password> [ESP101]<Password> pwd=<admin password>
* Change Hostname * Change Hostname
[ESP102]<hostname> [ESP102]<hostname>
if authentication is on, need admin password if authentication is on, need admin password
[ESP102]<hostname>pwd=<admin password> [ESP102]<hostname> pwd=<admin password>
* Change Wifi mode (STA/AP) * Change Wifi mode (STA/AP)
[ESP103]<mode> [ESP103]<mode>
if authentication is on, need admin password if authentication is on, need admin password
[ESP103]<mode>pwd=<admin password> [ESP103]<mode> pwd=<admin password>
* Change STA IP mode (DHCP/STATIC) * Change STA IP mode (DHCP/STATIC)
[ESP104]<mode> [ESP104]<mode>
if authentication is on, need admin password if authentication is on, need admin password
[ESP104]<mode>pwd=<admin password> [ESP104]<mode> pwd=<admin password>
* Change AP SSID * Change AP SSID
[ESP105]<SSID> [ESP105]<SSID>
if authentication is on, need admin password if authentication is on, need admin password
[ESP105]<SSID>pwd=<admin password> [ESP105]<SSID> pwd=<admin password>
* Change AP Password * Change AP Password
[ESP106]<Password> [ESP106]<Password>
if authentication is on, need admin password if authentication is on, need admin password
[ESP106]<Password>pwd=<admin password> [ESP106]<Password> pwd=<admin password>
* Change AP IP mode (DHCP/STATIC) * Change AP IP mode (DHCP/STATIC)
[ESP107]<mode> [ESP107]<mode>
if authentication is on, need admin password if authentication is on, need admin password
[ESP107]<mode>pwd=<admin password> [ESP107]<mode> pwd=<admin password>
* Set wifi on/off * Set wifi on/off
[ESP110]<state> [ESP110]<state>
state can be ON, OFF, RESTART state can be ON, OFF, RESTART
if authentication is on, need admin password if authentication is on, need admin password
[ESP110]<state>pwd=<admin password> [ESP110]<state> pwd=<admin password>
* Get current IP * Get current IP
[ESP111]<header answer> [ESP111]<header answer>
@ -81,7 +81,7 @@ if RAW=YES do not set pinmode just read value
*Get full EEPROM settings content *Get full EEPROM settings content
but do not give any passwords but do not give any passwords
can filter if only need wifi or printer can filter if only need wifi or printer
[ESP400]<network/printer> [ESP400]<network/printer>
*Set EEPROM setting *Set EEPROM setting
@ -134,7 +134,7 @@ output is JSON or plain text according parameter
cmd can be RESET, SAFEMODE, CONFIG, RESTART cmd can be RESET, SAFEMODE, CONFIG, RESTART
[ESP444]<cmd> [ESP444]<cmd>
if authentication is on, need admin password for RESET, RESTART and SAFEMODE if authentication is on, need admin password for RESET, RESTART and SAFEMODE
[ESP444]<cmd>pwd=<admin password> [ESP444]<cmd> pwd=<admin password>
* Send GCode with check sum caching right line numbering * Send GCode with check sum caching right line numbering
[ESP500]<gcode> [ESP500]<gcode>
@ -143,7 +143,7 @@ if authentication is on, need admin password for RESET, RESTART and SAFEMODE
[ESP501]<line> [ESP501]<line>
* Change / Reset user password * Change / Reset user password
[ESP555]<password>pwd=<admin password> [ESP555]<password> pwd=<admin password>
if no password set it use default one if no password set it use default one
* Send Notification * 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 * Get state / Set Enable / Disable Serial Communication
[ESP900]<ENABLE/DISABLE> [ESP900]<ENABLE/DISABLE>

96
wiki/docs/Commands3.txt
View File

@ -1,36 +1,36 @@
Note: Note:
1 - add space to separate parameters 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 * Set/Get STA SSID
[ESP100]<SSID>pwd=<admin password> [ESP100]<SSID> pwd=<admin password>
* Set STA Password * Set STA Password
[ESP101]<Password>pwd=<admin password> [ESP101]<Password> pwd=<admin password>
* Set/Get STA IP mode (DHCP/STATIC) * Set/Get STA IP mode (DHCP/STATIC)
[ESP102]<mode>pwd=<admin password> [ESP102]<mode> pwd=<admin password>
* Set/Get STA IP/Mask/GW * Set/Get STA IP/Mask/GW
[ESP103]IP=<IP> MSK=<IP> GW=<IP> pwd=<admin password> [ESP103]IP=<IP> MSK=<IP> GW=<IP> pwd=<admin password>
* Set/Get Fallback mode which can be BT, SETUP, OFF * Set/Get Fallback mode which can be BT, SETUP, OFF
[ESP104]<state>pwd=<admin password> [ESP104]<state> pwd=<admin password>
* Set/Get AP SSID * Set/Get AP SSID
[ESP105]<SSID>pwd=<admin password> [ESP105]<SSID> pwd=<admin password>
* Change AP Password * Change AP Password
[ESP106]<Password>pwd=<admin password> [ESP106]<Password> pwd=<admin password>
* Set/Get AP IP * Set/Get AP IP
[ESP107]<IP>pwd=<admin password> [ESP107]<IP> pwd=<admin password>
* Set/Get AP channel * Set/Get AP channel
[ESP108]<channel>pwd=<admin password> [ESP108]<channel> pwd=<admin password>
* Set/Get radio state which can be WIFI-STA, WIFI-AP, BT, ETH-STA, WIFI-SETUP, OFF * Set/Get radio state which can be WIFI-STA, WIFI-AP, BT, ETH-STA, WIFI-SETUP, OFF
[ESP110]<state>pwd=<admin password> [ESP110]<state> pwd=<admin password>
* Get current IP * Get current IP
[ESP111]<header answer> [ESP111]<header answer>
@ -39,19 +39,19 @@ Note:
[ESP112]<Hostname> pwd=<admin password> [ESP112]<Hostname> pwd=<admin password>
* Get/Set immediate network(WiFi/BT/Ethernet) state which can be ON, OFF * Get/Set immediate network(WiFi/BT/Ethernet) state which can be ON, OFF
[ESP115]<state>pwd=<admin password> [ESP115]<state> pwd=<admin password>
* Get/Set HTTP state which can be ON, OFF * Get/Set HTTP state which can be ON, OFF
[ESP120]<state>pwd=<admin password> [ESP120]<state> pwd=<admin password>
* Get/Set HTTP port * Get/Set HTTP port
[ESP121]<port>pwd=<admin password> [ESP121]<port> pwd=<admin password>
* Get/Set Telnet state which can be ON, OFF, CLOSE * Get/Set Telnet state which can be ON, OFF, CLOSE
[ESP130]<state>pwd=<admin password> [ESP130]<state> pwd=<admin password>
* Get/Set Telnet port * Get/Set Telnet port
[ESP131]<port>pwd=<admin password> [ESP131]<port> pwd=<admin password>
* Sync / Set / Get current time * Sync / Set / Get current time
[ESP140]<SYNC> <srv1=XXXXX> <srv2=XXXXX> <srv3=XXXXX> <zone=xxx> <dst=YES/NO> <time=YYYY-MM-DD#H24:MM:SS> pwd=<admin password> [ESP140]<SYNC> <srv1=XXXXX> <srv2=XXXXX> <srv3=XXXXX> <zone=xxx> <dst=YES/NO> <time=YYYY-MM-DD#H24:MM:SS> pwd=<admin password>
@ -60,25 +60,25 @@ Note:
[ESP150]<time in milliseconds>[pwd=<admin password>] [ESP150]<time in milliseconds>[pwd=<admin password>]
* Get/Set WebSocket state which can be ON, OFF * Get/Set WebSocket state which can be ON, OFF
[ESP160]<state>pwd=<admin password> [ESP160]<state> pwd=<admin password>
* Get/Set WebSocket port * Get/Set WebSocket port
[ESP161]<port>pwd=<admin password> [ESP161]<port> pwd=<admin password>
* Get/Set camera server state which can be ON, OFF, but not saved in EEPROM * Get/Set camera server state which can be ON, OFF, but not saved in EEPROM
[ESP170]<state>pwd=<admin password> [ESP170]<state> pwd=<admin password>
* Get/Set Camera port * Get/Set Camera port
[ESP171]<port>pwd=<admin password> [ESP171]<port> pwd=<admin password>
* Get/Set Camera command value / list all values in JSON/plain * Get/Set Camera command value / list all values in JSON/plain
label can be: light/framesize/quality/contrast/brightness/saturation/gainceiling/colorbar/awb/agc/aec/hmirror/vflip/awb_gain/agc_gain/aec_value/aec2/cw/bpc/wpc/raw_gma/lenc/special_effect/wb_mode/ae_level label can be: light/framesize/quality/contrast/brightness/saturation/gainceiling/colorbar/awb/agc/aec/hmirror/vflip/awb_gain/agc_gain/aec_value/aec2/cw/bpc/wpc/raw_gma/lenc/special_effect/wb_mode/ae_level
[ESP172]<plain><label=value> pwd=<admin password> [ESP172]<plain><label=value> pwd=<admin password>
* Get/Set Ftp state which can be ON, OFF, CLOSE * Get/Set Ftp state which can be ON, OFF, CLOSE
[ESP180]<state>pwd=<admin password> [ESP180]<state> pwd=<admin password>
* Get/Set Ftp ports * Get/Set Ftp ports
[ESP181]ctrl=<port> active=<port> passive=<port> pwd=<admin password> [ESP181]ctrl=<port> active=<port> passive=<port> pwd=<admin password>
* Get SD Card Status * Get SD Card Status
@ -93,20 +93,20 @@ if RAW=YES do not set pinmode just read value
Flash pins (6~11) cannot be used Flash pins (6~11) cannot be used
* Output to esp screen status * Output to esp screen status
[ESP214]<Text>pwd=<user password> [ESP214]<Text> pwd=<user password>
* Touch Calibration * Touch Calibration
[ESP215]<CALIBRATE>[pwd=<user password>] [ESP215]<CALIBRATE> [pwd=<user password>]
* Take screen snapshot * Take screen snapshot
[ESP216]<SNAP>[pwd=<user password>] [ESP216]<SNAP> [pwd=<user password>]
* Play sound * Play sound
No parameter just play beep No parameter just play beep
[ESP250]F=<frequency> D=<duration> [pwd=<user password>] [ESP250]F=<frequency> D=<duration> [pwd=<user password>]
* Delay command * Delay command
[ESP290]<delay in ms>[pwd=<user password>] [ESP290]<delay in ms> [pwd=<user password>]
* Get full EEPROM settings content * Get full EEPROM settings content
but do not give any passwords but do not give any passwords
@ -127,7 +127,7 @@ ESP_BAUD_RATE 112 //4 bytes = int
ESP_NOTIFICATION_TYPE 116 //1 byte = flag ESP_NOTIFICATION_TYPE 116 //1 byte = flag
ESP_CALIBRATION 117 //1 byte = flag ESP_CALIBRATION 117 //1 byte = flag
ESP_AP_CHANNEL 118 //1 byte = flag ESP_AP_CHANNEL 118 //1 byte = flag
ESP_BUZZER 119 //1 byte = flag ESP_BUZZER 119 //1 byte = flag
ESP_INTERNET_TIME 120 //1 byte = flag ESP_INTERNET_TIME 120 //1 byte = flag
ESP_HTTP_PORT 121 //4 bytes = int ESP_HTTP_PORT 121 //4 bytes = int
ESP_TELNET_PORT 125 //4 bytes = int ESP_TELNET_PORT 125 //4 bytes = int
@ -163,28 +163,28 @@ ESP_SD_CHECK_UPDATE_AT_BOOT 854//1 bytes = flag
ESP_NOTIFICATION_SETTINGS 855//128 bytes 127+1 = string ; warning does not support multibyte char like chinese ESP_NOTIFICATION_SETTINGS 855//128 bytes 127+1 = string ; warning does not support multibyte char like chinese
ESP_CALIBRATION_1 983 //4 bytes = int ESP_CALIBRATION_1 983 //4 bytes = int
ESP_CALIBRATION_2 987 //4 bytes = int ESP_CALIBRATION_2 987 //4 bytes = int
ESP_CALIBRATION_3 991 //4 bytes = int ESP_CALIBRATION_3 991 //4 bytes = int
ESP_CALIBRATION_4 995 //4 bytes = int ESP_CALIBRATION_4 995 //4 bytes = int
ESP_CALIBRATION_5 999 //4 bytes = int ESP_CALIBRATION_5 999 //4 bytes = int
ESP_AUTO_NOTIFICATION 1004 //1 byte = flag ESP_AUTO_NOTIFICATION 1004 //1 byte = flag
*Get available AP list (limited to 30) *Get available AP list (limited to 30)
output is JSON or plain text according parameter output is JSON or plain text according parameter
[ESP410]<plain><pwd=admin/user> [ESP410]<plain> pwd=<admin/user password>
*Get current settings of ESP3D *Get current settings of ESP3D
output is plain text output is plain text
[ESP420]<pwd=admin/user> [ESP420]pwd=<admin/user password>
* Set ESP State * Set ESP State
cmd are RESTART / RESET cmd are RESTART / RESET
[ESP444]<cmd><pwd=admin> [ESP444]<cmd> pwd=<admin password>
* Change admin password * Change admin password
[ESP550]<password>pwd=<admin password> [ESP550]<password> pwd=<admin password>
* Change user password * Change user password
[ESP555]<password>pwd=<admin/user password> [ESP555]<password> pwd=<admin/user password>
* Send Notification * Send Notification
[ESP600]msg [pwd=<admin password>] [ESP600]msg [pwd=<admin password>]
@ -217,7 +217,7 @@ rmdir / remove / mkdir / exists / create
[ESP800]<plain> pwd=<admin password> [ESP800]<plain> pwd=<admin password>
* Get state / Set Enable / Disable Serial Communication * Get state / Set Enable / Disable Serial Communication
[ESP900]<ENABLE/DISABLE>[pwd=<admin/user password>] [ESP900]<ENABLE/DISABLE> [pwd=<admin/user password>]
* Get state / Set Enable / Disable buzzer * Get state / Set Enable / Disable buzzer
[ESP910]<ENABLE/DISABLE>[pwd=<admin/user password>] [ESP910]<ENABLE/DISABLE> [pwd=<admin/user password>]