[TIM] Able to build without HAL module

Signed-off-by: Frederic.Pillon <[email protected]>

Author: fpistm

cores/arduino/Tone.cpp

@@ -22,6 +22,8 @@
 #include "Arduino.h"
 
 PinName g_lastPin = NC;
+
+#ifdef HAL_TIM_MODULE_ENABLED
 static stimer_t _timer;
 
 // frequency (in hertz) and duration (in milliseconds).
@@ -47,3 +49,16 @@ void noTone(uint8_t _pin)
     g_lastPin = NC;
   }
 }
+#else
+void tone(uint8_t _pin, unsigned int frequency, unsigned long duration)
+{
+  UNUSED(_pin);
+  UNUSED(frequency);
+  UNUSED(duration);
+}
+
+void noTone(uint8_t _pin)
+{
+  UNUSED(_pin);
+}
+#endif /* HAL_TIM_MODULE_ENABLED */

cores/arduino/stm32/analog.c

@@ -46,7 +46,10 @@ extern "C" {
 
 
 /* Private_Variables */
+#if defined(HAL_ADC_MODULE_ENABLED) || defined(HAL_DAC_MODULE_ENABLED) ||\
+  defined(HAL_TIM_MODULE_ENABLED)
 static PinName g_current_pin = NC;
+#endif
 
 /* Private_Defines */
 #ifdef HAL_ADC_MODULE_ENABLED
@@ -160,6 +163,7 @@ static uint32_t get_adc_channel(PinName pin)
 }
 #endif /* HAL_ADC_MODULE_ENABLED */
 
+#ifdef HAL_TIM_MODULE_ENABLED
 static uint32_t get_pwm_channel(PinName pin)
 {
   uint32_t function = pinmap_function(pin, PinMap_PWM);
@@ -183,6 +187,7 @@ static uint32_t get_pwm_channel(PinName pin)
   }
   return channel;
 }
+#endif /* HAL_TIM_MODULE_ENABLED */
 
 #ifdef HAL_DAC_MODULE_ENABLED
 static uint32_t get_dac_channel(PinName pin)
@@ -647,6 +652,7 @@ uint16_t adc_read_value(PinName pin)
 }
 #endif /* HAL_ADC_MODULE_ENABLED */
 
+#ifdef HAL_TIM_MODULE_ENABLED
 ////////////////////////// PWM INTERFACE FUNCTIONS /////////////////////////////
 
 
@@ -780,6 +786,7 @@ void pwm_stop(PinName pin)
 
   HAL_TIM_PWM_DeInit(&timHandle);
 }
+#endif /* HAL_TIM_MODULE_ENABLED */
 
 #ifdef __cplusplus
 }

cores/arduino/stm32/stm32yyxx_hal_conf.h

@@ -11,7 +11,6 @@
 #define HAL_GPIO_MODULE_ENABLED
 #define HAL_PWR_MODULE_ENABLED
 #define HAL_RCC_MODULE_ENABLED
-#define HAL_TIM_MODULE_ENABLED
 
 /*
  * Optional HAL modules, can be enabled/disabled using
@@ -44,6 +43,12 @@
 #undef HAL_SPI_MODULE_ENABLED
 #endif
 
+#if !defined(HAL_TIM_MODULE_DISABLED)
+#define HAL_TIM_MODULE_ENABLED
+#else
+#undef HAL_TIM_MODULE_ENABLED
+#endif
+
 /*
  * Not defined by default
  */

cores/arduino/stm32/timer.c

@@ -42,6 +42,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#ifdef HAL_TIM_MODULE_ENABLED
 
 /* Private Variables */
 typedef enum {
@@ -1507,6 +1508,7 @@ void TIM22_IRQHandler(void)
   }
 }
 #endif //TIM22_BASE
+#endif /* HAL_TIM_MODULE_ENABLED */
 
 #ifdef __cplusplus
 }

cores/arduino/stm32/timer.h

