Skip to content

Handle micros() overflow every 70 minutes #58

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

Handle micros() overflow every 70 minutes #58

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd8925d
Prevent micros overflow after 70 minutes
mwalliczek Apr 7, 2021
59110c0
adapt formatting
mwalliczek Apr 7, 2021
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
45 changes: 25 additions & 20 deletions src/ESPiLight.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,29 +231,32 @@ void ICACHE_RAM_ATTR ESPiLight::interruptHandler() {

if (pulseTrain.length == 0) {
const unsigned long now = micros();
const unsigned int duration = now - _lastChange;

/* We first do some filtering (same as pilight BPF) */
if (duration > minpulselen) {
if (duration < maxpulselen) {
/* All codes are buffered */
codes[_nrpulses] = (uint16_t)duration;
_nrpulses = (uint8_t)((_nrpulses + 1) % MAXPULSESTREAMLENGTH);
/* Let's match footers */
if (duration > mingaplen) {
// Debug('g');
/* Only match minimal length pulse streams */
if (_nrpulses >= minrawlen && _nrpulses <= maxrawlen) {
// Debug(_nrpulses);
// Debug('l');
pulseTrain.length = _nrpulses;
_actualPulseTrain = (_actualPulseTrain + 1) % RECEIVER_BUFFER_SIZE;
if (now > _lastChange) { // prevent overflow after 70 minutes
const unsigned long duration = now - _lastChange;

/* We first do some filtering (same as pilight BPF) */
if (duration > minpulselen) {
if (duration < maxpulselen) {
/* All codes are buffered */
codes[_nrpulses] = (uint16_t)duration;
_nrpulses = (uint8_t)((_nrpulses + 1) % MAXPULSESTREAMLENGTH);
/* Let's match footers */
if (duration > mingaplen) {
// Debug('g');
/* Only match minimal length pulse streams */
if (_nrpulses >= minrawlen && _nrpulses <= maxrawlen) {
// Debug(_nrpulses);
// Debug('l');
pulseTrain.length = _nrpulses;
_actualPulseTrain =
(_actualPulseTrain + 1) % RECEIVER_BUFFER_SIZE;
}
_nrpulses = 0;
}
_nrpulses = 0;
}
}
_lastChange = now;
}
_lastChange = now;
} else {
Debug("_!_");
}
Expand Down Expand Up @@ -399,7 +402,8 @@ size_t ESPiLight::parsePulseTrain(uint16_t *pulses, uint8_t length) {
}

/* Reset # of repeats after a certain delay */
if ((protocol->second - protocol->first) > 500000) {
if (protocol->second < protocol->first ||
(protocol->second - protocol->first) > 500000) {
protocol->repeats = 0;
}

Expand All @@ -417,6 +421,7 @@ size_t ESPiLight::parsePulseTrain(uint16_t *pulses, uint8_t length) {
}
}
pnode = pnode->next;
yield();
}
if (_rawCallback != nullptr) {
(_rawCallback)(pulses, length);
Expand Down