3D-printing/Marlin
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2026-02-15 17:09:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

As G28_F_TEMPORARY_FEEDRATE

Browse source
This commit is contained in:
Scott Lahteine 2024-10-04 13:11:06 -05:00
parent aebd51952d
commit 23a56c23e7
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Marlin/src/gcode/calibrate/G28.cpp
View file

@ -237,11 +237,10 @@ void GcodeSuite::G28() {
return;
}
#if HAS_Y_AXIS
#if ENABLED(G28_F_TEMPORARY_FEEDRATE)
REMEMBER(fr, homing_feedrate_mm_m);
if (parser.floatval('F') > 0)
homing_feedrate_mm_m.x = homing_feedrate_mm_m.y = parser.value_feedrate();
else
homing_feedrate_mm_m = xyz_feedrate_t(HOMING_FEEDRATE_MM_M);
homing_feedrate_mm_m.x = TERN_(HAS_Y_AXIS, homing_feedrate_mm_m.y =) parser.value_feedrate();
#endif
#if ENABLED(FULL_REPORT_TO_HOST_FEATURE)

5
Marlin/src/gcode/gcode.cpp
View file

@ -199,10 +199,11 @@ void GcodeSuite::get_destination_from_command() {
recovery.save();
#endif
if (parser.floatval('F') > 0) {
const float fr_mm_m = parser.floatval('F');
if (fr_mm_m > 0) {
feedrate_mm_s = parser.value_feedrate();
// Update the cutter feed rate for use by M4 I set inline moves.
TERN_(LASER_FEATURE, cutter.feedrate_mm_m = MMS_TO_MMM(feedrate_mm_s));
TERN_(LASER_FEATURE, cutter.feedrate_mm_m = fr_mm_m);
}
#if ALL(PRINTCOUNTER, HAS_EXTRUDERS)

2
Marlin/src/module/motion.cpp
View file

@ -141,7 +141,7 @@ xyze_pos_t destination; // {0}
#endif
feedRate_t feedrate_mm_s = MMM_TO_MMS(DEFAULT_FEEDRATE_MM_M);
int16_t feedrate_percentage = 100;
#if HAS_Y_AXIS
#if ENABLED(G28_F_TEMPORARY_FEEDRATE)
xyz_feedrate_t homing_feedrate_mm_m = HOMING_FEEDRATE_MM_M;
#endif

2
Marlin/src/module/motion.h
View file

@ -79,7 +79,7 @@ extern xyz_pos_t cartes;
* Feed rates are often configured with mm/m
* but the planner and stepper like mm/s units.
*/
#if HAS_Y_AXIS
#if ENABLED(G28_F_TEMPORARY_FEEDRATE)
extern xyz_feedrate_t homing_feedrate_mm_m;
#else
constexpr xyz_feedrate_t homing_feedrate_mm_m = HOMING_FEEDRATE_MM_M;