Merge branch 'examples/remove_c2_build_disable_yml_v5.0' into 'release/v5.0'

example: remove build disable rules of spi_xxx example for c2 in build-test-rules.yml (v5.0)

See merge request espressif/esp-idf!20594
This commit is contained in:
morris
2022-11-03 10:07:57 +08:00
8 changed files with 30 additions and 64 deletions

View File

@@ -128,48 +128,12 @@ examples/peripherals/sigma_delta:
disable: disable:
- if: SOC_SDM_SUPPORTED != 1 - if: SOC_SDM_SUPPORTED != 1
examples/peripherals/spi_master/hd_eeprom:
disable:
- if: IDF_TARGET == "esp32c2"
temporary: true
reason: target esp32c2 is not supported yet
examples/peripherals/spi_master/lcd:
enable:
- if: IDF_TARGET in ["esp32", "esp32c3", "esp32s2"]
temporary: true
reason: the other targets are not tested yet
examples/peripherals/spi_slave/receiver:
disable:
- if: IDF_TARGET == "esp32c2"
temporary: true
reason: target esp32c2 is not supported yet
examples/peripherals/spi_slave/sender:
disable:
- if: IDF_TARGET == "esp32c2"
temporary: true
reason: target esp32c2 is not supported yet
examples/peripherals/spi_slave_hd/append_mode/master:
disable:
- if: IDF_TARGET == "esp32c2"
temporary: true
reason: target esp32c2 is not supported yet
examples/peripherals/spi_slave_hd/append_mode/slave: examples/peripherals/spi_slave_hd/append_mode/slave:
enable: enable:
- if: IDF_TARGET == "esp32s2" - if: IDF_TARGET == "esp32s2"
temporary: true temporary: true
reason: the other targets are not tested yet reason: the other targets are not tested yet
examples/peripherals/spi_slave_hd/segment_mode/seg_master:
disable:
- if: IDF_TARGET == "esp32c2"
temporary: true
reason: target esp32c2 is not supported yet
examples/peripherals/spi_slave_hd/segment_mode/seg_slave: examples/peripherals/spi_slave_hd/segment_mode/seg_slave:
disable: disable:
- if: IDF_TARGET == "esp32" - if: IDF_TARGET == "esp32"

View File

@@ -1,5 +1,5 @@
| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | | Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 |
| ----------------- | ----- | -------- | -------- | -------- | | ----------------- | ----- | -------- | -------- | -------- | -------- |
## SPI master half duplex EEPROM example ## SPI master half duplex EEPROM example
@@ -11,16 +11,16 @@
For different chip and host used, the connections may be different. For different chip and host used, the connections may be different.
| | ESP32 | ESP32 | ESP32S2 | ESP32C3 | ESP32S3 | | | ESP32 | ESP32 | ESP32S2 | ESP32C2 | ESP32C3 | ESP32S3 |
| ---- | ----- | ----- | ------- | ------- | ------- | | ---- | ----- | ----- | ------- | ------- | ------- | ------- |
| Host | SPI1 | HSPI | FSPI | SPI2 | SPI2 | | Host | SPI1 | HSPI | SPI2 | SPI2 | SPI2 | SPI2 |
| VCC | 3.3V | 3.3V | 3.3V | 3.3V | 3.3V | | VCC | 3.3V | 3.3V | 3.3V | 3.3V | 3.3V | 3.3V |
| GND | GND | GND | GND | GND | GND | | GND | GND | GND | GND | GND | GND | GND |
| DO | 7 | 18 | 37 | 2 | 13 | | DO | 7 | 18 | 37 | 2 | 2 | 13 |
| DI | 8 | 23 | 35 | 7 | 11 | | DI | 8 | 23 | 35 | 7 | 7 | 11 |
| SK | 6 | 19 | 36 | 6 | 12 | | SK | 6 | 19 | 36 | 6 | 6 | 12 |
| CS | 13 | 13 | 34 | 10 | 10 | | CS | 13 | 13 | 34 | 10 | 10 | 10 |
| ORG | GND | GND | GND | GND | GND | | ORG | GND | GND | GND | GND | GND | GND |
### Notes ### Notes

