Преглед изворни кода

Cleanup: Fix two compiler warnings

Guðni Már Gilbert пре 2 година
родитељ
комит
bd932b3b10
2 измењених фајлова са 3 додато и 3 уклоњено
  1. 2 2
      Firmware/mmu2.cpp
  2. 1 1
      Firmware/ultralcd.cpp

+ 2 - 2
Firmware/mmu2.cpp

@@ -82,7 +82,8 @@ void WaitForHotendTargetTempBeep(){
 MMU2 mmu2;
 
 MMU2::MMU2()
-    : logic(&mmu2Serial)
+    : is_mmu_error_monitor_active(false)
+    , logic(&mmu2Serial)
     , extruder(MMU2_NO_TOOL)
     , resume_position()
     , resume_hotend_temp(0)
@@ -91,7 +92,6 @@ MMU2::MMU2()
     , mmu_print_saved(false)
     , loadFilamentStarted(false)
     , loadingToNozzle(false)
-    , is_mmu_error_monitor_active(false)
 {
 }
 

+ 1 - 1
Firmware/ultralcd.cpp

@@ -3190,7 +3190,7 @@ int8_t lcd_show_multiscreen_message_yes_no_and_wait_P(const char *msg, bool allo
 //! @param second_choice text caption of second possible choice
 //! @param second_col column on LCD where second choice is rendered. If third choice is set, this value is hardcoded to 7
 //! @param third_choice text caption of third, optional, choice.
-void lcd_show_choices_prompt_P(uint8_t selected, const char *first_choice, const char *second_choice, uint8_t second_col, const char *third_choice = nullptr)
+void lcd_show_choices_prompt_P(uint8_t selected, const char *first_choice, const char *second_choice, uint8_t second_col, const char *third_choice)
 {
     lcd_set_cursor(0, 3);
     lcd_print(selected == LCD_LEFT_BUTTON_CHOICE ? '>': ' ');