SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Include order, spacing, etc.

Browse source
This commit is contained in:
Scott Lahteine 2019-06-23 03:43:36 -05:00
parent 1b1a4677f5
commit 3d9d72e8db
11 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Marlin/src/HAL/HAL_AVR/endstop_interrupts.h
View file

@ -37,9 +37,10 @@
*/ */
#include "../../core/macros.h" #include "../../core/macros.h"
#include <stdint.h>
#include "../../module/endstops.h" #include "../../module/endstops.h"
#include <stdint.h>
// One ISR for all EXT-Interrupts // One ISR for all EXT-Interrupts
void endstop_ISR(void) { endstops.update(); } void endstop_ISR(void) { endstops.update(); }

3
Marlin/src/HAL/HAL_AVR/fastio_AVR.h
View file

@ -27,9 +27,10 @@
* Contributed by Triffid_Hunter and modified by Kliment, thinkyhead, Bob-the-Kuhn, et.al. * Contributed by Triffid_Hunter and modified by Kliment, thinkyhead, Bob-the-Kuhn, et.al.
*/ */
#include <avr/io.h>
#include "../../core/macros.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_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_ATmega1284_FAMILY (defined(__AVR_ATmega644__) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644PA__) || defined(__AVR_ATmega1284P__))
#define AVR_ATmega2560_FAMILY (defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)) #define AVR_ATmega2560_FAMILY (defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__))

3
Marlin/src/HAL/HAL_DUE/DebugMonitor_Due.cpp
View file

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

2
Marlin/src/HAL/HAL_ESP32/HAL_spi_ESP32.cpp
View file

@ -29,7 +29,7 @@
#include "HAL.h" #include "HAL.h"
#include "../shared/HAL_SPI.h" #include "../shared/HAL_SPI.h"
#include "pins_arduino.h" #include <pins_arduino.h>
#include "spi_pins.h" #include "spi_pins.h"
#include "../../core/macros.h" #include "../../core/macros.h"
#include <SPI.h> #include <SPI.h>

3
Marlin/src/HAL/HAL_LINUX/spi_pins.h
View file

@ -21,7 +21,8 @@
*/ */
#pragma once #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) #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 #define LPC_SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently

2
Marlin/src/HAL/HAL_LPC1768/spi_pins.h
View file

@ -21,7 +21,7 @@
*/ */
#pragma once #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) #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 #define LPC_SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently

2
Marlin/src/HAL/HAL_STM32F4/HAL_spi_STM32F4.cpp
View file

@ -38,7 +38,7 @@
#include "HAL.h" #include "HAL.h"
#include "../shared/HAL_SPI.h" #include "../shared/HAL_SPI.h"
#include "pins_arduino.h" #include <pins_arduino.h>
#include "spi_pins.h" #include "spi_pins.h"
#include "../../core/macros.h" #include "../../core/macros.h"
#include <SPI.h> #include <SPI.h>

2
Marlin/src/HAL/HAL_STM32F7/HAL_spi_STM32F7.cpp
View file

@ -38,7 +38,7 @@
#include "HAL.h" #include "HAL.h"
#include "../shared/HAL_SPI.h" #include "../shared/HAL_SPI.h"
#include "pins_arduino.h" #include <pins_arduino.h>
#include "spi_pins.h" #include "spi_pins.h"
#include "../../core/macros.h" #include "../../core/macros.h"
#include <SPI.h> #include <SPI.h>

12
Marlin/src/lcd/extui_dgus_lcd.cpp
View file

@ -41,13 +41,13 @@ namespace ExtUI {
ScreenHandler.UpdateScreenVPData(); ScreenHandler.UpdateScreenVPData();
} }
void onIdle() { ScreenHandler.loop(); } void onIdle() { ScreenHandler.loop(); }
void onPrinterKilled(const char* msg) { void onPrinterKilled(const char* msg) {
ScreenHandler.sendinfoscreen(PSTR(MSG_HALTED), msg, PSTR(""), PSTR(MSG_PLEASE_RESET), true, true, true, true); ScreenHandler.sendinfoscreen(PSTR(MSG_HALTED), msg, PSTR(""), PSTR(MSG_PLEASE_RESET), true, true, true, true);
ScreenHandler.GotoScreen(DGUSLCD_SCREEN_KILL); ScreenHandler.GotoScreen(DGUSLCD_SCREEN_KILL);
while (!ScreenHandler.loop()); // Wait while anything is left to be sent while (!ScreenHandler.loop()); // Wait while anything is left to be sent
} }
void onMediaInserted() { ScreenHandler.SDCardInserted(); } void onMediaInserted() { ScreenHandler.SDCardInserted(); }
void onMediaError() { ScreenHandler.SDCardError(); } void onMediaError() { ScreenHandler.SDCardError(); }

2
Marlin/src/lcd/menu/menu.cpp
View file

@ -99,7 +99,7 @@ void MarlinUI::goto_previous_screen() {
/////////// Common Menu Actions //////////// /////////// 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 /////////// /////////// Menu Editing Actions ///////////

2
Marlin/src/lcd/menu/menu_filament.cpp
View file

@ -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_HEAT: return lcd_pause_heat_message;
case PAUSE_MESSAGE_HEATING: return lcd_pause_heating_message; case PAUSE_MESSAGE_HEATING: return lcd_pause_heating_message;
case PAUSE_MESSAGE_OPTION: pause_menu_response = PAUSE_RESPONSE_WAIT_FOR; case PAUSE_MESSAGE_OPTION: pause_menu_response = PAUSE_RESPONSE_WAIT_FOR;
return menu_pause_option; return menu_pause_option;
case PAUSE_MESSAGE_STATUS: case PAUSE_MESSAGE_STATUS:
default: break; default: break;
} }