From fcceed5be63094963023794d77ad886a8259da3c Mon Sep 17 00:00:00 2001 From: Bob-the-Kuhn Date: Sat, 1 Jul 2017 10:26:57 -0500 Subject: [PATCH] intermittent Teensy & G26 compile problem =============================================== also an issue with ubl_motion.cpp --- Marlin/G26_Mesh_Validation_Tool.cpp | 3 ++- Marlin/ubl_motion.cpp | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Marlin/G26_Mesh_Validation_Tool.cpp b/Marlin/G26_Mesh_Validation_Tool.cpp index 7c780c676d..80f6782aa4 100644 --- a/Marlin/G26_Mesh_Validation_Tool.cpp +++ b/Marlin/G26_Mesh_Validation_Tool.cpp @@ -135,12 +135,13 @@ #endif extern float destination[XYZE]; void set_destination_to_current(); - void set_current_to_destination(); void prepare_move_to_destination(); #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]); } + inline void set_current_to_destination() { COPY(current_position, destination); } #else void sync_plan_position_e(); + void set_current_to_destination(); #endif #if ENABLED(NEWPANEL) void lcd_setstatusPGM(const char* const message, const int8_t level); diff --git a/Marlin/ubl_motion.cpp b/Marlin/ubl_motion.cpp index 6d39f9570b..7e037d40a4 100644 --- a/Marlin/ubl_motion.cpp +++ b/Marlin/ubl_motion.cpp @@ -31,7 +31,12 @@ #include extern float destination[XYZE]; - extern void set_current_to_destination(); + + #if AVR_AT90USB1286_FAMILY // Teensyduino & Printrboard IDE extensions have compile errors without this + inline void set_current_to_destination() { COPY(current_position, destination); } + #else + extern void set_current_to_destination(); + #endif #if ENABLED(DELTA)