diff --git a/sw/airborne/boards/lisa_mx/chibios/v2.1/board.h b/sw/airborne/boards/lisa_mx/chibios/v2.1/board.h
@@ -1165,7 +1165,21 @@
 
 /*
  * PWM defines
+ * enable TIM3, TIM4 and TIM5 by default
  */
+
+#ifndef USE_PWM_TIM3
+#define USE_PWM_TIM3 1
+#endif
+
+#ifndef USE_PWM_TIM4
+#define USE_PWM_TIM4 1
+#endif
+
+#ifndef USE_PWM_TIM5
+#define USE_PWM_TIM5 1
+#endif
+
 #ifndef USE_PWM0
 #define USE_PWM0 1
 #endif

diff --git a/sw/airborne/boards/lisa_mxs/chibios/v1.0/board.h b/sw/airborne/boards/lisa_mxs/chibios/v1.0/board.h
@@ -1163,6 +1163,22 @@
 
 #define DefaultVoltageOfAdc(adc) (0.004489*adc)
 
+/*
+ * PWM TIM defines
+ * enable TIM 3, 4 and 5 by default
+ */
+#ifndef USE_PWM_TIM3
+#define USE_PWM_TIM3 1
+#endif
+
+#ifndef USE_PWM_TIM4
+#define USE_PWM_TIM4 1
+#endif
+
+#ifndef USE_PWM_TIM5
+#define USE_PWM_TIM5 1
+#endif
+
 /*
  * PWM defines
  */

diff --git a/sw/airborne/boards/mateksys/F765-WING/matekF765-WING.h b/sw/airborne/boards/mateksys/F765-WING/matekF765-WING.h
@@ -101,6 +101,30 @@
  */
 #define DefaultMilliAmpereOfAdc(adc) ((40000.f*3.3f/4096.f)*adc)
 
+/*
+ * PWM TIM defines
+ * enable TIM 2, 4, 5, 8, 9 by default
+ */
+#ifndef USE_PWM_TIM2
+#define USE_PWM_TIM2 1
+#endif
+
+#ifndef USE_PWM_TIM4
+#define USE_PWM_TIM4 1
+#endif
+
+#ifndef USE_PWM_TIM5
+#define USE_PWM_TIM5 1
+#endif
+
+#ifndef USE_PWM_TIM8
+#define USE_PWM_TIM8 1
+#endif
+
+#ifndef USE_PWM_TIM9
+#define USE_PWM_TIM9 1
+#endif
+
 /*
  * PWM defines
  */

diff --git a/sw/airborne/boards/mateksys/FC-H743-SLIM/board.cfg b/sw/airborne/boards/mateksys/FC-H743-SLIM/board.cfg
@@ -39,6 +39,22 @@ HEADER
 #define SDLOG_BAT_ADC ADCD1
 #define SDLOG_BAT_CHAN AD1_5_CHANNEL
 
+/*
+ * PWM TIM defines
+ * enable TIM 3, 4 and 5 by default
+ */
+#ifndef USE_PWM_TIM3
+#define USE_PWM_TIM3 1
+#endif
+
+#ifndef USE_PWM_TIM4
+#define USE_PWM_TIM4 1
+#endif
+
+#ifndef USE_PWM_TIM5
+#define USE_PWM_TIM5 1
+#endif
+
 CONFIG
 
 

diff --git a/sw/airborne/boards/mateksys/FC-H743-SLIM/board.h b/sw/airborne/boards/mateksys/FC-H743-SLIM/board.h
@@ -53,6 +53,22 @@
 #define SDLOG_BAT_ADC ADCD1
 #define SDLOG_BAT_CHAN AD1_5_CHANNEL
 
+/*
+ * PWM TIM defines
+ * enable TIM 3, 4 and 5 by default
+ */
+#ifndef USE_PWM_TIM3
+#define USE_PWM_TIM3 1
+#endif
+
+#ifndef USE_PWM_TIM4
+#define USE_PWM_TIM4 1
+#endif
+
+#ifndef USE_PWM_TIM5
+#define USE_PWM_TIM5 1
+#endif
+
 /*
  * IO pins assignments.
  */

