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
@@ -3,6 +3,7 @@
|
||||
#include "./Power.h"
|
||||
#include "./SdCard.h"
|
||||
#include "./i2c/I2c.h"
|
||||
#include "Tactility/hal/spi/Spi.h"
|
||||
|
||||
namespace tt::hal {
|
||||
|
||||
@@ -23,41 +24,26 @@ struct Configuration {
|
||||
*/
|
||||
const InitBoot _Nullable initBoot = nullptr;
|
||||
|
||||
/**
|
||||
* Called after I2C/SPI/etc is initialized.
|
||||
* This can be used to communicate with built-in peripherals such as an I2C keyboard.
|
||||
*/
|
||||
const InitHardware _Nullable initHardware = nullptr;
|
||||
|
||||
/**
|
||||
* Create and initialize all LVGL devices. (e.g. display, touch, keyboard)
|
||||
*/
|
||||
/** Create and initialize all LVGL devices. (e.g. display, touch, keyboard) */
|
||||
const InitLvgl _Nullable initLvgl = nullptr;
|
||||
|
||||
/**
|
||||
* Display HAL functionality.
|
||||
*/
|
||||
/** Display HAL functionality. */
|
||||
const CreateDisplay _Nullable createDisplay = nullptr;
|
||||
|
||||
/**
|
||||
* Display HAL functionality.
|
||||
*/
|
||||
/** Display HAL functionality. */
|
||||
const CreateKeyboard _Nullable createKeyboard = nullptr;
|
||||
|
||||
/**
|
||||
* An optional SD card interface.
|
||||
*/
|
||||
/** An optional SD card interface. */
|
||||
const std::shared_ptr<SdCard> _Nullable sdcard = nullptr;
|
||||
|
||||
/**
|
||||
* An optional power interface for battery or other power delivery.
|
||||
*/
|
||||
/** An optional power interface for battery or other power delivery. */
|
||||
const CreatePower _Nullable power = nullptr;
|
||||
|
||||
/**
|
||||
* A list of i2c interfaces
|
||||
*/
|
||||
/** A list of I2C interfaces */
|
||||
const std::vector<i2c::Configuration> i2c = {};
|
||||
|
||||
/** A list of SPI interfaces */
|
||||
const std::vector<spi::Configuration> spi = {};
|
||||
};
|
||||
|
||||
} // namespace
|
||||
|
||||
@@ -38,6 +38,7 @@ enum class Status {
|
||||
|
||||
bool init(const std::vector<i2c::Configuration>& configurations);
|
||||
|
||||
bool configure(i2c_port_t port, const i2c_config_t& configuration);
|
||||
bool start(i2c_port_t port);
|
||||
bool stop(i2c_port_t port);
|
||||
bool isStarted(i2c_port_t port);
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
#pragma once
|
||||
|
||||
#include "SpiCompat.h"
|
||||
|
||||
#include <Tactility/Lockable.h>
|
||||
#include <Tactility/RtosCompat.h>
|
||||
|
||||
#include <vector>
|
||||
#include <memory>
|
||||
|
||||
namespace tt::hal::spi {
|
||||
|
||||
enum class InitMode {
|
||||
ByTactility, // Tactility will initialize it in the correct bootup phase
|
||||
ByExternal, // The device is already initialized and Tactility should assume it works
|
||||
Disabled // Not initialized by default
|
||||
};
|
||||
|
||||
struct Configuration {
|
||||
spi_host_device_t device;
|
||||
spi_common_dma_t dma;
|
||||
spi_bus_config_t config;
|
||||
/** Whether this bus should be initialized when device starts up */
|
||||
InitMode initMode;
|
||||
/** Whether this bus can stopped and re-started. */
|
||||
bool canReinit;
|
||||
/** Whether configuration can be changed. */
|
||||
bool hasMutableConfiguration;
|
||||
/** Optional custom lock */
|
||||
std::shared_ptr<Lockable> _Nullable lock;
|
||||
};
|
||||
|
||||
enum class Status {
|
||||
Started,
|
||||
Stopped,
|
||||
Unknown
|
||||
};
|
||||
|
||||
bool init(const std::vector<spi::Configuration>& configurations);
|
||||
|
||||
bool start(spi_host_device_t device);
|
||||
bool stop(spi_host_device_t device);
|
||||
bool isStarted(spi_host_device_t device);
|
||||
|
||||
bool lock(spi_host_device_t device, TickType_t timeout = 10 / portTICK_PERIOD_MS);
|
||||
bool unlock(spi_host_device_t device);
|
||||
|
||||
} // namespace tt::hal::spi
|
||||
@@ -0,0 +1,58 @@
|
||||
#pragma once
|
||||
|
||||
#ifdef ESP_PLATFORM
|
||||
#include <driver/spi_common.h>
|
||||
#else
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
enum spi_host_device_t {
|
||||
SPI1_HOST = 0,
|
||||
SPI2_HOST = 1,
|
||||
SPI3_HOST = 2,
|
||||
SPI_HOST_MAX,
|
||||
};
|
||||
|
||||
enum spi_common_dma_t {
|
||||
SPI_DMA_DISABLED = 0, ///< No DMA
|
||||
SPI_DMA_CH1 = 1, ///< DMA, select DMA Channel 1
|
||||
SPI_DMA_CH2 = 2, ///< DMA, select DMA Channel 2
|
||||
SPI_DMA_CH_AUTO = 3, ///< DMA, channel selected by driver
|
||||
};
|
||||
|
||||
enum esp_intr_cpu_affinity_t {
|
||||
ESP_INTR_CPU_AFFINITY_AUTO,
|
||||
ESP_INTR_CPU_AFFINITY_0,
|
||||
ESP_INTR_CPU_AFFINITY_1,
|
||||
};
|
||||
|
||||
struct spi_bus_config_t {
|
||||
union {
|
||||
int mosi_io_num;
|
||||
int data0_io_num;
|
||||
};
|
||||
union {
|
||||
int miso_io_num;
|
||||
int data1_io_num;
|
||||
};
|
||||
int sclk_io_num;
|
||||
union {
|
||||
int quadwp_io_num;
|
||||
int data2_io_num;
|
||||
};
|
||||
union {
|
||||
int quadhd_io_num;
|
||||
int data3_io_num;
|
||||
};
|
||||
int data4_io_num;
|
||||
int data5_io_num;
|
||||
int data6_io_num;
|
||||
int data7_io_num;
|
||||
bool data_io_default_level;
|
||||
int max_transfer_sz;
|
||||
uint32_t flags;
|
||||
esp_intr_cpu_affinity_t isr_cpu_id;
|
||||
int intr_flags;
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -9,6 +9,8 @@ enum class SystemEvent {
|
||||
BootInitHalEnd,
|
||||
BootInitI2cBegin,
|
||||
BootInitI2cEnd,
|
||||
BootInitSpiBegin,
|
||||
BootInitSpiEnd,
|
||||
BootInitLvglBegin,
|
||||
BootInitLvglEnd,
|
||||
BootSplash,
|
||||
|
||||
Reference in New Issue
Block a user