stm32duino · fpistm · Nov 28, 2019 · Nov 27, 2019 · Nov 2, 2019 · Nov 1, 2019
diff --git a/cores/arduino/HardwareSerial.cpp b/cores/arduino/HardwareSerial.cpp
@@ -26,7 +26,7 @@
 #include "Arduino.h"
 #include "HardwareSerial.h"
 
-#if defined(HAL_UART_MODULE_ENABLED)
+#if defined(HAL_UART_MODULE_ENABLED) && !defined(HAL_UART_MODULE_ONLY)
 #if defined(HAVE_HWSERIAL1) || defined(HAVE_HWSERIAL2) || defined(HAVE_HWSERIAL3) ||\
     defined(HAVE_HWSERIAL4) || defined(HAVE_HWSERIAL5) || defined(HAVE_HWSERIAL6) ||\
     defined(HAVE_HWSERIAL7) || defined(HAVE_HWSERIAL8) || defined(HAVE_HWSERIAL9) ||\
@@ -528,4 +528,4 @@ void HardwareSerial::enableHalfDuplexRx(void)
   }
 }
 
-#endif // HAL_UART_MODULE_ENABLED
+#endif // HAL_UART_MODULE_ENABLED && !HAL_UART_MODULE_ONLY
diff --git a/cores/arduino/HardwareTimer.cpp b/cores/arduino/HardwareTimer.cpp
@@ -26,7 +26,7 @@
 #include "Arduino.h"
 #include "HardwareTimer.h"
 
-#ifdef HAL_TIM_MODULE_ENABLED
+#if defined(HAL_TIM_MODULE_ENABLED) && !defined(HAL_TIM_MODULE_ONLY)
 
 /* Private Defines */
 #define PIN_NOT_USED 0xFF
@@ -1472,4 +1472,4 @@ extern "C" {
 #endif //TIM22_BASE
 }
 
-#endif // HAL_TIM_MODULE_ENABLED
+#endif // HAL_TIM_MODULE_ENABLED && !HAL_TIM_MODULE_ONLY
diff --git a/cores/arduino/HardwareTimer.h b/cores/arduino/HardwareTimer.h
@@ -30,7 +30,7 @@
 /* Includes ------------------------------------------------------------------*/
 #include "timer.h"
 
-#ifdef HAL_TIM_MODULE_ENABLED
+#if defined(HAL_TIM_MODULE_ENABLED) && !defined(HAL_TIM_MODULE_ONLY)
 
 #define  TIMER_CHANNELS 4    // channel5 and channel 6 are not considered here has they don't have gpio output and they don't have interrupt
 
@@ -149,5 +149,5 @@ extern timer_index_t get_timer_index(TIM_TypeDef *htim);
 
 #endif /* __cplusplus */
 
-#endif  // HAL_TIM_MODULE_ENABLED
+#endif  // HAL_TIM_MODULE_ENABLED && !HAL_TIM_MODULE_ONLY
 #endif  // HARDWARETIMER_H_
