yair/grbl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added code with merge conflict as note to self, accelleration will just have to wait

Browse Source
This commit is contained in:
Simen Svale Skogsrud
2010-12-20 14:01:38 +01:00
parent 703d812b85
commit 48b596c2fe
7 changed files with 158 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
config.c
View File

@@ -32,11 +32,19 @@ void reset_settings() {
settings.steps_per_mm[2] = Z_STEPS_PER_MM;
settings.pulse_microseconds = STEP_PULSE_MICROSECONDS;
settings.default_feed_rate = DEFAULT_FEEDRATE;
<<<<<<< Updated upstream
settings.default_seek_rate = RAPID_FEEDRATE;
settings.dead_feed_rate = DEFAULT_FEEDRATE/5;
settings.acceleration = DEFAULT_FEEDRATE/100;
settings.mm_per_arc_segment = MM_PER_ARC_SEGMENT;
settings.invert_mask = STEPPING_INVERT_MASK;
=======
settings.seek_rate = DEFAULT_SEEKRATE;
settings.mm_per_arc_segment = DEFAULT_MM_PER_ARC_SEGMENT;
settings.invert_mask = 0;
settings.max_jerk = DEFAULT_MAX_JERK;
settings.accelleration = DEFAULT_ACCELLERATION;
>>>>>>> Stashed changes
}
void dump_settings() {
@@ -51,7 +59,10 @@ void dump_settings() {
printPgmString(PSTR(" (mm/sec^2 max acceleration)\r\n$9 = ")); printFloat(settings.acceleration);
printPgmString(PSTR(" (mm/arc segment)\r\n$10 = ")); printInteger(settings.invert_mask);
printPgmString(PSTR(" (step port invert mask. binary = ")); printIntegerInBase(settings.invert_mask, 2);
printPgmString(PSTR(")\r\n\r\n'$x=value' to set parameter or just '$' to dump current settings\r\n"));
printPgmString(PSTR(")\n\r$8 = ")); printFloat(settings.max_jerk);
printPgmString(PSTR(" (max jerk in delta mm/second)\r\n$9 = ")); printFloat(settings.accelleration);
printPgmString(PSTR(" (accelleration in mm/second^2)"));
printPgmString(PSTR("\r\n'$x=value' to set parameter or just '$' to dump current settings\r\n"));
}
int read_settings() {
@@ -77,11 +88,19 @@ void store_setting(int parameter, double value) {
settings.steps_per_mm[parameter] = value; break;
case 3: settings.pulse_microseconds = round(value); break;
case 4: settings.default_feed_rate = value; break;
<<<<<<< Updated upstream
case 5: settings.default_seek_rate = value; break;
case 6: settings.dead_feed_rate = value; break;
case 8: settings.mm_per_arc_segment = value; break;
case 9: settings.acceleration = value; break;
case 10: settings.invert_mask = trunc(value); break;
=======
case 5: settings.seek_rate = value; break;
case 6: settings.mm_per_arc_segment = value; break;
case 7: settings.invert_mask = trunc(value); break;
case 8: settings.max_jerk = value; break;
case 9: settings.accelleration = fabs(value); break;
>>>>>>> Stashed changes
default:
printPgmString(PSTR("Unknown parameter\r\n"));
return;