X-Git-Url: http://git.hcoop.net/clinton/Smoothieware.git/blobdiff_plain/c0b50fa80aea8db5942178f49c4e491f81f56db3..27fdf0205958dcbc13241679f16587d79842c879:/src/modules/communication/GcodeDispatch.cpp diff --git a/src/modules/communication/GcodeDispatch.cpp b/src/modules/communication/GcodeDispatch.cpp index 17eed0c6..708628a9 100644 --- a/src/modules/communication/GcodeDispatch.cpp +++ b/src/modules/communication/GcodeDispatch.cpp @@ -25,8 +25,8 @@ #include "SimpleShell.h" #include "utils.h" #include "LPC17xx.h" +#include "version.h" -#define return_error_on_unhandled_gcode_checksum CHECKSUM("return_error_on_unhandled_gcode") #define panel_display_message_checksum CHECKSUM("display_message") #define panel_checksum CHECKSUM("panel") @@ -100,17 +100,24 @@ try_again: //Strip checksum value from possible_command size_t chkpos = possible_command.find_first_of("*"); - possible_command = possible_command.substr(0, chkpos); - //Calculate checksum + + //Calculate checksum if ( chkpos != string::npos ) { + possible_command = possible_command.substr(0, chkpos); for (auto c = possible_command.cbegin(); *c != '*' && c != possible_command.cend(); c++) cs = cs ^ *c; cs &= 0xff; // Defensive programming... cs -= chksum; - } + } + //Strip line number value from possible_command - size_t lnsize = possible_command.find_first_not_of("N0123456789.,- "); - possible_command = possible_command.substr(lnsize); + size_t lnsize = possible_command.find_first_not_of("N0123456789.,- "); + if(lnsize != string::npos) { + possible_command = possible_command.substr(lnsize); + }else{ + // it is a blank line + possible_command.clear(); + } } else { //Assume checks succeeded @@ -151,9 +158,13 @@ try_again: if(THEKERNEL->is_halted()) { // we ignore all commands until M999, unless it is in the exceptions list (like M105 get temp) if(gcode->has_m && gcode->m == 999) { - THEKERNEL->call_event(ON_HALT, (void *)1); // clears on_halt - - // fall through and pass onto other modules + if(THEKERNEL->is_halted()) { + THEKERNEL->call_event(ON_HALT, (void *)1); // clears on_halt + new_message.stream->printf("WARNING: After HALT you should HOME as position is currently unknown\n"); + } + new_message.stream->printf("ok\n"); + delete gcode; + continue; }else if(!is_allowed_mcode(gcode->m)) { // ignore everything, return error string to host @@ -196,7 +207,7 @@ try_again: } } // makes it handle the parameters as a machine position - THEKERNEL->robot->next_command_is_MCS= true; + THEROBOT->next_command_is_MCS= true; } @@ -249,6 +260,26 @@ try_again: delete gcode; return; + case 115: // M115 Get firmware version and capabilities + Version vers; + + new_message.stream->printf("FIRMWARE_NAME:Smoothieware, FIRMWARE_URL:http%%3A//smoothieware.org, X-SOURCE_CODE_URL:https://github.com/Smoothieware/Smoothieware, FIRMWARE_VERSION:%s, X-FIRMWARE_BUILD_DATE:%s, X-SYSTEM_CLOCK:%ldMHz, X-AXES:%d", vers.get_build(), vers.get_build_date(), SystemCoreClock / 1000000, MAX_ROBOT_ACTUATORS); + + #ifdef CNC + new_message.stream->printf(", X-CNC:1"); + #else + new_message.stream->printf(", X-CNC:0"); + #endif + + #ifdef DISABLEMSD + new_message.stream->printf(", X-MSD:0"); + #else + new_message.stream->printf(", X-MSD:1"); + #endif + + new_message.stream->printf("\nok\n"); + return; + case 117: // M117 is a special non compliant Gcode as it allows arbitrary text on the line following the command { // concatenate the command again and send to panel if enabled string str= single_command.substr(4) + possible_command; @@ -283,7 +314,7 @@ try_again: } case 500: // M500 save volatile settings to config-override - THEKERNEL->conveyor->wait_for_empty_queue(); //just to be safe as it can take a while to run + THEKERNEL->conveyor->wait_for_idle(); //just to be safe as it can take a while to run //remove(THEKERNEL->config_override_filename()); // seems to cause a hang every now and then __disable_irq(); { @@ -307,7 +338,7 @@ try_again: string arg= get_arguments(single_command + possible_command); // rest of line is filename if(arg.empty()) arg= "/sd/config-override"; else arg= "/sd/config-override." + arg; - new_message.stream->printf("args: <%s>\n", arg.c_str()); + //new_message.stream->printf("args: <%s>\n", arg.c_str()); SimpleShell::parse_command((gcode->m == 501) ? "load_command" : "save_command", arg, new_message.stream); } delete gcode; @@ -356,6 +387,10 @@ try_again: new_message.stream->printf("unknown\r\n"); } + // we cannot continue safely after an error so we enter HALT state + new_message.stream->printf("Entering Alarm/Halt state\n"); + THEKERNEL->call_event(ON_HALT, nullptr); + }else{ if(gcode->add_nl) @@ -399,7 +434,6 @@ try_again: } single_command.append("\n"); - static int cnt = 0; if(fwrite(single_command.c_str(), 1, single_command.size(), upload_fd) != single_command.size()) { // error writing to file new_message.stream->printf("Error:error writing to file.\r\n"); @@ -408,14 +442,7 @@ try_again: continue; } else { - cnt += single_command.size(); - if (cnt > 400) { - // HACK ALERT to get around fwrite corruption close and re open for append - fclose(upload_fd); - upload_fd = fopen(upload_filename.c_str(), "a"); - cnt = 0; - } - new_message.stream->printf("ok\r\n"); + new_message.stream->printf("ok\r\n"); //printf("uploading file write ok\n"); } }