diff options
| author | kintel <kintel@cb376a5e-1013-0410-a455-b6b1f9ac8223> | 2008-06-23 20:04:56 +0000 |
|---|---|---|
| committer | kintel <kintel@cb376a5e-1013-0410-a455-b6b1f9ac8223> | 2008-06-23 20:04:56 +0000 |
| commit | 75a58f609991f05554a946eb7da554b7059c83fb (patch) | |
| tree | b6e76c9b194013cb9422b731b0e4f914d14753c0 | |
| parent | ba3e85d02af52c9b0486c7d2a2f1c5f6e6ca2c33 (diff) | |
| download | reprap-backup-75a58f609991f05554a946eb7da554b7059c83fb.tar.gz reprap-backup-75a58f609991f05554a946eb7da554b7059c83fb.zip | |
cosmetics
git-svn-id: https://reprap.svn.sourceforge.net/svnroot/reprap@1651 cb376a5e-1013-0410-a455-b6b1f9ac8223
| -rw-r--r-- | trunk/reprap/firmware/Arduino/GCode_Interpreter/GCode_Interpreter.pde | 6 | ||||
| -rw-r--r-- | trunk/reprap/firmware/Arduino/GCode_Interpreter/stepper_control.pde | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/trunk/reprap/firmware/Arduino/GCode_Interpreter/GCode_Interpreter.pde b/trunk/reprap/firmware/Arduino/GCode_Interpreter/GCode_Interpreter.pde index 1dac1192..f2272c9b 100644 --- a/trunk/reprap/firmware/Arduino/GCode_Interpreter/GCode_Interpreter.pde +++ b/trunk/reprap/firmware/Arduino/GCode_Interpreter/GCode_Interpreter.pde @@ -1,3 +1,5 @@ +// Yep, this is actually -*- c++ -*- + // Arduino G-code Interpreter // v1.0 by Mike Ellery - initial software (mellery@gmail.com) // v1.1 by Zach Hoeken - cleaned up and did lots of tweaks (hoeken@gmail.com) @@ -53,12 +55,12 @@ void loop() serial_count++; } if (c == ')') - comment = false; // End of comment - start listening again + comment = false; // End of comment - start listening again } bytes_received = true; } - //mark no data if nothing heard for 10 milliseconds + //mark no data if nothing heard for 100 milliseconds else { if ((millis() - idle_time) >= 100) diff --git a/trunk/reprap/firmware/Arduino/GCode_Interpreter/stepper_control.pde b/trunk/reprap/firmware/Arduino/GCode_Interpreter/stepper_control.pde index cbdb463e..b709f1b4 100644 --- a/trunk/reprap/firmware/Arduino/GCode_Interpreter/stepper_control.pde +++ b/trunk/reprap/firmware/Arduino/GCode_Interpreter/stepper_control.pde @@ -1,3 +1,4 @@ +// Yep, this is actually -*- c++ -*- //init our variables long max_delta; @@ -233,7 +234,9 @@ void calculate_deltas() long calculate_feedrate_delay(float feedrate) { //how long is our line length? - float distance = sqrt(delta_units.x*delta_units.x + delta_units.y*delta_units.y + delta_units.z*delta_units.z); + float distance = sqrt(delta_units.x*delta_units.x + + delta_units.y*delta_units.y + + delta_units.z*delta_units.z); long master_steps = 0; //find the dominant axis. @@ -254,6 +257,7 @@ long calculate_feedrate_delay(float feedrate) //calculate delay between steps in microseconds. this is sort of tricky, but not too bad. //the formula has been condensed to save space. here it is in english: + // (feedrate is in mm/minute) // distance / feedrate * 60000000.0 = move duration in microseconds // move duration / master_steps = time between steps for master axis. |