A few small changes. Expected to be low impact

Author: SpenceKonde

ChangeLog.md

@@ -22,7 +22,7 @@ These items are in addition to what was listed under changes already in release.
 ## Unreleased changes
 Changes listed here are checked in to GitHub ("master" branch unless specifically noted; this is only done when a change involves a large amount of work and breaks the core in the interim, or where the change is considered very high risk, and needs testing by others prior to merging the changes with master - everything else goes straight into master). These changes are not yet in any "release" nor can they be installed through board manager, only downloading latest code from github will work. These changes will be included in the listed version, though planned version numbers may change without notice - critical fixes may be inserted before a planned release and the planned release bumped up a version, or versions may go from patch to minor version depending on the scale of changes.
 
-The 2.6.11 release is pending, following that the next version will by 2.7.0.
+The 2.6.11 release is pending, following that the next version will by 2.7.0, barring major catastrophes.
 
 ## Released Versions
 
@@ -33,6 +33,7 @@ The 2.6.11 release is pending, following that the next version will by 2.7.0.
 * General cleanup of wiring.c and timers.h for maintainability.
 * Fix some of the constants for timers so that all timers can still get uniform codes specifying the portmux and (for non-TCA's) which pin within the mux it is, which matters for the other core.
 * Documentation improvements.
+* Study of the state of 20 MHz timekeeping is ongoing. By my calculations it resulted in time passing 1/51th too fast
 * Corrected critical bug in the TCD0 millis option (the default on 1-series parts) (#1243)
 * Corrected bug sometimes encountered when using serial under atypical cases the causes of which remain mysterious), where it would complain about `__poll_dre_done`. (#1226)
 * Correct bug with Comparator (#1236)
@@ -41,6 +42,7 @@ The 2.6.11 release is pending, following that the next version will by 2.7.0.
 * Major Bugfix: Correct buffered PWM on all parts.
 * Major Bugfix: Correct PWM on non-default pins on all parts; digitalPinHasPWM() macro.
 * Fix bug with CCL clock source selection options.
+* Correct some ambiguities with the clock specification defines for RTC Millis using external clock; we don't support it,
 * Enhance documentation
 * Correct critical problem with timekeeping on parts with a TCD. (#1243)
 * Removed example of exactly the sort of boneheaded and strictly-worse code I rail against in a trivial part of Wire. While it was merely a bad example at the time it was written, it is now known to be a bad, dangerous example, because it featured code that demonstrated Strictly Worse access to registers, by loading a vport register to a pointer register, and using that - not only is it stupid and just a less-featureful PORT when accessed that way, avoiding pointer access to the I/O space (64 addresses, - 28 VPORTs and 4 GPIORs in low I/O and SP, RAMPZ (if applicable), CCP (the register used for `__PROTECTED_WRITE()`}), and of course the SREG) is necessary due to an erratum effecting all AVRxm parts. And indeed, none of those are registers that anyone should ever access using a pointer, even if it didn't wasn't safe against an incredibly scary bug - the low I/O is all about the bitwise instructions, which need both the register and bit compile time known. `VPORT_t*` is not a type you should ever declare - if you have had to declare it, *you get no benefit* from faster access to it (like you do if you use the compile-time known VPORT's amd access them without pointing. )

megaavr/boards.txt

@@ -435,7 +435,7 @@ atxy7.menu.millis.timerb0.build.millistimer=B0
 atxy7.menu.millis.timerb1.build.millistimer=B1
 atxy7.menu.millis.rtc.build.millistimer=RTC
 atxy7.menu.millis.rtcxtal.build.millistimer=RTC_XTAL
-atxy7.menu.millis.rtcxosc.build.millistimer=RTC_XOSC
+atxy7.menu.millis.rtcxosc.build.millistimer=RTC_OSC
 
 #----------------------------------------#
 # UPDI/RESET PIN CONFIGURATION           #
@@ -1003,7 +1003,7 @@ atxy6.menu.millis.timerb0.build.millistimer=B0
 atxy6.menu.millis.timerb1.build.millistimer=B1
 atxy6.menu.millis.rtc.build.millistimer=RTC
 atxy6.menu.millis.rtcxtal.build.millistimer=RTC_XTAL
-atxy6.menu.millis.rtcxosc.build.millistimer=RTC_XOSC
+atxy6.menu.millis.rtcxosc.build.millistimer=RTC_OSC
 
 #----------------------------------------#
 # UPDI/RESET PIN CONFIGURATION           #
@@ -1542,7 +1542,7 @@ atxy4.menu.millis.timerb0.build.millistimer=B0
 atxy4.menu.millis.timerb1.build.millistimer=B1
 atxy4.menu.millis.rtc.build.millistimer=RTC
 atxy4.menu.millis.rtcxtal.build.millistimer=RTC_XTAL
-atxy4.menu.millis.rtcxosc.build.millistimer=RTC_XOSC
+atxy4.menu.millis.rtcxosc.build.millistimer=RTC_OSC
 
 #----------------------------------------#
 # UPDI/RESET PIN CONFIGURATION           #
@@ -2408,7 +2408,7 @@ microchip.menu.millis.timerb0.build.millistimer=B0
 microchip.menu.millis.timerb1.build.millistimer=B1
 microchip.menu.millis.rtc.build.millistimer=RTC
 microchip.menu.millis.rtcxtal.build.millistimer=RTC_XTAL
-microchip.menu.millis.rtcxosc.build.millistimer=RTC_XOSC
+microchip.menu.millis.rtcxosc.build.millistimer=RTC_OSC
 
 #----------------------------------------#
 # UPDI/RESET PIN CONFIGURATION           #
@@ -2832,7 +2832,7 @@ atxy7o.menu.millis.timerb0.build.millistimer=B0
 atxy7o.menu.millis.timerb1.build.millistimer=B1
 atxy7o.menu.millis.rtc.build.millistimer=RTC
 atxy7o.menu.millis.rtcxtal.build.millistimer=RTC_XTAL
-atxy7o.menu.millis.rtcxosc.build.millistimer=RTC_XOSC
+atxy7o.menu.millis.rtcxosc.build.millistimer=RTC_OSC
 
 #----------------------------------------#
 #  UPDI and RESET PIN configuration      #
@@ -3277,7 +3277,7 @@ atx27o.menu.millis.timerb0.build.millistimer=B0
 atx27o.menu.millis.timerb1.build.millistimer=B1
 atx27o.menu.millis.rtc.build.millistimer=RTC
 atx27o.menu.millis.rtcxtal.build.millistimer=RTC_XTAL
-atx27o.menu.millis.rtcxosc.build.millistimer=RTC_XOSC
+atx27o.menu.millis.rtcxosc.build.millistimer=RTC_OSC
 
 #----------------------------------------#
 # BODVOLTAGE                             #
@@ -3757,7 +3757,7 @@ atxy6o.menu.millis.timerb0.build.millistimer=B0
 atxy6o.menu.millis.timerb1.build.millistimer=B1
 atxy6o.menu.millis.rtc.build.millistimer=RTC
 atxy6o.menu.millis.rtcxtal.build.millistimer=RTC_XTAL
-atxy6o.menu.millis.rtcxosc.build.millistimer=RTC_XOSC
+atxy6o.menu.millis.rtcxosc.build.millistimer=RTC_OSC
 
 #----------------------------------------#
 # BOD VOLTAGE                            #
@@ -4216,7 +4216,7 @@ atx26o.menu.millis.timerb0.build.millistimer=B0
 atx26o.menu.millis.timerb1.build.millistimer=B1
 atx26o.menu.millis.rtc.build.millistimer=RTC
 atx26o.menu.millis.rtcxtal.build.millistimer=RTC_XTAL
-atx26o.menu.millis.rtcxosc.build.millistimer=RTC_XOSC
+atx26o.menu.millis.rtcxosc.build.millistimer=RTC_OSC
 
 #----------------------------------------#
 # BODVOLTAGE                             #
@@ -4694,7 +4694,7 @@ atxy4o.menu.millis.timerb0.build.millistimer=B0
 atxy4o.menu.millis.timerb1.build.millistimer=B1
 atxy4o.menu.millis.rtc.build.millistimer=RTC
 atxy4o.menu.millis.rtcxtal.build.millistimer=RTC_XTAL
-atxy4o.menu.millis.rtcxosc.build.millistimer=RTC_XOSC
+atxy4o.menu.millis.rtcxosc.build.millistimer=RTC_OSC
 
 #----------------------------------------#
 # BOD VOLTAGE                            #
@@ -5110,7 +5110,7 @@ atx24o.menu.millis.timerb0.build.millistimer=B0
 atx24o.menu.millis.timerb1.build.millistimer=B1
 atx24o.menu.millis.rtc.build.millistimer=RTC
 atx24o.menu.millis.rtcxtal.build.millistimer=RTC_XTAL
-atx24o.menu.millis.rtcxosc.build.millistimer=RTC_XOSC
+atx24o.menu.millis.rtcxosc.build.millistimer=RTC_OSC
 
 #----------------------------------------#
 # BODVOLTAGE                             #

megaavr/cores/megatinycore/core_devices.h

@@ -1061,7 +1061,7 @@ has once worked for the same thing as meaning that thing */
     #define TCB_CLKSEL_EVENT_gc  (badCall("This processor does not support TCB count on event mode. Only Dx, Ex, and 2-series tiny support that"))
   #endif
   /* Make sure we error out quickly if told to use an RTC timing option that isn't available. */
-  #if (defined(MILLIS_USE_TIMERRTC_XTAL) || defined(MILLIS_USE_TIMERRTC_XOSC))
+  #if (defined(MILLIS_USE_TIMERRTC_XTAL) || defined(MILLIS_USE_TIMERRTC_OSC))
     #if (MEGATINYCORE_SERIES == 0 || defined(__AVR_ATtinyxy2__))
       #error "Only the tinyAVR 1-series and 2-series parts with at least 14 pins support external RTC timebase"
     #endif

megaavr/libraries/tinyNeoPixel/tinyNeoPixel.cpp

@@ -1115,7 +1115,7 @@ void tinyNeoPixel::show(uint16_t leds) {
 
 
   interrupts();
-  #if (!defined(MILLIS_USE_TIMERNONE) && !defined(MILLIS_USE_TIMERRTC) && !defined(MILLIS_USE_TIMERRTC_XTAL) && !defined(MILLIS_USE_TIMERRTC_XOSC))
+  #if (defined(micros))
     endTime = micros();
     // Save EOD time for latch on next call
   #endif

megaavr/libraries/tinyNeoPixel/tinyNeoPixel.h

@@ -314,7 +314,7 @@ class tinyNeoPixel {
   */
   static uint32_t   gamma32(uint32_t x);
 
-  #if (!defined(MILLIS_USE_TIMERNONE) && !defined(MILLIS_USE_TIMERRTC) && !defined(MILLIS_USE_TIMERRTC_XTAL) && !defined(MILLIS_USE_TIMERRTC_XOSC))
+  #if (defined(micros))
     inline bool canShow(void) { return (micros() - endTime) >= (uint32_t) latchTime; }
   #else
     inline bool canShow(void) {return 1;} // we don't have micros here;

megaavr/libraries/tinyNeoPixel_Static/tinyNeoPixel_Static.cpp

@@ -1070,7 +1070,7 @@ void tinyNeoPixel::show(uint16_t leds) {
 
 
   interrupts();
-  #if (!defined(MILLIS_USE_TIMERNONE) && !defined(MILLIS_USE_TIMERRTC) && !defined(MILLIS_USE_TIMERRTC_XTAL) && !defined(MILLIS_USE_TIMERRTC_XOSC))
+  #if (defined(micros))
     endTime = micros();
     // Save EOD time for latch on next call
   #endif

megaavr/libraries/tinyNeoPixel_Static/tinyNeoPixel_Static.h

@@ -298,7 +298,7 @@ class tinyNeoPixel {
   */
   static uint32_t gamma32(uint32_t x);
 
-  #if (!defined(MILLIS_USE_TIMERNONE) && !defined(MILLIS_USE_TIMERRTC) && !defined(MILLIS_USE_TIMERRTC_XTAL) && !defined(MILLIS_USE_TIMERRTC_XOSC))
+  #if (defined(micros))
     inline bool canShow(void) { return (micros() - endTime) >= (uint32_t) latchTime; }
   #else
     inline bool canShow(void) {return 1;} // we don't have micros here;