Skip to content

Commit ab860f5

Browse files
committed
fix pr conflicts.
1 parent 60ff37e commit ab860f5

File tree

6 files changed

+1
-2
lines changed

6 files changed

+1
-2
lines changed

bsp/renesas/libraries/HAL_Drivers/config/ra2a1/adc_config.h renamed to bsp/renesas/libraries/HAL_Drivers/drivers/config/ra2a1/adc_config.h

File renamed without changes.

bsp/renesas/libraries/HAL_Drivers/config/ra2a1/can_config.h renamed to bsp/renesas/libraries/HAL_Drivers/drivers/config/ra2a1/can_config.h

File renamed without changes.

bsp/renesas/libraries/HAL_Drivers/config/ra2a1/dac_config.h renamed to bsp/renesas/libraries/HAL_Drivers/drivers/config/ra2a1/dac_config.h

File renamed without changes.

bsp/renesas/libraries/HAL_Drivers/config/ra2a1/pwm_config.h renamed to bsp/renesas/libraries/HAL_Drivers/drivers/config/ra2a1/pwm_config.h

File renamed without changes.

bsp/renesas/libraries/HAL_Drivers/config/ra2a1/uart_config.h renamed to bsp/renesas/libraries/HAL_Drivers/drivers/config/ra2a1/uart_config.h

File renamed without changes.

bsp/renesas/ra2a1-ek/src/hal_entry.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,10 @@ void hal_entry(void)
2222
{
2323
rt_kprintf("\nHello RT-Thread!\n");
2424
while (1)
25-
{
25+
{
2626
rt_pin_write(LED_PIN, PIN_HIGH);
2727
rt_thread_mdelay(500);
2828
rt_pin_write(LED_PIN, PIN_LOW);
2929
rt_thread_mdelay(500);
3030
}
3131
}
32-

0 commit comments

Comments
 (0)