zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

FILRUNOUT => FIL_RUNOUT

Browse source
This commit is contained in:
Scott Lahteine 2016-06-19 19:25:09 -07:00
parent dfbf8b3c2c
commit 2fd2301928
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/Conditionals.h
View file

@ -634,7 +634,7 @@
#define HAS_SERVO_2 (PIN_EXISTS(SERVO2)) #define HAS_SERVO_2 (PIN_EXISTS(SERVO2))
#define HAS_SERVO_3 (PIN_EXISTS(SERVO3)) #define HAS_SERVO_3 (PIN_EXISTS(SERVO3))
#define HAS_FILAMENT_WIDTH_SENSOR (PIN_EXISTS(FILWIDTH)) #define HAS_FILAMENT_WIDTH_SENSOR (PIN_EXISTS(FILWIDTH))
#define HAS_FILRUNOUT (PIN_EXISTS(FILRUNOUT)) #define HAS_FIL_RUNOUT (PIN_EXISTS(FIL_RUNOUT))
#define HAS_HOME (PIN_EXISTS(HOME)) #define HAS_HOME (PIN_EXISTS(HOME))
#define HAS_KILL (PIN_EXISTS(KILL)) #define HAS_KILL (PIN_EXISTS(KILL))
#define HAS_SUICIDE (PIN_EXISTS(SUICIDE)) #define HAS_SUICIDE (PIN_EXISTS(SUICIDE))

6
Marlin/Marlin_main.cpp
View file

@ -689,9 +689,9 @@ void setup_killpin() {
#if ENABLED(FILAMENT_RUNOUT_SENSOR) #if ENABLED(FILAMENT_RUNOUT_SENSOR)
void setup_filrunoutpin() { void setup_filrunoutpin() {
pinMode(FILRUNOUT_PIN, INPUT); pinMode(FIL_RUNOUT_PIN, INPUT);
#if ENABLED(ENDSTOPPULLUP_FIL_RUNOUT) #if ENABLED(ENDSTOPPULLUP_FIL_RUNOUT)
WRITE(FILRUNOUT_PIN, HIGH); WRITE(FIL_RUNOUT_PIN, HIGH);
#endif #endif
} }
@ -8151,7 +8151,7 @@ void idle(
void manage_inactivity(bool ignore_stepper_queue/*=false*/) { void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
#if ENABLED(FILAMENT_RUNOUT_SENSOR) #if ENABLED(FILAMENT_RUNOUT_SENSOR)
if (IS_SD_PRINTING && !(READ(FILRUNOUT_PIN) ^ FIL_RUNOUT_INVERTING)) if (IS_SD_PRINTING && !(READ(FIL_RUNOUT_PIN) ^ FIL_RUNOUT_INVERTING))
handle_filament_runout(); handle_filament_runout();
#endif #endif

4
Marlin/SanityCheck.h
View file

@ -128,8 +128,8 @@
* Filament Runout needs a pin and SD Support * Filament Runout needs a pin and SD Support
*/ */
#if ENABLED(FILAMENT_RUNOUT_SENSOR) #if ENABLED(FILAMENT_RUNOUT_SENSOR)
#if !HAS_FILRUNOUT #if !HAS_FIL_RUNOUT
#error "FILAMENT_RUNOUT_SENSOR requires FILRUNOUT_PIN." #error "FILAMENT_RUNOUT_SENSOR requires FIL_RUNOUT_PIN."
#elif DISABLED(SDSUPPORT) #elif DISABLED(SDSUPPORT)
#error "FILAMENT_RUNOUT_SENSOR requires SDSUPPORT." #error "FILAMENT_RUNOUT_SENSOR requires SDSUPPORT."
#endif #endif

2
Marlin/pins_CNCONTROLS_12.h
View file

@ -67,7 +67,7 @@
//common I/O //common I/O
//#define TEMP_CHAMBER_PIN 13 // ANALOG INPUT !! //#define TEMP_CHAMBER_PIN 13 // ANALOG INPUT !!
#define FILRUNOUT_PIN 18 #define FIL_RUNOUT_PIN 18
//#define PWM_1_PIN 12 //#define PWM_1_PIN 12
//#define PWM_2_PIN 13 //#define PWM_2_PIN 13
//#define SPARE_IO 17 //#define SPARE_IO 17

2
Marlin/pins_RAMPS_14.h
View file

@ -99,7 +99,7 @@
#endif #endif
// define digital pin 4 for the filament runout sensor. Use the RAMPS 1.4 digital input 4 on the servos connector // 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 #define FIL_RUNOUT_PIN 4
#if MB(RAMPS_14_EFF) || MB(RAMPS_13_EFF) || ENABLED(IS_RAMPS_EFB) #if MB(RAMPS_14_EFF) || MB(RAMPS_13_EFF) || ENABLED(IS_RAMPS_EFB)
#define FAN_PIN 9 // (Sprinter config) #define FAN_PIN 9 // (Sprinter config)