Просмотр исходного кода

Fix feedrate in gcode_T (max_feedrate is mm/s)

Scott Lahteine 8 лет назад
Родитель
Сommit
ef3bef6b9e
3 измененных файлов: 9 добавлений и 7 удалений
  1. 7
    5
      Marlin/Marlin_main.cpp
  2. 1
    1
      Marlin/planner.cpp
  3. 1
    1
      Marlin/planner.h

+ 7
- 5
Marlin/Marlin_main.cpp Просмотреть файл

6633
       if (next_feedrate > 0.0) stored_feedrate = feedrate = next_feedrate;
6633
       if (next_feedrate > 0.0) stored_feedrate = feedrate = next_feedrate;
6634
     }
6634
     }
6635
     else {
6635
     else {
6636
-      #ifdef XY_TRAVEL_SPEED
6637
-        feedrate = XY_TRAVEL_SPEED;
6638
-      #else
6639
-        feedrate = min(planner.max_feedrate[X_AXIS], planner.max_feedrate[Y_AXIS]);
6640
-      #endif
6636
+      feedrate =
6637
+        #ifdef XY_TRAVEL_SPEED
6638
+          XY_TRAVEL_SPEED
6639
+        #else
6640
+          min(planner.max_feedrate[X_AXIS], planner.max_feedrate[Y_AXIS]) * 60
6641
+        #endif
6642
+      ;
6641
     }
6643
     }
6642
 
6644
 
6643
     if (tmp_extruder != active_extruder) {
6645
     if (tmp_extruder != active_extruder) {

+ 1
- 1
Marlin/planner.cpp Просмотреть файл

80
 volatile uint8_t Planner::block_buffer_head = 0;           // Index of the next block to be pushed
80
 volatile uint8_t Planner::block_buffer_head = 0;           // Index of the next block to be pushed
81
 volatile uint8_t Planner::block_buffer_tail = 0;
81
 volatile uint8_t Planner::block_buffer_tail = 0;
82
 
82
 
83
-float Planner::max_feedrate[NUM_AXIS]; // Max speeds in mm per minute
83
+float Planner::max_feedrate[NUM_AXIS]; // Max speeds in mm per second
84
 float Planner::axis_steps_per_mm[NUM_AXIS];
84
 float Planner::axis_steps_per_mm[NUM_AXIS];
85
 unsigned long Planner::max_acceleration_steps_per_s2[NUM_AXIS];
85
 unsigned long Planner::max_acceleration_steps_per_s2[NUM_AXIS];
86
 unsigned long Planner::max_acceleration_mm_per_s2[NUM_AXIS]; // Use M201 to override by software
86
 unsigned long Planner::max_acceleration_mm_per_s2[NUM_AXIS]; // Use M201 to override by software

+ 1
- 1
Marlin/planner.h Просмотреть файл

115
     static volatile uint8_t block_buffer_head;           // Index of the next block to be pushed
115
     static volatile uint8_t block_buffer_head;           // Index of the next block to be pushed
116
     static volatile uint8_t block_buffer_tail;
116
     static volatile uint8_t block_buffer_tail;
117
 
117
 
118
-    static float max_feedrate[NUM_AXIS]; // Max speeds in mm per minute
118
+    static float max_feedrate[NUM_AXIS]; // Max speeds in mm per second
119
     static float axis_steps_per_mm[NUM_AXIS];
119
     static float axis_steps_per_mm[NUM_AXIS];
120
     static unsigned long max_acceleration_steps_per_s2[NUM_AXIS];
120
     static unsigned long max_acceleration_steps_per_s2[NUM_AXIS];
121
     static unsigned long max_acceleration_mm_per_s2[NUM_AXIS]; // Use M201 to override by software
121
     static unsigned long max_acceleration_mm_per_s2[NUM_AXIS]; // Use M201 to override by software

Загрузка…
Отмена
Сохранить