Преглед на файлове

Include order, spacing, etc.

Scott Lahteine преди 5 години
родител
ревизия
3d9d72e8db

+ 2
- 1
Marlin/src/HAL/HAL_AVR/endstop_interrupts.h Целия файл

@@ -37,9 +37,10 @@
37 37
  */
38 38
 
39 39
 #include "../../core/macros.h"
40
-#include <stdint.h>
41 40
 #include "../../module/endstops.h"
42 41
 
42
+#include <stdint.h>
43
+
43 44
 // One ISR for all EXT-Interrupts
44 45
 void endstop_ISR(void) { endstops.update(); }
45 46
 

+ 2
- 1
Marlin/src/HAL/HAL_AVR/fastio_AVR.h Целия файл

@@ -27,9 +27,10 @@
27 27
  * Contributed by Triffid_Hunter and modified by Kliment, thinkyhead, Bob-the-Kuhn, et.al.
28 28
  */
29 29
 
30
-#include <avr/io.h>
31 30
 #include "../../core/macros.h"
32 31
 
32
+#include <avr/io.h>
33
+
33 34
 #define AVR_AT90USB1286_FAMILY (defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1286P__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB646P__) || defined(__AVR_AT90USB647__))
34 35
 #define AVR_ATmega1284_FAMILY (defined(__AVR_ATmega644__) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644PA__) || defined(__AVR_ATmega1284P__))
35 36
 #define AVR_ATmega2560_FAMILY (defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__))

+ 2
- 1
Marlin/src/HAL/HAL_DUE/DebugMonitor_Due.cpp Целия файл

@@ -24,11 +24,12 @@
24 24
 
25 25
 #include "../../core/macros.h"
26 26
 #include "../../core/serial.h"
27
-#include <stdarg.h>
28 27
 
29 28
 #include "../shared/backtrace/unwinder.h"
30 29
 #include "../shared/backtrace/unwmemaccess.h"
31 30
 
31
+#include <stdarg.h>
32
+
32 33
 // Debug monitor that dumps to the Programming port all status when
33 34
 // an exception or WDT timeout happens - And then resets the board
34 35
 

+ 1
- 1
Marlin/src/HAL/HAL_ESP32/HAL_spi_ESP32.cpp Целия файл

@@ -29,7 +29,7 @@
29 29
 
30 30
 #include "HAL.h"
31 31
 #include "../shared/HAL_SPI.h"
32
-#include "pins_arduino.h"
32
+#include <pins_arduino.h>
33 33
 #include "spi_pins.h"
34 34
 #include "../../core/macros.h"
35 35
 #include <SPI.h>

+ 2
- 1
Marlin/src/HAL/HAL_LINUX/spi_pins.h Целия файл

@@ -21,7 +21,8 @@
21 21
  */
22 22
 #pragma once
23 23
 
24
-#include "src/core/macros.h"
24
+#include "../../core/macros.h"
25
+#include "../../inc/MarlinConfigPre.h"
25 26
 
26 27
 #if BOTH(SDSUPPORT, DOGLCD) && (LCD_PINS_D4 == SCK_PIN || LCD_PINS_ENABLE == MOSI_PIN || DOGLCD_SCK == SCK_PIN || DOGLCD_MOSI == MOSI_PIN)
27 28
   #define LPC_SOFTWARE_SPI  // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently

+ 1
- 1
Marlin/src/HAL/HAL_LPC1768/spi_pins.h Целия файл

@@ -21,7 +21,7 @@
21 21
  */
22 22
 #pragma once
23 23
 
24
-#include "src/core/macros.h"
24
+#include "../../core/macros.h"
25 25
 
26 26
 #if ENABLED(SDSUPPORT) && HAS_GRAPHICAL_LCD && (LCD_PINS_D4 == SCK_PIN || LCD_PINS_ENABLE == MOSI_PIN || DOGLCD_SCK == SCK_PIN || DOGLCD_MOSI == MOSI_PIN)
