fixed a bug where F-commands never would modify feed-rate of G0-operations

This commit is contained in:
Simen Svale Skogsrud 2011-02-04 23:48:10 +01:00
parent f38c5016ed
commit 9f5365aac9

View File

@ -217,8 +217,12 @@ uint8_t gc_execute_line(char *line) {
case 'F': case 'F':
if (gc.inverse_feed_rate_mode) { if (gc.inverse_feed_rate_mode) {
inverse_feed_rate = unit_converted_value; // seconds per motion for this motion only inverse_feed_rate = unit_converted_value; // seconds per motion for this motion only
} else { } else {
gc.feed_rate = unit_converted_value/60; // millimeters pr second if (gc.motion_mode == MOTION_MODE_SEEK) {
gc.seek_rate = unit_converted_value/60;
} else {
gc.feed_rate = unit_converted_value/60; // millimeters pr second
}
} }
break; break;
case 'I': case 'J': case 'K': offset[letter-'I'] = unit_converted_value; break; case 'I': case 'J': case 'K': offset[letter-'I'] = unit_converted_value; break;