include PWM code only for the used timers

tenbaht · tenbaht · commit 0ba35bc5e396 · 2017-03-01T18:53:06.000+01:00
diff --git a/sduino/hardware/sduino/stm8/cores/sduino/Arduino.h b/sduino/hardware/sduino/stm8/cores/sduino/Arduino.h
@@ -249,16 +249,23 @@ void alternateFunction(uint8_t val);
 #define PL 12
 #endif
 
-#define NOT_ON_TIMER 0
-#define TIMER11 1
-#define TIMER12 2
-#define TIMER13 3
-#define TIMER14 4
-#define TIMER21 5
-#define TIMER22 6
-#define TIMER23 7
-#define TIMER31 8
-#define TIMER32 9
+enum {
+    NOT_ON_TIMER = 0,
+#ifdef NEED_TIMER_11_12
+    TIMER11,
+    TIMER12,
+#endif
+    TIMER13,
+    TIMER14,
+    TIMER21,
+    TIMER22,
+    TIMER23,
+#ifdef NEED_TIMER_31_32
+    TIMER31,
+    TIMER32,
+#endif
+    NUM_TIMERS
+};
 
 
 //FIXME#include "WCharacter.h"
diff --git a/sduino/hardware/sduino/stm8/cores/sduino/wiring_digital.c b/sduino/hardware/sduino/stm8/cores/sduino/wiring_digital.c
@@ -34,15 +34,22 @@
  * at runtime.
  */
 typedef unsigned char *uc_p;
+
 /* timer capture/compare mode register to control PWM mode */
-const uc_p ccmrx[7]={
+const uc_p ccmrx[NUM_TIMERS]={
+#ifdef NEED_TIMER_11_12
 	TIM1->CCMR1,	/* for TIMER11 */
 	TIM1->CCMR2,	/* for TIMER12 */
+#endif
 	TIM1->CCMR3,	/* for TIMER13 */
 	TIM1->CCMR4,	/* for TIMER14 */
 	TIM2->CCMR1,	/* for TIMER21 */
 	TIM2->CCMR2,	/* for TIMER22 */
-	TIM2->CCMR3	/* for TIMER23 */
+	TIM2->CCMR3,	/* for TIMER23 */
+#ifdef NEED_TIMER_31_32
+	TIM3->CCMR1,	/* for TIMER31 */
+	TIM3->CCMR2	/* for TIMER32 */
+#endif
 };
 
 
@@ -164,7 +171,7 @@ void pinMode(uint8_t pin, uint8_t mode)
  */
 static void turnOffPWM(uint8_t timer)
 {
-	*((unsigned char *) ccmrx[timer-TIMER11]) &= ~TIM1_CCMR_OCM;
+	*((unsigned char *) ccmrx[timer-1]) &= ~TIM1_CCMR_OCM;
 }
 
 
