Improve CYD-4848 SPI corectness (does not fix SD card issue)

This commit is contained in:
Ken Van Hoeylandt 2025-09-20 14:04:15 +02:00
parent a4d15b2a1e
commit 2ea2a3a752
2 changed files with 11 additions and 6 deletions

View File

@ -1,4 +1,7 @@
#include "CYD4848S040C.h" #include "CYD4848S040C.h"
#include "Tactility/kernel/SystemEvents.h"
#include "Tactility/lvgl/LvglSync.h"
#include "devices/St7701Display.h" #include "devices/St7701Display.h"
#include "devices/SdCard.h" #include "devices/SdCard.h"
@ -12,7 +15,7 @@ static bool initBoot() {
static DeviceVector createDevices() { static DeviceVector createDevices() {
return { return {
std::reinterpret_pointer_cast<Device>(std::make_shared<St7701Display>()), std::make_shared<St7701Display>(),
createSdCard() createSdCard()
}; };
} }
@ -59,7 +62,7 @@ const Configuration cyd_4848s040c_config = {
} }
}, },
.spi { .spi {
//SD Card // SD Card & display init
spi::Configuration { spi::Configuration {
.device = SPI2_HOST, .device = SPI2_HOST,
.dma = SPI_DMA_CH_AUTO, .dma = SPI_DMA_CH_AUTO,
@ -68,20 +71,20 @@ const Configuration cyd_4848s040c_config = {
.miso_io_num = GPIO_NUM_41, .miso_io_num = GPIO_NUM_41,
.sclk_io_num = GPIO_NUM_48, .sclk_io_num = GPIO_NUM_48,
.quadwp_io_num = -1, .quadwp_io_num = -1,
.quadhd_io_num = -1, .quadhd_io_num = GPIO_NUM_42,
.data4_io_num = -1, .data4_io_num = -1,
.data5_io_num = -1, .data5_io_num = -1,
.data6_io_num = -1, .data6_io_num = -1,
.data7_io_num = -1, .data7_io_num = -1,
.data_io_default_level = false, .data_io_default_level = false,
.max_transfer_sz = 8192, .max_transfer_sz = 1024 * 128,
.flags = 0, .flags = 0,
.isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO, .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
.intr_flags = 0 .intr_flags = 0
}, },
.initMode = spi::InitMode::ByTactility, .initMode = spi::InitMode::ByTactility,
.isMutable = false, .isMutable = false,
.lock = nullptr .lock = tt::lvgl::getSyncLock()
} }
} }
}; };

View File

@ -11,7 +11,9 @@ std::shared_ptr<SdCardDevice> createSdCard() {
GPIO_NUM_NC, GPIO_NUM_NC,
GPIO_NUM_NC, GPIO_NUM_NC,
GPIO_NUM_NC, GPIO_NUM_NC,
SdCardDevice::MountBehaviour::AtBoot SdCardDevice::MountBehaviour::AtBoot,
tt::lvgl::getSyncLock(),
std::vector { GPIO_NUM_39 }
); );
auto sdcard = std::make_shared<SpiSdCardDevice>( auto sdcard = std::make_shared<SpiSdCardDevice>(