27 27
   #define LPC_SOFTWARE_SPI  // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently

+ 1
- 1
Marlin/src/HAL/HAL_STM32F4/HAL_spi_STM32F4.cpp Целия файл

@@ -38,7 +38,7 @@
38 38
 
39 39
 #include "HAL.h"
40 40
 #include "../shared/HAL_SPI.h"
41
-#include "pins_arduino.h"
41
+#include <pins_arduino.h>
42 42
 #include "spi_pins.h"
43 43
 #include "../../core/macros.h"
44 44
 #include <SPI.h>

+ 1
- 1
Marlin/src/HAL/HAL_STM32F7/HAL_spi_STM32F7.cpp Целия файл

@@ -38,7 +38,7 @@
38 38
 
39 39
 #include "HAL.h"
40 40
 #include "../shared/HAL_SPI.h"
41
-#include "pins_arduino.h"
41
+#include <pins_arduino.h>
42 42
 #include "spi_pins.h"
43 43
 #include "../../core/macros.h"
44 44
 #include <SPI.h>

+ 6
- 6
Marlin/src/lcd/extui_dgus_lcd.cpp Целия файл

@@ -41,13 +41,13 @@ namespace ExtUI {
41 41
     ScreenHandler.UpdateScreenVPData();
42 42
   }
43 43
 
44
- void onIdle() { ScreenHandler.loop(); }
44
+  void onIdle() { ScreenHandler.loop(); }
45 45
 
46
- void onPrinterKilled(const char* msg) {
47
-   ScreenHandler.sendinfoscreen(PSTR(MSG_HALTED), msg, PSTR(""), PSTR(MSG_PLEASE_RESET), true, true, true, true);
48
-   ScreenHandler.GotoScreen(DGUSLCD_SCREEN_KILL);
49
-   while (!ScreenHandler.loop());  // Wait while anything is left to be sent
50
- }
46
+  void onPrinterKilled(const char* msg) {
47
+    ScreenHandler.sendinfoscreen(PSTR(MSG_HALTED), msg, PSTR(""), PSTR(MSG_PLEASE_RESET), true, true, true, true);
48
+    ScreenHandler.GotoScreen(DGUSLCD_SCREEN_KILL);
49
+    while (!ScreenHandler.loop());  // Wait while anything is left to be sent
50
+  }
51 51
 
52 52
   void onMediaInserted() { ScreenHandler.SDCardInserted(); }
53 53
   void onMediaError()    { ScreenHandler.SDCardError(); }

+ 1
- 1
Marlin/src/lcd/menu/menu.cpp Целия файл

@@ -99,7 +99,7 @@ void MarlinUI::goto_previous_screen() {
99 99
 /////////// Common Menu Actions ////////////
100 100
 ////////////////////////////////////////////
101 101
 
102
-void MenuItem_gcode::action(PGM_P pgcode) { queue.inject_P(pgcode); }
102
+void MenuItem_gcode::action(PGM_P const pgcode) { queue.inject_P(pgcode); }
103 103
 
104 104
 ////////////////////////////////////////////
105 105
 /////////// Menu Editing Actions ///////////

+ 1
- 1
Marlin/src/lcd/menu/menu_filament.cpp Целия файл

@@ -512,7 +512,7 @@ FORCE_INLINE screenFunc_t ap_message_screen(const PauseMessage message) {
512 512
     case PAUSE_MESSAGE_HEAT:     return lcd_pause_heat_message;
513 513
     case PAUSE_MESSAGE_HEATING:  return lcd_pause_heating_message;
514 514
     case PAUSE_MESSAGE_OPTION:   pause_menu_response = PAUSE_RESPONSE_WAIT_FOR;
515
-                                          return menu_pause_option;
515
+                                 return menu_pause_option;
516 516
     case PAUSE_MESSAGE_STATUS:
517 517
     default: break;
518 518
   }

Loading…
Отказ
Запис