瀏覽代碼

More externs and functions in Marlin.h

Scott Lahteine 7 年之前
父節點
當前提交
e1b998e40a
共有 4 個文件被更改,包括 5 次插入14 次删除
  1. 0
    4
      Marlin/G26_Mesh_Validation_Tool.cpp
  2. 5
    0
      Marlin/Marlin.h
  3. 0
    4
      Marlin/Marlin_main.cpp
  4. 0
    6
      Marlin/ultralcd.cpp

+ 0
- 4
Marlin/G26_Mesh_Validation_Tool.cpp 查看文件

@@ -132,15 +132,11 @@
132 132
 
133 133
   // External references
134 134
 
135
-  extern float feedrate_mm_s; // must set before calling prepare_move_to_destination
136 135
   extern Planner planner;
137 136
   #if ENABLED(ULTRA_LCD)
138 137
     extern char lcd_status_message[];
139 138
   #endif
140
-  void set_destination_from_current();
141
-  void prepare_move_to_destination();
142 139
   inline void sync_plan_position_e() { planner.set_e_position_mm(current_position[E_AXIS]); }
143
-  inline void set_current_from_destination() { COPY(current_position, destination); }
144 140
 
145 141
   // Private functions
146 142
 

+ 5
- 0
Marlin/Marlin.h 查看文件

@@ -210,6 +210,7 @@ inline void refresh_cmd_timeout() { previous_cmd_ms = millis(); }
210 210
 /**
211 211
  * Feedrate scaling and conversion
212 212
  */
213
+extern float feedrate_mm_s;
213 214
 extern int16_t feedrate_percentage;
214 215
 
215 216
 #define MMS_SCALED(MM_S) ((MM_S)*feedrate_percentage*0.01)
@@ -461,6 +462,10 @@ extern uint8_t active_extruder;
461 462
   extern float mixing_factor[MIXING_STEPPERS];
462 463
 #endif
463 464
 
465
+inline void set_current_from_destination() { COPY(current_position, destination); }
466
+inline void set_destination_from_current() { COPY(destination, current_position); }
467
+void prepare_move_to_destination();
468
+
464 469
 /**
465 470
  * Blocking movement and shorthand functions
466 471
  */

+ 0
- 4
Marlin/Marlin_main.cpp 查看文件

@@ -724,7 +724,6 @@ void stop();
724 724
 void get_available_commands();
725 725
 void process_next_command();
726 726
 void process_parsed_command();
727
-void prepare_move_to_destination();
728 727
 
729 728
 void get_cartesian_from_steppers();
730 729
 void set_current_from_steppers_for_axis(const AxisEnum axis);
@@ -1533,9 +1532,6 @@ inline void buffer_line_to_destination(const float fr_mm_s) {
1533 1532
   planner.buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], fr_mm_s, active_extruder);
1534 1533
 }
1535 1534
 
1536
-inline void set_current_from_destination() { COPY(current_position, destination); }
1537
-inline void set_destination_from_current() { COPY(destination, current_position); }
1538
-
1539 1535
 #if IS_KINEMATIC
1540 1536
   /**
1541 1537
    * Calculate delta, start a line, and set current_position to destination

+ 0
- 6
Marlin/ultralcd.cpp 查看文件

@@ -2753,12 +2753,6 @@ void kill_screen(const char* lcd_msg) {
2753 2753
 
2754 2754
   #endif // DELTA_CALIBRATION_MENU || DELTA_AUTO_CALIBRATION
2755 2755
 
2756
-  #if IS_KINEMATIC
2757
-    extern float feedrate_mm_s;
2758
-    void set_destination_from_current();
2759
-    void prepare_move_to_destination();
2760
-  #endif
2761
-
2762 2756
   /**
2763 2757
    * If the most recent manual move hasn't been fed to the planner yet,
2764 2758
    * and the planner can accept one, send immediately

Loading…
取消
儲存