Skip to content

feat: Generic variant C071RBTx support #2556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 13, 2024
Merged

feat: Generic variant C071RBTx support #2556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e581c5c
feat: Generic variant C071RBTx support
thernstig Nov 8, 2024
e88ece1
fix(i2c): no I2C2_ER_IRQn for new STM32C071x
fpistm Nov 12, 2024
8a8303f
chore(cmake): update with new board
fpistm Nov 12, 2024
a8a6903
chore(ci): update generics list to skip
fpistm Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CI/build/conf/cores_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"GENERIC_C031C4UX",
"GENERIC_C031C6TX",
"GENERIC_C031F4PX",
"GENERIC_C071R8TX",
"GENERIC_F031C4TX",
"GENERIC_F031E6YX",
"GENERIC_F031F4PX",
Expand Down
1 change: 1 addition & 0 deletions CI/build/conf/cores_config_ci.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"GENERIC_C031C4UX",
"GENERIC_C031C6TX",
"GENERIC_C031F4PX",
"GENERIC_C071R8TX",
"GENERIC_F031C4TX",
"GENERIC_F031E6YX",
"GENERIC_F031F4PX",
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
| :green_heart: | STM32C011J4<br>STM32C011J6 | Generic Board | *2.8.0* | |
| :green_heart: | STM32C031C4<br>STM32C031C6 | Generic Board | *2.5.0* | |
| :green_heart: | STM32C031F4<br>STM32C031F6 | Generic Board | *2.6.0* | |
| :yellow_heart: | STM32C071R8<br>STM32C071RB | Generic Board | **2.9.0** | |

### Generic STM32F0 boards

Expand Down
16 changes: 16 additions & 0 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1668,6 +1668,22 @@ GenC0.menu.pnum.GENERIC_C031F6PX.build.product_line=STM32C031xx
GenC0.menu.pnum.GENERIC_C031F6PX.build.variant=STM32C0xx/C011D6Y_C011F(4-6)(P-U)_C031F(4-6)P
GenC0.menu.pnum.GENERIC_C031F6PX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32C0xx/STM32C031.svd

# Generic C071R8Tx
GenC0.menu.pnum.GENERIC_C071R8TX=Generic C071R8Tx
GenC0.menu.pnum.GENERIC_C071R8TX.upload.maximum_size=65536
GenC0.menu.pnum.GENERIC_C071R8TX.upload.maximum_data_size=24576
GenC0.menu.pnum.GENERIC_C071R8TX.build.board=GENERIC_C071R8TX
GenC0.menu.pnum.GENERIC_C071R8TX.build.product_line=STM32C071xx
GenC0.menu.pnum.GENERIC_C071R8TX.build.variant=STM32C0xx/C071R(8-B)T

# Generic C071RBTx
GenC0.menu.pnum.GENERIC_C071RBTX=Generic C071RBTx
GenC0.menu.pnum.GENERIC_C071RBTX.upload.maximum_size=131072
GenC0.menu.pnum.GENERIC_C071RBTX.upload.maximum_data_size=24576
GenC0.menu.pnum.GENERIC_C071RBTX.build.board=GENERIC_C071RBTX
GenC0.menu.pnum.GENERIC_C071RBTX.build.product_line=STM32C071xx
GenC0.menu.pnum.GENERIC_C071RBTX.build.variant=STM32C0xx/C071R(8-B)T

# Upload menu
GenC0.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
GenC0.menu.upload_method.swdMethod.upload.protocol=swd
Expand Down
108 changes: 108 additions & 0 deletions cmake/boards_db.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7130,6 +7130,114 @@ target_compile_options(GENERIC_C031F6PX_serial_none INTERFACE
"SHELL:-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE"
)

# GENERIC_C071R8TX
# -----------------------------------------------------------------------------