diff --git a/sw/airborne/boards/nucleo/144_f767zi/nucleo144_f767zi.h b/sw/airborne/boards/nucleo/144_f767zi/nucleo144_f767zi.h
@@ -149,6 +149,18 @@
 #define VBAT_R2 12000.0f
 #define DefaultVoltageOfAdc(adc) ((3.3f/4096.0f)*((VBAT_R1+VBAT_R2)/VBAT_R1)*adc)
 
+/*
+ * PWM TIM defines
+ * enable TIM1 and TIM4 by default
+ */
+#ifndef USE_PWM_TIM1
+#define USE_PWM_TIM1 1
+#endif
+
+#ifndef USE_PWM_TIM4
+#define USE_PWM_TIM4 1
+#endif
+
 /*
  * PWM defines
  */

diff --git a/sw/airborne/boards/px4fmu/chibios/v2.4/board.h b/sw/airborne/boards/px4fmu/chibios/v2.4/board.h
@@ -768,6 +768,18 @@
 
 #define DefaultVoltageOfAdc(adc) (0.006185*adc)
 
+/*
+ * PWM TIM defines
+ * enable TIM2 and TIM3 by default
+ */
+#ifndef USE_PWM_TIM2
+#define USE_PWM_TIM2 1
+#endif
+
+#ifndef USE_PWM_TIM3
+#define USE_PWM_TIM3 1
+#endif
+
 /*
  * PWM defines TODO
  */

diff --git a/sw/airborne/boards/px4fmu/chibios/v4.0/px4fmu.h b/sw/airborne/boards/px4fmu/chibios/v4.0/px4fmu.h
@@ -98,6 +98,18 @@
 #define DefaultVoltageOfAdc(adc) ((3.3f/4096.0f) * 10.27708149f * adc)
 #define MilliAmpereOfAdc(adc) ((3.3f/4096.0f) * 36367.51556f * adc)
 
+/*
+ * PWM TIM defines
+ * enable TIM1 and TIM4 by default
+ */
+#ifndef USE_PWM_TIM1
+#define USE_PWM_TIM1 1
+#endif
+
+#ifndef USE_PWM_TIM4
+#define USE_PWM_TIM4 1
+#endif
+
 /*
  * PWM defines
  */

diff --git a/sw/airborne/boards/px4fmu/chibios/v5.0/board.cfg b/sw/airborne/boards/px4fmu/chibios/v5.0/board.cfg
@@ -51,6 +51,22 @@ HEADER
 #define SDLOG_BAT_CHAN AD1_1_CHANNEL
 #define SDLOG_USB_LED 3
 
+/*
+ * PWM TIM defines
+ * enable TIM 1, 4 and 12 by default
+ */
+#ifndef USE_PWM_TIM1
+#define USE_PWM_TIM1 1
+#endif
+
+#ifndef USE_PWM_TIM4
+#define USE_PWM_TIM4 1
+#endif
+
+#ifndef USE_PWM_TIM12
+#define USE_PWM_TIM12 1
+#endif
+
 CONFIG
 
 

diff --git a/sw/airborne/boards/px4fmu/chibios/v5.0/board.h b/sw/airborne/boards/px4fmu/chibios/v5.0/board.h
@@ -65,6 +65,22 @@
 #define SDLOG_BAT_CHAN AD1_1_CHANNEL
 #define SDLOG_USB_LED 3
 
+/*
+ * PWM TIM defines
+ * enable TIM 1, 4 and 12 by default
+ */
+#ifndef USE_PWM_TIM1
+#define USE_PWM_TIM1 1
+#endif
+
+#ifndef USE_PWM_TIM4
+#define USE_PWM_TIM4 1
+#endif
+
+#ifndef USE_PWM_TIM12
+#define USE_PWM_TIM12 1
+#endif
+
 /*
  * IO pins assignments.
  */

diff --git a/sw/airborne/boards/tawaki/chibios/common/tawaki.h b/sw/airborne/boards/tawaki/chibios/common/tawaki.h
@@ -158,6 +158,13 @@
  * PWM defines
  */
 
+/*
+ * enable TIM1 by default
+ */
+#ifndef USE_PWM_TIM1
+#define USE_PWM_TIM1 1
+#endif
+
 // SRVa connectors, activated in PWM mode by default
 
 #ifndef USE_PWM1