Browse Source

Merge pull request #4510 from thinkyhead/rc_buzzer_needs_beeper

Patch for COREYZ, tweak to scaled feedrate macro
Scott Lahteine 9 years ago
parent
commit
58749cae94
3 changed files with 3 additions and 3 deletions
  1. 1
    1
      Marlin/Marlin.h
  2. 1
    1
      Marlin/enum.h
  3. 1
    1
      Marlin/planner.cpp

+ 1
- 1
Marlin/Marlin.h View File

@@ -261,7 +261,7 @@ extern int feedrate_percentage;
261 261
 
262 262
 #define MMM_TO_MMS(MM_M) ((MM_M)/60.0)
263 263
 #define MMS_TO_MMM(MM_S) ((MM_S)*60.0)
264
-#define MMM_SCALED(MM_M) ((MM_M)*feedrate_percentage/100.0)
264
+#define MMM_SCALED(MM_M) ((MM_M)*feedrate_percentage*0.01)
265 265
 #define MMS_SCALED(MM_S) MMM_SCALED(MM_S)
266 266
 #define MMM_TO_MMS_SCALED(MM_M) (MMS_SCALED(MMM_TO_MMS(MM_M)))
267 267
 

+ 1
- 1
Marlin/enum.h View File

@@ -42,7 +42,7 @@ enum AxisEnum {
42 42
   E_AXIS  = 3,
43 43
   X_HEAD  = 4,
44 44
   Y_HEAD  = 5,
45
-  Z_HEAD  = 5
45
+  Z_HEAD  = 6
46 46
 };
47 47
 
48 48
 #define LOOP_XYZ(VAR)  for (uint8_t VAR=X_AXIS; VAR<=Z_AXIS; VAR++)

+ 1
- 1
Marlin/planner.cpp View File

@@ -782,7 +782,7 @@ void Planner::check_axes_activity() {
782 782
    * Having the real displacement of the head, we can calculate the total movement length and apply the desired speed.
783 783
    */
784 784
   #if ENABLED(COREXY) || ENABLED(COREXZ) || ENABLED(COREYZ)
785
-    float delta_mm[6];
785
+    float delta_mm[7];
786 786
     #if ENABLED(COREXY)
787 787
       delta_mm[X_HEAD] = dx * steps_to_mm[A_AXIS];
788 788
       delta_mm[Y_HEAD] = dy * steps_to_mm[B_AXIS];

Loading…
Cancel
Save