bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Sync with non-gen6 version

Browse Source
This commit is contained in:
Erik van der Zalm
2011-09-14 18:56:45 +02:00
parent b5f6482dce
commit 8e017b81ab
3 changed files with 44 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/Marlin.h
View File

@ -86,12 +86,13 @@ typedef struct {
float nominal_speed; // The nominal speed for this block in mm/min
float millimeters; // The total travel of this block in mm
float entry_speed;
float acceleration; // acceleration mm/sec^2
// Settings for the trapezoid generator
long nominal_rate; // The nominal step rate for this block in step_events/sec
volatile long initial_rate; // The jerk-adjusted step rate at start of block
volatile long final_rate; // The minimal rate at exit
long acceleration; // acceleration mm/sec^2
volatile long initial_rate; // The jerk-adjusted step rate at start of block
volatile long final_rate; // The minimal rate at exit
long acceleration_st; // acceleration steps/sec^2
volatile char busy;
} block_t;
@ -104,4 +105,3 @@ void plan_set_position(float x, float y, float z, float e);
void st_wake_up();
void st_synchronize();