Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
marlin-anet-a8
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Leder
marlin-anet-a8
Commits
b51c06e2
Commit
b51c06e2
authored
May 11, 2012
by
MaikStohn
Browse files
Options
Downloads
Plain Diff
Merge branch 'Marlin_v1' of
https://github.com/ErikZalm/Marlin
into Marlin_v1
parents
159ae908
451f9cc6
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
Marlin/planner.h
+4
-4
4 additions, 4 deletions
Marlin/planner.h
README.md
+2
-1
2 additions, 1 deletion
README.md
with
6 additions
and
5 deletions
Marlin/planner.h
+
4
−
4
View file @
b51c06e2
...
...
@@ -45,10 +45,10 @@ typedef struct {
#endif
// Fields used by the motion planner to manage acceleration
// float speed_x, speed_y, speed_z, speed_e; // Nominal mm/
minute
for each axis
float
nominal_speed
;
// The nominal speed for this block in mm/
min
float
entry_speed
;
// Entry speed at previous-current junction in mm/
min
float
max_entry_speed
;
// Maximum allowable junction entry speed in mm/
min
// float speed_x, speed_y, speed_z, speed_e; // Nominal mm/
sec
for each axis
float
nominal_speed
;
// The nominal speed for this block in mm/
sec
float
entry_speed
;
// Entry speed at previous-current junction in mm/
sec
float
max_entry_speed
;
// Maximum allowable junction entry speed in mm/
sec
float
millimeters
;
// The total travel of this block in mm
float
acceleration
;
// acceleration mm/sec^2
unsigned
char
recalculate_flag
;
// Planner flag to recalculate trapezoids on entry junction
...
...
This diff is collapsed.
Click to expand it.
README.md
+
2
−
1
View file @
b51c06e2
...
...
@@ -161,7 +161,8 @@ Advance:
EEPROM:
*
M500 - stores paramters in EEPROM
*
M500 - stores paramters in EEPROM. This parameters are stored: axis_steps_per_unit, max_feedrate, max_acceleration ,acceleration,retract_acceleration,
minimumfeedrate,mintravelfeedrate,minsegmenttime, jerk velocities, PID
*
M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily).
*
M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to.
*
M503 - print the current settings (from memory not from eeprom)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment