Browse Source

Merge pull request #4276 from esenapaj/Suppress-warnings

Suppress warnings
Scott Lahteine 9 years ago
parent
commit
4865447830
4 changed files with 19 additions and 7 deletions
  1. 2
    0
      Marlin/MarlinSerial.cpp
  2. 4
    2
      Marlin/Marlin_main.cpp
  3. 12
    4
      Marlin/planner.cpp
  4. 1
    1
      Marlin/ultralcd.cpp

+ 2
- 0
Marlin/MarlinSerial.cpp View File

542
             case state_M410:
542
             case state_M410:
543
               quickstop_stepper();
543
               quickstop_stepper();
544
               break;
544
               break;
545
+            default:
546
+              break;
545
           }
547
           }
546
           state = state_RESET;
548
           state = state_RESET;
547
         }
549
         }

+ 4
- 2
Marlin/Marlin_main.cpp View File

5965
    * Use either 'M421 X<linear> Y<linear> Z<linear>' or 'M421 I<xindex> J<yindex> Z<linear>'
5965
    * Use either 'M421 X<linear> Y<linear> Z<linear>' or 'M421 I<xindex> J<yindex> Z<linear>'
5966
    */
5966
    */
5967
   inline void gcode_M421() {
5967
   inline void gcode_M421() {
5968
-    int8_t px, py;
5968
+    int8_t px = 0, py = 0;
5969
     float z = 0;
5969
     float z = 0;
5970
     bool hasX, hasY, hasZ, hasI, hasJ;
5970
     bool hasX, hasY, hasZ, hasI, hasJ;
5971
     if ((hasX = code_seen('X'))) px = mbl.probe_index_x(code_value_axis_units(X_AXIS));
5971
     if ((hasX = code_seen('X'))) px = mbl.probe_index_x(code_value_axis_units(X_AXIS));
6210
     disable_e3();
6210
     disable_e3();
6211
     delay(100);
6211
     delay(100);
6212
 
6212
 
6213
-    millis_t next_tick = 0;
6213
+    #if HAS_BUZZER
6214
+      millis_t next_tick = 0;
6215
+    #endif
6214
 
6216
 
6215
     // Wait for filament insert by user and press button
6217
     // Wait for filament insert by user and press button
6216
     lcd_filament_change_show_message(FILAMENT_CHANGE_MESSAGE_INSERT);
6218
     lcd_filament_change_show_message(FILAMENT_CHANGE_MESSAGE_INSERT);

+ 12
- 4
Marlin/planner.cpp View File

397
   #endif
397
   #endif
398
 
398
 
399
   #if ENABLED(BARICUDA)
399
   #if ENABLED(BARICUDA)
400
-    unsigned char tail_valve_pressure = baricuda_valve_pressure,
401
-                  tail_e_to_p_pressure = baricuda_e_to_p_pressure;
400
+    #if HAS_HEATER_1
401
+      unsigned char tail_valve_pressure = baricuda_valve_pressure;
402
+    #endif
403
+    #if HAS_HEATER_2
404
+      unsigned char tail_e_to_p_pressure = baricuda_e_to_p_pressure;
405
+    #endif
402
   #endif
406
   #endif
403
 
407
 
404
   if (blocks_queued()) {
408
   if (blocks_queued()) {
411
 
415
 
412
     #if ENABLED(BARICUDA)
416
     #if ENABLED(BARICUDA)
413
       block = &block_buffer[block_buffer_tail];
417
       block = &block_buffer[block_buffer_tail];
414
-      tail_valve_pressure = block->valve_pressure;
415
-      tail_e_to_p_pressure = block->e_to_p_pressure;
418
+      #if HAS_HEATER_1
419
+        tail_valve_pressure = block->valve_pressure;
420
+      #endif
421
+      #if HAS_HEATER_2
422
+        tail_e_to_p_pressure = block->e_to_p_pressure;
423
+      #endif
416
     #endif
424
     #endif
417
 
425
 
418
     for (uint8_t b = block_buffer_tail; b != block_buffer_head; b = next_block_index(b)) {
426
     for (uint8_t b = block_buffer_tail; b != block_buffer_head; b = next_block_index(b)) {

+ 1
- 1
Marlin/ultralcd.cpp View File

230
     for (int8_t _lcdLineNr = 0; _lcdLineNr < LCD_HEIGHT; _lcdLineNr++, _menuLineNr++) { \
230
     for (int8_t _lcdLineNr = 0; _lcdLineNr < LCD_HEIGHT; _lcdLineNr++, _menuLineNr++) { \
231
       _thisItemNr = 0;
231
       _thisItemNr = 0;
232
 
232
 
233
-  #define START_SCREEN() _START_SCREEN(0)
233
+  #define START_SCREEN() _START_SCREEN(NOOP)
234
 
234
 
235
   /**
235
   /**
236
    * START_MENU generates the init code for a menu function
236
    * START_MENU generates the init code for a menu function

Loading…
Cancel
Save