Browse Source

Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1

MaikStohn 13 years ago
parent
commit
b51c06e2b3
2 changed files with 6 additions and 5 deletions
  1. 4
    4
      Marlin/planner.h
  2. 2
    1
      README.md

+ 4
- 4
Marlin/planner.h View File

45
   #endif
45
   #endif
46
 
46
 
47
   // Fields used by the motion planner to manage acceleration
47
   // Fields used by the motion planner to manage acceleration
48
-//  float speed_x, speed_y, speed_z, speed_e;        // Nominal mm/minute for each axis
49
-  float nominal_speed;                               // The nominal speed for this block in mm/min  
50
-  float entry_speed;                                 // Entry speed at previous-current junction in mm/min
51
-  float max_entry_speed;                             // Maximum allowable junction entry speed in mm/min
48
+//  float speed_x, speed_y, speed_z, speed_e;        // Nominal mm/sec for each axis
49
+  float nominal_speed;                               // The nominal speed for this block in mm/sec 
50
+  float entry_speed;                                 // Entry speed at previous-current junction in mm/sec
51
+  float max_entry_speed;                             // Maximum allowable junction entry speed in mm/sec
52
   float millimeters;                                 // The total travel of this block in mm
52
   float millimeters;                                 // The total travel of this block in mm
53
   float acceleration;                                // acceleration mm/sec^2
53
   float acceleration;                                // acceleration mm/sec^2
54
   unsigned char recalculate_flag;                    // Planner flag to recalculate trapezoids on entry junction
54
   unsigned char recalculate_flag;                    // Planner flag to recalculate trapezoids on entry junction

+ 2
- 1
README.md View File

161
 
161
 
162
 EEPROM:
162
 EEPROM:
163
 
163
 
164
-*   M500 - stores paramters in EEPROM
164
+*   M500 - stores paramters in EEPROM. This parameters are stored:  axis_steps_per_unit,  max_feedrate, max_acceleration  ,acceleration,retract_acceleration,
165
+  minimumfeedrate,mintravelfeedrate,minsegmenttime,  jerk velocities, PID
165
 *   M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily).  
166
 *   M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily).  
166
 *   M502 - reverts to the default "factory settings".  You still need to store them in EEPROM afterwards if you want to.
167
 *   M502 - reverts to the default "factory settings".  You still need to store them in EEPROM afterwards if you want to.
167
 *   M503 - print the current settings (from memory not from eeprom)
168
 *   M503 - print the current settings (from memory not from eeprom)

Loading…
Cancel
Save