From 23462de85acc595ba4a36783c3b45743e8c86b26 Mon Sep 17 00:00:00 2001 From: Simen Svale Skogsrud Date: Thu, 17 Feb 2011 20:23:12 +0100 Subject: [PATCH] cleaned up settings.h --- settings.c | 13 +++++++++++++ settings.h | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/settings.c b/settings.c index a3c33dd..6669cc9 100644 --- a/settings.c +++ b/settings.c @@ -39,6 +39,19 @@ typedef struct { double mm_per_arc_segment; } settings_v1_t; +// Default settings (used when resetting eeprom-settings) +#define MICROSTEPS 8 +#define DEFAULT_X_STEPS_PER_MM (94.488188976378*MICROSTEPS) +#define DEFAULT_Y_STEPS_PER_MM (94.488188976378*MICROSTEPS) +#define DEFAULT_Z_STEPS_PER_MM (94.488188976378*MICROSTEPS) +#define DEFAULT_STEP_PULSE_MICROSECONDS 30 +#define DEFAULT_MM_PER_ARC_SEGMENT 0.1 +#define DEFAULT_RAPID_FEEDRATE 480.0 // in millimeters per minute +#define DEFAULT_FEEDRATE 480.0 +#define DEFAULT_ACCELERATION (DEFAULT_FEEDRATE/100.0) +#define DEFAULT_MAX_JERK 50.0 +#define DEFAULT_STEPPING_INVERT_MASK 0 + void settings_reset() { settings.steps_per_mm[X_AXIS] = DEFAULT_X_STEPS_PER_MM; settings.steps_per_mm[Y_AXIS] = DEFAULT_Y_STEPS_PER_MM; diff --git a/settings.h b/settings.h index 5831e0f..505cc3b 100644 --- a/settings.h +++ b/settings.h @@ -54,17 +54,4 @@ void settings_dump(); // A helper method to set new settings from command line void settings_store_setting(int parameter, double value); -// Default settings (used when resetting eeprom-settings) -#define MICROSTEPS 8 -#define DEFAULT_X_STEPS_PER_MM (94.488188976378*MICROSTEPS) -#define DEFAULT_Y_STEPS_PER_MM (94.488188976378*MICROSTEPS) -#define DEFAULT_Z_STEPS_PER_MM (94.488188976378*MICROSTEPS) -#define DEFAULT_STEP_PULSE_MICROSECONDS 30 -#define DEFAULT_MM_PER_ARC_SEGMENT 0.1 -#define DEFAULT_RAPID_FEEDRATE 480.0 // in millimeters per minute -#define DEFAULT_FEEDRATE 480.0 -#define DEFAULT_ACCELERATION (DEFAULT_FEEDRATE/100.0) -#define DEFAULT_MAX_JERK 50.0 -#define DEFAULT_STEPPING_INVERT_MASK 0 - #endif