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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Leder
marlin-anet-a8
Commits
9593f09b
Commit
9593f09b
authored
10 years ago
by
Scott Lahteine
Browse files
Options
Downloads
Plain Diff
Merge pull request #1764 from thinkyhead/probe_leveling
Fix homing and leveling
parents
7bf31cc8
72c7de35
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Marlin/Conditionals.h
+5
-1
5 additions, 1 deletion
Marlin/Conditionals.h
Marlin/Marlin.h
+2
-0
2 additions, 0 deletions
Marlin/Marlin.h
Marlin/Marlin_main.cpp
+302
-312
302 additions, 312 deletions
Marlin/Marlin_main.cpp
with
309 additions
and
313 deletions
Marlin/Conditionals.h
+
5
−
1
View file @
9593f09b
...
...
@@ -4,6 +4,10 @@
*/
#ifndef CONDITIONALS_H
#ifndef M_PI
#define M_PI 3.1415926536
#endif
#ifndef CONFIGURATION_LCD // Get the LCD defines which are needed first
#define CONFIGURATION_LCD
...
...
@@ -252,7 +256,7 @@
* Advance calculated values
*/
#ifdef ADVANCE
#define EXTRUSION_AREA (0.25 * D_FILAMENT * D_FILAMENT *
3.14159
)
#define EXTRUSION_AREA (0.25 * D_FILAMENT * D_FILAMENT *
M_PI
)
#define STEPS_PER_CUBIC_MM_E (axis_steps_per_unit[E_AXIS] / EXTRUSION_AREA)
#endif
...
...
This diff is collapsed.
Click to expand it.
Marlin/Marlin.h
+
2
−
0
View file @
9593f09b
...
...
@@ -29,6 +29,8 @@
#define BIT(b) (1<<(b))
#define TEST(n,b) (((n)&BIT(b))!=0)
#define RADIANS(d) ((d)*M_PI/180.0)
#define DEGREES(r) ((d)*180.0/M_PI)
// Arduino < 1.0.0 does not define this, so we need to do it ourselves
#ifndef analogInputToDigitalPin
...
...
This diff is collapsed.
Click to expand it.
Marlin/Marlin_main.cpp
+
302
−
312
View file @
9593f09b
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