adafruit-mirror/arduino-esp32
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix component build errors

Browse source
This commit is contained in:
me-no-dev 2022-03-18 13:29:28 +02:00
parent b19eba670f
commit 2e90c25f7d
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -239,7 +239,7 @@ endfunction()
maybe_add_component(esp-dsp)
if(CONFIG_ESP_RMAKER_TASK_STACK)
if(CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_STACK)
maybe_add_component(esp_rainmaker)
maybe_add_component(qrcode)
endif()

14
libraries/SD_MMC/src/SD_MMC.cpp
View file

@ -67,13 +67,13 @@ bool SDMMCFS::setPins(int clk, int cmd, int d0, int d1, int d2, int d3)
// ESP32 doesn't support SDMMC pin configuration via GPIO matrix.
// Since SDMMCFS::begin hardcodes the usage of slot 1, only check if
// the pins match slot 1 pins.
bool pins_ok = (clk == SDMMC_SLOT1_IOMUX_PIN_NUM_CLK) &&
(cmd == SDMMC_SLOT1_IOMUX_PIN_NUM_CMD) &&
(d0 == SDMMC_SLOT1_IOMUX_PIN_NUM_D0) &&
((d1 == d2 == d3 == -1) ||
(d1 == SDMMC_SLOT1_IOMUX_PIN_NUM_D1) &&
(d1 == SDMMC_SLOT1_IOMUX_PIN_NUM_D2) &&
(d1 == SDMMC_SLOT1_IOMUX_PIN_NUM_D3));
bool pins_ok = (clk == (int)SDMMC_SLOT1_IOMUX_PIN_NUM_CLK) &&
(cmd == (int)SDMMC_SLOT1_IOMUX_PIN_NUM_CMD) &&
(d0 == (int)SDMMC_SLOT1_IOMUX_PIN_NUM_D0) &&
(((d1 == -1) && (d2 == -1) && (d3 == -1)) ||
((d1 == (int)SDMMC_SLOT1_IOMUX_PIN_NUM_D1) &&
(d1 == (int)SDMMC_SLOT1_IOMUX_PIN_NUM_D2) &&
(d1 == (int)SDMMC_SLOT1_IOMUX_PIN_NUM_D3)));
if (!pins_ok) {
log_e("SDMMCFS: specified pins are not supported by this chip.");
return false;