AP_HAL_ESP32: replace HAVE_FILESYSTEM_SUPPORT with backend defines

This commit is contained in:
Peter Barker 2023-05-15 11:44:22 +10:00 committed by Peter Barker
parent 30131a2f36
commit 86db236647
5 changed files with 2 additions and 9 deletions

View File

@ -171,7 +171,7 @@
#define HAL_ESP32_UART_DEVICES \ #define HAL_ESP32_UART_DEVICES \
{.port=UART_NUM_0, .rx=GPIO_NUM_3, .tx=GPIO_NUM_1 },{.port=UART_NUM_1, .rx=GPIO_NUM_16, .tx=GPIO_NUM_17 } {.port=UART_NUM_0, .rx=GPIO_NUM_3, .tx=GPIO_NUM_1 },{.port=UART_NUM_1, .rx=GPIO_NUM_16, .tx=GPIO_NUM_17 }
#define HAVE_FILESYSTEM_SUPPORT 1 #define AP_FILESYSTEM_ESP32_ENABLED 1
// Do u want to use mmc or spi mode for the sd card, this is board specific , // Do u want to use mmc or spi mode for the sd card, this is board specific ,
// as mmc uses specific pins but is quicker, // as mmc uses specific pins but is quicker,
@ -184,7 +184,6 @@
#define HAL_BOARD_LOG_DIRECTORY "/SDCARD/APM/LOGS" #define HAL_BOARD_LOG_DIRECTORY "/SDCARD/APM/LOGS"
#define HAL_BOARD_TERRAIN_DIRECTORY "/SDCARD/APM/TERRAIN" #define HAL_BOARD_TERRAIN_DIRECTORY "/SDCARD/APM/TERRAIN"
#define HAL_BOARD_STORAGE_DIRECTORY "/SDCARD/APM/STORAGE" #define HAL_BOARD_STORAGE_DIRECTORY "/SDCARD/APM/STORAGE"
#define HAL_OS_POSIX_IO 1
// this becomes the default value for the ardupilot param LOG_BACKEND_TYPE, which most ppl want to be 1, for log-to-flash // this becomes the default value for the ardupilot param LOG_BACKEND_TYPE, which most ppl want to be 1, for log-to-flash
// setting to 2 means log-over-mavlink to a companion computer etc. // setting to 2 means log-over-mavlink to a companion computer etc.

View File

@ -93,13 +93,12 @@
{.port=UART_NUM_1, .rx=GPIO_NUM_39, .tx=GPIO_NUM_33 },\ {.port=UART_NUM_1, .rx=GPIO_NUM_39, .tx=GPIO_NUM_33 },\
{.port=UART_NUM_2, .rx=GPIO_NUM_34, .tx=GPIO_NUM_25 } {.port=UART_NUM_2, .rx=GPIO_NUM_34, .tx=GPIO_NUM_25 }
#define HAVE_FILESYSTEM_SUPPORT 1 #define AP_FILESYSTEM_ESP32_ENABLED 1
#define HAL_ESP32_SDCARD 1 #define HAL_ESP32_SDCARD 1
#define LOGGER_MAVLINK_SUPPORT 1 #define LOGGER_MAVLINK_SUPPORT 1
#define HAL_BOARD_LOG_DIRECTORY "/SDCARD/APM/LOGS" #define HAL_BOARD_LOG_DIRECTORY "/SDCARD/APM/LOGS"
#define HAL_BOARD_TERRAIN_DIRECTORY "/SDCARD/APM/TERRAIN" #define HAL_BOARD_TERRAIN_DIRECTORY "/SDCARD/APM/TERRAIN"
#define HAL_BOARD_STORAGE_DIRECTORY "/SDCARD/APM/STORAGE" #define HAL_BOARD_STORAGE_DIRECTORY "/SDCARD/APM/STORAGE"
#define HAL_OS_POSIX_IO 1
#define HAL_LOGGING_BACKENDS_DEFAULT 2 #define HAL_LOGGING_BACKENDS_DEFAULT 2

View File

@ -117,8 +117,6 @@
//#define HAL_ESP32_SDMMC //#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_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_LOGGING_FILESYSTEM_ENABLED 0 #define HAL_LOGGING_FILESYSTEM_ENABLED 0
#define HAL_LOGGING_DATAFLASH_ENABLED 0 #define HAL_LOGGING_DATAFLASH_ENABLED 0
#define HAL_LOGGING_MAVLINK_ENABLED 0 #define HAL_LOGGING_MAVLINK_ENABLED 0

View File

@ -29,7 +29,6 @@
#define HAL_ESP32_SDCARD //after enabled, uncomment one of below #define HAL_ESP32_SDCARD //after enabled, uncomment one of below
#define HAL_ESP32_SDMMC #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_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_LOG_DIRECTORY "/SDCARD/APM/LOGS"
#define HAL_BOARD_STORAGE_DIRECTORY "/SDCARD/APM/STORAGE" #define HAL_BOARD_STORAGE_DIRECTORY "/SDCARD/APM/STORAGE"
#define HAL_BOARD_TERRAIN_DIRECTORY "/SDCARD/APM/TERRAIN" #define HAL_BOARD_TERRAIN_DIRECTORY "/SDCARD/APM/TERRAIN"

View File

@ -124,8 +124,6 @@
#define HAL_ESP32_SDCARD 1 #define HAL_ESP32_SDCARD 1
#define HAL_ESP32_SDSPI {.host=HSPI_HOST, .dma_ch=1, .mosi=GPIO_NUM_13, .miso=GPIO_NUM_12, .sclk=GPIO_NUM_14, .cs=GPIO_NUM_15} #define HAL_ESP32_SDSPI {.host=HSPI_HOST, .dma_ch=1, .mosi=GPIO_NUM_13, .miso=GPIO_NUM_12, .sclk=GPIO_NUM_14, .cs=GPIO_NUM_15}
#define HAL_OS_POSIX_IO 1
#define HAL_LOGGING_FILESYSTEM_ENABLED 1 #define HAL_LOGGING_FILESYSTEM_ENABLED 1
#define HAL_LOGGING_DATAFLASH_ENABLED 0 #define HAL_LOGGING_DATAFLASH_ENABLED 0
#define HAL_LOGGING_MAVLINK_ENABLED 0 #define HAL_LOGGING_MAVLINK_ENABLED 0