Skip to content

Commit d88416c

Browse files
thinkyheadthinkyhead
committed
more formatting
1 parent 1a99d78 commit d88416c

File tree

24 files changed

+109
-96
lines changed

24 files changed

+109
-96
lines changed

‎Marlin/src/HAL/HC32/inc/Conditionals_adv.h

+4
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,7 @@
2020
*
2121
*/
2222
#pragma once
23+
24+
#ifndef TEMP_SOC_PIN
25+
#define TEMP_SOC_PIN 0xFF // Dummy that is not a valid GPIO, HAL checks for this
26+
#endif

‎Marlin/src/HAL/HC32/inc/SanityCheck.h

+4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
*/
2222
#pragma once
2323

24+
#ifndef BOARD_XTAL_FREQUENCY
25+
#error "BOARD_XTAL_FREQUENCY is required for HC32F460."
26+
#endif
27+
2428
#if ENABLED(FAST_PWM_FAN)
2529
#error "FAST_PWM_FAN is not yet implemented for this platform."
2630
#endif

‎Marlin/src/HAL/HC32/sdio.cpp

+17-31
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
#define SDIO_PERIPHERAL M4_SDIOC1
3434

35-
// use DMA2 channel 0
35+
// Use DMA2 channel 0
3636
#define SDIO_DMA_PERIPHERAL M4_DMA2
3737
#define SDIO_DMA_CHANNEL DmaCh0
3838

