Browse Source

Fix some compiler warnings

Scott Lahteine 8 years ago
parent
commit
493f0b0c62
1 changed files with 7 additions and 8 deletions
  1. 7
    8
      Marlin/Marlin_main.cpp

+ 7
- 8
Marlin/Marlin_main.cpp View File

5746
     static bool sd_print_paused = false;
5746
     static bool sd_print_paused = false;
5747
   #endif
5747
   #endif
5748
 
5748
 
5749
-  static void filament_change_beep(const int max_beep_count, const bool init=false) {
5749
+  static void filament_change_beep(const int8_t max_beep_count, const bool init=false) {
5750
     static millis_t next_buzz = 0;
5750
     static millis_t next_buzz = 0;
5751
-    static uint16_t runout_beep = 0;
5751
+    static int8_t runout_beep = 0;
5752
 
5752
 
5753
     if (init) next_buzz = runout_beep = 0;
5753
     if (init) next_buzz = runout_beep = 0;
5754
 
5754
 
5762
     }
5762
     }
5763
   }
5763
   }
5764
 
5764
 
5765
-  static bool pause_print(const float& retract, const float& z_lift, const float& x_pos, const float& y_pos,
5766
-                          const float& unload_length = 0 , int max_beep_count = 0, bool show_lcd = false) {
5765
+  static bool pause_print(const float &retract, const float &z_lift, const float &x_pos, const float &y_pos,
5766
+                          const float &unload_length = 0 , int8_t max_beep_count = 0, bool show_lcd = false
5767
+  ) {
5767
     if (move_away_flag) return false; // already paused
5768
     if (move_away_flag) return false; // already paused
5768
 
5769
 
5769
     if (!DEBUGGING(DRYRUN) && thermalManager.tooColdToExtrude(active_extruder) && unload_length > 0) {
5770
     if (!DEBUGGING(DRYRUN) && thermalManager.tooColdToExtrude(active_extruder) && unload_length > 0) {
5772
       return false;
5773
       return false;
5773
     }
5774
     }
5774
 
5775
 
5775
-    const bool job_running = print_job_timer.isRunning();
5776
-
5777
     // Indicate that the printer is paused
5776
     // Indicate that the printer is paused
5778
     move_away_flag = true;
5777
     move_away_flag = true;
5779
 
5778
 
5857
     return true;
5856
     return true;
5858
   }
5857
   }
5859
 
5858
 
5860
-  static void wait_for_filament_reload(int max_beep_count = 0) {
5859
+  static void wait_for_filament_reload(int8_t max_beep_count = 0) {
5861
     bool nozzle_timed_out = false;
5860
     bool nozzle_timed_out = false;
5862
 
5861
 
5863
     // Wait for filament insert by user and press button
5862
     // Wait for filament insert by user and press button
5882
     KEEPALIVE_STATE(IN_HANDLER);
5881
     KEEPALIVE_STATE(IN_HANDLER);
5883
   }
5882
   }
5884
 
5883
 
5885
-  static void resume_print(const float& load_length = 0, const float& initial_extrude_length = 0, int max_beep_count = 0) {
5884
+  static void resume_print(const float& load_length = 0, const float& initial_extrude_length = 0, int8_t max_beep_count = 0) {
5886
     bool nozzle_timed_out = false;
5885
     bool nozzle_timed_out = false;
5887
 
5886
 
5888
     if (!move_away_flag) return;
5887
     if (!move_away_flag) return;

Loading…
Cancel
Save