espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 13:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/spi_master_rx_bug' into 'master'

Browse Source 
examples/spi_master: Fixed SPI read (keeping CS active) in SPI master example

Closes IDFGH-7034

See merge request espressif/esp-idf!17606
This commit is contained in:
morris
2022-03-29 22:51:24 +08:00
parent 51f438628a 29792561ca
commit 204432191d
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
examples/peripherals/spi_master/lcd/main/spi_master_example_main.c
View File

@@ -184,7 +184,7 @@ DRAM_ATTR static const lcd_init_cmd_t ili_init_cmds[]={
* mode for higher speed. The overhead of interrupt transactions is more than * mode for higher speed. The overhead of interrupt transactions is more than
* just waiting for the transaction to complete. * just waiting for the transaction to complete.
*/ */
void lcd_cmd(spi_device_handle_t spi, const uint8_t cmd) void lcd_cmd(spi_device_handle_t spi, const uint8_t cmd, bool keep_cs_active)
{ {
esp_err_t ret; esp_err_t ret;
spi_transaction_t t; spi_transaction_t t;
@@ -192,6 +192,9 @@ void lcd_cmd(spi_device_handle_t spi, const uint8_t cmd)
t.length=8; //Command is 8 bits t.length=8; //Command is 8 bits
t.tx_buffer=&cmd; //The data is the cmd itself t.tx_buffer=&cmd; //The data is the cmd itself
t.user=(void*)0; //D/C needs to be set to 0 t.user=(void*)0; //D/C needs to be set to 0
if (keep_cs_active) {
t.flags = SPI_TRANS_CS_KEEP_ACTIVE; //Keep CS active after data transfer
}
ret=spi_device_polling_transmit(spi, &t); //Transmit! ret=spi_device_polling_transmit(spi, &t); //Transmit!
assert(ret==ESP_OK); //Should have had no issues. assert(ret==ESP_OK); //Should have had no issues.
} }
@@ -226,8 +229,11 @@ void lcd_spi_pre_transfer_callback(spi_transaction_t *t)
uint32_t lcd_get_id(spi_device_handle_t spi) uint32_t lcd_get_id(spi_device_handle_t spi)
{ {
// When using SPI_TRANS_CS_KEEP_ACTIVE, bus must be locked/acquired
spi_device_acquire_bus(spi, portMAX_DELAY);
//get_id cmd //get_id cmd
lcd_cmd(spi, 0x04); lcd_cmd(spi, 0x04, true);
spi_transaction_t t; spi_transaction_t t;
memset(&t, 0, sizeof(t)); memset(&t, 0, sizeof(t));
@@ -238,6 +244,9 @@ uint32_t lcd_get_id(spi_device_handle_t spi)
esp_err_t ret = spi_device_polling_transmit(spi, &t); esp_err_t ret = spi_device_polling_transmit(spi, &t);
assert( ret == ESP_OK ); assert( ret == ESP_OK );
// Release bus
spi_device_release_bus(spi);
return *(uint32_t*)t.rx_data; return *(uint32_t*)t.rx_data;
} }
@@ -293,7 +302,7 @@ void lcd_init(spi_device_handle_t spi)
//Send all the commands //Send all the commands
while (lcd_init_cmds[cmd].databytes!=0xff) { while (lcd_init_cmds[cmd].databytes!=0xff) {
lcd_cmd(spi, lcd_init_cmds[cmd].cmd); lcd_cmd(spi, lcd_init_cmds[cmd].cmd, false);
lcd_data(spi, lcd_init_cmds[cmd].data, lcd_init_cmds[cmd].databytes&0x1F); lcd_data(spi, lcd_init_cmds[cmd].data, lcd_init_cmds[cmd].databytes&0x1F);
if (lcd_init_cmds[cmd].databytes&0x80) { if (lcd_init_cmds[cmd].databytes&0x80) {
vTaskDelay(100 / portTICK_PERIOD_MS); vTaskDelay(100 / portTICK_PERIOD_MS);