Browse Source

Fix BUTTON_EXISTS and misplaced comma (#13411)

Fixes #13410 and redeclaration of `BUTTON_EXISTS`
pull/1/head
Ludy 6 years ago
committed by Scott Lahteine
parent
commit
59353546e8
  1. 1
      Marlin/src/lcd/ultralcd.h
  2. 4
      Marlin/src/module/temperature.cpp

1
Marlin/src/lcd/ultralcd.h

@ -187,6 +187,7 @@
#else
#undef BUTTON_EXISTS
#define BUTTON_EXISTS(BN) false
// Shift register bits correspond to buttons:

4
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

Loading…
Cancel
Save