RTC-GPIO pin calculation incorrect #822
Conversation
components/esp32/deep_sleep.c: Modifying esp_deep_sleep_get_ext1_wakeup_status so it calculates the GPIO pins from RTC pins correctly. Previously the function composed the return value incorrectly, e.g. when the returned RTC pin was Pin 0.
|
|
components/esp32/deep_sleep.c
Outdated
| if (!RTC_GPIO_IS_VALID_GPIO(gpio)) { | ||
| continue; | ||
| } | ||
| int rtc_pin = rtc_gpio_desc[gpio].rtc_num; | ||
| if ((status & BIT(rtc_pin)) == 0) { | ||
| continue; | ||
| } | ||
| gpio_mask |= BIT(gpio); |
There was a problem hiding this comment.
Would it be sufficient to replace this line with gpio_mask |= 1ULL << gpio; to fix the issue with GPIOs higher than 32?
There was a problem hiding this comment.
Hello,
According to my understanding the gpio_mask should show that which PIN caused the wakeup, with setting a relevant bit to 1. E.g.: the interrupt comes through GPIO Pin3, then gpio_mask (the return value) should look like: 0x0000000000001000, because 4th bit from the right (LSB) is associated with GPIO Pin 3. However with the current solution, the gpio_mask would look like the following: 0x0000000000001100. Is this the value the function should return ? If yes then sorry, I misunderstood the concept.
Even if I misunderstood the interpretation of the gpio_mask, a problem still exists with GPIO Pin 0: gpio_mask would be 0, even the interrupt has came through Pin 0, or even no interrupt came at all.
Cheers,
Geza
There was a problem hiding this comment.
Why? If gpio = 0, BIT(0) = 1, and gpio_mask = 1. Are you sure you aren't misunderstanding the macro BIT? The patch does not seem like it would work. Igrr's suggestion seems right to fix gpio >= 32.
There was a problem hiding this comment.
Yes, you are right, sorry I did not check what BIT() does when I replied to the first comment.
Actually my change exactly does the same what Igrr suggests just with an extra, unnecessary variable.
So in summary: I agree that the only change is necessary is which proposed by Igrr.
|
The requested change is done, new commit is pushed. |
|
Thanks @husigeza . I've squashed this commit and cherry-picked into our review & merge queue. |
|
Cherry-picked, thanks! |
components/esp32/deep_sleep.c: Modifying esp_deep_sleep_get_ext1_wakeup_status so it calculates the GPIO pins from RTC pins correctly. Previously the function composed the return value incorrectly, e.g. when the returned RTC pin was Pin 0.