diff options
| author | hathach <[email protected]> | 2023-03-06 11:16:21 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2023-03-06 11:16:21 +0700 |
| commit | 5c537c25f00dad43c4839ba1bffe7d9cd03cc87f (patch) | |
| tree | 7fa6f4c3dda81a7924a91c208a7d394a8d9028f8 | |
| parent | 956d1c9c4e6c26e1c7de70c1c2e01a5380dd3dfe (diff) | |
change gcc to 10.3 due to freeRTOS warning
| -rw-r--r-- | .github/workflows/build_win_mac.yml | 2 | ||||
| -rw-r--r-- | hw/bsp/stm32f1/family.c | 2 | ||||
| -rw-r--r-- | hw/bsp/stm32f1/stm32f1xx_hal_conf.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/build_win_mac.yml b/.github/workflows/build_win_mac.yml index a4b0ad220..4b899cfb6 100644 --- a/.github/workflows/build_win_mac.yml +++ b/.github/workflows/build_win_mac.yml @@ -44,7 +44,7 @@ jobs: - name: Install ARM GCC uses: carlosperate/arm-none-eabi-gcc-action@v1 with: - release: '12.2.Rel1' + release: '10.3-2021.10' - name: Checkout TinyUSB uses: actions/checkout@v3 diff --git a/hw/bsp/stm32f1/family.c b/hw/bsp/stm32f1/family.c index 246d496c8..61b40badd 100644 --- a/hw/bsp/stm32f1/family.c +++ b/hw/bsp/stm32f1/family.c @@ -151,7 +151,7 @@ void HardFault_Handler (void) * @param line: assert_param error line source number * @retval None */ -void assert_failed(char *file, uint32_t line) +void assert_failed(const char *file, uint32_t line) { /* USER CODE BEGIN 6 */ /* User can add his own implementation to report the file name and line number, diff --git a/hw/bsp/stm32f1/stm32f1xx_hal_conf.h b/hw/bsp/stm32f1/stm32f1xx_hal_conf.h index a4a3f3086..5243e5bca 100644 --- a/hw/bsp/stm32f1/stm32f1xx_hal_conf.h +++ b/hw/bsp/stm32f1/stm32f1xx_hal_conf.h @@ -362,9 +362,9 @@ * If expr is true, it returns no value. * @retval None */ - #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__)) + #define assert_param(expr) ((expr) ? (void)0U : assert_failed(__FILE__, __LINE__)) /* Exported functions ------------------------------------------------------- */ - void assert_failed(uint8_t* file, uint32_t line); + void assert_failed(const char* file, uint32_t line); #else #define assert_param(expr) ((void)0U) #endif /* USE_FULL_ASSERT */ |