SPI HAL implemented and more (#207)
- Cleanup unused code and move ISR/IRQ checks to `Kernel.h` - Improve clang-format - Fix for LVGL lock transfer: ensure lock isn't activate when changing the lock - Implement SPI HAL - Remove `initHardware` HAL configuration entry - Fix `I2cScanner`: don't scan when port isn't started
This commit is contained in:
committed by
GitHub
parent
88b3bfbe3e
commit
c1f55429b6
@@ -1,47 +0,0 @@
|
||||
#include "hal/UnPhoneDisplayConstants.h"
|
||||
#include "hx8357/disp_spi.h"
|
||||
#include <Tactility/TactilityCore.h>
|
||||
#include <driver/spi_common.h>
|
||||
#include <soc/gpio_num.h>
|
||||
#include <lvgl.h>
|
||||
|
||||
#define TAG "unphone"
|
||||
|
||||
// SPI
|
||||
#define UNPHONE_SPI_HOST SPI2_HOST
|
||||
#define UNPHONE_SPI_PIN_SCLK GPIO_NUM_39
|
||||
#define UNPHONE_SPI_PIN_MOSI GPIO_NUM_40
|
||||
#define UNPHONE_SPI_PIN_MISO GPIO_NUM_41
|
||||
#define UNPHONE_SPI_TRANSFER_SIZE_LIMIT (UNPHONE_LCD_HORIZONTAL_RESOLUTION * UNPHONE_LCD_SPI_TRANSFER_HEIGHT * LV_COLOR_DEPTH / 8)
|
||||
|
||||
static bool initSpi() {
|
||||
TT_LOG_I(TAG, LOG_MESSAGE_SPI_INIT_START_FMT, UNPHONE_SPI_HOST);
|
||||
|
||||
spi_bus_config_t bus_config = {
|
||||
.mosi_io_num = UNPHONE_SPI_PIN_MOSI,
|
||||
.miso_io_num = UNPHONE_SPI_PIN_MISO,
|
||||
.sclk_io_num = UNPHONE_SPI_PIN_SCLK,
|
||||
.quadwp_io_num = -1, // Quad SPI LCD driver is not yet supported
|
||||
.quadhd_io_num = -1, // Quad SPI LCD driver is not yet supported
|
||||
.data4_io_num = 0,
|
||||
.data5_io_num = 0,
|
||||
.data6_io_num = 0,
|
||||
.data7_io_num = 0,
|
||||
.data_io_default_level = false,
|
||||
.max_transfer_sz = UNPHONE_SPI_TRANSFER_SIZE_LIMIT,
|
||||
.flags = 0,
|
||||
.isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
|
||||
.intr_flags = 0
|
||||
};
|
||||
|
||||
if (spi_bus_initialize(UNPHONE_SPI_HOST, &bus_config, SPI_DMA_CH_AUTO) != ESP_OK) {
|
||||
TT_LOG_E(TAG, LOG_MESSAGE_SPI_INIT_FAILED_FMT, UNPHONE_SPI_HOST);
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool unPhoneInitHardware() {
|
||||
return initSpi();
|
||||
}
|
||||
@@ -1,5 +1,3 @@
|
||||
#include "hal/UnPhoneDisplay.h"
|
||||
|
||||
#include <Tactility/Log.h>
|
||||
#include <Tactility/Thread.h>
|
||||
#include <Tactility/lvgl/LvglSync.h>
|
||||
|
||||
@@ -1,16 +1,18 @@
|
||||
#include "Tactility/lvgl/LvglSync.h"
|
||||
#include "UnPhoneFeatures.h"
|
||||
#include "hal/UnPhoneDisplayConstants.h"
|
||||
#include "hal/UnPhoneDisplay.h"
|
||||
#include "hal/UnPhonePower.h"
|
||||
#include "hal/UnPhoneSdCard.h"
|
||||
#include <Tactility/hal/Configuration.h>
|
||||
|
||||
#define UNPHONE_SPI_TRANSFER_SIZE_LIMIT (UNPHONE_LCD_HORIZONTAL_RESOLUTION * UNPHONE_LCD_SPI_TRANSFER_HEIGHT * LV_COLOR_DEPTH / 8)
|
||||
|
||||
bool unPhoneInitPower();
|
||||
bool unPhoneInitHardware();
|
||||
bool unPhoneInitLvgl();
|
||||
|
||||
extern const tt::hal::Configuration unPhone = {
|
||||
.initBoot = unPhoneInitPower,
|
||||
.initHardware = unPhoneInitHardware,
|
||||
.initLvgl = unPhoneInitLvgl,
|
||||
.createDisplay = createDisplay,
|
||||
.sdcard = createUnPhoneSdCard(),
|
||||
@@ -52,5 +54,31 @@ extern const tt::hal::Configuration unPhone = {
|
||||
.clk_flags = 0
|
||||
}
|
||||
}
|
||||
},
|
||||
.spi {
|
||||
tt::hal::spi::Configuration {
|
||||
.device = SPI2_HOST,
|
||||
.dma = SPI_DMA_CH_AUTO,
|
||||
.config = {
|
||||
.mosi_io_num = GPIO_NUM_40,
|
||||
.miso_io_num = GPIO_NUM_41,
|
||||
.sclk_io_num = GPIO_NUM_39,
|
||||
.quadwp_io_num = -1, // Quad SPI LCD driver is not yet supported
|
||||
.quadhd_io_num = -1, // Quad SPI LCD driver is not yet supported
|
||||
.data4_io_num = 0,
|
||||
.data5_io_num = 0,
|
||||
.data6_io_num = 0,
|
||||
.data7_io_num = 0,
|
||||
.data_io_default_level = false,
|
||||
.max_transfer_sz = UNPHONE_SPI_TRANSFER_SIZE_LIMIT,
|
||||
.flags = 0,
|
||||
.isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
|
||||
.intr_flags = 0
|
||||
},
|
||||
.initMode = tt::hal::spi::InitMode::ByTactility,
|
||||
.canReinit = false,
|
||||
.hasMutableConfiguration = false,
|
||||
.lock = tt::lvgl::getLvglSyncLockable() // esp_lvgl_port owns the lock for the display
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user