Browse Source

FILRUNOUT => FIL_RUNOUT

Scott Lahteine 9 years ago
parent
commit
2fd2301928

+ 1
- 1
Marlin/Conditionals.h View File

634
   #define HAS_SERVO_2 (PIN_EXISTS(SERVO2))
634
   #define HAS_SERVO_2 (PIN_EXISTS(SERVO2))
635
   #define HAS_SERVO_3 (PIN_EXISTS(SERVO3))
635
   #define HAS_SERVO_3 (PIN_EXISTS(SERVO3))
636
   #define HAS_FILAMENT_WIDTH_SENSOR (PIN_EXISTS(FILWIDTH))
636
   #define HAS_FILAMENT_WIDTH_SENSOR (PIN_EXISTS(FILWIDTH))
637
-  #define HAS_FILRUNOUT (PIN_EXISTS(FILRUNOUT))
637
+  #define HAS_FIL_RUNOUT (PIN_EXISTS(FIL_RUNOUT))
638
   #define HAS_HOME (PIN_EXISTS(HOME))
638
   #define HAS_HOME (PIN_EXISTS(HOME))
639
   #define HAS_KILL (PIN_EXISTS(KILL))
639
   #define HAS_KILL (PIN_EXISTS(KILL))
640
   #define HAS_SUICIDE (PIN_EXISTS(SUICIDE))
640
   #define HAS_SUICIDE (PIN_EXISTS(SUICIDE))

+ 3
- 3
Marlin/Marlin_main.cpp View File

689
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
689
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
690
 
690
 
691
   void setup_filrunoutpin() {
691
   void setup_filrunoutpin() {
692
-    pinMode(FILRUNOUT_PIN, INPUT);
692
+    pinMode(FIL_RUNOUT_PIN, INPUT);
693
     #if ENABLED(ENDSTOPPULLUP_FIL_RUNOUT)
693
     #if ENABLED(ENDSTOPPULLUP_FIL_RUNOUT)
694
-      WRITE(FILRUNOUT_PIN, HIGH);
694
+      WRITE(FIL_RUNOUT_PIN, HIGH);
695
     #endif
695
     #endif
696
   }
696
   }
697
 
697
 
8151
 void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
8151
 void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
8152
 
8152
 
8153
   #if ENABLED(FILAMENT_RUNOUT_SENSOR)
8153
   #if ENABLED(FILAMENT_RUNOUT_SENSOR)
8154
-    if (IS_SD_PRINTING && !(READ(FILRUNOUT_PIN) ^ FIL_RUNOUT_INVERTING))
8154
+    if (IS_SD_PRINTING && !(READ(FIL_RUNOUT_PIN) ^ FIL_RUNOUT_INVERTING))
8155
       handle_filament_runout();
8155
       handle_filament_runout();
8156
   #endif
8156
   #endif
8157
 
8157
 

+ 2
- 2
Marlin/SanityCheck.h View File

128
  * Filament Runout needs a pin and SD Support
128
  * Filament Runout needs a pin and SD Support
129
  */
129
  */
130
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
130
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
131
-  #if !HAS_FILRUNOUT
132
-    #error "FILAMENT_RUNOUT_SENSOR requires FILRUNOUT_PIN."
131
+  #if !HAS_FIL_RUNOUT
132
+    #error "FILAMENT_RUNOUT_SENSOR requires FIL_RUNOUT_PIN."
133
   #elif DISABLED(SDSUPPORT)
133
   #elif DISABLED(SDSUPPORT)
134
     #error "FILAMENT_RUNOUT_SENSOR requires SDSUPPORT."
134
     #error "FILAMENT_RUNOUT_SENSOR requires SDSUPPORT."
135
   #endif
135
   #endif

+ 1
- 1
Marlin/pins_CNCONTROLS_12.h View File

67
 //common I/O
67
 //common I/O
68
 
68
 
69
  //#define TEMP_CHAMBER_PIN        13  // ANALOG INPUT !!
69
  //#define TEMP_CHAMBER_PIN        13  // ANALOG INPUT !!
70
- #define FILRUNOUT_PIN             18
70
+ #define FIL_RUNOUT_PIN            18
71
  //#define PWM_1_PIN               12
71
  //#define PWM_1_PIN               12
72
  //#define PWM_2_PIN               13 
72
  //#define PWM_2_PIN               13 
73
  //#define SPARE_IO                17  
73
  //#define SPARE_IO                17  

+ 1
- 1
Marlin/pins_RAMPS_14.h View File

99
 #endif
99
 #endif
100
 
100
 
101
 // define digital pin 4 for the filament runout sensor. Use the RAMPS 1.4 digital input 4 on the servos connector
101
 // define digital pin 4 for the filament runout sensor. Use the RAMPS 1.4 digital input 4 on the servos connector
102
-#define FILRUNOUT_PIN       4
102
+#define FIL_RUNOUT_PIN      4
103
 
103
 
104
 #if MB(RAMPS_14_EFF) || MB(RAMPS_13_EFF) || ENABLED(IS_RAMPS_EFB)
104
 #if MB(RAMPS_14_EFF) || MB(RAMPS_13_EFF) || ENABLED(IS_RAMPS_EFB)
105
   #define FAN_PIN           9 // (Sprinter config)
105
   #define FAN_PIN           9 // (Sprinter config)

Loading…
Cancel
Save