kopia lustrzana https://github.com/pjalocha/esp32-ogn-tracker
Try SD card in simple SPI mode, doe snot work yet
rodzic
81fc30b83d
commit
c25c9c82a4
|
@ -30,8 +30,8 @@
|
|||
// #define WITH_GPS_NMEA_PASS // to pass directly NMEA to/from GPS
|
||||
|
||||
// #define WITH_BMP180 // BMP180 pressure sensor
|
||||
#define WITH_BMP280 // BMP280 pressure sensor
|
||||
// #define WITH_BME280 // BMP280 with humidity (but still works with BMP280)
|
||||
// #define WITH_BMP280 // BMP280 pressure sensor
|
||||
#define WITH_BME280 // BMP280 with humidity (but still works with BMP280)
|
||||
// #define WITH_MS5607 // MS5607 pressure sensor
|
||||
|
||||
#define WITH_PFLAA // PFLAU and PFLAA for compatibility with XCsoar and LK8000
|
||||
|
|
17
main/hal.cpp
17
main/hal.cpp
|
@ -211,6 +211,7 @@ GPIO HELTEC TTGO JACEK T-Beam FollowMe Restrictions
|
|||
#define PIN_RFM_MOSI GPIO_NUM_23 // SPI MOSI
|
||||
#endif // FollowMe
|
||||
|
||||
#define RFM_SPI_HOST VSPI_HOST // or HSPI_HOST
|
||||
#define RFM_SPI_SPEED 4000000 // [Hz] 4MHz SPI clock rate for RF chip
|
||||
|
||||
#if defined(WITH_HELTEC) || defined(WITH_TTGO)
|
||||
|
@ -275,6 +276,11 @@ uint8_t BARO_I2C = (uint8_t)I2C_BUS;
|
|||
#undef PIN_I2C_SDA
|
||||
#endif
|
||||
|
||||
#define PIN_SD_MISO GPIO_NUM_12 // SD card in simple SPI mode, using HSPI IOMUX pins
|
||||
#define PIN_SD_MOSI GPIO_NUM_13
|
||||
#define PIN_SD_SCK GPIO_NUM_14
|
||||
#define PIN_SD_CS GPIO_NUM_15
|
||||
|
||||
// ======================================================================================================
|
||||
// 48-bit unique ID of the chip
|
||||
|
||||
|
@ -777,7 +783,7 @@ static sdspi_slot_config_t SlotConfig;
|
|||
static esp_vfs_fat_sdmmc_mount_config_t MountConfig =
|
||||
{ .format_if_mount_failed = false,
|
||||
.max_files = 5,
|
||||
.allocation_unit_size = 16 * 1024 };
|
||||
/* .allocation_unit_size = 16 * 1024 */ };
|
||||
|
||||
sdmmc_card_t *SD_Card = 0;
|
||||
|
||||
|
@ -801,7 +807,8 @@ static esp_err_t SD_Init(void)
|
|||
SlotConfig.gpio_mosi = PIN_SD_MOSI;
|
||||
SlotConfig.gpio_sck = PIN_SD_SCK;
|
||||
SlotConfig.gpio_cs = PIN_SD_CS;
|
||||
return SD_Mount(); }
|
||||
SlotConfig.dma_channel = 2; // otherwise it conflicts with RFM SPI
|
||||
return SD_Mount(); } // ESP_OK => all good, ESP_FAIL => failed to mount file system, other => failed to init. the SD card
|
||||
|
||||
#endif // WITH_SD
|
||||
|
||||
|
@ -837,7 +844,7 @@ void LED_TimerCheck(uint8_t Ticks)
|
|||
else LED_TX_Off();
|
||||
LED_TX_Counter=Counter; }
|
||||
#endif
|
||||
#ifdef WITH_LED_TX
|
||||
#ifdef WITH_LED_RX
|
||||
Counter=LED_RX_Counter;
|
||||
if(Counter)
|
||||
{ if(Ticks<Counter) Counter-=Ticks;
|
||||
|
@ -929,8 +936,8 @@ void IO_Configuration(void)
|
|||
pre_cb : 0,
|
||||
post_cb : 0
|
||||
};
|
||||
esp_err_t ret=spi_bus_initialize(HSPI_HOST, &BusCfg, 1);
|
||||
ret=spi_bus_add_device(HSPI_HOST, &DevCfg, &RFM_SPI);
|
||||
esp_err_t ret=spi_bus_initialize(RFM_SPI_HOST, &BusCfg, 1);
|
||||
ret=spi_bus_add_device(RFM_SPI_HOST, &DevCfg, &RFM_SPI);
|
||||
|
||||
#ifdef PIN_GPS_PPS
|
||||
gpio_set_direction(PIN_GPS_PPS, GPIO_MODE_INPUT);
|
||||
|
|
24
sdkconfig
24
sdkconfig
|
@ -378,14 +378,6 @@ CONFIG_MEMMAP_TRACEMEM=
|
|||
CONFIG_MEMMAP_TRACEMEM_TWOBANKS=
|
||||
CONFIG_ESP32_TRAX=
|
||||
CONFIG_TRACEMEM_RESERVE_DRAM=0x0
|
||||
|
||||
#
|
||||
# Core dump
|
||||
#
|
||||
CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH=
|
||||
CONFIG_ESP32_ENABLE_COREDUMP_TO_UART=
|
||||
CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y
|
||||
CONFIG_ESP32_ENABLE_COREDUMP=
|
||||
CONFIG_TWO_UNIVERSAL_MAC_ADDRESS=
|
||||
CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y
|
||||
CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4
|
||||
|
@ -510,6 +502,19 @@ CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y
|
|||
CONFIG_HTTPD_MAX_REQ_HDR_LEN=512
|
||||
CONFIG_HTTPD_MAX_URI_LEN=512
|
||||
|
||||
#
|
||||
# ESP HTTPS OTA
|
||||
#
|
||||
CONFIG_OTA_ALLOW_HTTP=
|
||||
|
||||
#
|
||||
# Core dump
|
||||
#
|
||||
CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH=
|
||||
CONFIG_ESP32_ENABLE_COREDUMP_TO_UART=
|
||||
CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y
|
||||
CONFIG_ESP32_ENABLE_COREDUMP=
|
||||
|
||||
#
|
||||
# Ethernet
|
||||
#
|
||||
|
@ -821,9 +826,6 @@ CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread"
|
|||
CONFIG_SPI_FLASH_VERIFY_WRITE=
|
||||
CONFIG_SPI_FLASH_ENABLE_COUNTERS=
|
||||
CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y
|
||||
CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y
|
||||
CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_FAILS=
|
||||
CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ALLOWED=
|
||||
|
||||
#
|
||||
# SPIFFS Configuration
|
||||
|
|
Ładowanie…
Reference in New Issue