From 3d9d72e8db818c856e1018813e51b0ac736436e4 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 23 Jun 2019 03:43:36 -0500
Subject: [PATCH] Include order, spacing, etc.
---
Marlin/src/HAL/HAL_AVR/endstop_interrupts.h | 3 ++-
Marlin/src/HAL/HAL_AVR/fastio_AVR.h | 3 ++-
Marlin/src/HAL/HAL_DUE/DebugMonitor_Due.cpp | 3 ++-
Marlin/src/HAL/HAL_ESP32/HAL_spi_ESP32.cpp | 2 +-
Marlin/src/HAL/HAL_LINUX/spi_pins.h | 3 ++-
Marlin/src/HAL/HAL_LPC1768/spi_pins.h | 2 +-
Marlin/src/HAL/HAL_STM32F4/HAL_spi_STM32F4.cpp | 2 +-
Marlin/src/HAL/HAL_STM32F7/HAL_spi_STM32F7.cpp | 2 +-
Marlin/src/lcd/extui_dgus_lcd.cpp | 12 ++++++------
Marlin/src/lcd/menu/menu.cpp | 2 +-
Marlin/src/lcd/menu/menu_filament.cpp | 2 +-
11 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/Marlin/src/HAL/HAL_AVR/endstop_interrupts.h b/Marlin/src/HAL/HAL_AVR/endstop_interrupts.h
index cabf830c90..89933c3673 100644
--- a/Marlin/src/HAL/HAL_AVR/endstop_interrupts.h
+++ b/Marlin/src/HAL/HAL_AVR/endstop_interrupts.h
@@ -37,9 +37,10 @@
*/
#include "../../core/macros.h"
-#include <stdint.h>
#include "../../module/endstops.h"
+#include <stdint.h>
+
// One ISR for all EXT-Interrupts
void endstop_ISR(void) { endstops.update(); }
diff --git a/Marlin/src/HAL/HAL_AVR/fastio_AVR.h b/Marlin/src/HAL/HAL_AVR/fastio_AVR.h
index f0ef7af1c8..8fdd0909da 100644
--- a/Marlin/src/HAL/HAL_AVR/fastio_AVR.h
+++ b/Marlin/src/HAL/HAL_AVR/fastio_AVR.h
@@ -27,9 +27,10 @@
* Contributed by Triffid_Hunter and modified by Kliment, thinkyhead, Bob-the-Kuhn, et.al.
*/
-#include <avr/io.h>
#include "../../core/macros.h"
+#include <avr/io.h>
+
#define AVR_AT90USB1286_FAMILY (defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1286P__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB646P__) || defined(__AVR_AT90USB647__))
#define AVR_ATmega1284_FAMILY (defined(__AVR_ATmega644__) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644PA__) || defined(__AVR_ATmega1284P__))
#define AVR_ATmega2560_FAMILY (defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__))
diff --git a/Marlin/src/HAL/HAL_DUE/DebugMonitor_Due.cpp b/Marlin/src/HAL/HAL_DUE/DebugMonitor_Due.cpp
index 89206fa94c..135b5f7797 100644
--- a/Marlin/src/HAL/HAL_DUE/DebugMonitor_Due.cpp
+++ b/Marlin/src/HAL/HAL_DUE/DebugMonitor_Due.cpp
@@ -24,11 +24,12 @@
#include "../../core/macros.h"
#include "../../core/serial.h"
-#include <stdarg.h>
#include "../shared/backtrace/unwinder.h"
#include "../shared/backtrace/unwmemaccess.h"
+#include <stdarg.h>
+
// Debug monitor that dumps to the Programming port all status when
// an exception or WDT timeout happens - And then resets the board
diff --git a/Marlin/src/HAL/HAL_ESP32/HAL_spi_ESP32.cpp b/Marlin/src/HAL/HAL_ESP32/HAL_spi_ESP32.cpp
index c837eb0624..730fd43aa4 100644
--- a/Marlin/src/HAL/HAL_ESP32/HAL_spi_ESP32.cpp
+++ b/Marlin/src/HAL/HAL_ESP32/HAL_spi_ESP32.cpp
@@ -29,7 +29,7 @@
#include "HAL.h"
#include "../shared/HAL_SPI.h"
-#include "pins_arduino.h"
+#include <pins_arduino.h>
#include "spi_pins.h"
#include "../../core/macros.h"
#include <SPI.h>
diff --git a/Marlin/src/HAL/HAL_LINUX/spi_pins.h b/Marlin/src/HAL/HAL_LINUX/spi_pins.h
index fe510ddcff..22893ac2c3 100644
--- a/Marlin/src/HAL/HAL_LINUX/spi_pins.h
+++ b/Marlin/src/HAL/HAL_LINUX/spi_pins.h
@@ -21,7 +21,8 @@
*/
#pragma once
-#include "src/core/macros.h"
+#include "../../core/macros.h"
+#include "../../inc/MarlinConfigPre.h"
#if BOTH(SDSUPPORT, DOGLCD) && (LCD_PINS_D4 == SCK_PIN || LCD_PINS_ENABLE == MOSI_PIN || DOGLCD_SCK == SCK_PIN || DOGLCD_MOSI == MOSI_PIN)
#define LPC_SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
diff --git a/Marlin/src/HAL/HAL_LPC1768/spi_pins.h b/Marlin/src/HAL/HAL_LPC1768/spi_pins.h
index c0a072851e..51cb195fb9 100644
--- a/Marlin/src/HAL/HAL_LPC1768/spi_pins.h
+++ b/Marlin/src/HAL/HAL_LPC1768/spi_pins.h
@@ -21,7 +21,7 @@
*/
#pragma once
-#include "src/core/macros.h"
+#include "../../core/macros.h"
#if ENABLED(SDSUPPORT) && HAS_GRAPHICAL_LCD && (LCD_PINS_D4 == SCK_PIN || LCD_PINS_ENABLE == MOSI_PIN || DOGLCD_SCK == SCK_PIN || DOGLCD_MOSI == MOSI_PIN)
#define LPC_SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
diff --git a/Marlin/src/HAL/HAL_STM32F4/HAL_spi_STM32F4.cpp b/Marlin/src/HAL/HAL_STM32F4/HAL_spi_STM32F4.cpp
index 8365b8370b..7347d060fb 100644
--- a/Marlin/src/HAL/HAL_STM32F4/HAL_spi_STM32F4.cpp
+++ b/Marlin/src/HAL/HAL_STM32F4/HAL_spi_STM32F4.cpp
@@ -38,7 +38,7 @@
#include "HAL.h"
#include "../shared/HAL_SPI.h"
-#include "pins_arduino.h"
+#include <pins_arduino.h>
#include "spi_pins.h"
#include "../../core/macros.h"
#include <SPI.h>
diff --git a/Marlin/src/HAL/HAL_STM32F7/HAL_spi_STM32F7.cpp b/Marlin/src/HAL/HAL_STM32F7/HAL_spi_STM32F7.cpp
index 7a338a2f2f..9a06a5ccd5 100644
--- a/Marlin/src/HAL/HAL_STM32F7/HAL_spi_STM32F7.cpp
+++ b/Marlin/src/HAL/HAL_STM32F7/HAL_spi_STM32F7.cpp
@@ -38,7 +38,7 @@
#include "HAL.h"
#include "../shared/HAL_SPI.h"
-#include "pins_arduino.h"
+#include <pins_arduino.h>
#include "spi_pins.h"
#include "../../core/macros.h"
#include <SPI.h>
diff --git a/Marlin/src/lcd/extui_dgus_lcd.cpp b/Marlin/src/lcd/extui_dgus_lcd.cpp
index 5d6d1d43a8..6fca8c9cdd 100644
--- a/Marlin/src/lcd/extui_dgus_lcd.cpp
+++ b/Marlin/src/lcd/extui_dgus_lcd.cpp
@@ -41,13 +41,13 @@ namespace ExtUI {
ScreenHandler.UpdateScreenVPData();
}
- void onIdle() { ScreenHandler.loop(); }
+ void onIdle() { ScreenHandler.loop(); }
- void onPrinterKilled(const char* msg) {
- ScreenHandler.sendinfoscreen(PSTR(MSG_HALTED), msg, PSTR(""), PSTR(MSG_PLEASE_RESET), true, true, true, true);
- ScreenHandler.GotoScreen(DGUSLCD_SCREEN_KILL);
- while (!ScreenHandler.loop()); // Wait while anything is left to be sent
- }
+ void onPrinterKilled(const char* msg) {
+ ScreenHandler.sendinfoscreen(PSTR(MSG_HALTED), msg, PSTR(""), PSTR(MSG_PLEASE_RESET), true, true, true, true);
+ ScreenHandler.GotoScreen(DGUSLCD_SCREEN_KILL);
+ while (!ScreenHandler.loop()); // Wait while anything is left to be sent
+ }
void onMediaInserted() { ScreenHandler.SDCardInserted(); }
void onMediaError() { ScreenHandler.SDCardError(); }
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index 85f876d68e..f13b370d29 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -99,7 +99,7 @@ void MarlinUI::goto_previous_screen() {
/////////// Common Menu Actions ////////////
////////////////////////////////////////////
-void MenuItem_gcode::action(PGM_P pgcode) { queue.inject_P(pgcode); }
+void MenuItem_gcode::action(PGM_P const pgcode) { queue.inject_P(pgcode); }
////////////////////////////////////////////
/////////// Menu Editing Actions ///////////
diff --git a/Marlin/src/lcd/menu/menu_filament.cpp b/Marlin/src/lcd/menu/menu_filament.cpp
index 4d4beb9e1c..a7b6e0b4f5 100644
--- a/Marlin/src/lcd/menu/menu_filament.cpp
+++ b/Marlin/src/lcd/menu/menu_filament.cpp
@@ -512,7 +512,7 @@ FORCE_INLINE screenFunc_t ap_message_screen(const PauseMessage message) {
case PAUSE_MESSAGE_HEAT: return lcd_pause_heat_message;
case PAUSE_MESSAGE_HEATING: return lcd_pause_heating_message;
case PAUSE_MESSAGE_OPTION: pause_menu_response = PAUSE_RESPONSE_WAIT_FOR;
- return menu_pause_option;
+ return menu_pause_option;
case PAUSE_MESSAGE_STATUS:
default: break;
}
--
GitLab