Bläddra i källkod

Silence unused parameter warnings

Marcio Teixeira 4 år sedan
förälder
incheckning
6376b683c7

+ 2
- 1
Marlin/src/lcd/marlinui.cpp Visa fil

1450
       #if ENABLED(STATUS_MESSAGE_SCROLLING)
1450
       #if ENABLED(STATUS_MESSAGE_SCROLLING)
1451
         status_scroll_offset = 0;
1451
         status_scroll_offset = 0;
1452
       #endif
1452
       #endif
1453
-
1453
+    #else // HAS_SPI_LCD
1454
+      UNUSED(persist);
1454
     #endif
1455
     #endif
1455
 
1456
 
1456
     TERN_(EXTENSIBLE_UI, ExtUI::onStatusChanged(status_message));
1457
     TERN_(EXTENSIBLE_UI, ExtUI::onStatusChanged(status_message));

+ 1
- 1
Marlin/src/module/settings.cpp Visa fil

2363
   #if ENABLED(AUTO_BED_LEVELING_UBL)
2363
   #if ENABLED(AUTO_BED_LEVELING_UBL)
2364
 
2364
 
2365
     inline void ubl_invalid_slot(const int s) {
2365
     inline void ubl_invalid_slot(const int s) {
2366
-      #if ENABLED(EEPROM_CHITCHAT)
2366
+      #if BOTH(EEPROM_CHITCHAT, DEBUG_OUT)
2367
         DEBUG_ECHOLNPGM("?Invalid slot.");
2367
         DEBUG_ECHOLNPGM("?Invalid slot.");
2368
         DEBUG_ECHO(s);
2368
         DEBUG_ECHO(s);
2369
         DEBUG_ECHOLNPGM(" mesh slots available.");
2369
         DEBUG_ECHOLNPGM(" mesh slots available.");

+ 1
- 1
Marlin/src/module/temperature.h Visa fil

69
   typedef IF<(LPQ_MAX_LEN > 255), uint16_t, uint8_t>::type lpq_ptr_t;
69
   typedef IF<(LPQ_MAX_LEN > 255), uint16_t, uint8_t>::type lpq_ptr_t;
70
 #endif
70
 #endif
71
 
71
 
72
-#define PID_PARAM(F,H) _PID_##F(TERN(PID_PARAMS_PER_HOTEND, H, 0))
72
+#define PID_PARAM(F,H) _PID_##F(TERN(PID_PARAMS_PER_HOTEND, H, 0 & H)) // Always use 'H' to suppress warning
73
 #define _PID_Kp(H) TERN(PIDTEMP, Temperature::temp_hotend[H].pid.Kp, NAN)
73
 #define _PID_Kp(H) TERN(PIDTEMP, Temperature::temp_hotend[H].pid.Kp, NAN)
74
 #define _PID_Ki(H) TERN(PIDTEMP, Temperature::temp_hotend[H].pid.Ki, NAN)
74
 #define _PID_Ki(H) TERN(PIDTEMP, Temperature::temp_hotend[H].pid.Ki, NAN)
75
 #define _PID_Kd(H) TERN(PIDTEMP, Temperature::temp_hotend[H].pid.Kd, NAN)
75
 #define _PID_Kd(H) TERN(PIDTEMP, Temperature::temp_hotend[H].pid.Kd, NAN)

+ 1
- 1
Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.h Visa fil

70
     bool readBlock(uint32_t block, uint8_t* dst);
70
     bool readBlock(uint32_t block, uint8_t* dst);
71
     bool writeBlock(uint32_t blockNumber, const uint8_t* src);
71
     bool writeBlock(uint32_t blockNumber, const uint8_t* src);
72
 
72
 
73
-    bool readCSD(csd_t* csd) { return true; };
73
+    bool readCSD(csd_t*)                                         { return true; }
74
 
74
 
75
     uint32_t cardSize();
75
     uint32_t cardSize();
76
     static bool isInserted();
76
     static bool isInserted();

Laddar…
Avbryt
Spara