From 9dda022705e28ce833704e64afd6d0becbcff9bd Mon Sep 17 00:00:00 2001
From: Bob-the-Kuhn <bob.kuhn@att.net>
Date: Thu, 15 Jun 2017 00:32:05 -0500
Subject: [PATCH] fix compile errors
================================
Changed to conditional compile for AT90USB issue
---
Marlin/G26_Mesh_Validation_Tool.cpp | 6 +++++-
Marlin/Marlin_main.cpp | 6 +++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/Marlin/G26_Mesh_Validation_Tool.cpp b/Marlin/G26_Mesh_Validation_Tool.cpp
index 18a28b3c41..aa4b0fb39a 100644
--- a/Marlin/G26_Mesh_Validation_Tool.cpp
+++ b/Marlin/G26_Mesh_Validation_Tool.cpp
@@ -137,7 +137,11 @@
void set_destination_to_current();
void set_current_to_destination();
void prepare_move_to_destination();
- void sync_plan_position_e();
+ #if AVR_AT90USB1286_FAMILY // Teensyduino & Printrboard IDE extensions have compile errors without this
+ inline void sync_plan_position_e() { planner.set_e_position_mm(current_position[E_AXIS]); }
+ #else
+ void sync_plan_position_e();
+ #endif
#if ENABLED(NEWPANEL)
void lcd_setstatusPGM(const char* const message, const int8_t level);
void chirp_at_user();
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 4d8b0f9fef..6762b70abd 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -5895,7 +5895,7 @@ inline void gcode_M17() {
if (!DEBUGGING(DRYRUN) && unload_length != 0) {
#if ENABLED(PREVENT_COLD_EXTRUSION)
- if (!thermalManager.allow_cold_extrude &&
+ if (!thermalManager.allow_cold_extrude &&
thermalManager.degTargetHotend(active_extruder) < thermalManager.extrude_min_temp) {
SERIAL_ERROR_START();
SERIAL_ERRORLNPGM(MSG_TOO_COLD_FOR_M600);
@@ -7659,7 +7659,7 @@ inline void gcode_M18_M84() {
#endif
}
- #if ENABLED(AUTO_BED_LEVELING_UBL)
+ #if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(ULTRA_LCD) //only needed if have an LCD
ubl_lcd_map_control = false;
defer_return_to_status = false;
#endif
@@ -12442,7 +12442,7 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
#if ENABLED(DISABLE_INACTIVE_E)
disable_e_steppers();
#endif
- #if ENABLED(AUTO_BED_LEVELING_UBL)
+ #if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(ULTRA_LCD) //only needed if have an LCD
ubl_lcd_map_control = false;
defer_return_to_status = false;
#endif