3DPrinting/Marlin-Tevo-Tarantula
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More externs and functions in Marlin.h

Browse source
This commit is contained in:
Scott Lahteine 2017-12-15 18:18:26 -06:00
parent 4277fcb32c
commit e1b998e40a
4 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/G26_Mesh_Validation_Tool.cpp
View file

@ -132,15 +132,11 @@
// External references // External references
extern float feedrate_mm_s; // must set before calling prepare_move_to_destination
extern Planner planner; extern Planner planner;
#if ENABLED(ULTRA_LCD) #if ENABLED(ULTRA_LCD)
extern char lcd_status_message[]; extern char lcd_status_message[];
#endif #endif
void set_destination_from_current();
void prepare_move_to_destination();
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_from_destination() { COPY(current_position, destination); }
// Private functions // Private functions

5
Marlin/Marlin.h
View file

@ -210,6 +210,7 @@ inline void refresh_cmd_timeout() { previous_cmd_ms = millis(); }
/** /**
* Feedrate scaling and conversion * Feedrate scaling and conversion
*/ */
extern float feedrate_mm_s;
extern int16_t feedrate_percentage; extern int16_t feedrate_percentage;
#define MMS_SCALED(MM_S) ((MM_S)*feedrate_percentage*0.01) #define MMS_SCALED(MM_S) ((MM_S)*feedrate_percentage*0.01)
@ -461,6 +462,10 @@ extern uint8_t active_extruder;
extern float mixing_factor[MIXING_STEPPERS]; extern float mixing_factor[MIXING_STEPPERS];
#endif #endif
inline void set_current_from_destination() { COPY(current_position, destination); }
inline void set_destination_from_current() { COPY(destination, current_position); }
void prepare_move_to_destination();
/** /**
* Blocking movement and shorthand functions * Blocking movement and shorthand functions
*/ */

4
Marlin/Marlin_main.cpp
View file

@ -724,7 +724,6 @@ void stop();
void get_available_commands(); void get_available_commands();
void process_next_command(); void process_next_command();
void process_parsed_command(); void process_parsed_command();
void prepare_move_to_destination();
void get_cartesian_from_steppers(); void get_cartesian_from_steppers();
void set_current_from_steppers_for_axis(const AxisEnum axis); 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) {
planner.buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], fr_mm_s, active_extruder); planner.buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], fr_mm_s, active_extruder);
} }
inline void set_current_from_destination() { COPY(current_position, destination); }
inline void set_destination_from_current() { COPY(destination, current_position); }
#if IS_KINEMATIC #if IS_KINEMATIC
/** /**
* Calculate delta, start a line, and set current_position to destination * Calculate delta, start a line, and set current_position to destination

6
Marlin/ultralcd.cpp
View file

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