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

G28 F

Browse source
This commit is contained in:
vovodroid 2024-08-29 13:51:33 +03:00
parent 8ac0f14796
commit 256f88da5c
3 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -237,6 +237,13 @@ void GcodeSuite::G28() {
return;
}
#if NUM_AXES >= 2
if (parser.seen_test('F'))
homing_feedrate_mm_m.x = homing_feedrate_mm_m.y = parser.floatval('F');
else
homing_feedrate_mm_m = xyz_feedrate_t(HOMING_FEEDRATE_MM_M);
#endif
#if ENABLED(FULL_REPORT_TO_HOST_FEATURE)
const M_StateEnum old_grblstate = M_State_grbl;
set_and_report_grblstate(M_HOMING);

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

@ -141,6 +141,9 @@ xyze_pos_t destination; // {0}
#endif
feedRate_t feedrate_mm_s = MMM_TO_MMS(DEFAULT_FEEDRATE_MM_M);
int16_t feedrate_percentage = 100;
#if NUM_AXES >= 2
xyz_feedrate_t homing_feedrate_mm_m = HOMING_FEEDRATE_MM_M;
#endif
// Cartesian conversion result goes here:
xyz_pos_t cartes;

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

@ -79,7 +79,12 @@ extern xyz_pos_t cartes;
* Feed rates are often configured with mm/m
* but the planner and stepper like mm/s units.
*/
constexpr xyz_feedrate_t homing_feedrate_mm_m = HOMING_FEEDRATE_MM_M;
#if NUM_AXES >= 2
extern xyz_feedrate_t homing_feedrate_mm_m;
#else
constexpr xyz_feedrate_t homing_feedrate_mm_m = HOMING_FEEDRATE_MM_M;
#endif
FORCE_INLINE feedRate_t homing_feedrate(const AxisEnum a) {
float v = TERN0(HAS_Z_AXIS, homing_feedrate_mm_m.z);
#if DISABLED(DELTA)