Browse Source

Rename filament runout items

Scott Lahteine 9 years ago
parent
commit
cafa8b8ce3
2 changed files with 7 additions and 7 deletions
  1. 1
    1
      Marlin/Marlin.h
  2. 6
    6
      Marlin/Marlin_main.cpp

+ 1
- 1
Marlin/Marlin.h View File

226
 void Stop();
226
 void Stop();
227
 
227
 
228
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
228
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
229
-  void filrunout();
229
+  void handle_filament_runout();
230
 #endif
230
 #endif
231
 
231
 
232
 /**
232
 /**

+ 6
- 6
Marlin/Marlin_main.cpp View File

446
 #endif
446
 #endif
447
 
447
 
448
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
448
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
449
-  static bool filrunoutEnqueued = false;
449
+  static bool filament_ran_out = false;
450
 #endif
450
 #endif
451
 
451
 
452
 static bool send_ok[BUFSIZE];
452
 static bool send_ok[BUFSIZE];
6105
     #endif
6105
     #endif
6106
 
6106
 
6107
     #if ENABLED(FILAMENT_RUNOUT_SENSOR)
6107
     #if ENABLED(FILAMENT_RUNOUT_SENSOR)
6108
-      filrunoutEnqueued = false;
6108
+      filament_ran_out = false;
6109
     #endif
6109
     #endif
6110
 
6110
 
6111
   }
6111
   }
7741
 
7741
 
7742
   #if HAS_FILRUNOUT
7742
   #if HAS_FILRUNOUT
7743
     if (IS_SD_PRINTING && !(READ(FILRUNOUT_PIN) ^ FIL_RUNOUT_INVERTING))
7743
     if (IS_SD_PRINTING && !(READ(FILRUNOUT_PIN) ^ FIL_RUNOUT_INVERTING))
7744
-      filrunout();
7744
+      handle_filament_runout();
7745
   #endif
7745
   #endif
7746
 
7746
 
7747
   if (commands_in_queue < BUFSIZE) get_available_commands();
7747
   if (commands_in_queue < BUFSIZE) get_available_commands();
7924
 
7924
 
7925
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
7925
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
7926
 
7926
 
7927
-  void filrunout() {
7928
-    if (!filrunoutEnqueued) {
7929
-      filrunoutEnqueued = true;
7927
+  void handle_filament_runout() {
7928
+    if (!filament_ran_out) {
7929
+      filament_ran_out = true;
7930
       enqueue_and_echo_commands_P(PSTR(FILAMENT_RUNOUT_SCRIPT));
7930
       enqueue_and_echo_commands_P(PSTR(FILAMENT_RUNOUT_SCRIPT));
7931
       st_synchronize();
7931
       st_synchronize();
7932
     }
7932
     }

Loading…
Cancel
Save