Skip to content

Commit 39e42eb

Browse files
committed
🎨 Cosmetic and comments
1 parent a3101a0 commit 39e42eb

File tree

449 files changed

+3397
-3707
lines changed

Some content is hidden

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

449 files changed

+3397
-3707
lines changed

Marlin/src/HAL/AVR/HAL.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
/**
22
* Marlin 3D Printer Firmware
33
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4-
* Copyright (c) 2016 Bob Cousins [email protected]
4+
*
5+
* Based on Sprinter and grbl.
6+
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
57
*
68
* This program is free software: you can redistribute it and/or modify
79
* it under the terms of the GNU General Public License as published by

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
@@ -682,7 +682,6 @@
682682
#define PF7_PWM 0
683683
#define PF7_DDR DDRF
684684

685-
686685
/**
687686
* Some of the pin mapping functions of the Teensduino extension to the Arduino IDE
688687
* do not function the same as the other Arduino extensions.

Marlin/src/HAL/AVR/pinsDebug.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ void PRINT_ARRAY_NAME(uint8_t x) {
9090

9191
#define GET_ARRAY_IS_DIGITAL(x) pgm_read_byte(&pin_array[x].is_digital)
9292

93-
9493
#if defined(__AVR_ATmega1284P__) // 1284 IDE extensions set this to the number of
9594
#undef NUM_DIGITAL_PINS // digital only pins while all other CPUs have it
9695
#define NUM_DIGITAL_PINS 32 // set to digital only + digital/analog
@@ -164,7 +163,6 @@ static bool pwm_status(uint8_t pin) {
164163
SERIAL_ECHO_SP(2);
165164
} // pwm_status
166165

167-
168166
const volatile uint8_t* const PWM_other[][3] PROGMEM = {
169167
{ &TCCR0A, &TCCR0B, &TIMSK0 },
170168
{ &TCCR1A, &TCCR1B, &TIMSK1 },
@@ -182,7 +180,6 @@ const volatile uint8_t* const PWM_other[][3] PROGMEM = {
182180
#endif
183181
};
184182

185-
186183
const volatile uint8_t* const PWM_OCR[][3] PROGMEM = {
187184

188185
#ifdef TIMER0A
@@ -218,7 +215,6 @@ const volatile uint8_t* const PWM_OCR[][3] PROGMEM = {
218215
#endif
219216
};
220217

221-
222218
#define TCCR_A(T) pgm_read_word(&PWM_other[T][0])
223219
#define TCCR_B(T) pgm_read_word(&PWM_other[T][1])
224220
#define TIMSK(T) pgm_read_word(&PWM_other[T][2])

Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,10 @@
2222
#pragma once
2323

2424
//
25-
// some of the pin mapping functions of the Teensduino extension to the Arduino IDE
26-
// do not function the same as the other Arduino extensions
25+
// Some of the pin mapping functions of the Arduino IDE Teensduino extension
26+
// function differently from other Arduino extensions.
2727
//
2828

29-
3029
#define TEENSYDUINO_IDE
3130

3231
//digitalPinToTimer(pin) function works like Arduino but Timers are not defined
@@ -48,8 +47,6 @@
4847
#define PE 5
4948
#define PF 6
5049

51-
#undef digitalPinToPort
52-
5350
const uint8_t PROGMEM digital_pin_to_port_PGM[] = {
5451
PD, // 0 - PD0 - INT0 - PWM
5552
PD, // 1 - PD1 - INT1 - PWM
@@ -101,7 +98,7 @@ const uint8_t PROGMEM digital_pin_to_port_PGM[] = {
10198
PE, // 47 - PE3 (not defined in teensyduino)
10299
};
103100

104-
#define digitalPinToPort(P) ( pgm_read_byte( digital_pin_to_port_PGM + (P) ) )
101+
#define digitalPinToPort(P) pgm_read_byte(digital_pin_to_port_PGM[P])
105102

106103
// digitalPinToBitMask(pin) is OK
107104

Marlin/src/HAL/AVR/pinsDebug_plus_70.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ const uint8_t PROGMEM digital_pin_to_bit_mask_PGM_plus_70[] = {
231231

232232
#define digitalPinToBitMask_plus_70(P) ( pgm_read_byte( digital_pin_to_bit_mask_PGM_plus_70 + (P) ) )
233233

234-
235234
const uint8_t PROGMEM digital_pin_to_timer_PGM_plus_70[] = {
236235
// TIMERS
237236
// ------------------------

Marlin/src/HAL/AVR/timers.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
/**
22
* Marlin 3D Printer Firmware
33
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4-
* Copyright (c) 2016 Bob Cousins [email protected]
4+
*
5+
* Based on Sprinter and grbl.
6+
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
57
*
68
* This program is free software: you can redistribute it and/or modify
79
* it under the terms of the GNU General Public License as published by

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

0 commit comments

Comments
 (0)