diff --git a/cores/arduino/Print.cpp b/cores/arduino/Print.cpp
@@ -200,7 +200,7 @@ extern "C" {
   __attribute__((weak))
   int _write(int file, char *ptr, int len)
   {
-#ifdef HAL_UART_MODULE_ENABLED
+#if defined(HAL_UART_MODULE_ENABLED) && !defined(HAL_UART_MODULE_ONLY)
     switch (file) {
       case STDOUT_FILENO:
       case STDERR_FILENO:

diff --git a/cores/arduino/Tone.cpp b/cores/arduino/Tone.cpp
@@ -22,7 +22,7 @@
 #include "Arduino.h"
 #include "HardwareTimer.h"
 
-#if defined(HAL_TIM_MODULE_ENABLED) && defined(TIMER_TONE)
+#if defined(HAL_TIM_MODULE_ENABLED) && defined(TIMER_TONE) && !defined(HAL_TIM_MODULE_ONLY)
 
 #define MAX_FREQ  65535
 
@@ -143,4 +143,4 @@ void noTone(uint8_t _pin)
 {
   UNUSED(_pin);
 }
-#endif /* HAL_TIM_MODULE_ENABLED && TIMER_TONE */
+#endif /* HAL_TIM_MODULE_ENABLED && TIMER_TONE && !HAL_TIM_MODULE_ONLY*/
diff --git a/cores/arduino/WSerial.h b/cores/arduino/WSerial.h
@@ -21,7 +21,7 @@
 extern void serialEventUSB(void) __attribute__((weak));
 #endif /* USBCON && USBD_USE_CDC */
 
-#if defined(HAL_UART_MODULE_ENABLED)
+#if defined(HAL_UART_MODULE_ENABLED) && !defined(HAL_UART_MODULE_ONLY)
 #if !defined(HWSERIAL_NONE) && defined(SERIAL_UART_INSTANCE)
 #if SERIAL_UART_INSTANCE == 0
 #define ENABLE_HWSERIALLP1
@@ -163,7 +163,7 @@ extern void serialEvent8(void) __attribute__((weak));
 extern void serialEvent9(void) __attribute__((weak));
 extern void serialEvent10(void) __attribute__((weak));
 extern void serialEventLP1(void) __attribute__((weak));
-#endif /* HAL_UART_MODULE_ENABLED */
+#endif /* HAL_UART_MODULE_ENABLED  && !HAL_UART_MODULE_ONLY */
 
 extern void serialEventRun(void) __attribute__((weak));
 

diff --git a/cores/arduino/board.h b/cores/arduino/board.h
@@ -14,10 +14,8 @@
 #include "hw_config.h"
 #include "low_power.h"
 #include "rtc.h"
-#include "spi_com.h"
 #include "stm32_eeprom.h"
 #include "timer.h"
-#include "twi.h"
 #include "uart.h"
 
 #ifdef __cplusplus

diff --git a/cores/arduino/stm32/analog.cpp b/cores/arduino/stm32/analog.cpp
@@ -47,12 +47,13 @@ extern "C" {
 
 
 /* Private_Variables */
-#if defined(HAL_ADC_MODULE_ENABLED) || defined(HAL_DAC_MODULE_ENABLED)
+#if (defined(HAL_ADC_MODULE_ENABLED) && !defined(HAL_ADC_MODULE_ONLY)) ||\
+    (defined(HAL_DAC_MODULE_ENABLED) && !defined(HAL_DAC_MODULE_ONLY))
 static PinName g_current_pin = NC;
 #endif
 
 /* Private_Defines */
-#ifdef HAL_ADC_MODULE_ENABLED
+#if defined(HAL_ADC_MODULE_ENABLED) && !defined(HAL_ADC_MODULE_ONLY)
 
 #ifndef ADC_SAMPLINGTIME
 #if defined(ADC_SAMPLETIME_8CYCLES_5)
@@ -269,9 +270,9 @@ static uint32_t get_adc_internal_channel(PinName pin)
   }
   return channel;
 }
-#endif /* HAL_ADC_MODULE_ENABLED */
+#endif /* HAL_ADC_MODULE_ENABLED && !HAL_ADC_MODULE_ONLY */
 
-#ifdef HAL_TIM_MODULE_ENABLED
+#if defined(HAL_TIM_MODULE_ENABLED) && !defined(HAL_TIM_MODULE_ONLY)
 uint32_t get_pwm_channel(PinName pin)
 {
   uint32_t function = pinmap_function(pin, PinMap_PWM);
@@ -295,9 +296,9 @@ uint32_t get_pwm_channel(PinName pin)
   }
   return channel;
 }
-#endif /* HAL_TIM_MODULE_ENABLED */
+#endif /* HAL_TIM_MODULE_ENABLED && !HAL_TIM_MODULE_ONLY */
 
-#ifdef HAL_DAC_MODULE_ENABLED
+#if defined(HAL_DAC_MODULE_ENABLED) && !defined(HAL_DAC_MODULE_ONLY)
 static uint32_t get_dac_channel(PinName pin)
 {
   uint32_t function = pinmap_function(pin, PinMap_DAC);
@@ -555,9 +556,10 @@ void dac_stop(PinName pin)
     return;
   }
 }
-#endif //HAL_DAC_MODULE_ENABLED
+#endif //HAL_DAC_MODULE_ENABLED && !HAL_DAC_MODULE_ONLY
 
-#ifdef HAL_ADC_MODULE_ENABLED
+
+#if defined(HAL_ADC_MODULE_ENABLED) && !defined(HAL_ADC_MODULE_ONLY)
 ////////////////////////// ADC INTERFACE FUNCTIONS /////////////////////////////
 
 /**
@@ -980,9 +982,9 @@ uint16_t adc_read_value(PinName pin)
 
   return uhADCxConvertedValue;
 }
-#endif /* HAL_ADC_MODULE_ENABLED */
+#endif /* HAL_ADC_MODULE_ENABLED && !HAL_ADC_MODULE_ONLY*/
 
