From 90cc4087e8764b91307f07f46a03b955049e83b7 Mon Sep 17 00:00:00 2001 From: Wiktor Maslowski Date: Tue, 29 Nov 2022 21:19:05 +0100 Subject: [PATCH] AP_HAL_ESP32: fix build esp32icarus --- libraries/AP_HAL_ESP32/boards/esp32icarus.h | 10 ++++++++-- libraries/AP_HAL_ESP32/hwdef/esp32icarus/hwdef.dat | 0 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 libraries/AP_HAL_ESP32/hwdef/esp32icarus/hwdef.dat diff --git a/libraries/AP_HAL_ESP32/boards/esp32icarus.h b/libraries/AP_HAL_ESP32/boards/esp32icarus.h index d5aaa70ffd..7a5c5b4f1f 100644 --- a/libraries/AP_HAL_ESP32/boards/esp32icarus.h +++ b/libraries/AP_HAL_ESP32/boards/esp32icarus.h @@ -14,8 +14,9 @@ */ #pragma once -#define HAL_INS_DEFAULT HAL_INS_MPU60XX_SPI +#define HAL_INS_DEFAULT AP_FEATURE_BOARD_DETECT #define HAL_INS_MPU60x0_NAME "MPU6000" +#define TRUE 1 #define HAL_BARO_DEFAULT HAL_BARO_BMP280_I2C #define HAL_BARO_BMP280_BUS 0 @@ -23,9 +24,12 @@ #define ALLOW_ARM_NO_COMPASS -#define HAL_ESP32_SDCARD 1 +#define HAL_ESP32_SDCARD //after enabled, uncomment one of below +#define HAL_ESP32_SDMMC +//#define HAL_ESP32_SDSPI {.host=VSPI_HOST, .dma_ch=2, .mosi=GPIO_NUM_2, .miso=GPIO_NUM_15, .sclk=GPIO_NUM_26, .cs=GPIO_NUM_21} #define HAL_OS_POSIX_IO 1 #define HAL_BOARD_LOG_DIRECTORY "/SDCARD/APM/LOGS" +#define HAL_BOARD_STORAGE_DIRECTORY "/SDCARD/APM/STORAGE" #define HAL_BOARD_TERRAIN_DIRECTORY "/SDCARD/APM/TERRAIN" #define HAL_ESP32_WIFI 1 @@ -50,3 +54,5 @@ {.port=UART_NUM_1, .rx=GPIO_NUM_34, .tx=GPIO_NUM_32},\ {.port=UART_NUM_2, .rx=GPIO_NUM_35, .tx=GPIO_NUM_33} +#define HAL_DISABLE_ADC_DRIVER 1 +#define HAL_USE_ADC 0 diff --git a/libraries/AP_HAL_ESP32/hwdef/esp32icarus/hwdef.dat b/libraries/AP_HAL_ESP32/hwdef/esp32icarus/hwdef.dat new file mode 100644 index 0000000000..e69de29bb2