Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Improve FILAMENT_RUNOUT_SENSOR, FILRUNOUT_PIN #4095

Merged
merged 1 commit into from
Jun 20, 2016
Merged

Improve FILAMENT_RUNOUT_SENSOR, FILRUNOUT_PIN #4095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 12 additions & 6 deletions Marlin/Marlin_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,14 +686,16 @@ void setup_killpin() {
#endif
}

void setup_filrunoutpin() {
#if HAS_FILRUNOUT
#if ENABLED(FILAMENT_RUNOUT_SENSOR)

void setup_filrunoutpin() {
pinMode(FILRUNOUT_PIN, INPUT);
#if ENABLED(ENDSTOPPULLUP_FIL_RUNOUT)
WRITE(FILRUNOUT_PIN, HIGH);
#endif
#endif
}
}

#endif

// Set home pin
void setup_homepin(void) {
Expand Down Expand Up @@ -802,8 +804,12 @@ void setup() {
MCUCR = 0x80;
#endif

#if ENABLED(FILAMENT_RUNOUT_SENSOR)
setup_filrunoutpin();
#endif

setup_killpin();
setup_filrunoutpin();

setup_powerhold();

#if HAS_STEPPER_RESET
Expand Down Expand Up @@ -8144,7 +8150,7 @@ void idle(
*/
void manage_inactivity(bool ignore_stepper_queue/*=false*/) {

#if HAS_FILRUNOUT
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
if (IS_SD_PRINTING && !(READ(FILRUNOUT_PIN) ^ FIL_RUNOUT_INVERTING))
handle_filament_runout();
#endif
Expand Down
11 changes: 11 additions & 0 deletions Marlin/SanityCheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,17 @@
#endif
#endif

/**
* Filament Runout needs a pin and SD Support
*/
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
#if !HAS_FILRUNOUT
#error "FILAMENT_RUNOUT_SENSOR requires FILRUNOUT_PIN."
#elif DISABLED(SDSUPPORT)
#error "FILAMENT_RUNOUT_SENSOR requires SDSUPPORT."
#endif
#endif

/**
* Filament Change with Extruder Runout Prevention
*/
Expand Down
2 changes: 1 addition & 1 deletion Marlin/pins_CNCONTROLS_12.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
//common I/O

//#define TEMP_CHAMBER_PIN 13 // ANALOG INPUT !!
//#define FILAMENT_RUNOUT_SENSOR 18
#define FILRUNOUT_PIN 18
//#define PWM_1_PIN 12
//#define PWM_2_PIN 13
//#define SPARE_IO 17
Expand Down
6 changes: 2 additions & 4 deletions Marlin/pins_RAMPS_14.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,8 @@
#define Z_MIN_PROBE_PIN 32
#endif

#if ENABLED(FILAMENT_RUNOUT_SENSOR)
// define digital pin 4 for the filament runout sensor. Use the RAMPS 1.4 digital input 4 on the servos connector
#define FILRUNOUT_PIN 4
#endif
// define digital pin 4 for the filament runout sensor. Use the RAMPS 1.4 digital input 4 on the servos connector
#define FILRUNOUT_PIN 4

#if MB(RAMPS_14_EFF) || MB(RAMPS_13_EFF) || ENABLED(IS_RAMPS_EFB)
#define FAN_PIN 9 // (Sprinter config)
Expand Down