Merge pull request #109 from SidLeung/master

Brian Baltz · Brian Baltz · commit a6381cb123d7 · 2016-01-26T17:05:08.000-07:00
Jira-501: CurieTimer.resume() did not re-enable interrupt at the controller.
diff --git a/libraries/CurieTimerOne/CurieTimer.cpp b/libraries/CurieTimerOne/CurieTimer.cpp
@@ -139,6 +139,9 @@ void CurieTimer::resume(void)
   aux_reg_write(timerCountAddr, pauseCount);
   aux_reg_write(timerControlAddr, pauseCntrl);
   currState = RUNNING;
+
+  // Re-enable timer interrupt once timer is reloaded with previous stop values.
+  interrupt_enable(timerIrqNum);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,9 @@ void CurieTimer::resume(void)`
`139`	`139`	`aux_reg_write(timerCountAddr, pauseCount);`
`140`	`140`	`aux_reg_write(timerControlAddr, pauseCntrl);`
`141`	`141`	`currState = RUNNING;`
	`142`	`+`
	`143`	`+ // Re-enable timer interrupt once timer is reloaded with previous stop values.`
	`144`	`+ interrupt_enable(timerIrqNum);`
`142`	`145`	`}`
`143`	`146`
`144`	`147`