Browse Source

FILRUNOUT => FIL_RUNOUT

Scott Lahteine 8 years ago
parent
commit
2fd2301928
5 changed files with 8 additions and 8 deletions
  1. 1
    1
      Marlin/Conditionals.h
  2. 3
    3
      Marlin/Marlin_main.cpp
  3. 2
    2
      Marlin/SanityCheck.h
  4. 1
    1
      Marlin/pins_CNCONTROLS_12.h
  5. 1
    1
      Marlin/pins_RAMPS_14.h

+ 1
- 1
Marlin/Conditionals.h View File

@@ -634,7 +634,7 @@
634 634
   #define HAS_SERVO_2 (PIN_EXISTS(SERVO2))
635 635
   #define HAS_SERVO_3 (PIN_EXISTS(SERVO3))
636 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 638
   #define HAS_HOME (PIN_EXISTS(HOME))
639 639
   #define HAS_KILL (PIN_EXISTS(KILL))
640 640
   #define HAS_SUICIDE (PIN_EXISTS(SUICIDE))

+ 3
- 3
Marlin/Marlin_main.cpp View File

@@ -689,9 +689,9 @@ void setup_killpin() {
689 689
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
690 690
 
691 691
   void setup_filrunoutpin() {
692
-    pinMode(FILRUNOUT_PIN, INPUT);
692
+    pinMode(FIL_RUNOUT_PIN, INPUT);
693 693
     #if ENABLED(ENDSTOPPULLUP_FIL_RUNOUT)
694
-      WRITE(FILRUNOUT_PIN, HIGH);
694
+      WRITE(FIL_RUNOUT_PIN, HIGH);
695 695
     #endif
696 696
   }
697 697
 
@@ -8151,7 +8151,7 @@ void idle(
8151 8151
 void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
8152 8152
 
8153 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 8155
       handle_filament_runout();
8156 8156
   #endif
8157 8157
 

+ 2
- 2
Marlin/SanityCheck.h View File

@@ -128,8 +128,8 @@
128 128
  * Filament Runout needs a pin and SD Support
129 129
  */
130 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 133
   #elif DISABLED(SDSUPPORT)
134 134
     #error "FILAMENT_RUNOUT_SENSOR requires SDSUPPORT."
135 135
   #endif

+ 1
- 1
Marlin/pins_CNCONTROLS_12.h View File

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

+ 1
- 1
Marlin/pins_RAMPS_14.h View File

@@ -99,7 +99,7 @@
99 99
 #endif
100 100
 
101 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 104
 #if MB(RAMPS_14_EFF) || MB(RAMPS_13_EFF) || ENABLED(IS_RAMPS_EFB)
105 105
   #define FAN_PIN           9 // (Sprinter config)

Loading…
Cancel
Save