add HwPWM3 for nrf52840

Author: hathach

cores/nRF5/HardwarePWM.cpp

@@ -41,7 +41,17 @@ HardwarePWM HwPWM0(NRF_PWM0);
 HardwarePWM HwPWM1(NRF_PWM1);
 HardwarePWM HwPWM2(NRF_PWM2);
 
-HardwarePWM* HwPWMx[3] = { &HwPWM0, &HwPWM1, &HwPWM2 };
+#ifdef NRF52840_XXAA
+HardwarePWM HwPWM3(NRF_PWM3);
+#endif
+
+HardwarePWM* HwPWMx[] =
+{
+  &HwPWM0, &HwPWM1, &HwPWM2
+#ifdef NRF52840_XXAA
+  ,&HwPWM3
+#endif
+};
 
 HardwarePWM::HardwarePWM(NRF_PWM_Type* pwm)
 {

cores/nRF5/HardwarePWM.h

@@ -39,7 +39,11 @@
 #include "common_inc.h"
 #include "nrf.h"
 
+#ifdef NRF52840_XXAA
+#define HWPWM_MODULE_NUM    4
+#else
 #define HWPWM_MODULE_NUM    3
+#endif
 
 class HardwarePWM
 {
@@ -65,7 +69,7 @@ class HardwarePWM
     void setClockDiv(uint8_t div);      // value is PWM_PRESCALER_PRESCALER_DIV_x, DIV1 is 16Mhz
 
     bool addPin     (uint8_t pin);
-    int  pin2channel(uint8_t pin) ATTR_ALWAYS_INLINE
+    int  pin2channel(uint8_t pin)
     {
       for(int i=0; i<_count; i++)
       {
@@ -74,7 +78,7 @@ class HardwarePWM
       return (-1);
     }
 
-    bool checkPin(uint8_t pin) ATTR_ALWAYS_INLINE
+    bool checkPin(uint8_t pin)
     {
       return pin2channel(pin) >= 0;
     }
@@ -84,8 +88,8 @@ class HardwarePWM
     void stop  (void);
 
     // Generate PWM
-    bool     writePin    (uint8_t pin, uint16_t value, bool inverted = false);
-    bool     writeChannel(uint8_t ch , uint16_t value, bool inverted = false);
+    bool writePin    (uint8_t pin, uint16_t value, bool inverted = false);
+    bool writeChannel(uint8_t ch , uint16_t value, bool inverted = false);
 
     // Read current set value
     uint16_t readPin     (uint8_t pin);
@@ -96,6 +100,10 @@ extern HardwarePWM HwPWM0;
 extern HardwarePWM HwPWM1;
 extern HardwarePWM HwPWM2;
 
-extern HardwarePWM* HwPWMx[3];
+#ifdef NRF52840_XXAA
+extern HardwarePWM HwPWM3;
+#endif
+
+extern HardwarePWM* HwPWMx[];
 
 #endif /* HARDWAREPWM_H_ */

cores/nRF5/wiring_analog.cpp

@@ -64,7 +64,7 @@ void analogWriteResolution( uint8_t res )
  */
 void analogWrite( uint32_t pin, uint32_t value )
 {
-  for(int i=0; i<3; i++)
+  for(int i=0; i<HWPWM_MODULE_NUM; i++)
   {
     // Added by if needed
     if ( HwPWMx[i]->addPin(pin) )

libraries/Bluefruit52Lib/examples/Hardware/hwpwm/hwpwm.ino

@@ -28,7 +28,8 @@
 
 #include <Arduino.h>
 
-// Maximum 12 pins can be used for 3 PWM module ( 4 channel each )
+// Maximum 12 pins can be used for 3 PWM modules ( 4 channel each )
+// Note: nRF52832 has 3 PWM modules, nRF52840 has 4 PWM modules
 int pins[12] = 
 { 
   A0 , A1      , A2          , A3,