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
29c53f24
Commit
29c53f24
authored
6 years ago
by
Scott Lahteine
Browse files
Options
Downloads
Patches
Plain Diff
Hide some compile warnings
parent
caca3c85
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Marlin/src/feature/runout.h
+3
-2
3 additions, 2 deletions
Marlin/src/feature/runout.h
Marlin/src/module/probe.cpp
+4
-0
4 additions, 0 deletions
Marlin/src/module/probe.cpp
with
7 additions
and
2 deletions
Marlin/src/feature/runout.h
+
3
−
2
View file @
29c53f24
...
...
@@ -217,6 +217,7 @@ class FilamentSensorBase {
static
bool
poll_runout_pin
(
const
uint8_t
extruder
)
{
const
uint8_t
runout_bits
=
poll_runout_pins
();
#if NUM_RUNOUT_SENSORS == 1
UNUSED
(
extruder
);
return
runout_bits
;
// A single sensor applying to all extruders
#else
#if ENABLED(DUAL_X_CARRIAGE)
...
...
@@ -233,7 +234,7 @@ class FilamentSensorBase {
}
public
:
static
inline
void
block_completed
(
const
block_t
*
const
b
)
{}
static
inline
void
block_completed
(
const
block_t
*
const
b
)
{
UNUSED
(
b
);
}
static
inline
void
run
()
{
const
bool
out
=
poll_runout_pin
(
active_extruder
);
...
...
@@ -313,7 +314,7 @@ class FilamentSensorBase {
static
inline
void
reset
()
{
runout_count
=
runout_threshold
;
}
static
inline
void
run
()
{
runout_count
--
;
}
static
inline
bool
has_run_out
()
{
return
runout_count
<
0
;
}
static
inline
void
block_completed
(
const
block_t
*
const
b
)
{}
static
inline
void
block_completed
(
const
block_t
*
const
b
)
{
UNUSED
(
b
);
}
static
inline
void
filament_present
(
const
uint8_t
extruder
)
{
runout_count
=
runout_threshold
;
UNUSED
(
extruder
);
}
};
...
...
This diff is collapsed.
Click to expand it.
Marlin/src/module/probe.cpp
+
4
−
0
View file @
29c53f24
...
...
@@ -405,6 +405,10 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
do_blocking_move_to_x
(
deploy
?
Z_PROBE_DEPLOY_X
:
Z_PROBE_RETRACT_X
);
#elif DISABLED(PAUSE_BEFORE_DEPLOY_STOW)
UNUSED
(
deploy
);
#endif
}
...
...
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