CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix BUTTON_EXISTS and misplaced comma (#13411)

Browse Source 
Fixes #13410 and redeclaration of `BUTTON_EXISTS`
This commit is contained in:
Ludy 2019-03-16 17:59:12 +01:00 committed by Scott Lahteine
parent 09eb30dc05
commit 59353546e8
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/src/lcd/ultralcd.h
View File

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

4
Marlin/src/module/temperature.cpp
View File

@ -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_PTERM, work_pid[HOTEND_INDEX].Kp,
MSG_PID_DEBUG_ITERM, work_pid[HOTEND_INDEX].Ki, MSG_PID_DEBUG_ITERM, work_pid[HOTEND_INDEX].Ki,
MSG_PID_DEBUG_DTERM, work_pid[HOTEND_INDEX].Kd MSG_PID_DEBUG_DTERM, work_pid[HOTEND_INDEX].Kd
#if ENABLED(PID_EXTRUSION_SCALING), #if ENABLED(PID_EXTRUSION_SCALING)
MSG_PID_DEBUG_CTERM, work_pid[HOTEND_INDEX].Kc , MSG_PID_DEBUG_CTERM, work_pid[HOTEND_INDEX].Kc
#endif #endif
); );
#endif #endif