Skip to content

Fix three core/library bugs affecting all AVR #650

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
ws-asahi wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix three core/library bugs affecting all AVR #650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25e8762
Fix operator precedence in ADC-disabled check
ws-asahi Aug 8, 2026
63c042f
Fix unreachable chan=255 (auto-select) in event generator pin setup
ws-asahi Aug 8, 2026
30f456d
Flash: fix writeBytes - dropped trailing byte, corrupted neighbour, l…
ws-asahi Aug 8, 2026
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
4 changes: 2 additions & 2 deletions megaavr/cores/dxcore/wiring_analog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ inline __attribute__((always_inline)) void check_valid_resolution(uint8_t res) {
#endif
return ADC_ERROR_BAD_PIN_OR_CHANNEL;
}
if (!ADC0.CTRLA & 0x01) return ADC_ERROR_DISABLED;
if (!(ADC0.CTRLA & 0x01)) return ADC_ERROR_DISABLED;

if (ADC0.COMMAND & ADC_START_gm) return ADC_ERROR_BUSY;
// gotta be careful here - don't want to shit ongoing conversion - unlikle classic AVRs
Expand Down Expand Up @@ -730,7 +730,7 @@ inline __attribute__((always_inline)) void check_valid_resolution(uint8_t res) {
#endif
return ADC_ERROR_BAD_PIN_OR_CHANNEL;
}
if (!ADC0.CTRLA & 0x01) return ADC_ERROR_DISABLED;
if (!(ADC0.CTRLA & 0x01)) return ADC_ERROR_DISABLED;

if (ADC0.COMMAND & ADC_START_gm) return ADC_ERROR_BUSY;
// gotta be careful here - don't want to shit ongoing conversion - unlikle classic AVRs
Expand Down
2 changes: 1 addition & 1 deletion megaavr/cores/dxcore/wiring_extra.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ void pinConfigure(uint8_t digital_pin, uint16_t pin_config) {
uint8_t _setEventPin(uint8_t pin, uint8_t chan) {
// Works the same was as
uint8_t temp = digitalPinToPort(pin);
if (temp != NOT_A_PIN && (chan + 1) < 3) {
if (temp != NOT_A_PIN && (chan == 255 || chan < 2)) { // (chan + 1) < 3 promoted to int, so chan = 255 could never take this path
volatile uint8_t* p;
p = (volatile uint8_t*) (uint16_t) (digitalPinToPortStruct(temp));
p += 0x18; // now p pointing to evgenctrl.
Expand Down
24 changes: 16 additions & 8 deletions megaavr/libraries/Flash/src/Flash.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,20 +405,28 @@ uint8_t FlashClass::writeWords(const uint32_t address, const uint16_t* data, uin

uint8_t FlashClass::writeBytes(const uint32_t address, const uint8_t* data, uint16_t length) {
uint32_t tAddress = address;
uint8_t status;
if(address & 0x01) {
status = writeByte(tAddress++, *(data));
uint8_t status = FLASHWRITE_OK;
if (length == 0) {
return FLASHWRITE_0LENGTH;
}
if (tAddress & 0x01) {
// Unaligned start: write the leading byte, then continue word-aligned.
status = writeByte(tAddress++, *data++);
if (status) return status;
length--;
}
if(length > 1) {
status = writeWords(tAddress, (uint16_t*) data, (length >> 1));
if (length > 1) {
// The bulk of the data, as whole words.
uint16_t words = length >> 1;
status = writeWords(tAddress, (uint16_t*) data, words);
if (status) return status;
tAddress += ((uint32_t) words) << 1;
data += words << 1;
length -= words << 1; // 0 or 1 byte left
}
// there may be one more byte...
if (length & 1) {
data += (length & 0xFFFE); // what we wrote with the word above...
status = writeByte(tAddress + length - 2, *data);
// And finally the trailing byte, if the length was odd.
status = writeByte(tAddress, *data);
}
return status;
}
Expand Down