Merge pull request #93 from burbankb/master

hathach · web-flow · commit 10a9af52aaa3 · 2017-11-06T13:43:19.000+07:00
Allow HardwarePWM::addPin method to return true if _count == MAX_CHAN…
diff --git a/cores/nRF5/HardwarePWM.cpp b/cores/nRF5/HardwarePWM.cpp
@@ -78,14 +78,20 @@ void HardwarePWM::setClockDiv(uint8_t div)
  */
 bool HardwarePWM::addPin(uint8_t pin)
 {
-  VERIFY( isPinValid(pin) && (_count < MAX_CHANNELS) );
+  VERIFY( isPinValid(pin) && (_count <= MAX_CHANNELS) );
 
   // Check if pin is already configured
   for(uint8_t i=0; i<_count; i++)
   {
     if (_pwm->PSEL.OUT[i] == pin) return true;
   }
 
+  if ((_count >= MAX_CHANNELS))
+  {
+    //Pin not already configured, but this HardwarePWM is full
+    return false;
+  }
+
   pinMode(pin, OUTPUT);
   digitalWrite(pin, LOW);
 

Original file line number	Diff line number	Diff line change
`@@ -78,14 +78,20 @@ void HardwarePWM::setClockDiv(uint8_t div)`
`78`	`78`	`*/`
`79`	`79`	`bool HardwarePWM::addPin(uint8_t pin)`
`80`	`80`	`{`
`81`		`- VERIFY( isPinValid(pin) && (_count < MAX_CHANNELS) );`
	`81`	`+ VERIFY( isPinValid(pin) && (_count <= MAX_CHANNELS) );`
`82`	`82`
`83`	`83`	`// Check if pin is already configured`
`84`	`84`	`for(uint8_t i=0; i<_count; i++)`
`85`	`85`	`{`
`86`	`86`	`if (_pwm->PSEL.OUT[i] == pin) return true;`
`87`	`87`	`}`
`88`	`88`
	`89`	`+ if ((_count >= MAX_CHANNELS))`
	`90`	`+ {`
	`91`	`+ //Pin not already configured, but this HardwarePWM is full`
	`92`	`+ return false;`
	`93`	`+ }`
	`94`	`+`
`89`	`95`	`pinMode(pin, OUTPUT);`
`90`	`96`	`digitalWrite(pin, LOW);`
`91`	`97`