-#ifdef HAL_TIM_MODULE_ENABLED
+#if defined(HAL_TIM_MODULE_ENABLED) && !defined(HAL_TIM_MODULE_ONLY)
 ////////////////////////// PWM INTERFACE FUNCTIONS /////////////////////////////
 
 /**
@@ -1032,7 +1034,7 @@ void pwm_stop(PinName pin)
     HT = NULL;
   }
 }
-#endif /* HAL_TIM_MODULE_ENABLED */
+#endif /* HAL_TIM_MODULE_ENABLED && !HAL_TIM_MODULE_ONLY */
 
 #ifdef __cplusplus
 }

diff --git a/cores/arduino/stm32/low_power.c b/cores/arduino/stm32/low_power.c
@@ -39,13 +39,13 @@
 #include "Arduino.h"
 #include "low_power.h"
 
-#ifdef HAL_PWR_MODULE_ENABLED
+#if defined(HAL_PWR_MODULE_ENABLED) && !defined(HAL_PWR_MODULE_ONLY)
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if defined(UART_IT_WUF) && defined(HAL_UART_MODULE_ENABLED)
+#if defined(UART_IT_WUF) && defined(HAL_UART_MODULE_ENABLED) && !defined(HAL_UART_MODULE_ONLY)
 /* Save UART handler for callback */
 static UART_HandleTypeDef *WakeUpUart = NULL;
 #endif
@@ -209,7 +209,7 @@ void LowPower_stop(serial_t *obj)
 {
   __disable_irq();
 
-#if defined(UART_IT_WUF) && defined(HAL_UART_MODULE_ENABLED)
+#if defined(UART_IT_WUF) && defined(HAL_UART_MODULE_ENABLED) && !defined(HAL_UART_MODULE_ONLY)
   if (WakeUpUart != NULL) {
     HAL_UARTEx_EnableStopMode(WakeUpUart);
   }
@@ -232,7 +232,7 @@ void LowPower_stop(serial_t *obj)
 
   /* Exit Stop mode reset clocks */
   SystemClock_ConfigFromStop();
-#if defined(UART_IT_WUF) && defined(HAL_UART_MODULE_ENABLED)
+#if defined(UART_IT_WUF) && defined(HAL_UART_MODULE_ENABLED) && !defined(HAL_UART_MODULE_ONLY)
   if (WakeUpUart != NULL) {
     /* In case of WakeUp from UART, reset its clock source to HSI */
     uart_config_lowpower(obj);
@@ -301,7 +301,7 @@ void LowPower_shutdown()
   */
 void LowPower_EnableWakeUpUart(serial_t *serial, void (*FuncPtr)(void))
 {
-#if defined(UART_IT_WUF) && defined(HAL_UART_MODULE_ENABLED)
+#if defined(UART_IT_WUF) && defined(HAL_UART_MODULE_ENABLED) && !defined(HAL_UART_MODULE_ONLY)
   UART_WakeUpTypeDef WakeUpSelection;
   if (serial == NULL) {
     return;
@@ -346,6 +346,6 @@ WEAK void SystemClock_ConfigFromStop(void)
 }
 #endif
 
-#endif /* HAL_PWR_MODULE_ENABLED */
+#endif /* HAL_PWR_MODULE_ENABLED  && !HAL_PWR_MODULE_ONLY */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/cores/arduino/stm32/low_power.h b/cores/arduino/stm32/low_power.h
@@ -43,7 +43,7 @@
 #include "stm32_def.h"
 #include "uart.h"
 
-#ifdef HAL_PWR_MODULE_ENABLED
+#if defined(HAL_PWR_MODULE_ENABLED) && !defined(HAL_PWR_MODULE_ONLY)
 
 #ifdef __cplusplus
 extern "C" {
@@ -67,6 +67,6 @@ void SystemClock_ConfigFromStop(void);
 }
 #endif
 
-#endif /* HAL_PWR_MODULE_ENABLED */
+#endif /* HAL_PWR_MODULE_ENABLED  && !HAL_PWR_MODULE_ONLY */
 
 #endif /* __LOW_POWER_H */
diff --git a/cores/arduino/stm32/rtc.c b/cores/arduino/stm32/rtc.c
@@ -38,7 +38,7 @@
 
 #include "rtc.h"
 
-#ifdef HAL_RTC_MODULE_ENABLED
+#if defined(HAL_RTC_MODULE_ENABLED) && !defined(HAL_RTC_MODULE_ONLY)
 #if defined(STM32MP1xx)
 /**
  * Currently there is no RTC driver for STM32MP1xx. If RTC is used in the future
@@ -704,6 +704,6 @@ void RTC_Alarm_IRQHandler(void)
 }
 #endif
 
-#endif /* HAL_RTC_MODULE_ENABLED */
+#endif /* HAL_RTC_MODULE_ENABLED  && !HAL_RTC_MODULE_ONLY */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/cores/arduino/stm32/rtc.h b/cores/arduino/stm32/rtc.h
@@ -45,7 +45,7 @@
 #include "backup.h"
 #include "clock.h"
 
-#ifdef HAL_RTC_MODULE_ENABLED
+#if defined(HAL_RTC_MODULE_ENABLED) && !defined(HAL_RTC_MODULE_ONLY)
 
 #ifdef __cplusplus
 extern "C" {
@@ -170,7 +170,7 @@ void detachAlarmCallback(void);
 }
 #endif
 
-#endif /* HAL_RTC_MODULE_ENABLED */
+#endif /* HAL_RTC_MODULE_ENABLED  && !HAL_RTC_MODULE_ONLY */
 
 #endif /* __RTC_H */
 

diff --git a/cores/arduino/stm32/timer.c b/cores/arduino/stm32/timer.c
@@ -17,7 +17,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#ifdef HAL_TIM_MODULE_ENABLED
+#if defined(HAL_TIM_MODULE_ENABLED) && !defined(HAL_TIM_MODULE_ONLY)
 
 /* Private Functions */
 /* Aim of the function is to get _timerObj pointer using htim pointer */
@@ -716,7 +716,7 @@ uint8_t getTimerClkSrc(TIM_TypeDef *tim)
 }
 
 
-#endif /* HAL_TIM_MODULE_ENABLED */
+#endif /* HAL_TIM_MODULE_ENABLED && !HAL_TIM_MODULE_ONLY */
 
 #ifdef __cplusplus
 }

diff --git a/cores/arduino/stm32/timer.h b/cores/arduino/stm32/timer.h
@@ -22,7 +22,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#ifdef HAL_TIM_MODULE_ENABLED
+#if defined(HAL_TIM_MODULE_ENABLED) && !defined(HAL_TIM_MODULE_ONLY)
 
 /* Exported constants --------------------------------------------------------*/
 #ifndef TIM_IRQ_PRIO
@@ -254,7 +254,7 @@ uint8_t getTimerClkSrc(TIM_TypeDef *tim);
 IRQn_Type getTimerUpIrq(TIM_TypeDef *tim);
 IRQn_Type getTimerCCIrq(TIM_TypeDef *tim);
 
-#endif /* HAL_TIM_MODULE_ENABLED */
+#endif /* HAL_TIM_MODULE_ENABLED && !HAL_TIM_MODULE_ONLY */
 
 #ifdef __cplusplus
 }