View File

@@ -45,7 +45,7 @@
# define PIN_NUM_MOSI 35 # define PIN_NUM_MOSI 35
# define PIN_NUM_CLK 36 # define PIN_NUM_CLK 36
# define PIN_NUM_CS 34 # define PIN_NUM_CS 34
#elif defined CONFIG_IDF_TARGET_ESP32C3 #elif defined CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C2
# define EEPROM_HOST SPI2_HOST # define EEPROM_HOST SPI2_HOST
# define PIN_NUM_MISO 2 # define PIN_NUM_MISO 2

View File

@@ -1,5 +1,5 @@
| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | | Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 |
| ----------------- | ----- | -------- | -------- | | ----------------- | ----- | -------- | -------- | -------- | -------- |
# SPI Host Driver Example # SPI Host Driver Example

View File

@@ -40,18 +40,18 @@
#define PIN_NUM_DC 21 #define PIN_NUM_DC 21
#define PIN_NUM_RST 18 #define PIN_NUM_RST 18
#define PIN_NUM_BCKL 5 #define PIN_NUM_BCKL 5
#elif defined CONFIG_IDF_TARGET_ESP32S2 #elif defined CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
#define LCD_HOST SPI2_HOST #define LCD_HOST SPI2_HOST
#define PIN_NUM_MISO 37 #define PIN_NUM_MISO 37
#define PIN_NUM_MOSI 35 #define PIN_NUM_MOSI 35
#define PIN_NUM_CLK 36 #define PIN_NUM_CLK 36
#define PIN_NUM_CS 34 #define PIN_NUM_CS 45
#define PIN_NUM_DC 4 #define PIN_NUM_DC 4
#define PIN_NUM_RST 5 #define PIN_NUM_RST 5
#define PIN_NUM_BCKL 6 #define PIN_NUM_BCKL 6
#elif defined CONFIG_IDF_TARGET_ESP32C3 #elif defined CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C2
#define LCD_HOST SPI2_HOST #define LCD_HOST SPI2_HOST
#define PIN_NUM_MISO 2 #define PIN_NUM_MISO 2
@@ -258,9 +258,11 @@ void lcd_init(spi_device_handle_t spi)
const lcd_init_cmd_t* lcd_init_cmds; const lcd_init_cmd_t* lcd_init_cmds;
//Initialize non-SPI GPIOs //Initialize non-SPI GPIOs
gpio_set_direction(PIN_NUM_DC, GPIO_MODE_OUTPUT); gpio_config_t io_conf = {};
gpio_set_direction(PIN_NUM_RST, GPIO_MODE_OUTPUT); io_conf.pin_bit_mask = ((1ULL<<PIN_NUM_DC) | (1ULL<<PIN_NUM_RST) | (1ULL<<PIN_NUM_BCKL));
gpio_set_direction(PIN_NUM_BCKL, GPIO_MODE_OUTPUT); io_conf.mode = GPIO_MODE_OUTPUT;
io_conf.pull_up_en = true;
gpio_config(&io_conf);
//Reset the display //Reset the display
gpio_set_level(PIN_NUM_RST, 0); gpio_set_level(PIN_NUM_RST, 0);

View File

@@ -1,5 +1,5 @@
| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | | Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 |
| ----------------- | ----- | -------- | -------- | -------- | | ----------------- | ----- | -------- | -------- | -------- | -------- |
## SPI slave example ## SPI slave example

View File

@@ -1,4 +1,4 @@
| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | | Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 |
| ----------------- | ----- | -------- | -------- | -------- | | ----------------- | ----- | -------- | -------- | -------- | -------- |
See README.md in the parent directory See README.md in the parent directory

View File

@@ -1,4 +1,4 @@
| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | | Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-S2 | ESP32-S3 |
| ----------------- | ----- | -------- | -------- | -------- | | ----------------- | ----- | -------- | -------- | -------- | -------- |
See README.md in the parent directory See README.md in the parent directory