From 7f1911fa97f1dae002e0d90827d8cc9c5f274c7a Mon Sep 17 00:00:00 2001 From: Spence Konde Date: Fri, 16 Sep 2022 15:20:50 -0400 Subject: [PATCH] spelling and changelog --- ChangeLog.md | 4 ++-- README.md | 2 +- megaavr/cores/megatinycore/UART.cpp | 2 +- megaavr/cores/megatinycore/wiring.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 8f836fac..e519fae1 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -22,7 +22,7 @@ Changes listed here are checked in to GitHub ("master" branch unless specificall ## Released Versions -### Planned 2.6.1 (critical update) +### 2.6.1 (critical update) * 2.6.0 Bugfix: Correct several USART bugs that snuck through, including an apparent regression that would prevent proper serial operation. * 2.6.0 Bugfix: Azduino5 was no good. Same filesystem structure error as usual, moved to Azduino6. * 2.6.0 Bugfix: The 4000 lines of workarounds for compatibility issues introduced by the toolchain update didn't make it into the megaTinyCore release. @@ -44,7 +44,7 @@ Changes listed here are checked in to GitHub ("master" branch unless specificall * Bugfix: `long_soft_event` method did not work correctly. * Bugfix: Removed attempted optimization by inlining analogReadEnh; I had wrongly assumed that it would then not inline the call to `_analogReadEnh`. Well, it wound up inlining it, with the result being exactly what I had hoped to prevent. I don't think this made it into a release. * Bugfix: Event was not functioning correctly on tinyAVR parts. -* Bugfix: Correct bug when waking from sleep mode via TWI address match (Thanks @MX682X. You are one of our MVPs) - sleepy TWI slaves now work reliably in all sleep modes. +* Bugfix: Correct bug(s) when waking from sleep mode via TWI (aka I2C/Wire) address match (Thanks @MX682X. You are one of our MVPs). TWI slaves should now *reliably* wake on address match and other wake sources from all sleep modes. * Bugfix: 3224 optiboot maximum upload size was same as 1624. Oops. * Bugfix: Microchip boards in optiboot mode (admittedly a rare mode) were not subtracting the size of the bootloader from the chip capacity. * Enhancement: Lay groundwork in Event library for the new event system changes in the EA-series (There will be 2 generators per port, and 2 for RTC - but all of these will be accessible by all event channels, and a register on the peripheral controls which of the options is used for these two channels). While inapplicable to tinyAVR, Event.h and Event.cpp distributed with DxCore and megaTinyCore is identical. diff --git a/README.md b/README.md index 307fba3e..51734ac5 100644 --- a/README.md +++ b/README.md @@ -326,7 +326,7 @@ Using the `An` constants for analog pins is deprecated - the recommended practic ### Watchdog Timer, Software Reset There are more options than on classic AVR for resetting, including if the code gets hung up somehow. The watchdog timer can only reset (use the RTC and PIT for timed interrupts). -See the [**Reset and Watchdog (WDT) Reference**](https://github.com/SpenceKonde/megaTinyCore/blob/master/megaavr/extras/Ref_Reset.md)and (The core-auxiliary library, megaTinyCore/.)[../megaavr/libraries/megaTinyCore/README.md] +See the [**Reset and Watchdog (WDT) Reference**](https://github.com/SpenceKonde/megaTinyCore/blob/master/megaavr/extras/Ref_Reset.md) and [The core-auxiliary library megaTinyCore](megaavr/libraries/megaTinyCore/README.md) ### Improved Digital I/O This core adds a number of new features include fast digital I/O (1-14 clocks depending on what's known at compile time, and 2-28 bytes of flash (pin number must be known at compile time for the `________Fast()` functions, and for configuring all per-pin settings the hardware has with `pinConfigure()`. diff --git a/megaavr/cores/megatinycore/UART.cpp b/megaavr/cores/megatinycore/UART.cpp index 016b5349..c35be134 100644 --- a/megaavr/cores/megatinycore/UART.cpp +++ b/megaavr/cores/megatinycore/UART.cpp @@ -189,7 +189,7 @@ "reti" "\n\t" // return "_buff_full_rxc:" "\n\t" // potential improvement: move _buff_full_rxc to after the reti, and then rjmp back, saving 2 clocks for the common case "ori r19, 0x40" "\n\t" // record that there was a ring buffer overflow. 1 clk - "rjmp _end_rxc" "\n\t" // and now jump back to end. That way we don't need to jump over this inthe middle of the common case. + "rjmp _end_rxc" "\n\t" // and now jump back to end. That way we don't need to jump over this in the middle of the common case. ::); // total: 77 or 79 clocks, just barely squeaks by for cyclic RX of up to RX_BUFFER_SIZE characters. __builtin_unreachable(); diff --git a/megaavr/cores/megatinycore/wiring.c b/megaavr/cores/megatinycore/wiring.c index 227be654..b1e6c864 100644 --- a/megaavr/cores/megatinycore/wiring.c +++ b/megaavr/cores/megatinycore/wiring.c @@ -794,7 +794,7 @@ inline unsigned long microsecondsToClockCycles(unsigned long microseconds) { return -1; } #endif -#else // MILLIS_USE_TIMERNONE defined - we have nither of these functions. +#else // MILLIS_USE_TIMERNONE defined - we have neither of these functions. /* Uses should not call millis() or micros() if the core timekeeping has been disabled. Usually, encountering this error either means * that they disabled millis earlier for some other sketch, and the preferences were saved with that - or that they are using a library * with a dependence on the timekeeping facilities. Sometimes these are meaningful, other times it is only for a feature that isn't