MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unify interrupt handling (#520)

Browse Source 
ATMega328 hardware abstraction used a mix of AVR cli/sei and Arduino
noInterrupts/interrupts calls.
Changed to use AVR cli/sei only.
This commit is contained in:
Embedded Innovation
2016-07-17 10:28:00 +02:00
committed by Olivier
parent 1305aeca8a
commit 83cbb921f5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/MyHwATMega328.cpp
+2 -2
View File
@@ -161,7 +161,7 @@ uint16_t hwCPUVoltage() {
} }
uint16_t hwCPUFrequency() { uint16_t hwCPUFrequency() {
noInterrupts(); cli();
// setup timer1 // setup timer1
TIFR1 = 0xFF; TIFR1 = 0xFF;
TCNT1 = 0; TCNT1 = 0;
@@ -183,7 +183,7 @@ uint16_t hwCPUFrequency() {
wdt_reset(); wdt_reset();
WDTCSR |= (1 << WDCE) | (1 << WDE); WDTCSR |= (1 << WDCE) | (1 << WDE);
WDTCSR = WDTsave; WDTCSR = WDTsave;
interrupts(); sei();
// return frequency in 1/10MHz (accuracy +- 10%) // return frequency in 1/10MHz (accuracy +- 10%)
return TCNT1 * 2048UL / 100000UL; return TCNT1 * 2048UL / 100000UL;
} }