Parcourir la source

Drop E element from `homing_feedrate_mm_s`

Scott Lahteine il y a 6 ans
Parent
révision
0358ffcd4c
2 fichiers modifiés avec 3 ajouts et 3 suppressions
  1. 2
    2
      Marlin/src/module/motion.cpp
  2. 1
    1
      Marlin/src/module/motion.h

+ 2
- 2
Marlin/src/module/motion.cpp Voir le fichier

117
 int16_t feedrate_percentage = 100;
117
 int16_t feedrate_percentage = 100;
118
 
118
 
119
 // Homing feedrate is const progmem - compare to constexpr in the header
119
 // Homing feedrate is const progmem - compare to constexpr in the header
120
-const float homing_feedrate_mm_s[4] PROGMEM = {
120
+const float homing_feedrate_mm_s[XYZ] PROGMEM = {
121
   #if ENABLED(DELTA)
121
   #if ENABLED(DELTA)
122
     MMM_TO_MMS(HOMING_FEEDRATE_Z), MMM_TO_MMS(HOMING_FEEDRATE_Z),
122
     MMM_TO_MMS(HOMING_FEEDRATE_Z), MMM_TO_MMS(HOMING_FEEDRATE_Z),
123
   #else
123
   #else
124
     MMM_TO_MMS(HOMING_FEEDRATE_XY), MMM_TO_MMS(HOMING_FEEDRATE_XY),
124
     MMM_TO_MMS(HOMING_FEEDRATE_XY), MMM_TO_MMS(HOMING_FEEDRATE_XY),
125
   #endif
125
   #endif
126
-  MMM_TO_MMS(HOMING_FEEDRATE_Z), 0
126
+  MMM_TO_MMS(HOMING_FEEDRATE_Z)
127
 };
127
 };
128
 
128
 
129
 // Cartesian conversion result goes here:
129
 // Cartesian conversion result goes here:

+ 1
- 1
Marlin/src/module/motion.h Voir le fichier

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

Chargement…
Annuler
Enregistrer