Skip to content
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.

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

Fix compile error #330

Merged
merged 1 commit into from
Dec 17, 2018
Merged
Changes from all commits
Commits
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 lib/rc-switch/RCSwitch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,7 @@ void RECEIVE_ATTR RCSwitch::handleInterrupt() {
}

// заносим в массив длительность очередного принятого импульса
if (changeCount > 0 & duration < 100) { // игнорируем шумовые всплески менее 100 мкс
if (changeCount > 0 && duration < 100) { // игнорируем шумовые всплески менее 100 мкс
RCSwitch::timings[changeCount-1] += duration;
} else {
RCSwitch::timings[changeCount++] = duration;
Expand Down Expand Up @@ -945,4 +945,4 @@ unsigned long Keeloq::ReflectPack(unsigned long PackSrc) {
PackSrc = PackSrc >> 1;
}
return PackOut;
}
}