Browse Source

Fix BUTTON_EXISTS and misplaced comma (#13411)

Fixes #13410 and redeclaration of `BUTTON_EXISTS`
Ludy 6 years ago
parent
commit
59353546e8
2 changed files with 3 additions and 2 deletions
  1. 1
    0
      Marlin/src/lcd/ultralcd.h
  2. 2
    2
      Marlin/src/module/temperature.cpp

+ 1
- 0
Marlin/src/lcd/ultralcd.h View File

187
 
187
 
188
 #else
188
 #else
189
 
189
 
190
+  #undef BUTTON_EXISTS
190
   #define BUTTON_EXISTS(BN) false
191
   #define BUTTON_EXISTS(BN) false
191
 
192
 
192
   // Shift register bits correspond to buttons:
193
   // Shift register bits correspond to buttons:

+ 2
- 2
Marlin/src/module/temperature.cpp View File

823
           MSG_PID_DEBUG_PTERM, work_pid[HOTEND_INDEX].Kp,
823
           MSG_PID_DEBUG_PTERM, work_pid[HOTEND_INDEX].Kp,
824
           MSG_PID_DEBUG_ITERM, work_pid[HOTEND_INDEX].Ki,
824
           MSG_PID_DEBUG_ITERM, work_pid[HOTEND_INDEX].Ki,
825
           MSG_PID_DEBUG_DTERM, work_pid[HOTEND_INDEX].Kd
825
           MSG_PID_DEBUG_DTERM, work_pid[HOTEND_INDEX].Kd
826
-          #if ENABLED(PID_EXTRUSION_SCALING),
827
-            MSG_PID_DEBUG_CTERM, work_pid[HOTEND_INDEX].Kc
826
+          #if ENABLED(PID_EXTRUSION_SCALING)
827
+            , MSG_PID_DEBUG_CTERM, work_pid[HOTEND_INDEX].Kc
828
           #endif
828
           #endif
829
         );
829
         );
830
       #endif
830
       #endif

Loading…
Cancel
Save