Skip to content

Commit f6a45a7

Browse files
hathachhathach
committed
clean up
1 parent c7686f8 commit f6a45a7

File tree

5 files changed

+55
-37
lines changed

5 files changed

+55
-37
lines changed

‎.idea/runConfigurations/stm32g474_jlink.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎hw/bsp/board.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#define sys_read _read
4040
#endif
4141

42-
#if defined(LOGGER_RTT)
42+
#if defined(LOGGER_RTT) || defined(LOGGER_rtt)
4343
// Logging with RTT
4444

4545
// If using SES IDE, use the Syscalls/SEGGER_RTT_Syscalls_SES.c instead
@@ -62,7 +62,7 @@ TU_ATTR_USED int sys_read (int fhdl, char *buf, size_t count)
6262

6363
#endif
6464

65-
#elif defined(LOGGER_SWO)
65+
#elif defined(LOGGER_SWO) || defined(LOGGER_swo)
6666
// Logging with SWO for ARM Cortex
6767

6868
#include "board_mcu.h"
@@ -71,11 +71,12 @@ TU_ATTR_USED int sys_write (int fhdl, const void *buf, size_t count)
7171
{
7272
(void) fhdl;
7373
uint8_t const* buf8 = (uint8_t const*) buf;
74-
for(size_t i=0; i<count; i++)
75-
{
74+
75+
for(size_t i=0; i<count; i++) {
7676
ITM_SendChar(buf8[i]);
7777
}
78-
return count;
78+
79+
return (int) count;
7980
}
8081

8182
TU_ATTR_USED int sys_read (int fhdl, char *buf, size_t count)

‎hw/bsp/family_support.cmake

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,12 @@ function(family_configure_common TARGET)
115115
"LINKER:-Map=$<TARGET_FILE:${TARGET}>.map"
116116
)
117117
endif()
118+
119+
# LOGGER
120+
if (DEFINED LOGGER)
121+
target_compile_definitions(${TARGET} PUBLIC LOGGER_${LOGGER})
122+
endif ()
123+
118124
endfunction()
119125

120126

@@ -136,12 +142,11 @@ function(family_add_tinyusb TARGET OPT_MCU)
136142
set(TINYUSB_TARGET_PREFIX ${TARGET}-)
137143
add_library(${TARGET}-tinyusb_config INTERFACE)
138144

139-
target_include_directories(${TARGET}-tinyusb_config INTERFACE
140-
${CMAKE_CURRENT_SOURCE_DIR}/src
141-
)
142-
target_compile_definitions(${TARGET}-tinyusb_config INTERFACE
143-
CFG_TUSB_MCU=${OPT_MCU}
144-
)
145+
target_include_directories(${TARGET}-tinyusb_config INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/src)
146+
target_compile_definitions(${TARGET}-tinyusb_config INTERFACE CFG_TUSB_MCU=${OPT_MCU})
147+
if (DEFINED LOG)
148+
target_compile_definitions(${TARGET}-tinyusb_config INTERFACE CFG_TUSB_DEBUG=${LOG})
149+
endif()
145150

146151
# tinyusb's CMakeList.txt
147152
add_subdirectory(${TOP}/src ${CMAKE_CURRENT_BINARY_DIR}/tinyusb)

‎hw/bsp/stm32g4/family.c

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -79,32 +79,35 @@ void board_init(void)
7979
NVIC_SetPriority(USBWakeUp_IRQn, configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY);
8080
#endif
8181

82-
GPIO_InitTypeDef GPIO_InitStruct;
82+
GPIO_InitTypeDef gpio_init;
8383

8484
// LED
85-
GPIO_InitStruct.Pin = LED_PIN;
86-
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
87-
GPIO_InitStruct.Pull = GPIO_PULLUP;
88-
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
89-
HAL_GPIO_Init(LED_PORT, &GPIO_InitStruct);
85+
memset(&gpio_init, 0, sizeof(gpio_init));
86+
gpio_init.Pin = LED_PIN;
87+
gpio_init.Mode = GPIO_MODE_OUTPUT_PP;
88+
gpio_init.Pull = GPIO_PULLUP;
89+
gpio_init.Speed = GPIO_SPEED_FREQ_HIGH;
90+
HAL_GPIO_Init(LED_PORT, &gpio_init);
9091

