misc. cleanup

MarlinFirmware · Feb 19, 2023 · 53a2468 · 53a2468
1 parent 109e3cf
commit 53a2468
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/Marlin/src/HAL/AVR/HAL.cpp b/Marlin/src/HAL/AVR/HAL.cpp
@@ -85,7 +85,7 @@ void MarlinHAL::init() {
 
   init_pwm_timers();   // Init user timers to default frequency - 1000HZ
 
-  #if defined(BEEPER_PIN) && !ENABLED(ATMEGA_NO_BEEPFIX)
+  #if PIN_EXISTS(BEEPER) && ENABLED(HAL_AVR_DIRTY_INIT) && DISABLED(ATMEGA_NO_BEEPFIX)
     // Make sure no alternative is locked onto the BEEPER.
     // This fixes the issue where the ATmega is constantly beeping.
     // Might disable other peripherals using the pin; to circumvent that please undefine one of the above things!

diff --git a/Marlin/src/HAL/AVR/registers.cpp b/Marlin/src/HAL/AVR/registers.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -20,6 +20,12 @@
  *
  */
 
+#ifdef __AVR__
+
+#include "../../inc/MarlinConfigPre.h"
+
+#if ENABLED(HAL_AVR_DIRTY_INIT)
+
 #include "registers.h"
 
 // Since the compiler could be creating multiple copies of function code-graphs for each header inline-inclusion,
@@ -968,3 +974,6 @@ ATmegaPinFunctions _ATmega_getPinFunctions(int pin) {
 
   return ATmegaPinFunctions();  // default and empty.
 }
+
+#endif // HAL_AVR_DIRTY_INIT
+#endif // __AVR__
diff --git a/Marlin/src/HAL/AVR/registers.h b/Marlin/src/HAL/AVR/registers.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #pragma once
 
 #include <stdint.h>

diff --git a/Marlin/src/lcd/dogm/status_screen_DOGM.cpp b/Marlin/src/lcd/dogm/status_screen_DOGM.cpp
@@ -512,7 +512,9 @@ void MarlinUI::draw_status_screen() {
 
   const bool show_e_total = TERN0(LCD_SHOW_E_TOTAL, printingIsActive());
 
-  static u8g_uint_t progress_bar_solid_width = 0;
+  #if HAS_PRINT_PROGRESS
+    static u8g_uint_t progress_bar_solid_width = 0;
+  #endif
 
   // At the first page, generate new display values
   if (first_page) {