bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🩹 Remove extra #include, misc. style

Browse Source
This commit is contained in:
Scott Lahteine 2021-09-20 18:44:35 -05:00
parent b3fd03198a
commit a37580e4e8
9 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/lcd/marlinui.cpp
View File

@ -1490,9 +1490,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
next_filament_display = ms + 5000UL; // Show status message for 5s next_filament_display = ms + 5000UL; // Show status message for 5s
#endif #endif
#if ENABLED(STATUS_MESSAGE_SCROLLING) TERN_(STATUS_MESSAGE_SCROLLING, status_scroll_offset = 0);
status_scroll_offset = 0;
#endif
#else // HAS_WIRED_LCD #else // HAS_WIRED_LCD
UNUSED(persist); UNUSED(persist);
#endif #endif

2
Marlin/src/pins/stm32f4/pins_ANET_ET4.h
View File

@ -23,8 +23,6 @@
#include "env_validate.h" #include "env_validate.h"
#include "env_validate.h"
#if HOTENDS > 1 || E_STEPPERS > 1 #if HOTENDS > 1 || E_STEPPERS > 1
#error "Anet ET4 only supports one hotend / E-stepper. Comment out this line to continue." #error "Anet ET4 only supports one hotend / E-stepper. Comment out this line to continue."
#endif #endif

2
buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/variant.h
View File

@ -244,7 +244,7 @@ extern "C" {
#define PIN_WIRE_SCL PB6 #define PIN_WIRE_SCL PB6
// Timer Definitions // Timer Definitions
//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c // Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
#define TIMER_TONE TIM7 #define TIMER_TONE TIM7
#define TIMER_SERVO TIM5 #define TIMER_SERVO TIM5
#define TIMER_SERIAL TIM2 #define TIMER_SERIAL TIM2

2
buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/variant.h
View File

@ -244,7 +244,7 @@ extern "C" {
#define PIN_WIRE_SCL PB8 #define PIN_WIRE_SCL PB8
// Timer Definitions // Timer Definitions
//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c // Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
#define TIMER_TONE TIM7 #define TIMER_TONE TIM7
#define TIMER_SERVO TIM5 #define TIMER_SERVO TIM5
#define TIMER_SERIAL TIM8 #define TIMER_SERIAL TIM8

2
buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/variant.h
View File

@ -254,7 +254,7 @@ extern "C" {
#endif #endif
// Timer Definitions // Timer Definitions
//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c // Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
#define TIMER_TONE TIM10 #define TIMER_TONE TIM10
#define TIMER_SERVO TIM5 #define TIMER_SERVO TIM5
#define TIMER_SERIAL TIM7 #define TIMER_SERIAL TIM7

2
buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/variant.h
View File

@ -254,7 +254,7 @@ extern "C" {
#endif #endif
// Timer Definitions // Timer Definitions
//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c // Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
#define TIMER_TONE TIM2 #define TIMER_TONE TIM2
#define TIMER_SERVO TIM5 // Only 1 Servo PIN on SKR-PRO, so use the same timer as defined in PeripheralPins #define TIMER_SERVO TIM5 // Only 1 Servo PIN on SKR-PRO, so use the same timer as defined in PeripheralPins
#define TIMER_SERIAL TIM7 #define TIMER_SERIAL TIM7

2
buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/variant.h
View File

@ -156,7 +156,7 @@ extern "C" {
#define NUM_ANALOG_FIRST 108 #define NUM_ANALOG_FIRST 108
// Timer Definitions // Timer Definitions
//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c // Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
#define TIMER_TONE TIM2 #define TIMER_TONE TIM2
#define TIMER_SERVO TIM5 #define TIMER_SERVO TIM5
#define TIMER_SERIAL TIM7 #define TIMER_SERIAL TIM7

2
buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.h
View File

@ -298,7 +298,7 @@ extern "C" {
#define PIN_WIRE_SCL PB6 #define PIN_WIRE_SCL PB6
// Timer Definitions // Timer Definitions
//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c // Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
#define TIMER_TONE TIM6 #define TIMER_TONE TIM6
// Do not use basic timer: OC is required // Do not use basic timer: OC is required

2
buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/variant.h
View File

@ -184,7 +184,7 @@ extern "C" {
#define PIN_WIRE_SCL PB6 #define PIN_WIRE_SCL PB6
// Timer Definitions // Timer Definitions
//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c // Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
#define TIMER_TONE TIM6 #define TIMER_TONE TIM6
// Do not use basic timer: OC is required // Do not use basic timer: OC is required