Set MATRIX_DETACH_* values based on TRM #8345
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
The constants that need to be passed to gpio_matrix_in and gpio_matrix_out to detach an input or output pin from a peripheral vary by platform. Use SIG_GPIO_OUT_IDX to detach an output, and GPIO_MATRIX_CONST_ONE_INPUT and GPIO_MATRIX_CONST_ZERO_INPUT to detach an input. ESP32 before IDF 4.0 didn't define GPIO_MATRIX_CONST_*_INPUT, so add compatibility #defines for GPIO_FUNC_IN_LOW/HIGH. GPIO_FUNC_IN_LOW/HIGH exist in IDF 4.0+, but can't be used because they have the wrong values for ESP32-C3 at least in IDF 4.4.3 (espressif/esp-idf#11737).
colincross
force-pushed
the
esp32c3_gpio_matrix_out
branch
from
8ecdb4c to
5591c29
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of Change
The MATRIX_DETACH_* values vary by platform, which is not documented in the gpio_matrix_out or gpio_matrix_in functions (espressif/esp-idf#11737). Use the SDK macros that contain the correct values for all platforms.
Tests scenarios
Tested on an Adafruit Qt Py ESP32-C3 board.
Tested
pinMatrixInDetachby usingpinMatrixInAttachto connect an input pin to thecpu_gpio_in0signal, then usepinMatrixInDetachwith low and high values and verified that they propagated tocpu_gpio_in0read with the CSRR instruction on CSR 0x804.Tested
pinMatrixOutDetachon an output pin and verified that it was still driven.Without this patch both tests fail.
Tested with ESP-IDF 4.4.3 and arduino-esp32 72c41d0.
Related links
espressif/esp-idf#11737