From ef62ce6bff2c6059e1f0750c8fa2ec9af424f712 Mon Sep 17 00:00:00 2001 From: Brian Baltz Date: Wed, 3 Feb 2016 12:09:33 -0800 Subject: [PATCH 1/2] Fix pwmStop typo in keywords.txt Signed-off-by: Brian Baltz --- libraries/CurieTimerOne/keywords.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/CurieTimerOne/keywords.txt b/libraries/CurieTimerOne/keywords.txt index e76736b5..bcf1d0a4 100644 --- a/libraries/CurieTimerOne/keywords.txt +++ b/libraries/CurieTimerOne/keywords.txt @@ -21,7 +21,7 @@ rdRstTickCount KEYWORD2 pause KEYWORD2 resume KEYWORD2 pwmStart KEYWORD2 -pwdStop KEYWORD2 +pwmStop KEYWORD2 ####################################### # Instances (KEYWORD2) ####################################### From da68b6fcd5363a5b771e02ec7fa4ab1774286ebe Mon Sep 17 00:00:00 2001 From: Brian Baltz Date: Wed, 3 Feb 2016 12:10:41 -0800 Subject: [PATCH 2/2] ATLEDGE-516 Stop callback when setting duty cycle to 0 Signed-off-by: Brian Baltz --- libraries/CurieTimerOne/CurieTimer.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/CurieTimerOne/CurieTimer.cpp b/libraries/CurieTimerOne/CurieTimer.cpp index 01045c14..d4978511 100644 --- a/libraries/CurieTimerOne/CurieTimer.cpp +++ b/libraries/CurieTimerOne/CurieTimer.cpp @@ -163,6 +163,8 @@ int CurieTimer::pwmStart(unsigned int outputPin, double dutyPercentage, unsigned pinMode(pwmPin, OUTPUT); if(dutyPercentage == 0.0) { + // If PWM is already running, reset the timer and set pin to LOW + kill(); digitalWrite(pwmPin, LOW); return SUCCESS; }