9192
board_led_write(false);
9293

9394
// Button
94-
GPIO_InitStruct.Pin = BUTTON_PIN;
95-
GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
96-
GPIO_InitStruct.Pull = BUTTON_STATE_ACTIVE ? GPIO_PULLDOWN : GPIO_PULLUP;
97-
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
98-
HAL_GPIO_Init(BUTTON_PORT, &GPIO_InitStruct);
95+
memset(&gpio_init, 0, sizeof(gpio_init));
96+
gpio_init.Pin = BUTTON_PIN;
97+
gpio_init.Mode = GPIO_MODE_INPUT;
98+
gpio_init.Pull = BUTTON_STATE_ACTIVE ? GPIO_PULLDOWN : GPIO_PULLUP;
99+
gpio_init.Speed = GPIO_SPEED_FREQ_HIGH;
100+
HAL_GPIO_Init(BUTTON_PORT, &gpio_init);
99101

100102
#ifdef UART_DEV
101103
// UART
102-
GPIO_InitStruct.Pin = UART_TX_PIN | UART_RX_PIN;
103-
GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
104-
GPIO_InitStruct.Pull = GPIO_PULLUP;
105-
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
106-
GPIO_InitStruct.Alternate = UART_GPIO_AF;
107-
HAL_GPIO_Init(UART_GPIO_PORT, &GPIO_InitStruct);
104+
memset(&gpio_init, 0, sizeof(gpio_init));
105+
gpio_init.Pin = UART_TX_PIN | UART_RX_PIN;
106+
gpio_init.Mode = GPIO_MODE_AF_PP;
107+
gpio_init.Pull = GPIO_PULLUP;
108+
gpio_init.Speed = GPIO_SPEED_FREQ_HIGH;
109+
gpio_init.Alternate = UART_GPIO_AF;
110+
HAL_GPIO_Init(UART_GPIO_PORT, &gpio_init);
108111

109112
UartHandle = (UART_HandleTypeDef){
110113
.Instance = UART_DEV,
@@ -121,15 +124,18 @@ void board_init(void)
121124

122125
// USB Pins TODO double check USB clock and pin setup
123126
// Configure USB DM and DP pins. This is optional, and maintained only for user guidance.
124-
GPIO_InitStruct.Pin = (GPIO_PIN_11 | GPIO_PIN_12);
125-
GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
126-
GPIO_InitStruct.Pull = GPIO_NOPULL;
127-
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
128-
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
127+
memset(&gpio_init, 0, sizeof(gpio_init));
128+
gpio_init.Pin = (GPIO_PIN_11 | GPIO_PIN_12);
129+
gpio_init.Mode = GPIO_MODE_INPUT;
130+
gpio_init.Pull = GPIO_NOPULL;
131+
gpio_init.Speed = GPIO_SPEED_FREQ_HIGH;
132+
HAL_GPIO_Init(GPIOA, &gpio_init);
129133

130134
__HAL_RCC_USB_CLK_ENABLE();
131135

132136
board_vbus_sense_init();
137+
138+
// USB PD
133139
}
134140

135141
//--------------------------------------------------------------------+

‎src/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,3 @@ endif()
9898
target_link_libraries(${TINYUSB_TARGET} PUBLIC
9999
${TINYUSB_CONFIG_TARGET}
100100
)
101-
102-
# export target name
103-
# set(TINYUSB_TARGET ${TINYUSB_TARGET} PARENT_SCOPE)
104-
# set(TINYUSB_CONFIG_TARGET ${TINYUSB_CONFIG_TARGET} PARENT_SCOPE)

0 commit comments

Comments
 (0)