MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #9548 from thinkyhead/bf1_prevent_comments_resetting

Browse Source 
[1.1.0] Prevent watchdog reset due to many comments
This commit is contained in:
Scott Lahteine 2018-02-09 07:15:10 -06:00 committed by GitHub
commit 5a53e4d921
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Marlin/Marlin_main.cpp
View File

@ -1051,7 +1051,8 @@ inline void get_serial_commands() {
serial_comment_mode = false; // end of line == end of comment serial_comment_mode = false; // end of line == end of comment
if (!serial_count) continue; // Skip empty lines // Skip empty lines and comments
if (!serial_count) { thermalManager.manage_heater(); continue; }
serial_line_buffer[serial_count] = 0; // Terminate string serial_line_buffer[serial_count] = 0; // Terminate string
serial_count = 0; // Reset buffer serial_count = 0; // Reset buffer
@ -1134,12 +1135,9 @@ inline void get_serial_commands() {
// Keep fetching, but ignore normal characters beyond the max length // Keep fetching, but ignore normal characters beyond the max length
// The command will be injected when EOL is reached // The command will be injected when EOL is reached
} }
else if (serial_char == '\\') { // Handle escapes else if (serial_char == '\\') { // Handle escapes
if ((c = MYSERIAL.read()) >= 0) { if ((c = MYSERIAL.read()) >= 0 && !serial_comment_mode) // if we have one more character, copy it over
// if we have one more character, copy it over serial_line_buffer[serial_count++] = (char)c;
serial_char = c;
if (!serial_comment_mode) serial_line_buffer[serial_count++] = serial_char;
}
// otherwise do nothing // otherwise do nothing
} }
else { // it's not a newline, carriage return or escape char else { // it's not a newline, carriage return or escape char
@ -1211,7 +1209,8 @@ inline void get_serial_commands() {
sd_comment_mode = false; // for new command sd_comment_mode = false; // for new command
if (!sd_count) continue; // skip empty lines (and comment lines) // Skip empty lines and comments
if (!sd_count) { thermalManager.manage_heater(); continue; }
command_queue[cmd_queue_index_w][sd_count] = '\0'; // terminate string command_queue[cmd_queue_index_w][sd_count] = '\0'; // terminate string
sd_count = 0; // clear sd line buffer sd_count = 0; // clear sd line buffer
@ -13409,8 +13408,10 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
#endif #endif
#if ENABLED(EXTRUDER_RUNOUT_PREVENT) #if ENABLED(EXTRUDER_RUNOUT_PREVENT)
if (ELAPSED(ms, previous_cmd_ms + (EXTRUDER_RUNOUT_SECONDS) * 1000UL) if (thermalManager.degHotend(active_extruder) > EXTRUDER_RUNOUT_MINTEMP
&& thermalManager.degHotend(active_extruder) > EXTRUDER_RUNOUT_MINTEMP) { && ELAPSED(ms, previous_cmd_ms + (EXTRUDER_RUNOUT_SECONDS) * 1000UL)
&& !planner.blocks_queued()
) {
#if ENABLED(SWITCHING_EXTRUDER) #if ENABLED(SWITCHING_EXTRUDER)
const bool oldstatus = E0_ENABLE_READ; const bool oldstatus = E0_ENABLE_READ;
enable_E0(); enable_E0();

2
Marlin/power.cpp
View File

@ -45,7 +45,7 @@ bool Power::is_power_needed() {
HOTEND_LOOP() if (thermalManager.autofan_speed[e] > 0) return true; HOTEND_LOOP() if (thermalManager.autofan_speed[e] > 0) return true;
#endif #endif
#if ENABLED(AUTO_POWER_CONTROLLERFAN) && HAS_CONTROLLERFAN #if ENABLED(AUTO_POWER_CONTROLLERFAN) && HAS_CONTROLLER_FAN
if (controllerFanSpeed > 0) return true; if (controllerFanSpeed > 0) return true;
#endif #endif