From 559f4ce69f96ae95cd8559471418742fb3cbf126 Mon Sep 17 00:00:00 2001 From: Philippe G Date: Wed, 1 Dec 2021 09:30:34 -0800 Subject: [PATCH] SPI can only be HSPI + remove unused defines in globdefs --- components/services/accessors.c | 3 ++- components/services/globdefs.h | 8 -------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/components/services/accessors.c b/components/services/accessors.c index d81c65d4..2ddb1fea 100644 --- a/components/services/accessors.c +++ b/components/services/accessors.c @@ -606,7 +606,8 @@ const spi_bus_config_t * config_spi_get(spi_host_device_t * spi_host) { if ((p = strcasestr(nvs_item, "miso")) != NULL) spi.miso_io_num = atoi(strchr(p, '=') + 1); if ((p = strcasestr(nvs_item, "clk")) != NULL) spi.sclk_io_num = atoi(strchr(p, '=') + 1); if ((p = strcasestr(nvs_item, "dc")) != NULL) spi_system_dc_gpio = atoi(strchr(p, '=') + 1); - if ((p = strcasestr(nvs_item, "host")) != NULL) spi_system_host = atoi(strchr(p, '=') + 1); + // 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); } if(spi_host) *spi_host = spi_system_host; diff --git a/components/services/globdefs.h b/components/services/globdefs.h index 8b5139a5..db66a875 100644 --- a/components/services/globdefs.h +++ b/components/services/globdefs.h @@ -21,11 +21,3 @@ typedef struct { int timer, base_channel, max; } pwm_system_t; extern pwm_system_t pwm_system; - -#ifdef CONFIG_SQUEEZEAMP -#define ADAC dac_tas57xx -#elif defined(CONFIG_A1S) -#define ADAC dac_a1s -#else -#define ADAC dac_external -#endif