Browse Source

Drop E element from `homing_feedrate_mm_s`

pull/1/head
Scott Lahteine 6 years ago
parent
commit
0358ffcd4c
  1. 4
      Marlin/src/module/motion.cpp
  2. 2
      Marlin/src/module/motion.h

4
Marlin/src/module/motion.cpp

@ -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

@ -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;

Loading…
Cancel
Save