diff options
author | Emanuele Caruso <emanuele.caruso@gmail.com> | 2011-05-19 15:57:29 +0200 |
---|---|---|
committer | Emanuele Caruso <emanuele.caruso@gmail.com> | 2011-05-19 15:57:29 +0200 |
commit | a1e6fe387581b8ad981ecf29f901cc74982762e6 (patch) | |
tree | 7559d34a9bb60e5aea26f3778312c56b315eada3 /Tonokip_Firmware/configuration.h | |
parent | 7b90a1f0f89f588247051a76d849584aa515cebc (diff) |
Some refactoring in preparation of axis with less start speed constraint check. See next commit for more info.
Diffstat (limited to 'Tonokip_Firmware/configuration.h')
-rw-r--r-- | Tonokip_Firmware/configuration.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Tonokip_Firmware/configuration.h b/Tonokip_Firmware/configuration.h index 004c0d8..00bc9a5 100644 --- a/Tonokip_Firmware/configuration.h +++ b/Tonokip_Firmware/configuration.h @@ -24,7 +24,8 @@ //Acceleration settings #ifdef RAMP_ACCELERATION -float min_units_per_second = 35.0; // the minimum feedrate +//X, Y (Z and E currently not used) maximum start speed. E default value is good for skeinforge 40+, for older versions raise it a lot. +float max_start_speed_units_per_second[] = {35.0,35.0,1.0,10.0}; long max_acceleration_units_per_sq_second[] = {750,750,100,10000}; // X, Y (Z and E currently not used) max acceleration in mm/s^2 for printing moves long max_travel_acceleration_units_per_sq_second[] = {1500,1500,100}; // X, Y (Z currently not used) max acceleration in mm/s^2 for travel moves #endif @@ -87,10 +88,7 @@ float min_constant_speed_units = 2; // the minimum units of an accelerated move //Calibration variables const int NUM_AXIS = 4; // The axis order in all axis related arrays is X, Y, Z, E -float x_steps_per_unit = 80.376; -float y_steps_per_unit = 80.376; -float z_steps_per_unit = 3200/1.25; -float e_steps_per_unit = 16; +float axis_steps_per_unit[] = {80.376,80.376,3200/1.25,16}; float max_feedrate = 200000; //mmm, acceleration! float max_z_feedrate = 120; |