Mirrors/ESP3D
2
0
Fork 0
mirror of https://github.com/luc-github/ESP3D.git synced 2026-03-15 04:16:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix SD File listing incomplete as still processing

Browse Source 
Separate M20 command from file listing to give time to get the complete
file list before sending the list

Change SDK function system_get_time and wifi_get_opmode to use wrapper
ones and avoid to include user_interface.h if not necessary
This commit is contained in:
luc lebosse
2016-06-29 18:42:00 +02:00
parent 41d319bed8
commit 3d92f78eca
3 changed files with 71 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
esp3d/command.cpp
View File

@@ -22,9 +22,6 @@
#include "config.h"
#include "wifi.h"
#include "webinterface.h"
extern "C" {
#include "user_interface.h"
}
String COMMAND::buffer_serial;
String COMMAND::buffer_tcp;
@@ -81,7 +78,7 @@ void COMMAND::execute_command(int cmd,String cmd_params)
break;
case 111: {
String currentIP ;
if (wifi_get_opmode()==WIFI_STA) {
if (WiFi.getMode()==WIFI_STA) {
currentIP=WiFi.localIP().toString();
} else {
currentIP=WiFi.softAPIP().toString();
@@ -141,7 +138,7 @@ void COMMAND::check_command(String buffer)
//yes it is file list starting to be displayed
if (filesstart>-1) {
//init time out
start_list=system_get_time();
start_list = millis();
//set file list started
bfileslist=true;
//clear current list
@@ -198,7 +195,7 @@ void COMMAND::check_command(String buffer)
//if match mask T:xxx.xx /xxx.xx
if(spacepos-Tpos < 17) {
web_interface->answer4M105=buffer; //do not interprete just need when requested so store it
web_interface->last_temp=system_get_time();
web_interface->last_temp=millis();
}
}
//Position of axis
@@ -248,18 +245,24 @@ void COMMAND::check_command(String buffer)
}
} else { //listing file is on going
//check if we are too long
if ((system_get_time()-start_list)>30000000) { //timeout in case of problem
if ((millis()-start_list)>30000) { //timeout in case of problem
bfileslist=false;
(web_interface->blockserial) = false; //release serial
LOG("Time out\n");
} else {
//check if this is the end
if (buffer.indexOf("End file list")>-1) {
bfileslist=false;
(web_interface->blockserial) = false;
LOG("End list\n");
} else {
//Serial.print(buffer);
//add list to buffer
web_interface->fileslist.add(buffer);
LOG(String(web_interface->fileslist.size()));
LOG(":");
LOG(buffer);
LOG('\n');
}
}
@@ -315,7 +318,7 @@ void COMMAND::read_buffer_serial(uint8_t b)
previous_was_char=false; //next call will reset the buffer
}
//this is not printable but end of command check if need to handle it
if (b==13 ||b==10) {
if (b==13) {
//Minimum is something like M10 so 3 char
if (buffer_serial.length()>3) {
check_command(buffer_serial);