@@ -46,6 +46,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#ifdef HAL_TIM_MODULE_ENABLED
 
 /* Exported types ------------------------------------------------------------*/
 #define OFFSETOF(type, member) ((uint32_t) (&(((type *)(0))->member)))
@@ -233,6 +234,7 @@ uint32_t getTimerClkFreq(TIM_TypeDef *tim);
 
 void attachIntHandle(stimer_t *obj, void (*irqHandle)(stimer_t *));
 void attachIntHandleOC(stimer_t *obj, void (*irqHandle)(void), uint16_t timChannel, uint16_t pulseWidth);
+#endif /* HAL_TIM_MODULE_ENABLED */
 
 #ifdef __cplusplus
 }

cores/arduino/wiring_analog.c

@@ -23,9 +23,10 @@
 extern "C" {
 #endif
 
-
+#if defined(HAL_DAC_MODULE_ENABLED) || defined(HAL_TIM_MODULE_ENABLED)
 //This is the list of the IOs configured
 uint32_t g_anOutputPinConfigured[MAX_NB_PORT] = {0};
+#endif
 
 static int _readResolution = 10;
 static int _writeResolution = 8;
@@ -87,8 +88,9 @@ void analogOutputInit(void)
 // to digital output.
 void analogWrite(uint32_t ulPin, uint32_t ulValue)
 {
-
+#if defined(HAL_DAC_MODULE_ENABLED) || defined(HAL_TIM_MODULE_ENABLED)
   uint8_t do_init = 0;
+#endif
   PinName p = digitalPinToPinName(ulPin);
   if (p != NC) {
 #ifdef HAL_DAC_MODULE_ENABLED
@@ -101,6 +103,7 @@ void analogWrite(uint32_t ulPin, uint32_t ulValue)
       dac_write_value(p, ulValue, do_init);
     } else
 #endif //HAL_DAC_MODULE_ENABLED
+#ifdef HAL_TIM_MODULE_ENABLED
       if (pin_in_pinmap(p, PinMap_PWM)) {
         if (is_pin_configured(p, g_anOutputPinConfigured) == false) {
           do_init = 1;
@@ -110,7 +113,10 @@ void analogWrite(uint32_t ulPin, uint32_t ulValue)
         pwm_start(p, _writeFreq * PWM_MAX_DUTY_CYCLE,
                   PWM_MAX_DUTY_CYCLE,
                   ulValue, do_init);
-      } else { //DIGITAL PIN ONLY
+      } else
+#endif /* HAL_TIM_MODULE_ENABLED */
+      {
+        //DIGITAL PIN ONLY
         // Defaults to digital write
         pinMode(ulPin, OUTPUT);
         ulValue = mapResolution(ulValue, _writeResolution, 8);

cores/arduino/wiring_digital.c

@@ -32,18 +32,23 @@ void pinMode(uint32_t ulPin, uint32_t ulMode)
 
   if (p != NC) {
     // If the pin that support PWM or DAC output, we need to turn it off
+#if defined(HAL_DAC_MODULE_ENABLED) || defined(HAL_TIM_MODULE_ENABLED)
     if (is_pin_configured(p, g_anOutputPinConfigured)) {
 #ifdef HAL_DAC_MODULE_ENABLED
       if (pin_in_pinmap(p, PinMap_DAC)) {
         dac_stop(p);
       } else
 #endif //HAL_DAC_MODULE_ENABLED
+#ifdef HAL_TIM_MODULE_ENABLED
         if (pin_in_pinmap(p, PinMap_PWM)) {
           pwm_stop(p);
         }
-      reset_pin_configured(p, g_anOutputPinConfigured);
+#endif //HAL_TIM_MODULE_ENABLED
+      {
+        reset_pin_configured(p, g_anOutputPinConfigured);
+      }
     }
-
+#endif
     switch (ulMode) {
       case INPUT: /* INPUT_FLOATING */
         pin_function(p, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));