Skip to content

Commit 2e90c25

Browse files
committed
Fix component build errors
1 parent b19eba6 commit 2e90c25

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ endfunction()
239239

240240
maybe_add_component(esp-dsp)
241241

242-
if(CONFIG_ESP_RMAKER_TASK_STACK)
242+
if(CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_STACK)
243243
maybe_add_component(esp_rainmaker)
244244
maybe_add_component(qrcode)
245245
endif()

libraries/SD_MMC/src/SD_MMC.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ bool SDMMCFS::setPins(int clk, int cmd, int d0, int d1, int d2, int d3)
6767
// ESP32 doesn't support SDMMC pin configuration via GPIO matrix.
6868
// Since SDMMCFS::begin hardcodes the usage of slot 1, only check if
6969
// the pins match slot 1 pins.
70-
bool pins_ok = (clk == SDMMC_SLOT1_IOMUX_PIN_NUM_CLK) &&
71-
(cmd == SDMMC_SLOT1_IOMUX_PIN_NUM_CMD) &&
72-
(d0 == SDMMC_SLOT1_IOMUX_PIN_NUM_D0) &&
73-
((d1 == d2 == d3 == -1) ||
74-
(d1 == SDMMC_SLOT1_IOMUX_PIN_NUM_D1) &&
75-
(d1 == SDMMC_SLOT1_IOMUX_PIN_NUM_D2) &&
76-
(d1 == SDMMC_SLOT1_IOMUX_PIN_NUM_D3));
70+
bool pins_ok = (clk == (int)SDMMC_SLOT1_IOMUX_PIN_NUM_CLK) &&
71+
(cmd == (int)SDMMC_SLOT1_IOMUX_PIN_NUM_CMD) &&
72+
(d0 == (int)SDMMC_SLOT1_IOMUX_PIN_NUM_D0) &&
73+
(((d1 == -1) && (d2 == -1) && (d3 == -1)) ||
74+
((d1 == (int)SDMMC_SLOT1_IOMUX_PIN_NUM_D1) &&
75+
(d1 == (int)SDMMC_SLOT1_IOMUX_PIN_NUM_D2) &&
76+
(d1 == (int)SDMMC_SLOT1_IOMUX_PIN_NUM_D3)));
7777
if (!pins_ok) {
7878
log_e("SDMMCFS: specified pins are not supported by this chip.");
7979
return false;

0 commit comments

Comments
 (0)