From ac85819ccef882ece4df87c32d396125a2e47a8d Mon Sep 17 00:00:00 2001 From: Marcio Teixeira Date: Mon, 22 Jan 2018 07:55:45 -0700 Subject: [PATCH] Workaround for OctoPrint failures (T1598). Added delay to temperature report to allow OctoPrint to catch up. Backport of upstream fix https://github.com/MarlinFirmware/Marlin/commit/6ed284061580ffc6eef40df391afb30d2f8b45f5 --- Marlin/Conditionals_LulzBot.h | 7 ++++++- Marlin/Marlin_main.cpp | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Marlin/Conditionals_LulzBot.h b/Marlin/Conditionals_LulzBot.h index 893a266c1..f61f74936 100644 --- a/Marlin/Conditionals_LulzBot.h +++ b/Marlin/Conditionals_LulzBot.h @@ -13,7 +13,7 @@ * got disabled. */ -#define LULZBOT_FW_VERSION ".70" // Change this with each update +#define LULZBOT_FW_VERSION ".71" // Change this with each update #if ( \ !defined(LULZBOT_Gladiola_Mini) && \ @@ -281,6 +281,11 @@ #define LULZBOT_LCD_PAUSE_WORKAROUND +// Fix for OctoPrint serial buffer overflow when using auto temperature +// report. +// Back port of upstream https://github.com/MarlinFirmware/Marlin/commit/6ed284061580ffc6eef40df391afb30d2f8b45f5 +#define LULZBOT_OCTOPRINT_RX_BUFFER_OVERFLOW_WORKAROUND delay(2); + /************************* EXPERIMENTAL FEATURES ******************************/ #if defined(LULZBOT_USE_EXPERIMENTAL_FEATURES) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index d540c78a4..e78d98df9 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -7357,6 +7357,7 @@ inline void gcode_M104() { SERIAL_PROTOCOLPAIR(" (", r / OVERSAMPLENR); SERIAL_PROTOCOLCHAR(')'); #endif + LULZBOT_OCTOPRINT_RX_BUFFER_OVERFLOW_WORKAROUND } void print_heaterstates() {