ManuelW/grbl-LPC-CoreXY
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

fixed feed rate calculation

Browse Source
This commit is contained in:
Simen Svale Skogsrud
2010-01-06 00:23:07 +01:00
parent df271c82da
commit ed400693b3
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config.h
View File

@@ -23,17 +23,17 @@
#define VERSION "0.0"
#define X_STEPS_PER_MM 2.0
#define Y_STEPS_PER_MM 2.0
#define Z_STEPS_PER_MM 2.0
#define X_STEPS_PER_MM 128.0
#define Y_STEPS_PER_MM 128.0
#define Z_STEPS_PER_MM 128.0
#define INCHES_PER_MM 25.4
#define X_STEPS_PER_INCH X_STEPS_PER_MM*INCHES_PER_MM
#define Y_STEPS_PER_INCH Y_STEPS_PER_MM*INCHES_PER_MM
#define Z_STEPS_PER_INCH Z_STEPS_PER_MM*INCHES_PER_MM
#define RAPID_FEEDRATE 200000.0 // in millimeters per minute
#define DEFAULT_FEEDRATE 200000.0
#define RAPID_FEEDRATE 960.0 // in millimeters per minute
#define DEFAULT_FEEDRATE 960.0
#define STEPPERS_ENABLE_DDR DDRB
#define STEPPERS_ENABLE_PORT PORTB

3
motion_control.c
View File

@@ -70,7 +70,8 @@ void compute_and_set_step_pace(double feed_rate, double millimeters_of_travel, u
if (invert) {
pace = round(ONE_MINUTE_OF_MICROSECONDS/feed_rate/steps);
} else {
pace = round(((millimeters_of_travel * ONE_MINUTE_OF_MICROSECONDS) / feed_rate) / steps);
pace = round((ONE_MINUTE_OF_MICROSECONDS/X_STEPS_PER_MM)/feed_rate);
//pace = round(((millimeters_of_travel * ONE_MINUTE_OF_MICROSECONDS) / feed_rate) / steps);
}
st_buffer_pace(pace);
}