siwat
/
ESPMegaPRO-v3-SDK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change debouce logic

This commit is contained in:
Siwat Sirichai 2024-06-21 16:35:26 +07:00
parent b62ef700ed
commit d0ce4bf391
2 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/DigitalInputCard.cpp
View File

@ -137,25 +137,50 @@ void DigitalInputCard::handlePinChange(int pin, uint8_t &currentBuffer, uint8_t
// Handle Bank A // Handle Bank A
if (((previousBuffer >> (7 - pin)) & 1) != ((currentBuffer >> (7 - pin)) & 1)) if (((previousBuffer >> (7 - pin)) & 1) != ((currentBuffer >> (7 - pin)) & 1))
{ {
if (millis() - lastDebounceTime[pin] > debounceTime[pin]) if (!pinChanged[pin]) {
{
lastDebounceTime[pin] = millis(); lastDebounceTime[pin] = millis();
previousBuffer ^= (-((currentBuffer >> (7 - pin)) & 1) ^ previousBuffer) & (1UL << (7 - pin)); pinChanged[pin] = true;
for(const auto& callback : callbacks) } else {
callback.second(virtualPin, ((currentBuffer >> (7 - pin)) & 1)); if (millis() - lastDebounceTime[pin] > debounceTime[pin])
{
previousBuffer ^= (-((currentBuffer >> (7 - pin)) & 1) ^ previousBuffer) & (1UL << (7 - pin));
for (const auto& callback : callbacks)
callback.second(virtualPin, ((currentBuffer >> (7 - pin)) & 1));
pinChanged[pin] = false;
}
} }
} }
// Handle Bank B // Handle Bank B
if (((previousBuffer >> (15 - pin)) & 1) != ((currentBuffer >> (15 - pin)) & 1)) if (((previousBuffer >> (15 - pin)) & 1) != ((currentBuffer >> (15 - pin)) & 1))
{ {
if (millis() - lastDebounceTime[pin] > debounceTime[pin]) if (!pinChanged[pin]) {
{
lastDebounceTime[pin] = millis(); lastDebounceTime[pin] = millis();
previousBuffer ^= (-((currentBuffer >> (15 - pin)) & 1) ^ previousBuffer) & (1UL << (15 - pin)); pinChanged[pin] = true;
for (const auto& callback : callbacks) } else {
callback.second(virtualPin, ((currentBuffer >> (15 - pin)) & 1)); if (millis() - lastDebounceTime[pin] > debounceTime[pin])
{
previousBuffer ^= (-((currentBuffer >> (15 - pin)) & 1) ^ previousBuffer) & (1UL << (15 - pin));
for (const auto& callback : callbacks)
callback.second(virtualPin, ((currentBuffer >> (15 - pin)) & 1));
pinChanged[pin] = false;
}
} }
} }
// // Handle Bank B
// if (((previousBuffer >> (15 - pin)) & 1) != ((currentBuffer >> (15 - pin)) & 1))
// {
// if (millis() - lastDebounceTime[pin] > debounceTime[pin])
// {
// lastDebounceTime[pin] = millis();
// previousBuffer ^= (-((currentBuffer >> (15 - pin)) & 1) ^ previousBuffer) & (1UL << (15 - pin));
// for (const auto& callback : callbacks)
// callback.second(virtualPin, ((currentBuffer >> (15 - pin)) & 1));
// }
// }
} }
/** /**

1
ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/DigitalInputCard.hpp
View File

@ -54,6 +54,7 @@ class DigitalInputCard : public ExpansionCard {
uint8_t previousInputBufferB; uint8_t previousInputBufferB;
uint32_t debounceTime[16]; uint32_t debounceTime[16];
uint32_t lastDebounceTime[16]; uint32_t lastDebounceTime[16];
bool pinChanged[16];
// A map of the physical pin to the virtual pin // A map of the physical pin to the virtual pin
uint8_t pinMap[16]; uint8_t pinMap[16];
// A map of the virtual pin to the physical pin // A map of the virtual pin to the physical pin