Skip to main content
Homepage
Explore
Search or go to…
/
Register
Sign in
Explore
Primary navigation
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
?
Collapse sidebar
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Leder
marlin-anet-a8
Commits
379f1655
Commit
379f1655
authored
Sep 17, 2017
by
Scott Lahteine
Browse files
Options
Downloads
Patches
Plain Diff
Move M118 to cpp
parent
811c32b8
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
-1
0 additions, 1 deletion
Marlin/src/Marlin.cpp
Marlin/src/gcode/gcode.cpp
+2
-4
2 additions, 4 deletions
Marlin/src/gcode/gcode.cpp
Marlin/src/gcode/host/M118.cpp
+3
-1
3 additions, 1 deletion
Marlin/src/gcode/host/M118.cpp
with
5 additions
and
6 deletions
Marlin/src/Marlin.cpp
+
0
−
1
View file @
379f1655
...
@@ -355,7 +355,6 @@ bool pin_is_protected(const int8_t pin) {
...
@@ -355,7 +355,6 @@ bool pin_is_protected(const int8_t pin) {
return
false
;
return
false
;
}
}
#include
"gcode/host/M118.h"
#include
"gcode/host/M119.h"
#include
"gcode/host/M119.h"
#include
"gcode/control/M120_M121.h"
#include
"gcode/control/M120_M121.h"
...
...
...
...
This diff is collapsed.
Click to expand it.
Marlin/src/gcode/gcode.cpp
+
2
−
4
View file @
379f1655
...
@@ -116,7 +116,6 @@ void GcodeSuite::dwell(millis_t time) {
...
@@ -116,7 +116,6 @@ void GcodeSuite::dwell(millis_t time) {
//
//
// Placeholders for non-migrated codes
// Placeholders for non-migrated codes
//
//
extern
void
gcode_M118
();
extern
void
gcode_M119
();
extern
void
gcode_M119
();
extern
void
gcode_M120
();
extern
void
gcode_M120
();
extern
void
gcode_M121
();
extern
void
gcode_M121
();
...
@@ -498,9 +497,8 @@ void GcodeSuite::process_next_command() {
...
@@ -498,9 +497,8 @@ void GcodeSuite::process_next_command() {
case
115
:
M115
();
break
;
// M115: Report capabilities
case
115
:
M115
();
break
;
// M115: Report capabilities
case
117
:
M117
();
break
;
// M117: Set LCD message text, if possible
case
117
:
M117
();
break
;
// M117: Set LCD message text, if possible
case
118
:
// M118: Display a message in the host console
case
118
:
M118
();
break
;
// M118: Display a message in the host console
gcode_M118
();
break
;
case
119
:
// M119: Report endstop states
case
119
:
// M119: Report endstop states
gcode_M119
();
gcode_M119
();
break
;
break
;
...
...
...
...
This diff is collapsed.
Click to expand it.
Marlin/src/gcode/host/M118.
h
→
Marlin/src/gcode/host/M118.
cpp
+
3
−
1
View file @
379f1655
...
@@ -20,13 +20,15 @@
...
@@ -20,13 +20,15 @@
*
*
*/
*/
#include
"../gcode.h"
/**
/**
* M118: Display a message in the host console.
* M118: Display a message in the host console.
*
*
* A Append '// ' for an action command, as in OctoPrint
* A Append '// ' for an action command, as in OctoPrint
* E Have the host 'echo:' the text
* E Have the host 'echo:' the text
*/
*/
void
g
code
_
M118
()
{
void
G
code
Suite
::
M118
()
{
if
(
parser
.
boolval
(
'E'
))
SERIAL_ECHO_START
();
if
(
parser
.
boolval
(
'E'
))
SERIAL_ECHO_START
();
if
(
parser
.
boolval
(
'A'
))
SERIAL_ECHOPGM
(
"// "
);
if
(
parser
.
boolval
(
'A'
))
SERIAL_ECHOPGM
(
"// "
);
SERIAL_ECHOLN
(
parser
.
string_arg
);
SERIAL_ECHOLN
(
parser
.
string_arg
);
...
...
...
...
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