Skip to content

some improvements #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fredlllll wants to merge 3 commits into
base: master
Choose a base branch
from
Open

some improvements #11

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed086b2
fix for unwanted interrupt
fredlllll May 29, 2016
a30d630
rather use the bitset and bitclear methods
fredlllll May 29, 2016
31c56b6
added function for setperiod to restart the timer when setting period…
fredlllll Jun 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions TimerOne.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class TimerOne
TCCR1A = 0; // clear control register A
setPeriod(microseconds);
}
void setPeriod(unsigned long microseconds) __attribute__((always_inline)) {
void setPeriod(unsigned long microseconds, bool doRestart = false) __attribute__((always_inline)) {
const unsigned long cycles = (F_CPU / 2000000) * microseconds;
if (cycles < TIMER1_RESOLUTION) {
clockSelectBits = _BV(CS10);
Expand All @@ -75,16 +75,26 @@ class TimerOne
}
ICR1 = pwmPeriod;
TCCR1B = _BV(WGM13) | clockSelectBits;
if(doRestart){
restart();
}
}

//****************************
// Run Control
//****************************
void start() __attribute__((always_inline)) {
TCCR1B = 0;
TCNT1 = 0; // TODO: does this cause an undesired interrupt?
resume();
}
void start() __attribute__((always_inline)) {
TCCR1B = 0; //disable timer (this doesnt seem to stop the interrupt from occuring when setting TCNT1 to 0)
bool interruptActive = TIMSK1 & _BV(TOIE1);
if (interruptActive) {
bitClear(TIMSK1, TOIE1); //disable timer interrupt
}
TCNT1 = 0;
if (interruptActive) {
bitSet(TIMSK1, TOIE1); //enable timer interrupt
}
resume();
}
void stop() __attribute__((always_inline)) {
TCCR1B = _BV(WGM13);
}
Expand Down