mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'refactor/twai_example_default_gpio_change' into 'master' 

twai:modify default gpios in twai examples for esp32s3

See merge request espressif/esp-idf!14066
pull/7307/head
Michael (XIAO Xufeng) 2021-07-02 10:54:50 +00:00
rodzic 4a87be3ecd 21311ece58
commit 3a285635bc
8 zmienionych plików z 23 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
examples/peripherals/twai/twai_alert_and_recovery/README.md
Wyświetl plik

@ -25,7 +25,7 @@ idf.py menuconfig
* Under `Example Configuration`, configure the pin assignments using the options `TX GPIO Number` and `RX GPIO Number` according to how the target was connected to the transceiver. By default, `TX GPIO Number` and `RX GPIO Number` are set to the following values:
* On the ESP32, `TX GPIO Number` and `RX GPIO Number` default to `21` and `22` respectively
* On the ESP32-S2, `TX GPIO Number` and `RX GPIO Number` default to `20` and `21` respectively
* On the ESP32-S3, `TX GPIO Number` and `RX GPIO Number` default to `20` and `21` respectively
* On the ESP32-S3, `TX GPIO Number` and `RX GPIO Number` default to `4` and `5` respectively
* On the ESP32-C3, `TX GPIO Number` and `RX GPIO Number` default to `2` and `3` respectively
### Build and Flash

6
examples/peripherals/twai/twai_alert_and_recovery/main/Kconfig.projbuild
Wyświetl plik

@ -3,8 +3,9 @@ menu "Example Configuration"
config EXAMPLE_TX_GPIO_NUM
int "TX GPIO number"
default 2 if IDF_TARGET_ESP32C3
default 20 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
default 20 if IDF_TARGET_ESP32S2
default 21 if IDF_TARGET_ESP32
default 4 if IDF_TARGET_ESP32S3
help
This option selects the GPIO pin used for the TX signal. Connect the
TX signal to your transceiver.
@ -12,8 +13,9 @@ menu "Example Configuration"
config EXAMPLE_RX_GPIO_NUM
int "RX GPIO number"
default 3 if IDF_TARGET_ESP32C3
default 21 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
default 21 if IDF_TARGET_ESP32S2
default 22 if IDF_TARGET_ESP32
default 5 if IDF_TARGET_ESP32S3
help
This option selects the GPIO pin used for the RX signal. Connect the
RX signal to your transceiver.

2
examples/peripherals/twai/twai_network/README.md
Wyświetl plik

@ -55,7 +55,7 @@ idf.py menuconfig
* Under `Example Configuration`, configure the pin assignments using the options `TX GPIO Number` and `RX GPIO Number` according to how the target was connected to the transceiver. By default, `TX GPIO Number` and `RX GPIO Number` are set to the following values:
* On the ESP32, `TX GPIO Number` and `RX GPIO Number` default to `21` and `22` respectively
* On the ESP32-S2, `TX GPIO Number` and `RX GPIO Number` default to `20` and `21` respectively
* On the ESP32-S3, `TX GPIO Number` and `RX GPIO Number` default to `20` and `21` respectively
* On the ESP32-S3, `TX GPIO Number` and `RX GPIO Number` default to `4` and `5` respectively
* On the ESP32-C3, `TX GPIO Number` and `RX GPIO Number` default to `2` and `3` respectively

6
examples/peripherals/twai/twai_network/twai_network_listen_only/main/Kconfig.projbuild
Wyświetl plik

@ -3,8 +3,9 @@ menu "Example Configuration"
config EXAMPLE_TX_GPIO_NUM
int "TX GPIO number"
default 2 if IDF_TARGET_ESP32C3
default 20 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
default 20 if IDF_TARGET_ESP32S2
default 21 if IDF_TARGET_ESP32
default 4 if IDF_TARGET_ESP32S3
help
This option selects the GPIO pin used for the TX signal. Connect the
TX signal to your transceiver.
@ -12,8 +13,9 @@ menu "Example Configuration"
config EXAMPLE_RX_GPIO_NUM
int "RX GPIO number"
default 3 if IDF_TARGET_ESP32C3
default 21 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
default 21 if IDF_TARGET_ESP32S2
default 22 if IDF_TARGET_ESP32
default 5 if IDF_TARGET_ESP32S3
help
This option selects the GPIO pin used for the RX signal. Connect the
RX signal to your transceiver.

