Skip to content

Commit ee08814

Browse files
committed
♻️ Remove LOOP macros
1 parent 244c257 commit ee08814

File tree

121 files changed

+344
-349
lines changed

Some content is hidden

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

121 files changed

+344
-349
lines changed

Marlin/src/HAL/AVR/HAL_SPI.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ void spiBegin() {
198198
// output pin high - like sending 0xFF
199199
WRITE(SD_MOSI_PIN, HIGH);
200200

201-
LOOP_L_N(i, 8) {
201+
for (uint8_t i = 0; i < 8; ++i) {
202202
WRITE(SD_SCK_PIN, HIGH);
203203

204204
nop; // adjust so SCK is nice
@@ -225,7 +225,7 @@ void spiBegin() {
225225
void spiSend(uint8_t data) {
226226
// no interrupts during byte send - about 8µs
227227
cli();
228-
LOOP_L_N(i, 8) {
228+
for (uint8_t i = 0; i < 8; ++i) {
229229
WRITE(SD_SCK_PIN, LOW);
230230
WRITE(SD_MOSI_PIN, data & 0x80);
231231
data <<= 1;

Marlin/src/HAL/AVR/fast_pwm.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ void MarlinHAL::set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
132132

133133
DEBUG_ECHOLNPGM("f=", f);
134134
DEBUG_ECHOLNPGM("(prescaler loop)");
135-
LOOP_L_N(i, COUNT(prescaler)) { // Loop through all prescaler values
135+
for (uint8_t i = 0; i < COUNT(prescaler); ++i) { // Loop through all prescaler values
136136
const uint32_t p = prescaler[i]; // Extend to 32 bits for calculations
137137
DEBUG_ECHOLNPGM("prescaler[", i, "]=", p);
138138
uint16_t res_fast_temp, res_pc_temp;
@@ -232,7 +232,7 @@ void MarlinHAL::init_pwm_timers() {
232232
#endif
233233
};
234234

235-
LOOP_L_N(i, COUNT(pwm_pin))
235+
for (uint8_t i = 0; i < COUNT(pwm_pin); ++i)
236236
set_pwm_frequency(pwm_pin[i], 1000);
237237
}
238238

Marlin/src/HAL/AVR/pinsDebug.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@
7777

7878
void PRINT_ARRAY_NAME(uint8_t x) {
7979
PGM_P const name_mem_pointer = (PGM_P)pgm_read_ptr(&pin_array[x].name);
80-
LOOP_L_N(y, MAX_NAME_LENGTH) {
80+
for (uint8_t y = 0; y < MAX_NAME_LENGTH; ++y) {
8181
char temp_char = pgm_read_byte(name_mem_pointer + y);
8282
if (temp_char != 0)
8383
SERIAL_CHAR(temp_char);
8484
else {
85-
LOOP_L_N(i, MAX_NAME_LENGTH - y) SERIAL_CHAR(' ');
85+
for (uint8_t i = 0; i < MAX_NAME_LENGTH - y; ++i) SERIAL_CHAR(' ');
8686
break;
8787
}
8888
}

Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ void u8g_spiSend_sw_AVR_mode_0(uint8_t val) {
8888
volatile uint8_t *outData = u8g_outData,
8989
*outClock = u8g_outClock;
9090
U8G_ATOMIC_START();
91-
LOOP_L_N(i, 8) {
91+
for (uint8_t i = 0; i < 8; ++i) {
9292
if (val & 0x80)
9393
*outData |= bitData;
9494
else
@@ -108,7 +108,7 @@ void u8g_spiSend_sw_AVR_mode_3(uint8_t val) {
108108
volatile uint8_t *outData = u8g_outData,
109109
*outClock = u8g_outClock;
110110
U8G_ATOMIC_START();
111-
LOOP_L_N(i, 8) {
111+
for (uint8_t i = 0; i < 8; ++i) {
112112
*outClock &= bitNotClock;
113113
if (val & 0x80)
114114
*outData |= bitData;

Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Pio *SCK_pPio, *MOSI_pPio;
8181
uint32_t SCK_dwMask, MOSI_dwMask;
8282

8383
void u8g_spiSend_sw_DUE_mode_0(uint8_t val) { // 3MHz
84-
LOOP_L_N(i, 8) {
84+
for (uint8_t i = 0; i < 8; ++i) {
8585
if (val & 0x80)
8686
MOSI_pPio->PIO_SODR = MOSI_dwMask;
8787
else
@@ -95,7 +95,7 @@ void u8g_spiSend_sw_DUE_mode_0(uint8_t val) { // 3MHz
9595
}
9696

9797
void u8g_spiSend_sw_DUE_mode_3(uint8_t val) { // 3.5MHz
98-
LOOP_L_N(i, 8) {
98+
for (uint8_t i = 0; i < 8; ++i) {
9999
SCK_pPio->PIO_CODR = SCK_dwMask;
100100
DELAY_NS(50);
101101
if (val & 0x80)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ extern PWM_map ISR_table[NUM_PWMS];
6363
extern uint32_t motor_current_setting[3];
6464

6565
#define IR_BIT(p) (WITHIN(p, 0, 3) ? (p) : (p) + 4)
66-
#define COPY_ACTIVE_TABLE() do{ LOOP_L_N(i, 6) work_table[i] = active_table[i]; }while(0)
66+
#define COPY_ACTIVE_TABLE() do{ for (uint8_t i = 0; i < 6; ++i) work_table[i] = active_table[i]; }while(0)
6767

6868
#define PWM_MR0 19999 // base repetition rate minus one count - 20mS
6969
#define PWM_PR 24 // prescaler value - prescaler divide by 24 + 1 - 1 MHz output

Marlin/src/HAL/ESP32/i2s.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ void i2s_push_sample() {
356356
// Every 4µs (when space in DMA buffer) toggle each expander PWM output using
357357
// the current duty cycle/frequency so they sync with any steps (once
358358
// through the DMA/FIFO buffers). PWM signal inversion handled by other functions
359-
LOOP_L_N(p, MAX_EXPANDER_BITS) {
359+
for (uint8_t p = 0; p < MAX_EXPANDER_BITS; ++p) {
360360
if (hal.pwm_pin_data[p].pwm_duty_ticks > 0) { // pin has active pwm?
361361
if (hal.pwm_pin_data[p].pwm_tick_count == 0) {
362362
if (TEST32(i2s_port_data, p)) { // hi->lo

Marlin/src/HAL/LPC1768/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void MarlinHAL::init() {
6868
#endif
6969

7070
// Flash status LED 3 times to indicate Marlin has started booting
71-
LOOP_L_N(i, 6) {
71+
for (uint8_t i = 0; i < 6; ++i) {
7272
TOGGLE(LED_PIN);
7373
delay(100);
7474
}

Marlin/src/HAL/LPC1768/tft/tft_spi.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ uint32_t TFT_SPI::ReadID(uint16_t Reg) {
7272
WRITE(TFT_CS_PIN, LOW);
7373
WriteReg(Reg);
7474

75-
LOOP_L_N(i, 4) {
75+
for (uint8_t i = 0; i < 4; ++i) {
7676
SPIx.read((uint8_t*)&d, 1);
7777
data = (data << 8) | d;
7878
}

Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575

7676
uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, const pin_t sck_pin, const pin_t miso_pin, const pin_t mosi_pin ) {
7777

78-
LOOP_L_N(i, 8) {
78+
for (uint8_t i = 0; i < 8; ++i) {
7979
if (spi_speed == 0) {
8080
LPC176x::gpio_set(mosi_pin, !!(b & 0x80));
8181
LPC176x::gpio_set(sck_pin, HIGH);
@@ -85,16 +85,16 @@ uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, const pin_t sck
8585
}
8686
else {
8787
const uint8_t state = (b & 0x80) ? HIGH : LOW;
88-
LOOP_L_N(j, spi_speed)
88+
for (uint8_t j = 0; j < spi_speed; ++j)
8989
LPC176x::gpio_set(mosi_pin, state);
9090

91-
LOOP_L_N(j, spi_speed + (miso_pin >= 0 ? 0 : 1))
91+
for (uint8_t j = 0; j < spi_speed + (miso_pin >= 0 ? 0 : 1); ++j)
9292
LPC176x::gpio_set(sck_pin, HIGH);
9393

9494
b <<= 1;
9595
if (miso_pin >= 0 && LPC176x::gpio_get(miso_pin)) b |= 1;
9696

97-
LOOP_L_N(j, spi_speed)
97+
for (uint8_t j = 0; j < spi_speed; ++j)
9898
LPC176x::gpio_set(sck_pin, LOW);
9999
}
100100
}
@@ -104,7 +104,7 @@ uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, const pin_t sck
104104

105105
uint8_t swSpiTransfer_mode_3(uint8_t b, const uint8_t spi_speed, const pin_t sck_pin, const pin_t miso_pin, const pin_t mosi_pin ) {
106106

107-
LOOP_L_N(i, 8) {
107+
for (uint8_t i = 0; i < 8; ++i) {
108108
const uint8_t state = (b & 0x80) ? HIGH : LOW;
109109
if (spi_speed == 0) {
110110
LPC176x::gpio_set(sck_pin, LOW);
@@ -113,13 +113,13 @@ uint8_t swSpiTransfer_mode_3(uint8_t b, const uint8_t spi_speed, const pin_t sck
113113
LPC176x::gpio_set(sck_pin, HIGH);
114114
}
115115
else {
116-
LOOP_L_N(j, spi_speed + (miso_pin >= 0 ? 0 : 1))
116+
for (uint8_t j = 0; j < spi_speed + (miso_pin >= 0 ? 0 : 1); ++j)
117117
LPC176x::gpio_set(sck_pin, LOW);
118118

119-
LOOP_L_N(j, spi_speed)
119+
for (uint8_t j = 0; j < spi_speed; ++j)
120120
LPC176x::gpio_set(mosi_pin, state);
121121

122-
LOOP_L_N(j, spi_speed)
122+
for (uint8_t j = 0; j < spi_speed; ++j)
123123
LPC176x::gpio_set(sck_pin, HIGH);
124124
}
125125
b <<= 1;

Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
#endif
7171

7272
uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, const pin_t sck_pin, const pin_t miso_pin, const pin_t mosi_pin ) {
73-
LOOP_L_N(i, 8) {
73+
for (uint8_t i = 0; i < 8; ++i) {
7474
if (spi_speed == 0) {
7575
WRITE_PIN(mosi_pin, !!(b & 0x80));
7676
WRITE_PIN(sck_pin, HIGH);
@@ -80,16 +80,16 @@ uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, const pin_t sck
8080
}
8181
else {
8282
const uint8_t state = (b & 0x80) ? HIGH : LOW;
83-
LOOP_L_N(j, spi_speed)
83+
for (uint8_t j = 0; j < spi_speed; ++j)
8484
WRITE_PIN(mosi_pin, state);
8585

86-
LOOP_L_N(j, spi_speed + (miso_pin >= 0 ? 0 : 1))
86+
for (uint8_t j = 0; j < spi_speed + (miso_pin >= 0 ? 0 : 1); ++j)
8787
WRITE_PIN(sck_pin, HIGH);
8888

8989
b <<= 1;
9090
if (miso_pin >= 0 && READ_PIN(miso_pin)) b |= 1;
9191

92-
LOOP_L_N(j, spi_speed)
92+
for (uint8_t j = 0; j < spi_speed; ++j)
9393
WRITE_PIN(sck_pin, LOW);
9494
}
9595
}
@@ -99,7 +99,7 @@ uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, const pin_t sck
9999

100100
uint8_t swSpiTransfer_mode_3(uint8_t b, const uint8_t spi_speed, const pin_t sck_pin, const pin_t miso_pin, const pin_t mosi_pin ) {
101101

102-
LOOP_L_N(i, 8) {
102+
for (uint8_t i = 0; i < 8; ++i) {
103103
const uint8_t state = (b & 0x80) ? HIGH : LOW;
104104
if (spi_speed == 0) {
105105
WRITE_PIN(sck_pin, LOW);
@@ -108,13 +108,13 @@ uint8_t swSpiTransfer_mode_3(uint8_t b, const uint8_t spi_speed, const pin_t sck
108108
WRITE_PIN(sck_pin, HIGH);
109109
}
110110
else {
111-
LOOP_L_N(j, spi_speed + (miso_pin >= 0 ? 0 : 1))
111+
for (uint8_t j = 0; j < spi_speed + (miso_pin >= 0 ? 0 : 1); ++j)
112112
WRITE_PIN(sck_pin, LOW);
113113

114-
LOOP_L_N(j, spi_speed)
114+
for (uint8_t j = 0; j < spi_speed; ++j)
115115
WRITE_PIN(mosi_pin, state);
116116

117-
LOOP_L_N(j, spi_speed)
117+
for (uint8_t j = 0; j < spi_speed; ++j)
118118
WRITE_PIN(sck_pin, HIGH);
119119
}
120120
b <<= 1;

Marlin/src/HAL/SAMD51/HAL.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -650,10 +650,10 @@ void MarlinHAL::adc_init() {
650650
#if ADC_IS_REQUIRED
651651
memset(adc_results, 0xFF, sizeof(adc_results)); // Fill result with invalid values
652652

653-
LOOP_L_N(pi, COUNT(adc_pins))
653+
for (uint8_t pi = 0; pi < COUNT(adc_pins); ++pi)
654654
pinPeripheral(adc_pins[pi], PIO_ANALOG);
655655

656-
LOOP_S_LE_N(ai, FIRST_ADC, LAST_ADC) {
656+
for (uint8_t ai = FIRST_ADC; ai <= LAST_ADC; ++ai) {
657657
Adc* adc = ((Adc*[])ADC_INSTS)[ai];
658658

659659
// ADC clock setup
@@ -685,7 +685,7 @@ void MarlinHAL::adc_init() {
685685

686686
void MarlinHAL::adc_start(const pin_t pin) {
687687
#if ADC_IS_REQUIRED
688-
LOOP_L_N(pi, COUNT(adc_pins))
688+
for (uint8_t pi = 0; pi < COUNT(adc_pins); ++pi)
689689
if (pin == adc_pins[pi]) { adc_result = adc_results[pi]; return; }
690690
#endif
691691

Marlin/src/HAL/STM32/fastio.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
GPIO_TypeDef* FastIOPortMap[LastPort + 1] = { 0 };
3030

3131
void FastIO_init() {
32-
LOOP_L_N(i, NUM_DIGITAL_PINS)
32+
for (uint8_t i = 0; i < NUM_DIGITAL_PINS; ++i)
3333
FastIOPortMap[STM_PORT(digitalPin[i])] = get_GPIO_Port(STM_PORT(digitalPin[i]));
3434
}
3535

Marlin/src/HAL/STM32/tft/gt911.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ bool SW_IIC::read_ack() {
9090
}
9191

9292
void SW_IIC::send_byte(uint8_t txd) {
93-
LOOP_L_N(i, 8) {
93+
for (uint8_t i = 0; i < 8; ++i) {
9494
write_sda(txd & 0x80); // write data bit
9595
txd <<= 1;
9696
iic_delay(1);
@@ -107,7 +107,7 @@ uint8_t SW_IIC::read_byte(bool ack) {
107107
uint8_t data = 0;
108108

109109
set_sda_in();
110-
LOOP_L_N(i, 8) {
110+
for (uint8_t i = 0; i < 8; ++i) {
111111
write_scl(HIGH); // SCL = 1
112112
iic_delay(1);
113113
data <<= 1;
@@ -128,12 +128,12 @@ SW_IIC GT911::sw_iic = SW_IIC(GT911_SW_I2C_SDA_PIN, GT911_SW_I2C_SCL_PIN);
128128
void GT911::write_reg(uint16_t reg, uint8_t reg_len, uint8_t* w_data, uint8_t w_len) {
129129
sw_iic.start();
130130
sw_iic.send_byte(gt911_slave_address); // Set IIC Slave address
131-
LOOP_L_N(i, reg_len) { // Set reg address
131+
for (uint8_t i = 0; i < reg_len; ++i) { // Set reg address
132132
uint8_t r = (reg >> (8 * (reg_len - 1 - i))) & 0xFF;
133133
sw_iic.send_byte(r);
134134
}
135135

136-
LOOP_L_N(i, w_len) { // Write data to reg
136+
for (uint8_t i = 0; i < w_len; ++i) { // Write data to reg
137137
sw_iic.send_byte(w_data[i]);
138138
}
139139
sw_iic.stop();
@@ -142,15 +142,15 @@ void GT911::write_reg(uint16_t reg, uint8_t reg_len, uint8_t* w_data, uint8_t w_
142142
void GT911::read_reg(uint16_t reg, uint8_t reg_len, uint8_t* r_data, uint8_t r_len) {
143143
sw_iic.start();
144144
sw_iic.send_byte(gt911_slave_address); // Set IIC Slave address
145-
LOOP_L_N(i, reg_len) { // Set reg address
145+
for (uint8_t i = 0; i < reg_len; ++i) { // Set reg address
146146
uint8_t r = (reg >> (8 * (reg_len - 1 - i))) & 0xFF;
147147
sw_iic.send_byte(r);
148148
}
149149

150150
sw_iic.start();
151151
sw_iic.send_byte(gt911_slave_address + 1); // Set read mode
152152

153-
LOOP_L_N(i, r_len)
153+
for (uint8_t i = 0; i < r_len; ++i)
154154
r_data[i] = sw_iic.read_byte(1); // Read data from reg
155155

156156
sw_iic.stop();

Marlin/src/HAL/STM32/timers.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,8 @@ static constexpr struct { TimerPurpose p; int t; } timers_in_use[] = {
316316
};
317317

318318
static constexpr bool verify_no_timer_conflicts() {
319-
LOOP_L_N(i, COUNT(timers_in_use))
320-
LOOP_S_L_N(j, i + 1, COUNT(timers_in_use))
319+
for (uint8_t i = 0; i < COUNT(timers_in_use); ++i)
320+
for (uint8_t j = i + 1; j < COUNT(timers_in_use); ++j)
321321
if (timers_in_use[i].t == timers_in_use[j].t) return false;
322322
return true;
323323
}

Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
static uint8_t SPI_speed = LCD_SPI_SPEED;
3838

3939
static inline uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, const pin_t miso_pin=-1) {
40-
LOOP_L_N(i, 8) {
40+
for (uint8_t i = 0; i < 8; ++i) {
4141
if (spi_speed == 0) {
4242
WRITE(DOGLCD_MOSI, !!(b & 0x80));
4343
WRITE(DOGLCD_SCK, HIGH);
@@ -47,24 +47,24 @@ static inline uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, c
4747
}
4848
else {
4949
const uint8_t state = (b & 0x80) ? HIGH : LOW;
50-
LOOP_L_N(j, spi_speed)
50+
for (uint8_t j = 0; j < spi_speed; ++j)
5151
WRITE(DOGLCD_MOSI, state);
5252

53-
LOOP_L_N(j, spi_speed + (miso_pin >= 0 ? 0 : 1))
53+
for (uint8_t j = 0; j < spi_speed + (miso_pin >= 0 ? 0 : 1); ++j)
5454
WRITE(DOGLCD_SCK, HIGH);
5555

5656
b <<= 1;
5757
if (miso_pin >= 0 && READ(miso_pin)) b |= 1;
5858

59-
LOOP_L_N(j, spi_speed)
59+
for (uint8_t j = 0; j < spi_speed; ++j)
6060
WRITE(DOGLCD_SCK, LOW);
6161
}
6262
}
6363
return b;
6464
}
6565

6666
static inline uint8_t swSpiTransfer_mode_3(uint8_t b, const uint8_t spi_speed, const pin_t miso_pin=-1) {
67-
LOOP_L_N(i, 8) {
67+
for (uint8_t i = 0; i < 8; ++i) {
6868
const uint8_t state = (b & 0x80) ? HIGH : LOW;
6969
if (spi_speed == 0) {
7070
WRITE(DOGLCD_SCK, LOW);
@@ -73,13 +73,13 @@ static inline uint8_t swSpiTransfer_mode_3(uint8_t b, const uint8_t spi_speed, c
7373
WRITE(DOGLCD_SCK, HIGH);
7474
}
7575
else {
76-
LOOP_L_N(j, spi_speed + (miso_pin >= 0 ? 0 : 1))
76+
for (uint8_t j = 0; j < spi_speed + (miso_pin >= 0 ? 0 : 1); ++j)
7777
WRITE(DOGLCD_SCK, LOW);
7878

79-
LOOP_L_N(j, spi_speed)
79+
for (uint8_t j = 0; j < spi_speed; ++j)
8080
WRITE(DOGLCD_MOSI, state);
8181

82-
LOOP_L_N(j, spi_speed)
82+
for (uint8_t j = 0; j < spi_speed; ++j)
8383
WRITE(DOGLCD_SCK, HIGH);
8484
}
8585
b <<= 1;

Marlin/src/HAL/STM32F1/tft/tft_spi.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ uint32_t TFT_SPI::ReadID(uint16_t Reg) {
101101
DataTransferBegin(DATASIZE_8BIT);
102102
WriteReg(Reg);
103103

104-
LOOP_L_N(i, 4) {
104+
for (uint8_t i = 0; i < 4; ++i) {
105105
SPIx.read((uint8_t*)&d, 1);
106106
data = (data << 8) | d;
107107
}

Marlin/src/HAL/shared/servo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ uint8_t ServoCount = 0; // the total number of attached
6767

6868
static bool anyTimerChannelActive(const timer16_Sequence_t timer) {
6969
// returns true if any servo is active on this timer
70-
LOOP_L_N(channel, SERVOS_PER_TIMER) {
70+
for (uint8_t channel = 0; channel < SERVOS_PER_TIMER; ++channel) {
7171
if (SERVO(timer, channel).Pin.isActive)
7272
return true;
7373
}

0 commit comments

Comments
 (0)