From 59353546e81bc7f54724c04ae597f7663eff798d Mon Sep 17 00:00:00 2001 From: Ludy Date: Sat, 16 Mar 2019 17:59:12 +0100 Subject: [PATCH] Fix BUTTON_EXISTS and misplaced comma (#13411) Fixes #13410 and redeclaration of `BUTTON_EXISTS` --- Marlin/src/lcd/ultralcd.h | 1 + Marlin/src/module/temperature.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Marlin/src/lcd/ultralcd.h b/Marlin/src/lcd/ultralcd.h index 00c7b74d5..d830c9687 100644 --- a/Marlin/src/lcd/ultralcd.h +++ b/Marlin/src/lcd/ultralcd.h @@ -187,6 +187,7 @@ #else + #undef BUTTON_EXISTS #define BUTTON_EXISTS(BN) false // Shift register bits correspond to buttons: diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp index 499b4a69e..9258ce328 100644 --- a/Marlin/src/module/temperature.cpp +++ b/Marlin/src/module/temperature.cpp @@ -823,8 +823,8 @@ float Temperature::get_pid_output(const int8_t e) { MSG_PID_DEBUG_PTERM, work_pid[HOTEND_INDEX].Kp, MSG_PID_DEBUG_ITERM, work_pid[HOTEND_INDEX].Ki, MSG_PID_DEBUG_DTERM, work_pid[HOTEND_INDEX].Kd - #if ENABLED(PID_EXTRUSION_SCALING), - MSG_PID_DEBUG_CTERM, work_pid[HOTEND_INDEX].Kc + #if ENABLED(PID_EXTRUSION_SCALING) + , MSG_PID_DEBUG_CTERM, work_pid[HOTEND_INDEX].Kc #endif ); #endif