Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix backward Filament Runout (Presence) Sensor pullup/pulldown #20228

Merged
merged 4 commits into from
Nov 21, 2020
Merged

Fix backward Filament Runout (Presence) Sensor pullup/pulldown #20228

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ddd2a5
Fix issue 20224 by again supporting pull-up and pull-down again
Nov 20, 2020
8f8024e
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/20228
thinkyhead Nov 21, 2020
989381e
Revert "Fix issue 20224 by again supporting pull-up and pull-down again"
thinkyhead Nov 21, 2020
3ad2319
Fix present/out pull confusion
thinkyhead Nov 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Marlin/src/feature/runout.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ class FilamentSensorBase {

public:
static inline void setup() {
#define _INIT_RUNOUT_PIN(P,S,U) do{ if (DISABLED(U)) SET_INPUT(P); else if (S) SET_INPUT_PULLDOWN(P); else SET_INPUT_PULLUP(P); }while(0)
#define _INIT_RUNOUT_PIN(P,S,U) do{ if (DISABLED(U)) SET_INPUT(P); else if (S) SET_INPUT_PULLUP(P); else SET_INPUT_PULLDOWN(P); }while(0)
#define INIT_RUNOUT_PIN(N) _INIT_RUNOUT_PIN(FIL_RUNOUT##N##_PIN, FIL_RUNOUT##N##_STATE, FIL_RUNOUT##N##_PULL)
#if NUM_RUNOUT_SENSORS >= 1
INIT_RUNOUT_PIN(1);
Expand Down