Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
MarlinKimbra
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
machinery
MarlinKimbra
Commits
0b18e541
Commit
0b18e541
authored
May 04, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master' into Development
parents
cf4d0aeb
4802e3df
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+1
-1
language.h
MarlinKimbra/language.h
+1
-1
No files found.
MarlinKimbra/Marlin_main.cpp
View file @
0b18e541
...
...
@@ -6652,7 +6652,7 @@ void disable_all_steppers() {
void
manage_inactivity
(
bool
ignore_stepper_queue
/*=false*/
)
{
#if HAS_FILRUNOUT
if
((
printing
||
IS_SD_PRINTING
)
&&
(
READ
(
FILRUNOUT_PIN
)
^
FIL
_RUNOUT
_INVERTING
))
if
((
printing
||
IS_SD_PRINTING
)
&&
(
READ
(
FILRUNOUT_PIN
)
^
FIL
RUNOUT_PIN
_INVERTING
))
filrunout
();
#endif
...
...
MarlinKimbra/language.h
View file @
0b18e541
...
...
@@ -142,7 +142,7 @@
#define MSG_HOTEND_OFFSET "Hotend offsets:"
#define MSG_EMPTY_PLANE "Autolevel can only be execute on an actual plane, make sure width and height are not 0!"
#define MSG_ERR_MATERIAL_INDEX "M145 S<index> out of range (0-2)"
#define MSG_FIL
AMENT_RUNOUT_PIN
"filament_runout_pin: "
#define MSG_FIL
RUNOUT_PIN
"filament_runout_pin: "
#define MSG_ERR_M428_TOO_FAR "Too far from reference point"
#define MSG_SD_CANT_OPEN_SUBDIR "Cannot open subdir"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment