CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop E element from homing_feedrate_mm_s

Browse Source
This commit is contained in:
Scott Lahteine 2019-01-23 19:25:57 -06:00
parent 95223cb28e
commit 0358ffcd4c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/module/motion.cpp
View File

@ -117,13 +117,13 @@ float feedrate_mm_s = MMM_TO_MMS(1500.0f);
int16_t feedrate_percentage = 100; int16_t feedrate_percentage = 100;
// Homing feedrate is const progmem - compare to constexpr in the header // Homing feedrate is const progmem - compare to constexpr in the header
const float homing_feedrate_mm_s[4] PROGMEM = { const float homing_feedrate_mm_s[XYZ] PROGMEM = {
#if ENABLED(DELTA) #if ENABLED(DELTA)
MMM_TO_MMS(HOMING_FEEDRATE_Z), MMM_TO_MMS(HOMING_FEEDRATE_Z), MMM_TO_MMS(HOMING_FEEDRATE_Z), MMM_TO_MMS(HOMING_FEEDRATE_Z),
#else #else
MMM_TO_MMS(HOMING_FEEDRATE_XY), MMM_TO_MMS(HOMING_FEEDRATE_XY), MMM_TO_MMS(HOMING_FEEDRATE_XY), MMM_TO_MMS(HOMING_FEEDRATE_XY),
#endif #endif
MMM_TO_MMS(HOMING_FEEDRATE_Z), 0 MMM_TO_MMS(HOMING_FEEDRATE_Z)
}; };
// Cartesian conversion result goes here: // Cartesian conversion result goes here:

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

@ -71,7 +71,7 @@ extern float cartes[XYZ];
* Feed rates are often configured with mm/m * Feed rates are often configured with mm/m
* but the planner and stepper like mm/s units. * but the planner and stepper like mm/s units.
*/ */
extern const float homing_feedrate_mm_s[4]; extern const float homing_feedrate_mm_s[XYZ];
FORCE_INLINE float homing_feedrate(const AxisEnum a) { return pgm_read_float(&homing_feedrate_mm_s[a]); } FORCE_INLINE float homing_feedrate(const AxisEnum a) { return pgm_read_float(&homing_feedrate_mm_s[a]); }
extern float feedrate_mm_s; extern float feedrate_mm_s;