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
fc52fc72
Commit
fc52fc72
authored
Sep 16, 2017
by
Scott Lahteine
Browse files
Options
Downloads
Patches
Plain Diff
Move M48 to cpp
parent
be8d9134
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Marlin/src/Marlin.cpp
+0
-4
0 additions, 4 deletions
Marlin/src/Marlin.cpp
Marlin/src/gcode/calibrate/M48.cpp
+15
-1
15 additions, 1 deletion
Marlin/src/gcode/calibrate/M48.cpp
Marlin/src/gcode/gcode.cpp
+2
-5
2 additions, 5 deletions
Marlin/src/gcode/gcode.cpp
with
17 additions
and
10 deletions
Marlin/src/Marlin.cpp
+
0
−
4
View file @
fc52fc72
...
@@ -370,10 +370,6 @@ bool pin_is_protected(const int8_t pin) {
...
@@ -370,10 +370,6 @@ bool pin_is_protected(const int8_t pin) {
return
false
;
return
false
;
}
}
#if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
#include
"gcode/calibrate/M48.h"
#endif
#include
"gcode/stats/M75.h"
#include
"gcode/stats/M75.h"
#include
"gcode/stats/M76.h"
#include
"gcode/stats/M76.h"
#include
"gcode/stats/M77.h"
#include
"gcode/stats/M77.h"
...
...
...
...
This diff is collapsed.
Click to expand it.
Marlin/src/gcode/calibrate/M48.
h
→
Marlin/src/gcode/calibrate/M48.
cpp
+
15
−
1
View file @
fc52fc72
...
@@ -20,6 +20,18 @@
...
@@ -20,6 +20,18 @@
*
*
*/
*/
#include
"../../inc/MarlinConfig.h"
#if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
#include
"../gcode.h"
#include
"../../module/motion.h"
#include
"../../module/probe.h"
#if DISABLED(DELTA)
#include
"../../feature/bedlevel/bedlevel.h"
#endif
/**
/**
* M48: Z probe repeatability measurement function.
* M48: Z probe repeatability measurement function.
*
*
...
@@ -38,7 +50,7 @@
...
@@ -38,7 +50,7 @@
* Any information generated by a prior G29 Bed leveling command will be lost and need to be
* Any information generated by a prior G29 Bed leveling command will be lost and need to be
* regenerated.
* regenerated.
*/
*/
void
g
code
_
M48
()
{
void
G
code
Suite
::
M48
()
{
if
(
axis_unhomed_error
())
return
;
if
(
axis_unhomed_error
())
return
;
...
@@ -271,3 +283,5 @@ void gcode_M48() {
...
@@ -271,3 +283,5 @@ void gcode_M48() {
report_current_position
();
report_current_position
();
}
}
#endif // Z_MIN_PROBE_REPEATABILITY_TEST
This diff is collapsed.
Click to expand it.
Marlin/src/gcode/gcode.cpp
+
2
−
5
View file @
fc52fc72
...
@@ -117,7 +117,6 @@ void GcodeSuite::dwell(millis_t time) {
...
@@ -117,7 +117,6 @@ void GcodeSuite::dwell(millis_t time) {
// Placeholders for non-migrated codes
// Placeholders for non-migrated codes
//
//
extern
void
gcode_M18_M84
();
extern
void
gcode_M18_M84
();
extern
void
gcode_M48
();
extern
void
gcode_M75
();
extern
void
gcode_M75
();
extern
void
gcode_M76
();
extern
void
gcode_M76
();
extern
void
gcode_M77
();
extern
void
gcode_M77
();
...
@@ -438,10 +437,8 @@ void GcodeSuite::process_next_command() {
...
@@ -438,10 +437,8 @@ void GcodeSuite::process_next_command() {
#endif
#endif
#if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
#if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
case
48
:
// M48: Z probe repeatability test
case
48
:
M48
();
break
;
// M48: Z probe repeatability test
gcode_M48
();
#endif
break
;
#endif // Z_MIN_PROBE_REPEATABILITY_TEST
#if ENABLED(UBL_G26_MESH_VALIDATION)
#if ENABLED(UBL_G26_MESH_VALIDATION)
case
49
:
M49
();
break
;
// M49: Turn on or off G26 debug flag for verbose output
case
49
:
M49
();
break
;
// M49: Turn on or off G26 debug flag for verbose output
...
...
...
...
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