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

Fix: Robin Nano v3 MT_DET_#_PINs do not depend on LVGL_UI #23344

Merged
merged 3 commits into from
Dec 24, 2021
Merged

Fix: Robin Nano v3 MT_DET_#_PINs do not depend on LVGL_UI #23344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5abc941
Fix: Robin Nano v3 MT_DET_#_PINs do not depend on LVGL_UI
attilabody Dec 23, 2021
52436e6
Define filament runout pins directly
thinkyhead Dec 24, 2021
8454b59
use HAS_FILAMENT_SENSOR
thinkyhead Dec 24, 2021
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/pins/mega/pins_OVERLORD.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
#define Z_MIN_PROBE_PIN 46 // JP4, Tfeed1
#endif

#if ENABLED(FILAMENT_RUNOUT_SENSOR)
#ifndef FIL_RUNOUT_PIN
#define FIL_RUNOUT_PIN 44 // JP3, Tfeed2
#endif

Expand Down
7 changes: 5 additions & 2 deletions Marlin/src/pins/pins_postprocess.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,14 +546,17 @@
#undef K_MAX_PIN
#endif

// Filament Sensor first pin alias
#if HAS_FILAMENT_SENSOR
#define FIL_RUNOUT1_PIN FIL_RUNOUT_PIN
#define FIL_RUNOUT1_PIN FIL_RUNOUT_PIN // Filament Sensor first pin alias
#else
#undef FIL_RUNOUT_PIN
#undef FIL_RUNOUT1_PIN
#endif

#if NUM_RUNOUT_SENSORS < 2
#undef FIL_RUNOUT2_PIN
#endif

#ifndef LCD_PINS_D4
#define LCD_PINS_D4 -1
#endif
Expand Down
1 change: 0 additions & 1 deletion Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@
#define FAN_PIN 9
#define FAN1_PIN 12

#define NUM_RUNOUT_SENSORS 2
#define FIL_RUNOUT_PIN 22
#define FIL_RUNOUT2_PIN 21

Expand Down
6 changes: 2 additions & 4 deletions Marlin/src/pins/sam/pins_RURAMPS4D_11.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,8 @@
#define Z_MIN_PROBE_PIN 49
#endif

#if HAS_FILAMENT_SENSOR
#ifndef FIL_RUNOUT_PIN
#define FIL_RUNOUT_PIN Y_MIN_PIN
#endif
#ifndef FIL_RUNOUT_PIN
#define FIL_RUNOUT_PIN Y_MIN_PIN
#endif

//
Expand Down
6 changes: 2 additions & 4 deletions Marlin/src/pins/sam/pins_RURAMPS4D_13.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,8 @@
#define Z_MIN_PROBE_PIN 49
#endif

#if HAS_FILAMENT_SENSOR
#ifndef FIL_RUNOUT_PIN
#define FIL_RUNOUT_PIN Y_MIN_PIN
#endif
#ifndef FIL_RUNOUT_PIN
#define FIL_RUNOUT_PIN Y_MIN_PIN
#endif

//
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
#if SERVO0_PIN == BEEPER_PIN
#undef BEEPER_PIN
#endif
#elif ENABLED(FILAMENT_RUNOUT_SENSOR)
#elif HAS_FILAMENT_SENSOR
#ifndef FIL_RUNOUT_PIN
#define FIL_RUNOUT_PIN 27
#endif
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,10 @@
#endif

#ifndef FIL_RUNOUT_PIN
#define FIL_RUNOUT_PIN MT_DET_1_PIN
#define FIL_RUNOUT_PIN PA4
#endif
#ifndef FIL_RUNOUT2_PIN
#define FIL_RUNOUT2_PIN MT_DET_2_PIN
#define FIL_RUNOUT2_PIN PE6
#endif

#ifndef POWER_LOSS_PIN
Expand Down