Browse Source

intermittent Teensy & G26 compile problem

===============================================

also an issue with ubl_motion.cpp
Bob-the-Kuhn 7 years ago
parent
commit
fcceed5be6
2 changed files with 8 additions and 2 deletions
  1. 2
    1
      Marlin/G26_Mesh_Validation_Tool.cpp
  2. 6
    1
      Marlin/ubl_motion.cpp

+ 2
- 1
Marlin/G26_Mesh_Validation_Tool.cpp View File

135
   #endif
135
   #endif
136
   extern float destination[XYZE];
136
   extern float destination[XYZE];
137
   void set_destination_to_current();
137
   void set_destination_to_current();
138
-  void set_current_to_destination();
139
   void prepare_move_to_destination();
138
   void prepare_move_to_destination();
140
   #if AVR_AT90USB1286_FAMILY  // Teensyduino & Printrboard IDE extensions have compile errors without this
139
   #if AVR_AT90USB1286_FAMILY  // Teensyduino & Printrboard IDE extensions have compile errors without this
141
     inline void sync_plan_position_e() { planner.set_e_position_mm(current_position[E_AXIS]); }
140
     inline void sync_plan_position_e() { planner.set_e_position_mm(current_position[E_AXIS]); }
141
+    inline void set_current_to_destination() { COPY(current_position, destination); }
142
   #else
142
   #else
143
     void sync_plan_position_e();
143
     void sync_plan_position_e();
144
+    void set_current_to_destination();
144
   #endif
145
   #endif
145
   #if ENABLED(NEWPANEL)
146
   #if ENABLED(NEWPANEL)
146
     void lcd_setstatusPGM(const char* const message, const int8_t level);
147
     void lcd_setstatusPGM(const char* const message, const int8_t level);

+ 6
- 1
Marlin/ubl_motion.cpp View File

31
   #include <math.h>
31
   #include <math.h>
32
 
32
 
33
   extern float destination[XYZE];
33
   extern float destination[XYZE];
34
-  extern void set_current_to_destination();
34
+  
35
+  #if AVR_AT90USB1286_FAMILY  // Teensyduino & Printrboard IDE extensions have compile errors without this
36
+    inline void set_current_to_destination() { COPY(current_position, destination); }
37
+  #else
38
+    extern void set_current_to_destination();
39
+  #endif
35
 
40
 
36
 #if ENABLED(DELTA)
41
 #if ENABLED(DELTA)
37
 
42
 

Loading…
Cancel
Save