Skip to content

Commit 5639237

Browse files
committed
🎨 Misc. cleanup 29-01
1 parent 541bd26 commit 5639237

File tree

131 files changed

+13
-361
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+13
-361
lines changed

Marlin/Marlin.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
Marlin Firmware
44
5-
(c) 2011-2023 MarlinFirmware
5+
(c) 2011-2024 MarlinFirmware
66
Portions of Marlin are (c) by their respective authors.
77
All code complies with GPLv2 and/or GPLv3
88

Marlin/src/HAL/AVR/HAL_SPI.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ void spiBegin() {
119119
while (!TEST(SPSR, SPIF)) { /* Intentionally left empty */ }
120120
}
121121

122-
123122
/** begin spi transaction */
124123
void spiBeginTransaction(uint32_t spiClock, uint8_t bitOrder, uint8_t dataMode) {
125124
// Based on Arduino SPI library
@@ -175,7 +174,6 @@ void spiBegin() {
175174
SPSR = clockDiv | 0x01;
176175
}
177176

178-
179177
#else // SOFTWARE_SPI || FORCE_SOFT_SPI
180178

181179
// ------------------------

Marlin/src/HAL/AVR/Servo.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363

6464
static volatile int8_t Channel[_Nbr_16timers]; // counter for the servo being pulsed for each timer (or -1 if refresh interval)
6565

66-
6766
/************ static functions common to all instances ***********************/
6867

6968
static inline void handle_interrupts(const timer16_Sequence_t timer, volatile uint16_t* TCNTn, volatile uint16_t* OCRnA) {

Marlin/src/HAL/AVR/endstop_interrupts.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ void endstop_ISR() { endstops.update(); }
9191

9292
#endif
9393

94-
9594
// Install Pin change interrupt for a pin. Can be called multiple times.
9695
void pciSetup(const int8_t pin) {
9796
if (digitalPinHasPCICR(pin)) {

Marlin/src/HAL/AVR/fastio/fastio_AT90USB.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,6 @@
679679
#define PF7_PWM 0
680680
#define PF7_DDR DDRF
681681

682-
683682
/**
684683
* Some of the pin mapping functions of the Teensduino extension to the Arduino IDE
685684
* do not function the same as the other Arduino extensions.

Marlin/src/HAL/AVR/pinsDebug.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ bool pwm_status(uint8_t pin) {
163163
SERIAL_ECHO_SP(2);
164164
} // pwm_status
165165

166-
167166
const volatile uint8_t* const PWM_other[][3] PROGMEM = {
168167
{ &TCCR0A, &TCCR0B, &TIMSK0 },
169168
{ &TCCR1A, &TCCR1B, &TIMSK1 },
@@ -181,7 +180,6 @@ const volatile uint8_t* const PWM_other[][3] PROGMEM = {
181180
#endif
182181
};
183182

184-
185183
const volatile uint8_t* const PWM_OCR[][3] PROGMEM = {
186184

187185
#ifdef TIMER0A
@@ -217,7 +215,6 @@ const volatile uint8_t* const PWM_OCR[][3] PROGMEM = {
217215
#endif
218216
};
219217

220-
221218
#define TCCR_A(T) pgm_read_word(&PWM_other[T][0])
222219
#define TCCR_B(T) pgm_read_word(&PWM_other[T][1])
223220
#define TIMSK(T) pgm_read_word(&PWM_other[T][2])

Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ void u8g_spiSend_sw_AVR_mode_3(uint8_t val) {
120120
U8G_ATOMIC_END();
121121
}
122122

123-
124123
#if ENABLED(FYSETC_MINI_12864)
125124
#define SPISEND_SW_AVR u8g_spiSend_sw_AVR_mode_3
126125
#else

Marlin/src/HAL/DUE/MarlinSerial.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,6 @@ void MarlinSerial<Cfg>::flushTX() {
474474
}
475475
}
476476

477-
478477
// If not using the USB port as serial port
479478
#if defined(SERIAL_PORT) && SERIAL_PORT >= 0
480479
template class MarlinSerial< MarlinSerialCfg<SERIAL_PORT> >;

Marlin/src/HAL/DUE/fastio/G2_PWM.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ extern volatile uint32_t *SODR_A, *SODR_B, *CODR_A, *CODR_B;
4949

5050
#define PWM_MAP_INIT_ROW(IO,ZZ) { ZZ == 'A' ? SODR_A : SODR_B, ZZ == 'A' ? CODR_A : CODR_B, 1 << _PIN(IO) }
5151

52-
5352
#define PWM_MAP_INIT { PWM_MAP_INIT_ROW(MOTOR_CURRENT_PWM_X_PIN, 'B'), \
5453
PWM_MAP_INIT_ROW(MOTOR_CURRENT_PWM_Y_PIN, 'B'), \
5554
PWM_MAP_INIT_ROW(MOTOR_CURRENT_PWM_Z_PIN, 'B'), \

Marlin/src/HAL/DUE/fastio/G2_pins.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ const G2_PinDescription G2_g_APinDescription[] = {
168168
{ PIOB, PIO_PB21, ID_PIOB, PIO_OUTPUT_0, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // PIN 52
169169
{ PIOB, PIO_PB14, ID_PIOB, PIO_OUTPUT_0, PIO_DEFAULT, PIN_ATTR_DIGITAL, NO_ADC, NO_ADC, NOT_ON_PWM, NOT_ON_TIMER }, // PIN 53
170170

171-
172171
// 54 .. 65 - Analog pins
173172
// ----------------------
174173
{ PIOA, PIO_PA16X1_AD7, ID_PIOA, PIO_INPUT, PIO_DEFAULT, PIN_ATTR_ANALOG, ADC0, ADC7, NOT_ON_PWM, NOT_ON_TIMER }, // AD0

0 commit comments

Comments
 (0)