debug stm32 flag issue

Author: askuric

src/communication/SimpleFOCDebug.h

@@ -66,14 +66,11 @@ class SimpleFOCDebug {
 #define SIMPLEFOC_DEBUG(msg, ...) \
     SimpleFOCDebug::println(F(msg), ##__VA_ARGS__)
 
-#else //ifndef SIMPLEFOC_DISABLE_DEBUG
-
-
-
+#else  //ifndef SIMPLEFOC_DISABLE_DEBUG
+ 
 #define SIMPLEFOC_DEBUG(msg, ...)
 
 
-
 #endif //ifndef SIMPLEFOC_DISABLE_DEBUG
 #endif
 

src/drivers/hardware_specific/stm32/stm32_mcu.cpp

@@ -177,15 +177,15 @@ TIM_HandleTypeDef* stm32_initPinPWM(uint32_t PWM_freq, PinMap* timer, uint32_t m
   uint32_t channel = STM_PIN_CHANNEL(timer->function);
   if (handle==NULL) {
     handle = stm32_useTimer(timer);
-    #ifdef SIMPLEFOC_STM32_DEBUG
+    #if  defined(SIMPLEFOC_STM32_DEBUG) && !defined(SIMPLEFOC_DISABLE_DEBUG) 
     SIMPLEFOC_DEBUG("STM32-DRV: Initializing TIM", (int)stm32_getTimerNumber(handle->Instance));
     #endif
     uint32_t arr = stm32_setClockAndARR(handle, PWM_freq);
     if (arr<SIMPLEFOC_STM32_MIN_RESOLUTION) {
       SIMPLEFOC_DEBUG("STM32-DRV: WARN timer resolution too low (<8bit): ", (int)arr+1);
     }
     else {
-      #ifdef SIMPLEFOC_STM32_DEBUG
+      #if  defined(SIMPLEFOC_STM32_DEBUG) && !defined(SIMPLEFOC_DISABLE_DEBUG) 
       SIMPLEFOC_DEBUG("STM32-DRV: Timer resolution set to: ", (int)arr+1);
       #endif
     }
@@ -210,7 +210,7 @@ TIM_HandleTypeDef* stm32_initPinPWM(uint32_t PWM_freq, PinMap* timer, uint32_t m
   if (IS_TIM_BREAK_INSTANCE(handle->Instance)) {
     __HAL_TIM_MOE_ENABLE(handle);
   }
-  #ifdef SIMPLEFOC_STM32_DEBUG
+  #if defined(SIMPLEFOC_STM32_DEBUG) && !defined(SIMPLEFOC_DISABLE_DEBUG) 
     SimpleFOCDebug::print("STM32-DRV: Configured TIM");
     SimpleFOCDebug::print((int)stm32_getTimerNumber(handle->Instance));
     SIMPLEFOC_DEBUG("_CH", (int)channel);
@@ -289,7 +289,7 @@ int stm32_checkTimerFrequency(long pwm_frequency, TIM_HandleTypeDef *timers[], u
       common_pwm_freq = pwm_freq;
     } else {
       if (pwm_freq != common_pwm_freq) {
-        #ifdef SIMPLEFOC_STM32_DEBUG
+        #if  defined(SIMPLEFOC_STM32_DEBUG) && !defined(SIMPLEFOC_DISABLE_DEBUG) 
         SimpleFOCDebug::print("STM32-DRV: ERR: Timer frequency different: TIM");
         SimpleFOCDebug::print(stm32_getTimerNumber(timers_distinct[0]->Instance));
         SimpleFOCDebug::print(" freq: ");
@@ -303,7 +303,7 @@ int stm32_checkTimerFrequency(long pwm_frequency, TIM_HandleTypeDef *timers[], u
     }
   }
   if ( (common_pwm_freq - (float)pwm_frequency) > 1.0f) {
-      #ifdef SIMPLEFOC_STM32_DEBUG
+      #if  defined(SIMPLEFOC_STM32_DEBUG) && !defined(SIMPLEFOC_DISABLE_DEBUG) 
       SIMPLEFOC_DEBUG("STM32-DRV: ERR: Common timer frequency unexpected: ", common_pwm_freq);
       #endif
       return -1;

src/drivers/hardware_specific/stm32/stm32_searchtimers.cpp

@@ -149,7 +149,7 @@ int _stm32_findBestTimerCombination(int numPins, int index, int pins[], PinMap*
       score = _stm32_findBestTimerCombination(numPins, index+1, pins, searchArray);
     else {
       score = _stm32_scoreCombination(numPins, searchArray);
-      #ifdef SIMPLEFOC_STM32_DEBUG
+      #if defined(SIMPLEFOC_STM32_DEBUG) && !defined(SIMPLEFOC_DISABLE_DEBUG) 
       stm32_printTimerCombination(numPins, searchArray, score);
       #endif
     }
@@ -171,13 +171,13 @@ int _stm32_findBestTimerCombination(int numPins, int index, int pins[], PinMap*
 int stm32_findBestTimerCombination(int numPins, int pins[], PinMap* pinTimers[]) {
   int bestScore = _stm32_findBestTimerCombination(numPins, 0, pins, pinTimers);
   if (bestScore == NOT_FOUND) {
-    #ifdef SIMPLEFOC_STM32_DEBUG
+    #if defined(SIMPLEFOC_STM32_DEBUG) && !defined(SIMPLEFOC_DISABLE_DEBUG) 
     SimpleFOCDebug::println("STM32-DRV: no workable combination found on these pins");
     #endif
     return -10; // no workable combination found
   }
   else if (bestScore >= 0) {
-    #ifdef SIMPLEFOC_STM32_DEBUG
+    #if  defined(SIMPLEFOC_STM32_DEBUG) && !defined(SIMPLEFOC_DISABLE_DEBUG) 
     SimpleFOCDebug::print("STM32-DRV: best: ");
     stm32_printTimerCombination(numPins, pinTimers, bestScore);
     #endif

src/drivers/hardware_specific/stm32/stm32_timerutils.cpp

@@ -510,7 +510,7 @@ TIM_HandleTypeDef* stm32_alignTimers(TIM_HandleTypeDef *timers_in[], uint8_t num
   }
 
 
-  #ifdef SIMPLEFOC_STM32_DEBUG
+  #if defined(SIMPLEFOC_STM32_DEBUG) && !defined(SIMPLEFOC_DISABLE_DEBUG) 
     SimpleFOCDebug::print("STM32-DRV: Synchronising ");
     SimpleFOCDebug::print(numTimers);
     SimpleFOCDebug::println(" timers");
@@ -946,7 +946,7 @@ uint8_t getTimerClkSrc(TIM_TypeDef *tim) {
 
 
 
-#ifdef SIMPLEFOC_STM32_DEBUG
+#if defined(SIMPLEFOC_STM32_DEBUG) && !defined(SIMPLEFOC_DISABLE_DEBUG) 
 
 /*
     some utility functions to print out the timer combinations