#ifdef hell

These goddamned #ifdefs will be the death of me...
SpenceKonde · Mar 20, 2020 · 94dd0e8 · 94dd0e8 · Floessie · Mar 20, 2020
1 parent ae5fb7c
commit 94dd0e8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/megaavr/cores/arduino/Tone.cpp b/megaavr/cores/arduino/Tone.cpp
@@ -50,6 +50,7 @@
 #else
 #error "This part only has one type B timer, but it is selected as millis source; tone cannot be used."
 #endif
+#else
 #define USE_TIMERB0
 #endif
 

diff --git a/megaavr/cores/arduino/wiring.c b/megaavr/cores/arduino/wiring.c
@@ -100,6 +100,7 @@ static volatile TCB_t* _timer =
 #error "Selected millis timer, TCB1 does not exist on this part."
 #endif
 &TCB1;
+#endif
 #else //it's not TCB0, TCB1, TCD0, TCA0, or RTC
 #error "No millis timer selected, but not disabled - can't happen!".
 #endif
@@ -288,7 +289,10 @@ unsigned long micros() {
 	#endif //end of timer-specific part of micros calculations
 	return microseconds;
 }
+
 #endif //end of non-RTC micros code
+
+
 #endif //end of non-DISABLE_MILLIS code
 
 #if !(defined(DISABLE_MILLIS) || defined(MILLIS_USE_TIMERRTC)) //delay implementation when we do have micros()