From 2f4ef73dbafd14095fcb92cf5afeb598e453084c Mon Sep 17 00:00:00 2001 From: Oxore Date: Sun, 5 Mar 2023 21:51:51 +0300 Subject: Fix warnings, part2 --- CMakeLists.txt | 1 - app/button/button_task.c | 1 + app/head_task/head_task.c | 1 + app/indicate/indicate_modes_task.c | 1 + app/led_driver/led_driver_task.c | 1 + app/light_sensor/light_sensor_task.c | 1 + app/main.c | 6 +++++- app/nixie_driver/nixie_driver_process.c | 1 + app/nixie_driver/nixie_driver_task.c | 1 + app/stm32f0xx_conf.h | 2 +- third_party/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_rtc.c | 1 + third_party/TouchSense/STMTouch_Driver/src/tsl_acq_stm32f0xx.c | 8 ++++++-- third_party/TouchSense/STMTouch_Driver/src/tsl_dxs.c | 2 ++ 13 files changed, 22 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c50deb9..1648bb4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,7 +138,6 @@ target_compile_options(${PROJECT_NAME} PRIVATE -Wcast-align -Wshadow -Wlogical-op - -Wno-unused # TODO remove ) target_link_options(${PROJECT_NAME} PRIVATE diff --git a/app/button/button_task.c b/app/button/button_task.c index cc0a73f..7a2b9fc 100644 --- a/app/button/button_task.c +++ b/app/button/button_task.c @@ -225,5 +225,6 @@ void TkeyDebounce ( void ) // ---------------------------------------------------------------------------- void Button_Task ( void *pvParameters ) { + (void)pvParameters; while(1)ProcessFSM_ButtonTask (); } diff --git a/app/head_task/head_task.c b/app/head_task/head_task.c index 4d2b2b6..a01166a 100644 --- a/app/head_task/head_task.c +++ b/app/head_task/head_task.c @@ -364,5 +364,6 @@ static void ChangeValue ( uint8_t increase, uint8_t *data, uint8_t limit ) // ---------------------------------------------------------------------------- void Head_Task ( void *pvParameters ) { + (void)pvParameters; while(1)ProcessFSM_Head (); } diff --git a/app/indicate/indicate_modes_task.c b/app/indicate/indicate_modes_task.c index 2f3223e..10a8c26 100644 --- a/app/indicate/indicate_modes_task.c +++ b/app/indicate/indicate_modes_task.c @@ -285,5 +285,6 @@ void ProcessFSM_IndicateModes ( void ) // ---------------------------------------------------------------------------- void IndicateModes_Task ( void *pvParameters ) { + (void)pvParameters; while(1)ProcessFSM_IndicateModes (); } diff --git a/app/led_driver/led_driver_task.c b/app/led_driver/led_driver_task.c index d38deb4..5348a4e 100644 --- a/app/led_driver/led_driver_task.c +++ b/app/led_driver/led_driver_task.c @@ -22,5 +22,6 @@ void ProcessFSM_LED_RGB ( void ) // ---------------------------------------------------------------------------- void LED_Driver_Task ( void *pvParameters ) { + (void) pvParameters; while(1)ProcessFSM_LED_RGB (); } diff --git a/app/light_sensor/light_sensor_task.c b/app/light_sensor/light_sensor_task.c index d1a0f89..642d9e9 100644 --- a/app/light_sensor/light_sensor_task.c +++ b/app/light_sensor/light_sensor_task.c @@ -198,5 +198,6 @@ void ProcessFSM_LightSensor ( void ) // ---------------------------------------------------------------------------- void LightSensor_Task ( void *pvParameters ) { + (void)pvParameters; while(1)ProcessFSM_LightSensor (); } diff --git a/app/main.c b/app/main.c index b71d027..a1c3c05 100644 --- a/app/main.c +++ b/app/main.c @@ -282,7 +282,11 @@ void assert_failed ( uint8_t* file, uint32_t line ) // Специальные ф-ии FreeRTOS ------------------------------------------------ // void vApplicationMallocFailedHook ( void ) { for( ;; ); } -void vApplicationStackOverflowHook ( TaskHandle_t pxTask, char *pcTaskName ) { for( ;; ); } +void vApplicationStackOverflowHook ( TaskHandle_t pxTask, char *pcTaskName ) { + (void) pxTask; + (void) pcTaskName; + for( ;; ); +} void vApplicationIdleHook ( void ) { } /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/app/nixie_driver/nixie_driver_process.c b/app/nixie_driver/nixie_driver_process.c index 219494e..d2c96f4 100644 --- a/app/nixie_driver/nixie_driver_process.c +++ b/app/nixie_driver/nixie_driver_process.c @@ -226,6 +226,7 @@ static void SwitchOnTube ( uint8_t tube_nbr ) // ---------------------------------------------------------------------------- static void SwitchOffTube ( uint8_t tube_nbr ) { + (void) tube_nbr; NIX_DRIVER_RESET_ST_PIN; NIX_DRIVER_RESET_TUB_DP1_PIN; NIX_DRIVER_RESET_TUB_DP2_PIN; diff --git a/app/nixie_driver/nixie_driver_task.c b/app/nixie_driver/nixie_driver_task.c index b968128..4a157ad 100644 --- a/app/nixie_driver/nixie_driver_task.c +++ b/app/nixie_driver/nixie_driver_task.c @@ -32,5 +32,6 @@ void ProcessFSM_NixieDriver ( void ) // ---------------------------------------------------------------------------- void NixieDriver_Task ( void *pvParameters ) { + (void)pvParameters; while(1)ProcessFSM_NixieDriver (); } diff --git a/app/stm32f0xx_conf.h b/app/stm32f0xx_conf.h index adbf30b..fd7c629 100644 --- a/app/stm32f0xx_conf.h +++ b/app/stm32f0xx_conf.h @@ -76,7 +76,7 @@ /* Exported functions ------------------------------------------------------- */ void assert_failed(uint8_t* file, uint32_t line); #else - #define assert_param(expr) ((void)0) + #define assert_param(expr) ((void)(expr)) #endif /* USE_FULL_ASSERT */ #endif /* __STM32F0XX_CONF_H */ diff --git a/third_party/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_rtc.c b/third_party/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_rtc.c index f0481d1..7b1f7ac 100644 --- a/third_party/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_rtc.c +++ b/third_party/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_rtc.c @@ -1350,6 +1350,7 @@ void RTC_AlarmSubSecondConfig(uint32_t RTC_Alarm, uint32_t RTC_AlarmSubSecondVal */ uint32_t RTC_GetAlarmSubSecond(uint32_t RTC_Alarm) { + (void)RTC_Alarm; uint32_t tmpreg = 0; /* Get the RTC_ALRMAR register */ diff --git a/third_party/TouchSense/STMTouch_Driver/src/tsl_acq_stm32f0xx.c b/third_party/TouchSense/STMTouch_Driver/src/tsl_acq_stm32f0xx.c index 24271de..81bd229 100644 --- a/third_party/TouchSense/STMTouch_Driver/src/tsl_acq_stm32f0xx.c +++ b/third_party/TouchSense/STMTouch_Driver/src/tsl_acq_stm32f0xx.c @@ -902,9 +902,9 @@ TSL_tMeas_T TSL_acq_GetMeas(TSL_tIndex_T index) { // Check parameters (if USE_FULL_ASSERT is defined) #if (TSC_GROUP7_ENABLED > 0) || (TSC_GROUP8_ENABLED > 0) - assert_param(IS_SRC_INDEX_0_7_OK(idx_bk)); + assert_param(IS_SRC_INDEX_0_7_OK(index)); #else - assert_param(IS_SRC_INDEX_0_5_OK(idx_bk)); + assert_param(IS_SRC_INDEX_0_5_OK(index)); #endif return((TSL_tMeas_T)(TSC->IOGXCR[index])); } @@ -952,6 +952,7 @@ TSL_AcqStatus_enum_T TSL_acq_CheckNoise(void) */ TSL_Bool_enum_T TSL_acq_UseFilter(TSL_ChannelData_T *pCh) { + (void)pCh; return TSL_TRUE; } @@ -963,6 +964,7 @@ TSL_Bool_enum_T TSL_acq_UseFilter(TSL_ChannelData_T *pCh) */ TSL_Bool_enum_T TSL_acq_TestReferenceOutOfRange(TSL_ChannelData_T *pCh) { + (void)pCh; return TSL_FALSE; } @@ -975,6 +977,8 @@ TSL_Bool_enum_T TSL_acq_TestReferenceOutOfRange(TSL_ChannelData_T *pCh) */ TSL_Bool_enum_T TSL_acq_TestFirstReferenceIsValid(TSL_ChannelData_T *pCh, TSL_tMeas_T new_meas) { + (void)pCh; + (void)new_meas; return TSL_TRUE; } diff --git a/third_party/TouchSense/STMTouch_Driver/src/tsl_dxs.c b/third_party/TouchSense/STMTouch_Driver/src/tsl_dxs.c index c721b80..1641241 100644 --- a/third_party/TouchSense/STMTouch_Driver/src/tsl_dxs.c +++ b/third_party/TouchSense/STMTouch_Driver/src/tsl_dxs.c @@ -175,6 +175,8 @@ void TSL_dxs_FirstObj(CONST TSL_ObjectGroup_T *objgrp) } +#else + (void) objgrp; #endif // TSLPRM_USE_DXS > 0 } -- cgit v1.2.3