SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #7201 from Bob-the-Kuhn/intermittent_Teensy2++_G26_compile_issue

Browse source 
intermittent AT90USB & G26 compile problem (proposal)
This commit is contained in:
Scott Lahteine 2017-07-01 18:54:36 -05:00 committed by GitHub
commit 009a6104c5
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Marlin/G26_Mesh_Validation_Tool.cpp
View file

@ -135,12 +135,13 @@
#endif #endif
extern float destination[XYZE]; extern float destination[XYZE];
void set_destination_to_current(); void set_destination_to_current();
void set_current_to_destination();
void prepare_move_to_destination(); void prepare_move_to_destination();
#if AVR_AT90USB1286_FAMILY // Teensyduino & Printrboard IDE extensions have compile errors without this #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 sync_plan_position_e() { planner.set_e_position_mm(current_position[E_AXIS]); }
inline void set_current_to_destination() { COPY(current_position, destination); }
#else #else
void sync_plan_position_e(); void sync_plan_position_e();
void set_current_to_destination();
#endif #endif
#if ENABLED(NEWPANEL) #if ENABLED(NEWPANEL)
void lcd_setstatusPGM(const char* const message, const int8_t level); void lcd_setstatusPGM(const char* const message, const int8_t level);

5
Marlin/ubl_motion.cpp
View file

@ -31,7 +31,12 @@
#include <math.h> #include <math.h>
extern float destination[XYZE]; extern float destination[XYZE];
#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(); extern void set_current_to_destination();
#endif
#if ENABLED(DELTA) #if ENABLED(DELTA)