diff --git a/cores/arduino/stm32/uart.c b/cores/arduino/stm32/uart.c
@@ -41,7 +41,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#if defined(HAL_UART_MODULE_ENABLED)
+#if defined(HAL_UART_MODULE_ENABLED) && !defined(HAL_UART_MODULE_ONLY)
 
 /* If DEBUG_UART is not defined assume this is the one linked to PIN_SERIAL_TX */
 #if !defined(DEBUG_UART)
@@ -1066,7 +1066,7 @@ void HAL_UARTEx_WakeupCallback(UART_HandleTypeDef *huart)
   serial_t *obj = get_serial_obj(huart);
   HAL_UART_Receive_IT(huart,  &(obj->recv), 1);
 }
-#endif /* HAL_UART_MODULE_ENABLED */
+#endif /* HAL_UART_MODULE_ENABLED  && !HAL_UART_MODULE_ONLY */
 
 #ifdef __cplusplus
 }

diff --git a/cores/arduino/stm32/uart.h b/cores/arduino/stm32/uart.h
@@ -45,7 +45,7 @@
 extern "C" {
 #endif
 
-#if !defined(HAL_UART_MODULE_ENABLED)
+#if !defined(HAL_UART_MODULE_ENABLED) || defined(HAL_UART_MODULE_ONLY)
 #define serial_t void*
 #else
 
@@ -186,7 +186,7 @@ void uart_enable_rx(serial_t *obj);
 
 size_t uart_debug_write(uint8_t *data, uint32_t size);
 
-#endif /* HAL_UART_MODULE_ENABLED */
+#endif /* HAL_UART_MODULE_ENABLED  && !HAL_UART_MODULE_ONLY */
 #ifdef __cplusplus
 }
 #endif