Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2025-12-06 11:36:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Validate MCP23S17 + typos correction

Browse Source
This commit is contained in:
Philippe G
2021-12-10 12:10:26 -08:00
parent a59e1d9e54
commit af48710e31
2 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/services/accessors.c
View File

@@ -507,7 +507,7 @@ const gpio_exp_config_t* config_gpio_exp_get(int index) {
}
PARSE_PARAM(item, "addr", '=', config.phy.addr);
PARSE_PARAM(item, "cs_pin", '=', config.phy.cs_pin);
PARSE_PARAM(item, "cs", '=', config.phy.cs_pin);
PARSE_PARAM(item, "speed", '=', config.phy.speed);
PARSE_PARAM(item, "intr", '=', config.intr);
PARSE_PARAM(item, "base", '=', config.base);
@@ -617,7 +617,7 @@ const spi_bus_config_t * config_spi_get(spi_host_device_t * spi_host) {
PARSE_PARAM(nvs_item, "mosi", '=', spi.mosi_io_num);
PARSE_PARAM(nvs_item, "miso", '=', spi.miso_io_num);
PARSE_PARAM(nvs_item, "clk", '=', spi.sclk_io_num);
PARSE_PARAM(nvs_item, "dd", '=', spi_system_dc_gpio);
PARSE_PARAM(nvs_item, "dc", '=', spi_system_dc_gpio);
// only VSPI (1) can be used as Flash and PSRAM run at 80MHz
// if ((p = strcasestr(nvs_item, "host")) != NULL) spi_system_host = atoi(strchr(p, '=') + 1);
free(nvs_item);

45
components/services/gpio_exp.c
View File

@@ -161,18 +161,23 @@ gpio_exp_t* gpio_exp_create(const gpio_exp_config_t *config) {
// well... try again
if (!expander->model) {
ESP_LOGE(TAG,"Unknown GPIO expansion chip %s", config->model);
ESP_LOGE(TAG, "Unknown GPIO expansion chip %s", config->model);
return NULL;
}
memcpy(&expander->phy, &config->phy, sizeof(struct gpio_exp_phy_s));
// try to initialize the expander if required
if (expander->model->init && expander->model->init(expander) != ESP_OK) {
ESP_LOGE(TAG, "Cannot create GPIO expander %s, check i2c/spi configuration", config->model);
return NULL;
}
n_expanders++;
expander->first = config->base;
expander->last = config->base + config->count - 1;
expander->mutex = xSemaphoreCreateMutex();
memcpy(&expander->phy, &config->phy, sizeof(struct gpio_exp_phy_s));
if (expander->model->init) expander->model->init(expander);
// create a task to handle asynchronous requests (only write at this time)
if (!message_queue) {
// we allocate TCB but stack is static to avoid SPIRAM fragmentation
@@ -207,7 +212,7 @@ gpio_exp_t* gpio_exp_create(const gpio_exp_config_t *config) {
gpio_intr_enable(config->intr);
}
ESP_LOGI(TAG, "Create GPIO expander %s at base %u with INT %u at @%x on port %d", config->model, config->base, config->intr, config->phy.addr, config->phy.port);
ESP_LOGI(TAG, "Create GPIO expander %s at base %u with INT %u at @%x on port/host %d/%d", config->model, config->base, config->intr, config->phy.addr, config->phy.port, config->phy.host);
return expander;
}
@@ -550,7 +555,7 @@ static void mcp23017_write(gpio_exp_t* self) {
* MCP23s17 family : init, direction, read and write
*/
static esp_err_t mcp23s17_init(gpio_exp_t* self) {
self->spi_handle = spi_config(&self->phy);
if ((self->spi_handle = spi_config(&self->phy)) == NULL) return ESP_ERR_INVALID_ARG;
/*
0111 x10x = same bank, mirrot single int, no sequentµial, open drain, active low
@@ -655,15 +660,9 @@ static uint32_t i2c_read(uint8_t port, uint8_t addr, uint8_t reg, int len) {
* SPI device addition
*/
static spi_device_handle_t spi_config(struct gpio_exp_phy_s *phy) {
spi_device_interface_config_t config;
spi_device_interface_config_t config = { };
spi_device_handle_t handle = NULL;
// initialize ChipSelect (CS)
gpio_set_direction(phy->cs_pin, GPIO_MODE_OUTPUT );
gpio_set_level(phy->cs_pin, 0 );
memset( &config, 0, sizeof( spi_device_interface_config_t ) );
config.command_bits = config.address_bits = 8;
config.clock_speed_hz = phy->speed ? phy->speed : SPI_MASTER_FREQ_8M;
config.spics_io_num = phy->cs_pin;
@@ -671,6 +670,7 @@ static spi_device_handle_t spi_config(struct gpio_exp_phy_s *phy) {
config.flags = SPI_DEVICE_NO_DUMMY;
spi_bus_add_device( phy->host, &config, &handle );
ESP_LOGI(TAG, "SPI expander initialized on host:%d with cs:%d and speed:%dHz", phy->host, phy->cs_pin, config.clock_speed_hz);
return handle;
}
@@ -685,7 +685,7 @@ static esp_err_t spi_write(spi_device_handle_t handle, uint8_t addr, uint8_t reg
transaction.flags = SPI_TRANS_USE_TXDATA;
transaction.cmd = addr << 1;
transaction.addr = reg;
transaction.tx_data[1] = data; transaction.tx_data[2] = data >> 8;
transaction.tx_data[0] = data; transaction.tx_data[1] = data >> 8;
transaction.length = len * 8;
// only do polling as we don't have contention on SPI (otherwise DMA for transfers > 16 bytes)
@@ -696,15 +696,18 @@ static esp_err_t spi_write(spi_device_handle_t handle, uint8_t addr, uint8_t reg
* SPI read up to 32 bits
*/
static uint32_t spi_read(spi_device_handle_t handle, uint8_t addr, uint8_t reg, int len) {
spi_transaction_t transaction = { };
spi_transaction_t *transaction = heap_caps_calloc(1, sizeof(spi_transaction_t), MALLOC_CAP_DMA);
// tx_buffer is NULL, nothing to transmit except cmd/addr
transaction.flags = SPI_TRANS_USE_RXDATA;
transaction.cmd = (addr << 1) | 1;
transaction.addr = reg;
transaction.length = len * 8;
transaction->flags = SPI_TRANS_USE_RXDATA;
transaction->cmd = (addr << 1) | 0x01;
transaction->addr = reg;
transaction->length = len * 8;
// only do polling as we don't have contention on SPI (otherwise DMA for transfers > 16 bytes)
spi_device_polling_transmit(handle, &transaction);
return *(uint32_t*) transaction.rx_data;
spi_device_polling_transmit(handle, transaction);
uint32_t data = *(uint32_t*) transaction->rx_data;
free(transaction);
return data;
}