@@ -155,7 +155,7 @@ void HardwareTimer::pauseChannel(uint32_t channel)
155155void HardwareTimer::resume (void )
156156{
157157 // Clear flag and ennable IT
158- if (callbacks[0 ] != NULL ) {
158+ if (callbacks[0 ]) {
159159 __HAL_TIM_CLEAR_FLAG (&(_timerObj.handle ), TIM_FLAG_UPDATE);
160160 __HAL_TIM_ENABLE_IT (&(_timerObj.handle ), TIM_IT_UPDATE);
161161
@@ -331,7 +331,7 @@ void HardwareTimer::resumeChannel(uint32_t channel)
331331 }
332332
333333 // Clear flag and enable IT
334- if (callbacks[channel] != NULL ) {
334+ if (callbacks[channel]) {
335335 __HAL_TIM_CLEAR_FLAG (&(_timerObj.handle ), interrupt);
336336 __HAL_TIM_ENABLE_IT (&(_timerObj.handle ), interrupt);
337337 }
@@ -371,7 +371,7 @@ void HardwareTimer::resumeChannel(uint32_t channel)
371371 // Enable 2nd associated channel
372372 timAssociatedInputChannel = getAssociatedChannel (channel);
373373 LL_TIM_CC_EnableChannel (_timerObj.handle .Instance , getLLChannel (timAssociatedInputChannel));
374- if (callbacks[channel] != NULL ) {
374+ if (callbacks[channel]) {
375375 __HAL_TIM_CLEAR_FLAG (&(_timerObj.handle ), getIT (timAssociatedInputChannel));
376376 __HAL_TIM_ENABLE_IT (&(_timerObj.handle ), getIT (timAssociatedInputChannel));
377377 }
@@ -881,10 +881,10 @@ void HardwareTimer::setPWM(uint32_t channel, PinName pin, uint32_t frequency, ui
881881 setMode (channel, TIMER_OUTPUT_COMPARE_PWM1, pin);
882882 setOverflow (frequency, HERTZ_FORMAT);
883883 setCaptureCompare (channel, dutycycle, PERCENT_COMPARE_FORMAT);
884- if (PeriodCallback != NULL ) {
884+ if (PeriodCallback) {
885885 attachInterrupt (PeriodCallback);
886886 }
887- if (CompareCallback != NULL ) {
887+ if (CompareCallback) {
888888 attachInterrupt (channel, CompareCallback);
889889 }
890890 resume ();
@@ -915,7 +915,7 @@ void HardwareTimer::attachInterrupt(callback_function_t callback)
915915 callbacks[0 ] = callback;
916916 } else {
917917 callbacks[0 ] = callback;
918- if (callback != NULL ) {
918+ if (callback) {
919919 // Clear flag before enabling IT
920920 __HAL_TIM_CLEAR_FLAG (&(_timerObj.handle ), TIM_FLAG_UPDATE);
921921 // Enable update interrupt only if callback is valid
@@ -951,12 +951,12 @@ void HardwareTimer::attachInterrupt(uint32_t channel, callback_function_t callba
951951 if ((channel == 0 ) || (channel > (TIMER_CHANNELS + 1 ))) {
952952 Error_Handler (); // only channel 1..4 have an interrupt
953953 }
954- if (callbacks[channel] != NULL ) {
954+ if (callbacks[channel]) {
955955 // Callback previously configured : do not clear neither enable IT, it is just a change of callback
956956 callbacks[channel] = callback;
957957 } else {
958958 callbacks[channel] = callback;
959- if (callback != NULL ) {
959+ if (callback) {
960960 // Clear flag before enabling IT
961961 __HAL_TIM_CLEAR_FLAG (&(_timerObj.handle ), interrupt);
962962 // Enable interrupt corresponding to channel, only if callback is valid
@@ -1038,14 +1038,14 @@ TIM_HandleTypeDef *HardwareTimer::getHandle()
10381038 */
10391039void HardwareTimer::updateCallback (TIM_HandleTypeDef *htim)
10401040{
1041- if (htim == NULL ) {
1041+ if (! htim) {
10421042 Error_Handler ();
10431043 }
10441044
10451045 timerObj_t *obj = get_timer_obj (htim);
10461046 HardwareTimer *HT = (HardwareTimer *)(obj->__this );
10471047
1048- if (HT->callbacks [0 ] != NULL ) {
1048+ if (HT->callbacks [0 ]) {
10491049 HT->callbacks [0 ]();
10501050 }
10511051}
@@ -1057,7 +1057,7 @@ void HardwareTimer::updateCallback(TIM_HandleTypeDef *htim)
10571057 */
10581058void HardwareTimer::captureCompareCallback (TIM_HandleTypeDef *htim)
10591059{
1060- if (htim == NULL ) {
1060+ if (! htim) {
10611061 Error_Handler ();
10621062 }
10631063 uint32_t channel = htim->Channel ;
@@ -1086,7 +1086,7 @@ void HardwareTimer::captureCompareCallback(TIM_HandleTypeDef *htim)
10861086 timerObj_t *obj = get_timer_obj (htim);
10871087 HardwareTimer *HT = (HardwareTimer *)(obj->__this );
10881088
1089- if (HT->callbacks [channel] != NULL ) {
1089+ if (HT->callbacks [channel]) {
10901090 HT->callbacks [channel]();
10911091 }
10921092}
@@ -1394,13 +1394,13 @@ extern "C" {
13941394 */
13951395 void TIM1_IRQHandler (void )
13961396 {
1397- if (HardwareTimer_Handle[TIMER1_INDEX] != NULL ) {
1397+ if (HardwareTimer_Handle[TIMER1_INDEX]) {
13981398 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER1_INDEX]->handle );
13991399 }
14001400
14011401#if defined(STM32F1xx) || defined(STM32F2xx) || defined(STM32F4xx) || defined(STM32F7xx)
14021402#if defined (TIM10_BASE)
1403- if (HardwareTimer_Handle[TIMER10_INDEX] != NULL ) {
1403+ if (HardwareTimer_Handle[TIMER10_INDEX]) {
14041404 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER10_INDEX]->handle );
14051405 }
14061406#endif
@@ -1409,7 +1409,7 @@ extern "C" {
14091409#if defined(STM32F1xx) || defined(STM32F3xx) || defined(STM32G4xx) || defined(STM32L4xx) || \
14101410 defined (STM32WBxx)
14111411#if defined (TIM16_BASE)
1412- if (HardwareTimer_Handle[TIMER16_INDEX] != NULL ) {
1412+ if (HardwareTimer_Handle[TIMER16_INDEX]) {
14131413 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER16_INDEX]->handle );
14141414 }
14151415#endif
@@ -1419,7 +1419,7 @@ extern "C" {
14191419#if !defined(STM32F3xx)
14201420 void TIM1_CC_IRQHandler (void )
14211421 {
1422- if (HardwareTimer_Handle[TIMER1_INDEX] != NULL ) {
1422+ if (HardwareTimer_Handle[TIMER1_INDEX]) {
14231423 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER1_INDEX]->handle );
14241424 }
14251425 }
@@ -1434,7 +1434,7 @@ extern "C" {
14341434 */
14351435 void TIM2_IRQHandler (void )
14361436 {
1437- if (HardwareTimer_Handle[TIMER2_INDEX] != NULL ) {
1437+ if (HardwareTimer_Handle[TIMER2_INDEX]) {
14381438 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER2_INDEX]->handle );
14391439 }
14401440 }
@@ -1448,7 +1448,7 @@ extern "C" {
14481448 */
14491449 void TIM3_IRQHandler (void )
14501450 {
1451- if (HardwareTimer_Handle[TIMER3_INDEX] != NULL ) {
1451+ if (HardwareTimer_Handle[TIMER3_INDEX]) {
14521452 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER3_INDEX]->handle );
14531453 }
14541454 }
@@ -1462,7 +1462,7 @@ extern "C" {
14621462 */
14631463 void TIM4_IRQHandler (void )
14641464 {
1465- if (HardwareTimer_Handle[TIMER4_INDEX] != NULL ) {
1465+ if (HardwareTimer_Handle[TIMER4_INDEX]) {
14661466 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER4_INDEX]->handle );
14671467 }
14681468 }
@@ -1476,7 +1476,7 @@ extern "C" {
14761476 */
14771477 void TIM5_IRQHandler (void )
14781478 {
1479- if (HardwareTimer_Handle[TIMER5_INDEX] != NULL ) {
1479+ if (HardwareTimer_Handle[TIMER5_INDEX]) {
14801480 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER5_INDEX]->handle );
14811481 }
14821482 }
@@ -1490,7 +1490,7 @@ extern "C" {
14901490 */
14911491 void TIM6_IRQHandler (void )
14921492 {
1493- if (HardwareTimer_Handle[TIMER6_INDEX] != NULL ) {
1493+ if (HardwareTimer_Handle[TIMER6_INDEX]) {
14941494 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER6_INDEX]->handle );
14951495 }
14961496 }
@@ -1504,7 +1504,7 @@ extern "C" {
15041504 */
15051505 void TIM7_IRQHandler (void )
15061506 {
1507- if (HardwareTimer_Handle[TIMER7_INDEX] != NULL ) {
1507+ if (HardwareTimer_Handle[TIMER7_INDEX]) {
15081508 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER7_INDEX]->handle );
15091509 }
15101510 }
@@ -1518,13 +1518,13 @@ extern "C" {
15181518 */
15191519 void TIM8_IRQHandler (void )
15201520 {
1521- if (HardwareTimer_Handle[TIMER8_INDEX] != NULL ) {
1521+ if (HardwareTimer_Handle[TIMER8_INDEX]) {
15221522 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER8_INDEX]->handle );
15231523 }
15241524
15251525#if defined(STM32F1xx) || defined(STM32F2xx) ||defined(STM32F4xx) || defined(STM32F7xx) || defined(STM32H7xx)
15261526#if defined(TIMER13_BASE)
1527- if (HardwareTimer_Handle[TIMER13_INDEX] != NULL ) {
1527+ if (HardwareTimer_Handle[TIMER13_INDEX]) {
15281528 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER13_INDEX]->handle );
15291529 }
15301530#endif // TIMER13_BASE
@@ -1533,7 +1533,7 @@ extern "C" {
15331533
15341534 void TIM8_CC_IRQHandler (void )
15351535 {
1536- if (HardwareTimer_Handle[TIMER8_INDEX] != NULL ) {
1536+ if (HardwareTimer_Handle[TIMER8_INDEX]) {
15371537 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER8_INDEX]->handle );
15381538 }
15391539 }
@@ -1547,7 +1547,7 @@ extern "C" {
15471547 */
15481548 void TIM9_IRQHandler (void )
15491549 {
1550- if (HardwareTimer_Handle[TIMER9_INDEX] != NULL ) {
1550+ if (HardwareTimer_Handle[TIMER9_INDEX]) {
15511551 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER9_INDEX]->handle );
15521552 }
15531553 }
@@ -1562,7 +1562,7 @@ extern "C" {
15621562 */
15631563 void TIM10_IRQHandler (void )
15641564 {
1565- if (HardwareTimer_Handle[TIMER10_INDEX] != NULL ) {
1565+ if (HardwareTimer_Handle[TIMER10_INDEX]) {
15661566 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER10_INDEX]->handle );
15671567 }
15681568 }
@@ -1577,7 +1577,7 @@ extern "C" {
15771577 */
15781578 void TIM11_IRQHandler (void )
15791579 {
1580- if (HardwareTimer_Handle[TIMER11_INDEX] != NULL ) {
1580+ if (HardwareTimer_Handle[TIMER11_INDEX]) {
15811581 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER11_INDEX]->handle );
15821582 }
15831583 }
@@ -1591,7 +1591,7 @@ extern "C" {
15911591 */
15921592 void TIM12_IRQHandler (void )
15931593 {
1594- if (HardwareTimer_Handle[TIMER12_INDEX] != NULL ) {
1594+ if (HardwareTimer_Handle[TIMER12_INDEX]) {
15951595 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER12_INDEX]->handle );
15961596 }
15971597 }
@@ -1606,7 +1606,7 @@ extern "C" {
16061606 */
16071607 void TIM13_IRQHandler (void )
16081608 {
1609- if (HardwareTimer_Handle[TIMER13_INDEX] != NULL ) {
1609+ if (HardwareTimer_Handle[TIMER13_INDEX]) {
16101610 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER13_INDEX]->handle );
16111611 }
16121612 }
@@ -1621,7 +1621,7 @@ extern "C" {
16211621 */
16221622 void TIM14_IRQHandler (void )
16231623 {
1624- if (HardwareTimer_Handle[TIMER14_INDEX] != NULL ) {
1624+ if (HardwareTimer_Handle[TIMER14_INDEX]) {
16251625 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER14_INDEX]->handle );
16261626 }
16271627 }
@@ -1635,7 +1635,7 @@ extern "C" {
16351635 */
16361636 void TIM15_IRQHandler (void )
16371637 {
1638- if (HardwareTimer_Handle[TIMER15_INDEX] != NULL ) {
1638+ if (HardwareTimer_Handle[TIMER15_INDEX]) {
16391639 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER15_INDEX]->handle );
16401640 }
16411641 }
@@ -1650,7 +1650,7 @@ extern "C" {
16501650 */
16511651 void TIM16_IRQHandler (void )
16521652 {
1653- if (HardwareTimer_Handle[TIMER16_INDEX] != NULL ) {
1653+ if (HardwareTimer_Handle[TIMER16_INDEX]) {
16541654 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER16_INDEX]->handle );
16551655 }
16561656 }
@@ -1665,7 +1665,7 @@ extern "C" {
16651665 */
16661666 void TIM17_IRQHandler (void )
16671667 {
1668- if (HardwareTimer_Handle[TIMER17_INDEX] != NULL ) {
1668+ if (HardwareTimer_Handle[TIMER17_INDEX]) {
16691669 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER17_INDEX]->handle );
16701670 }
16711671 }
@@ -1679,13 +1679,13 @@ extern "C" {
16791679 */
16801680 void TIM18_IRQHandler (void )
16811681 {
1682- if (HardwareTimer_Handle[TIMER18_INDEX] != NULL ) {
1682+ if (HardwareTimer_Handle[TIMER18_INDEX]) {
16831683 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER18_INDEX]->handle );
16841684 }
16851685
16861686#if defined(STM32F3xx)
16871687#if defined (TIM1_BASE)
1688- if (HardwareTimer_Handle[TIMER1_INDEX] != NULL ) {
1688+ if (HardwareTimer_Handle[TIMER1_INDEX]) {
16891689 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER1_INDEX]->handle );
16901690 }
16911691#endif
@@ -1701,7 +1701,7 @@ extern "C" {
17011701 */
17021702 void TIM19_IRQHandler (void )
17031703 {
1704- if (HardwareTimer_Handle[TIMER19_INDEX] != NULL ) {
1704+ if (HardwareTimer_Handle[TIMER19_INDEX]) {
17051705 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER19_INDEX]->handle );
17061706 }
17071707 }
@@ -1715,14 +1715,14 @@ extern "C" {
17151715 */
17161716 void TIM20_IRQHandler (void )
17171717 {
1718- if (HardwareTimer_Handle[TIMER20_INDEX] != NULL ) {
1718+ if (HardwareTimer_Handle[TIMER20_INDEX]) {
17191719 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER20_INDEX]->handle );
17201720 }
17211721 }
17221722
17231723 void TIM20_CC_IRQHandler (void )
17241724 {
1725- if (HardwareTimer_Handle[TIMER20_INDEX] != NULL ) {
1725+ if (HardwareTimer_Handle[TIMER20_INDEX]) {
17261726 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER20_INDEX]->handle );
17271727 }
17281728 }
@@ -1736,7 +1736,7 @@ extern "C" {
17361736 */
17371737 void TIM21_IRQHandler (void )
17381738 {
1739- if (HardwareTimer_Handle[TIMER21_INDEX] != NULL ) {
1739+ if (HardwareTimer_Handle[TIMER21_INDEX]) {
17401740 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER21_INDEX]->handle );
17411741 }
17421742 }
@@ -1750,7 +1750,7 @@ extern "C" {
17501750 */
17511751 void TIM22_IRQHandler (void )
17521752 {
1753- if (HardwareTimer_Handle[TIMER22_INDEX] != NULL ) {
1753+ if (HardwareTimer_Handle[TIMER22_INDEX]) {
17541754 HAL_TIM_IRQHandler (&HardwareTimer_Handle[TIMER22_INDEX]->handle );
17551755 }
17561756 }
0 commit comments