Skip to content

fixing millis rollover bug x2 #196

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

Merged
merged 4 commits into from
Nov 29, 2023
Merged

fixing millis rollover bug x2 #196

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c7071f
fixing millis rollover bug x2
delta-G Nov 27, 2023
d118e9c
Update libraries/Wire/Wire.cpp
delta-G Nov 28, 2023
8944a64
Fixes https://github.com/arduino/ArduinoCore-renesas/issues/195
delta-G Nov 28, 2023
d7e4606
Fix: use const-correctness everywhere.
aentinger Nov 29, 2023
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
8 changes: 4 additions & 4 deletions libraries/Wire/Wire.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,8 +477,8 @@ uint8_t TwoWire::read_from(uint8_t address, uint8_t* data, uint8_t length, unsig
err = m_read(&m_i2c_ctrl,data,length,!sendStop);
}
}
timeout_ms = millis() + timeout_ms;
while(millis() < timeout_ms && bus_status == WIRE_STATUS_UNSET && err == FSP_SUCCESS) {
uint32_t startMillis = millis();
while(((millis() - startMillis) < timeout_ms) && bus_status == WIRE_STATUS_UNSET && err == FSP_SUCCESS) {

}
}
Expand All @@ -505,8 +505,8 @@ uint8_t TwoWire::write_to(uint8_t address, uint8_t* data, uint8_t length, unsign
err = m_write(&m_i2c_ctrl,data,length,!sendStop);
}
}
timeout_ms = millis() + timeout_ms;
while(millis() < timeout_ms && bus_status == WIRE_STATUS_UNSET && err == FSP_SUCCESS) {
uint32_t startMillis = millis();
while(((millis() - startMillis) < timeout_ms) && bus_status == WIRE_STATUS_UNSET && err == FSP_SUCCESS) {

}

Expand Down