6
examples/peripherals/twai/twai_network/twai_network_master/main/Kconfig.projbuild
Wyświetl plik

@ -3,8 +3,9 @@ menu "Example Configuration"
config EXAMPLE_TX_GPIO_NUM
int "TX GPIO number"
default 2 if IDF_TARGET_ESP32C3
default 20 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
default 20 if IDF_TARGET_ESP32S2
default 21 if IDF_TARGET_ESP32
default 4 if IDF_TARGET_ESP32S3
help
This option selects the GPIO pin used for the TX signal. Connect the
TX signal to your transceiver.
@ -12,8 +13,9 @@ menu "Example Configuration"
config EXAMPLE_RX_GPIO_NUM
int "RX GPIO number"
default 3 if IDF_TARGET_ESP32C3
default 21 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
default 21 if IDF_TARGET_ESP32S2
default 22 if IDF_TARGET_ESP32
default 5 if IDF_TARGET_ESP32S3
help
This option selects the GPIO pin used for the RX signal. Connect the
RX signal to your transceiver.

6
examples/peripherals/twai/twai_network/twai_network_slave/main/Kconfig.projbuild
Wyświetl plik

@ -3,8 +3,9 @@ menu "Example Configuration"
config EXAMPLE_TX_GPIO_NUM
int "TX GPIO number"
default 2 if IDF_TARGET_ESP32C3
default 20 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
default 20 if IDF_TARGET_ESP32S2
default 21 if IDF_TARGET_ESP32
default 4 if IDF_TARGET_ESP32S3
help
This option selects the GPIO pin used for the TX signal. Connect the
TX signal to your transceiver.
@ -12,8 +13,9 @@ menu "Example Configuration"
config EXAMPLE_RX_GPIO_NUM
int "RX GPIO number"
default 3 if IDF_TARGET_ESP32C3
default 21 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
default 21 if IDF_TARGET_ESP32S2
default 22 if IDF_TARGET_ESP32
default 5 if IDF_TARGET_ESP32S3
help
This option selects the GPIO pin used for the RX signal. Connect the
RX signal to your transceiver.

2
examples/peripherals/twai/twai_self_test/README.md
Wyświetl plik

@ -25,7 +25,7 @@ idf.py menuconfig
* Under `Example Configuration`, configure the pin assignments using the options `TX GPIO Number` and `RX GPIO Number` according to how the target was connected to the transceiver. By default, `TX GPIO Number` and `RX GPIO Number` are set to the following values:
* On the ESP32, `TX GPIO Number` and `RX GPIO Number` default to `21` and `22` respectively
* On the ESP32-S2, `TX GPIO Number` and `RX GPIO Number` default to `20` and `21` respectively
* On the ESP32-S3, `TX GPIO Number` and `RX GPIO Number` default to `20` and `21` respectively
* On the ESP32-S3, `TX GPIO Number` and `RX GPIO Number` default to `4` and `5` respectively
* On the ESP32-C3, `TX GPIO Number` and `RX GPIO Number` default to `2` and `3` respectively
### Build and Flash

6
examples/peripherals/twai/twai_self_test/main/Kconfig.projbuild
Wyświetl plik

@ -3,8 +3,9 @@ menu "Example Configuration"
config EXAMPLE_TX_GPIO_NUM
int "TX GPIO number"
default 2 if IDF_TARGET_ESP32C3
default 20 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
default 20 if IDF_TARGET_ESP32S2
default 21 if IDF_TARGET_ESP32
default 4 if IDF_TARGET_ESP32S3
help
This option selects the GPIO pin used for the TX signal. Connect the
TX signal to your transceiver.
@ -12,8 +13,9 @@ menu "Example Configuration"
config EXAMPLE_RX_GPIO_NUM
int "RX GPIO number"
default 3 if IDF_TARGET_ESP32C3
default 21 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
default 21 if IDF_TARGET_ESP32S2
default 22 if IDF_TARGET_ESP32
default 5 if IDF_TARGET_ESP32S3
help
This option selects the GPIO pin used for the RX signal. Connect the
RX signal to your transceiver.