set(GENERIC_C071R8TX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32C0xx/C071R(8-B)T")
set(GENERIC_C071R8TX_MAXSIZE 65536)
set(GENERIC_C071R8TX_MAXDATASIZE 24576)
set(GENERIC_C071R8TX_MCU cortex-m0plus)
set(GENERIC_C071R8TX_FPCONF "-")
add_library(GENERIC_C071R8TX INTERFACE)
target_compile_options(GENERIC_C071R8TX INTERFACE
"SHELL:-DSTM32C071xx -D__CORTEX_SC=0"
"SHELL:"
"SHELL:"
"SHELL: "
-mcpu=${GENERIC_C071R8TX_MCU}
)
target_compile_definitions(GENERIC_C071R8TX INTERFACE
"STM32C0xx"
"ARDUINO_GENERIC_C071R8TX"
"BOARD_NAME=\"GENERIC_C071R8TX\""
"BOARD_ID=GENERIC_C071R8TX"
"VARIANT_H=\"variant_generic.h\""
)
target_include_directories(GENERIC_C071R8TX INTERFACE
${CMAKE_CURRENT_LIST_DIR}/../system/STM32C0xx
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/STM32C0xx_HAL_Driver/Inc
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/STM32C0xx_HAL_Driver/Src
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32C0xx/Include/
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32C0xx/Source/Templates/gcc/
${GENERIC_C071R8TX_VARIANT_PATH}
)

target_link_options(GENERIC_C071R8TX INTERFACE
"LINKER:--default-script=${GENERIC_C071R8TX_VARIANT_PATH}/ldscript.ld"
"LINKER:--defsym=LD_FLASH_OFFSET=0x0"
"LINKER:--defsym=LD_MAX_SIZE=65536"
"LINKER:--defsym=LD_MAX_DATA_SIZE=24576"
"SHELL: "
-mcpu=${GENERIC_C071R8TX_MCU}
)

add_library(GENERIC_C071R8TX_serial_disabled INTERFACE)
target_compile_options(GENERIC_C071R8TX_serial_disabled INTERFACE
"SHELL:"
)
add_library(GENERIC_C071R8TX_serial_generic INTERFACE)
target_compile_options(GENERIC_C071R8TX_serial_generic INTERFACE
"SHELL:-DHAL_UART_MODULE_ENABLED"
)
add_library(GENERIC_C071R8TX_serial_none INTERFACE)
target_compile_options(GENERIC_C071R8TX_serial_none INTERFACE
"SHELL:-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE"
)

# GENERIC_C071RBTX
# -----------------------------------------------------------------------------

set(GENERIC_C071RBTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32C0xx/C071R(8-B)T")
set(GENERIC_C071RBTX_MAXSIZE 131072)
set(GENERIC_C071RBTX_MAXDATASIZE 24576)
set(GENERIC_C071RBTX_MCU cortex-m0plus)
set(GENERIC_C071RBTX_FPCONF "-")
add_library(GENERIC_C071RBTX INTERFACE)
target_compile_options(GENERIC_C071RBTX INTERFACE
"SHELL:-DSTM32C071xx -D__CORTEX_SC=0"
"SHELL:"
"SHELL:"
"SHELL: "
-mcpu=${GENERIC_C071RBTX_MCU}
)
target_compile_definitions(GENERIC_C071RBTX INTERFACE
"STM32C0xx"
"ARDUINO_GENERIC_C071RBTX"
"BOARD_NAME=\"GENERIC_C071RBTX\""
"BOARD_ID=GENERIC_C071RBTX"
"VARIANT_H=\"variant_generic.h\""
)
target_include_directories(GENERIC_C071RBTX INTERFACE
${CMAKE_CURRENT_LIST_DIR}/../system/STM32C0xx
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/STM32C0xx_HAL_Driver/Inc
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/STM32C0xx_HAL_Driver/Src
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32C0xx/Include/
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32C0xx/Source/Templates/gcc/
${GENERIC_C071RBTX_VARIANT_PATH}
)

target_link_options(GENERIC_C071RBTX INTERFACE
"LINKER:--default-script=${GENERIC_C071RBTX_VARIANT_PATH}/ldscript.ld"
"LINKER:--defsym=LD_FLASH_OFFSET=0x0"
"LINKER:--defsym=LD_MAX_SIZE=131072"
"LINKER:--defsym=LD_MAX_DATA_SIZE=24576"
"SHELL: "
-mcpu=${GENERIC_C071RBTX_MCU}
)

add_library(GENERIC_C071RBTX_serial_disabled INTERFACE)
target_compile_options(GENERIC_C071RBTX_serial_disabled INTERFACE
"SHELL:"
)
add_library(GENERIC_C071RBTX_serial_generic INTERFACE)
target_compile_options(GENERIC_C071RBTX_serial_generic INTERFACE
"SHELL:-DHAL_UART_MODULE_ENABLED"
)
add_library(GENERIC_C071RBTX_serial_none INTERFACE)
target_compile_options(GENERIC_C071RBTX_serial_none INTERFACE
"SHELL:-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE"
)

# GENERIC_F030C6TX
# -----------------------------------------------------------------------------

Expand Down
4 changes: 2 additions & 2 deletions libraries/Wire/src/utility/twi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,8 +763,8 @@ void i2c_init(i2c_t *obj, uint32_t timing, uint32_t ownAddress)
__HAL_RCC_I2C2_FORCE_RESET();
__HAL_RCC_I2C2_RELEASE_RESET();
obj->irq = I2C2_EV_IRQn;
#if !defined(STM32F0xx) && !defined(STM32G0xx) && !defined(STM32L0xx) && \
!defined(STM32U0xx)
#if !defined(STM32C0xx) && !defined(STM32F0xx) && !defined(STM32G0xx) && \
!defined(STM32L0xx) && !defined(STM32U0xx)
obj->irqER = I2C2_ER_IRQn;
#endif /* !STM32F0xx && !STM32G0xx && !STM32L0xx && !STM32U0xx */
i2c_handles[I2C2_INDEX] = handle;
Expand Down
29 changes: 27 additions & 2 deletions variants/STM32C0xx/C071R(8-B)T/generic_clock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
*/
#if defined(ARDUINO_GENERIC_C071R8TX) || defined(ARDUINO_GENERIC_C071RBTX)
#include "pins_arduino.h"
#include "stm32yyxx_ll_utils.h"

/**
* @brief System Clock Configuration
Expand All @@ -20,8 +21,32 @@
*/
WEAK void SystemClock_Config(void)
{
/* SystemClock_Config can be generated by STM32CubeMX */
#warning "SystemClock_Config() is empty. Default clock at reset is used."
LL_FLASH_SetLatency(LL_FLASH_LATENCY_1);

/* HSI configuration and activation */
LL_RCC_HSI_Enable();
while (LL_RCC_HSI_IsReady() != 1) {
}

LL_RCC_HSI_SetCalibTrimming(64);
LL_RCC_SetHSIDiv(LL_RCC_HSI_DIV_1);
/* Set AHB prescaler*/
LL_RCC_SetAHBPrescaler(LL_RCC_HCLK_DIV_1);

/* Sysclk activation on the HSI */
LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_HSI);
while (LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_HSI) {
}

/* Set APB1 prescaler*/
LL_RCC_SetAPB1Prescaler(LL_RCC_APB1_DIV_1);
/* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */
LL_SetSystemCoreClock(48000000);

/* Update the time base */
if (HAL_InitTick(TICK_INT_PRIORITY) != HAL_OK) {
Error_Handler();
}
}

#endif /* ARDUINO_GENERIC_* */
Loading
Loading