Переглянути джерело

Disable SCARA feedrate scaling by default

Scott Lahteine 8 роки тому
джерело
коміт
911a87e006

+ 3
- 3
Marlin/Marlin_main.cpp Переглянути файл

11136
     // SERIAL_ECHOPAIR(" seconds=", seconds);
11136
     // SERIAL_ECHOPAIR(" seconds=", seconds);
11137
     // SERIAL_ECHOLNPAIR(" segments=", segments);
11137
     // SERIAL_ECHOLNPAIR(" segments=", segments);
11138
 
11138
 
11139
-    #if IS_SCARA
11139
+    #if IS_SCARA && ENABLED(SCARA_FEEDRATE_SCALING)
11140
       // SCARA needs to scale the feed rate from mm/s to degrees/s
11140
       // SCARA needs to scale the feed rate from mm/s to degrees/s
11141
       const float inv_segment_length = min(10.0, float(segments) / cartesian_mm), // 1/mm/segs
11141
       const float inv_segment_length = min(10.0, float(segments) / cartesian_mm), // 1/mm/segs
11142
                   feed_factor = inv_segment_length * _feedrate_mm_s;
11142
                   feed_factor = inv_segment_length * _feedrate_mm_s;
11163
 
11163
 
11164
       ADJUST_DELTA(logical); // Adjust Z if bed leveling is enabled
11164
       ADJUST_DELTA(logical); // Adjust Z if bed leveling is enabled
11165
 
11165
 
11166
-      #if IS_SCARA
11166
+      #if IS_SCARA && ENABLED(SCARA_FEEDRATE_SCALING)
11167
         // For SCARA scale the feed rate from mm/s to degrees/s
11167
         // For SCARA scale the feed rate from mm/s to degrees/s
11168
         // Use ratio between the length of the move and the larger angle change
11168
         // Use ratio between the length of the move and the larger angle change
11169
         const float adiff = abs(delta[A_AXIS] - oldA),
11169
         const float adiff = abs(delta[A_AXIS] - oldA),
11179
     // Since segment_distance is only approximate,
11179
     // Since segment_distance is only approximate,
11180
     // the final move must be to the exact destination.
11180
     // the final move must be to the exact destination.
11181
 
11181
 
11182
-    #if IS_SCARA
11182
+    #if IS_SCARA && ENABLED(SCARA_FEEDRATE_SCALING)
11183
       // For SCARA scale the feed rate from mm/s to degrees/s
11183
       // For SCARA scale the feed rate from mm/s to degrees/s
11184
       // With segments > 1 length is 1 segment, otherwise total length
11184
       // With segments > 1 length is 1 segment, otherwise total length
11185
       inverse_kinematics(ltarget);
11185
       inverse_kinematics(ltarget);

+ 1
- 0
Marlin/example_configurations/SCARA/Configuration.h Переглянути файл

76
 
76
 
77
 #if ENABLED(MORGAN_SCARA) || ENABLED(MAKERARM_SCARA)
77
 #if ENABLED(MORGAN_SCARA) || ENABLED(MAKERARM_SCARA)
78
   //#define DEBUG_SCARA_KINEMATICS
78
   //#define DEBUG_SCARA_KINEMATICS
79
+  //#define SCARA_FEEDRATE_SCALING // Convert XY feedrate from mm/s to degrees/s on the fly
79
 
80
 
80
   // If movement is choppy try lowering this value
81
   // If movement is choppy try lowering this value
81
   #define SCARA_SEGMENTS_PER_SECOND 200
82
   #define SCARA_SEGMENTS_PER_SECOND 200

Завантаження…
Відмінити
Зберегти