@@ -77,20 +77,18 @@ bool SDIO_Init() {
7777
handle->enDevMode = SdCardDmaMode;
7878
handle->pstcDmaInitCfg = dmaConf;
7979

80-
// create card configuration
81-
// this should be a fairly safe configuration for most cards
80+
// Create card configuration
81+
// This should be a fairly safe configuration for most cards
8282
stc_sdcard_init_t cardConf = {
83-
.enBusWidth = SdiocBusWidth4Bit,
84-
.enClkFreq = SdiocClk400K,
85-
.enSpeedMode = SdiocNormalSpeedMode,
86-
//.pstcInitCfg = NULL,
83+
.enBusWidth = SdiocBusWidth4Bit,
84+
.enClkFreq = SdiocClk400K,
85+
.enSpeedMode = SdiocNormalSpeedMode,
86+
//.pstcInitCfg = NULL,
8787
};
8888

89-
// initialize sd card
89+
// Initialize sd card
9090
en_result_t rc = SDCARD_Init(handle, &cardConf);
91-
if (rc != Ok) {
92-
printf("SDIO_Init() error (rc=%u)\n", rc);
93-
}
91+
if (rc != Ok) printf("SDIO_Init() error (rc=%u)\n", rc);
9492

9593
return rc == Ok;
9694
}
@@ -101,12 +99,8 @@ bool SDIO_ReadBlock(uint32_t block, uint8_t *dst) {
10199

102100
WITH_RETRY(SDIO_READ_RETRIES, {
103101
en_result_t rc = SDCARD_ReadBlocks(handle, block, 1, dst, SDIO_READ_TIMEOUT);
104-
if (rc == Ok) {
105-
return true;
106-
}
107-
else {
108-
printf("SDIO_ReadBlock error (rc=%u; ErrorCode=%lu)\n", rc, handle->u32ErrorCode);
109-
}
102+
if (rc == Ok) return true;
103+
printf("SDIO_ReadBlock error (rc=%u; ErrorCode=%lu)\n", rc, handle->u32ErrorCode);
110104
})
111105

112106
return false;
@@ -118,12 +112,8 @@ bool SDIO_WriteBlock(uint32_t block, const uint8_t *src) {
118112

119113
WITH_RETRY(SDIO_WRITE_RETRIES, {
120114
en_result_t rc = SDCARD_WriteBlocks(handle, block, 1, (uint8_t *)src, SDIO_WRITE_TIMEOUT);
121-
if (rc == Ok) {
122-
return true;
123-
}
124-
else {
125-
printf("SDIO_WriteBlock error (rc=%u; ErrorCode=%lu)\n", rc, handle->u32ErrorCode);
126-
}
115+
if (rc == Ok) return true;
116+
printf("SDIO_WriteBlock error (rc=%u; ErrorCode=%lu)\n", rc, handle->u32ErrorCode);
127117
})
128118

129119
return false;
@@ -137,15 +127,11 @@ bool SDIO_IsReady() {
137127
uint32_t SDIO_GetCardSize() {
138128
CORE_ASSERT(handle != NULL, "SDIO not initialized");
139129

140-
// multiply number of blocks with block size to get size in bytes
141-
uint64_t cardSizeBytes = uint64_t(handle->stcSdCardInfo.u32LogBlockNbr) * uint64_t(handle->stcSdCardInfo.u32LogBlockSize);
142-
143-
// if the card is bigger than ~4Gb (maximum a 32bit integer can hold), clamp to the maximum value of a 32 bit integer
144-
if (cardSizeBytes >= UINT32_MAX) {
145-
return UINT32_MAX;
146-
}
130+
// Multiply number of blocks with block size to get size in bytes
131+
const uint64_t cardSizeBytes = uint64_t(handle->stcSdCardInfo.u32LogBlockNbr) * uint64_t(handle->stcSdCardInfo.u32LogBlockSize);
147132

148-
return uint32_t(cardSizeBytes);
133+
// If the card is bigger than ~4Gb (maximum a 32bit integer can hold), clamp to the maximum value of a 32 bit integer
134+
return _MAX(cardSizeBytes, UINT32_MAX);
149135
}
150136

151137
#endif // ARDUINO_ARCH_HC32

‎Marlin/src/HAL/HC32/sysclock.cpp

+27-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,39 @@
1+
/**
2+
* Marlin 3D Printer Firmware
3+
* Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4+
*
5+
* Based on Sprinter and grbl.
6+
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7+
*
8+
* This program is free software: you can redistribute it and/or modify
9+
* it under the terms of the GNU General Public License as published by
10+
* the Free Software Foundation, either version 3 of the License, or
11+
* (at your option) any later version.
12+
*
13+
* This program is distributed in the hope that it will be useful,
14+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
* GNU General Public License for more details.
17+
*
18+
* You should have received a copy of the GNU General Public License
19+
* along with this program. If not, see <https://www.gnu.org/licenses/>.
20+
*
21+
*/
22+
123
/**
224
* HC32f460 system clock configuration
325
*/
26+
427
#ifdef ARDUINO_ARCH_HC32
528

6-
// get BOARD_XTAL_FREQUENCY from configuration / pins
29+
// Get BOARD_XTAL_FREQUENCY from configuration / pins
730
#include "../../inc/MarlinConfig.h"
831

932
#include <core_hooks.h>
1033
#include <drivers/sysclock/sysclock_util.h>
1134

12-
1335
void core_hook_sysclock_init() {
14-
// set wait cycles, as we are about to switch to 200 MHz HCLK
36+
// Set wait cycles, as we are about to switch to 200 MHz HCLK
1537
sysclock_configure_flash_wait_cycles();
1638
sysclock_configure_sram_wait_cycles();
1739

@@ -69,8 +91,8 @@ void core_hook_sysclock_init() {
6991
panic("HRC is not 16 MHz");
7092
}
7193

72-
#if defined(BOARD_XTAL_FREQUENCY)
73-
#warning "no valid XTAL frequency defined, falling back to HRC."
94+
#ifdef BOARD_XTAL_FREQUENCY
95+
#warning "No valid XTAL frequency defined, falling back to HRC."
7496
#endif
7597
#endif
7698

‎Marlin/src/HAL/NATIVE_SIM/timers.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Marlin 3D Printer Firmware
3-
* Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3+
* Copyright (c) 2021 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
44
*
55
* Based on Sprinter and grbl.
66
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

‎Marlin/src/HAL/STM32/HAL.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Marlin 3D Printer Firmware
3-
* Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3+
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
44
*
55
* Based on Sprinter and grbl.
66
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

‎Marlin/src/HAL/STM32/HAL.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Marlin 3D Printer Firmware
3-
* Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3+
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
44
*
55
* Based on Sprinter and grbl.
66
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

‎Marlin/src/HAL/STM32/timers.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Marlin 3D Printer Firmware
3-
* Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3+
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
44
*
55
* Based on Sprinter and grbl.
66
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

‎Marlin/src/HAL/STM32/timers.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Marlin 3D Printer Firmware
3-
* Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3+
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
44
*
55
* Based on Sprinter and grbl.
66
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

‎Marlin/src/HAL/STM32F1/HAL.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Marlin 3D Printer Firmware
3-
* Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3+
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
44
*
55
* Based on Sprinter and grbl.
66
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

‎Marlin/src/HAL/STM32F1/HAL.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Marlin 3D Printer Firmware
3-
* Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3+
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
44
*
55
* Based on Sprinter and grbl.
66
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

‎Marlin/src/HAL/STM32F1/sdio.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Marlin 3D Printer Firmware
3-
* Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3+
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
44
*
55
* Based on Sprinter and grbl.
66
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

‎Marlin/src/HAL/STM32F1/timers.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Marlin 3D Printer Firmware
3-
* Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3+
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
44
*
55
* Based on Sprinter and grbl.
66
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

‎Marlin/src/HAL/STM32F1/timers.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Marlin 3D Printer Firmware
3-
* Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3+
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
44
*
55
* Based on Sprinter and grbl.
66
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

‎Marlin/src/HAL/TEENSY31_32/HAL.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Marlin 3D Printer Firmware
3-
* Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3+
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
44
*
55
* Based on Sprinter and grbl.
66
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

‎Marlin/src/HAL/TEENSY35_36/HAL.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Marlin 3D Printer Firmware
3-
* Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3+
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
44
*
55
* Based on Sprinter and grbl.
66
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

‎Marlin/src/HAL/TEENSY35_36/timers.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Marlin 3D Printer Firmware
3-
* Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3+
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
44
*
55
* Based on Sprinter and grbl.
66
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

‎Marlin/src/HAL/TEENSY40_41/HAL.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Marlin 3D Printer Firmware
3-
* Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3+
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
44
*
55
* Based on Sprinter and grbl.
66
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

‎Marlin/src/HAL/TEENSY40_41/timers.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Marlin 3D Printer Firmware
3-
* Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3+
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
44
*
55
* Based on Sprinter and grbl.
66
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

‎Marlin/src/HAL/shared/eeprom_if.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Marlin 3D Printer Firmware
3-
* Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
3+
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
44
*
55
* Based on Sprinter and grbl.
66
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/svg2cpp.py

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
* 0x0000 and 0xFFFE. A single 0xFFFF in the data stream indicates the
6969
* start of a new closed path.
7070
*/
71+
7172
#pragma once
7273
'''
7374

‎Marlin/src/libs/BL24CXX.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
#endif
4646

4747
// IO direction setting
48-
#if defined(__STM32F1__)
48+
#ifdef __STM32F1__
4949
#define SDA_IN() do{ PIN_MAP[IIC_EEPROM_SDA].gpio_device->regs->CRH &= 0XFFFF0FFF; PIN_MAP[IIC_EEPROM_SDA].gpio_device->regs->CRH |= 8 << 12; }while(0)
5050
#define SDA_OUT() do{ PIN_MAP[IIC_EEPROM_SDA].gpio_device->regs->CRH &= 0XFFFF0FFF; PIN_MAP[IIC_EEPROM_SDA].gpio_device->regs->CRH |= 3 << 12; }while(0)
5151
#elif defined(STM32F1) || defined(STM32F4) || defined(ARDUINO_ARCH_HC32)

‎Marlin/src/pins/hc32f460/env_validate.h

-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,3 @@
2424
#ifndef ARDUINO_ARCH_HC32
2525
#error "Oops! Select an HC32F460 board in 'Tools > Board.'"
2626
#endif
27-
28-
#ifndef TEMP_SOC_PIN
29-
#define TEMP_SOC_PIN 0xff // dummy that is not a valid GPIO, HAL checks for this
30-
#endif

0 commit comments

Comments
 (0)