dominic/Tactility
1
0
Fork 0
mirror of https://github.com/ByteWelder/Tactility.git synced 2026-02-18 19:03:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

M5stack CoreS3 support (#71)

Browse Source
This commit is contained in:
Ken Van Hoeylandt 2024-11-07 23:17:26 +01:00 committed by GitHub
parent 68aa34ad14
commit 67b9fc710a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
30 changed files with 355 additions and 334 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.github/workflows/esp.yml vendored
View File

@ -61,3 +61,18 @@ jobs:
esp_idf_version: v5.2.3
target: esp32
path: './'
build-m5stack-cores3:
runs-on: ubuntu-latest
steps:
- name: checkout repo
uses: actions/checkout@v2
with:
submodules: recursive
- name: board select
run: cp sdkconfig.board.m5stack_cores3 sdkconfig
- name: build
uses: espressif/esp-idf-ci-action@main
with:
esp_idf_version: v5.2.3
target: esp32s3
path: './'

1
CMakeLists.txt
View File

@ -28,6 +28,7 @@ if (DEFINED ENV{ESP_IDF_VERSION})
if(NOT "${IDF_TARGET}" STREQUAL "esp32")
set(EXCLUDE_COMPONENTS "yellow_board_2432s024")
set(EXCLUDE_COMPONENTS "m5stack_core2")
set(EXCLUDE_COMPONENTS "m5stack_cores3")
endif()
# ESP32-S3 boards

1
README.md
View File

@ -76,6 +76,7 @@ Predefined configurations are available for:
| Device | Screen&Touch | SD card | Power | Other |
|------------------------------------------|--------------|---------|-------|----------|
| [M5Stack Core2][m5stack] | ✅ | ✅ | ✅ | |
| [M5Stack CoreS3][m5stack] | ✅ | ✅ | ✅ | |
| [LilyGo T-Deck][tdeck] | ✅ | ✅ | | Keyboard |
| [Waveshare S3 Touch][waveshare_s3_touch] | ✅ | ⏳ | | |
| Yellow Board 2432S024C (\*) | ✅ | ✅ | | |

1
app-esp/CMakeLists.txt
View File

@ -13,6 +13,7 @@ endif()
if("${IDF_TARGET}" STREQUAL "esp32s3")
list(APPEND BOARD_COMPONENTS
lilygo_tdeck
m5stack_cores3
waveshare_s3_touch
)
endif()

2
app-esp/Kconfig
View File

@ -12,6 +12,8 @@ menu "Tactility App"
bool "LilyGo T-Deck"
config TT_BOARD_M5STACK_CORE2
bool "M5Stack Core2"
config TT_BOARD_M5STACK_CORES3
bool "M5Stack CoreS3"
config TT_BOARD_WAVESHARE_S3_TOUCH
bool "Waveshare S3 Touch LCD 4.3\""
endchoice

3
app-esp/src/board_config.h
View File

@ -12,6 +12,9 @@
#elif defined(CONFIG_TT_BOARD_M5STACK_CORE2)
#include "m5stack_core2.h"
#define TT_BOARD_HARDWARE &m5stack_core2
#elif defined(CONFIG_TT_BOARD_M5STACK_CORES3)
#include "m5stack_cores3.h"
#define TT_BOARD_HARDWARE &m5stack_cores3
#elif defined(CONFIG_TT_BOARD_WAVESHARE_S3_TOUCH)
#include "waveshare_s3_touch.h"
#define TT_BOARD_HARDWARE &waveshare_s3_touch

2
boards/m5stack_core2/CMakeLists.txt
View File

@ -2,5 +2,5 @@ idf_component_register(
SRC_DIRS "source"
INCLUDE_DIRS "include"
PRIV_INCLUDE_DIRS "private"
REQUIRES tactility esp_lvgl_port esp_lcd_ili9341 driver vfs fatfs M5Unified
REQUIRES tactility m5stack_shared vfs fatfs M5Unified
)

11
boards/m5stack_core2/private/bootstrap.h
View File

@ -1,11 +0,0 @@
#pragma once
#ifdef __cplusplus
extern "C" {
#endif
bool core2_bootstrap();
#ifdef __cplusplus
}
#endif

24
boards/m5stack_core2/private/config.h
View File

@ -1,32 +1,8 @@
#pragma once
#include "driver/spi_common.h"
#include "driver/i2c.h"
#include "driver/gpio.h"
// I2C
#define CORE2_I2C_PIN_SDA 21
#define CORE2_I2C_PIN_SCL 22
// SPI2 - Display, SD
#define CORE2_SPI2_PIN_SCLK GPIO_NUM_18
#define CORE2_SPI2_PIN_MOSI GPIO_NUM_23
#define CORE2_SPI2_PIN_MISO GPIO_NUM_38
#define CORE2_SPI2_TRANSACTION_LIMIT CORE2_LCD_DRAW_BUFFER_SIZE
// Display
#define CORE2_LCD_SPI_HOST SPI2_HOST
#define CORE2_LCD_HORIZONTAL_RESOLUTION 320
#define CORE2_LCD_VERTICAL_RESOLUTION 240
#define CORE2_LCD_BITS_PER_PIXEL 16
#define CORE2_LCD_DRAW_BUFFER_HEIGHT (CORE2_LCD_VERTICAL_RESOLUTION / 10)
#define CORE2_LCD_DRAW_BUFFER_SIZE (CORE2_LCD_HORIZONTAL_RESOLUTION * CORE2_LCD_DRAW_BUFFER_HEIGHT * (CORE2_LCD_BITS_PER_PIXEL / 8))
#define CORE2_LCD_PIN_CS GPIO_NUM_5
#define CORE2_LCD_PIN_DC GPIO_NUM_15
// Touch
#define CORE2_TOUCH_I2C_PORT I2C_NUM_0
// SD Card
#define CORE2_SDCARD_SPI_HOST SPI2_HOST
#define CORE2_SDCARD_PIN_CS GPIO_NUM_4

15
boards/m5stack_core2/private/display_i.hpp
View File

@ -1,15 +0,0 @@
#pragma once
#include <stdbool.h>
#include <stdint.h>
#include "lvgl.h"
#ifdef __cplusplus
extern "C" {
#endif
lv_disp_t* core2_display_init();
#ifdef __cplusplus
}
#endif

13
boards/m5stack_core2/private/lvgl_i.h
View File

@ -1,13 +0,0 @@
#pragma once
#include <stdbool.h>
#ifdef __cplusplus
extern "C" {
#endif
bool core2_lvgl_init();
#ifdef __cplusplus
}
#endif

11
boards/m5stack_core2/private/touch_i.hpp
View File

@ -1,11 +0,0 @@
#pragma once
#ifdef __cplusplus
extern "C" {
#endif
bool core2_touch_init();
#ifdef __cplusplus
}
#endif

105
boards/m5stack_core2/source/bootstrap.cpp
View File

@ -1,105 +0,0 @@
#include "bootstrap.h"
#include "M5Unified.hpp"
#include "config.h"
#include "log.h"
m5::IMU_Class& Imu = M5.Imu;
m5::Power_Class& Power = M5.Power;
m5::RTC8563_Class& Rtc = M5.Rtc;
m5::Touch_Class& Touch = M5.Touch;
m5::Speaker_Class& Speaker = M5.Speaker;
m5::Button_Class& BtnPWR = M5.BtnPWR;
#ifdef __cplusplus
extern "C" {
#endif
#define TAG "core2_bootstrap"
static bool init_i2c() {
const i2c_config_t i2c_conf = {
.mode = I2C_MODE_MASTER,
.sda_io_num = CORE2_I2C_PIN_SDA,
.scl_io_num = CORE2_I2C_PIN_SCL,
.sda_pullup_en = GPIO_PULLUP_DISABLE,
.scl_pullup_en = GPIO_PULLUP_DISABLE,
.master = {
.clk_speed = 100000
},
.clk_flags = 0
};
if (i2c_param_config(CORE2_TOUCH_I2C_PORT, &i2c_conf) != ESP_OK) {
TT_LOG_E(TAG, "i2c config failed");
return false;
}
if (i2c_driver_install(CORE2_TOUCH_I2C_PORT, i2c_conf.mode, 0, 0, 0) != ESP_OK) {
TT_LOG_E(TAG, "i2c driver install failed");
return false;
}
return true;
}
static bool init_spi2() {
const spi_bus_config_t bus_config = {
.mosi_io_num = CORE2_SPI2_PIN_MOSI,
.miso_io_num = CORE2_SPI2_PIN_MISO,
.sclk_io_num = CORE2_SPI2_PIN_SCLK,
.data2_io_num = GPIO_NUM_NC,
.data3_io_num = GPIO_NUM_NC,
.data4_io_num = GPIO_NUM_NC,
.data5_io_num = GPIO_NUM_NC,
.data6_io_num = GPIO_NUM_NC,
.data7_io_num = GPIO_NUM_NC,
.max_transfer_sz = CORE2_SPI2_TRANSACTION_LIMIT,
.flags = 0,
.isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
.intr_flags = 0
};
if (spi_bus_initialize(SPI2_HOST, &bus_config, SPI_DMA_CH_AUTO) != ESP_OK) {
TT_LOG_E(TAG, "SPI bus init failed");
return false;
}
return true;
}
static void log_power_status() {
TT_LOG_I(
TAG,
"Battery: level = %ld, voltage = %.1f, charging = %s",
M5.Power.getBatteryLevel(),
(float)M5.Power.getBatteryVoltage() / 1000.0f,
M5.Power.isCharging() ? "true" : "false"
);
}
bool core2_bootstrap() {
TT_LOG_I(TAG, "Initializing M5Unified");
M5.begin();
// For models with EPD : refresh control
M5.Display.setEpdMode(epd_mode_t::epd_fastest); // fastest but very-low quality.
log_power_status();
TT_LOG_I(TAG, "Initializing I2C");
if (!init_i2c()) {
return false;
}
TT_LOG_I(TAG, "Initializing SPI");
if (!init_spi2()) {
return false;
}
return true;
}
#ifdef __cplusplus
}
#endif

98
boards/m5stack_core2/source/display.cpp
View File

@ -1,98 +0,0 @@
#include "config.h"
#include "tactility_core.h"
#include "esp_err.h"
#include "esp_lcd_ili9341.h"
#include "esp_lcd_panel_io.h"
#include "esp_lcd_panel_ops.h"
#include "esp_lvgl_port.h"
#define TAG "core2"
#ifdef __cplusplus
extern "C" {
#endif
lv_disp_t* core2_display_init() {
TT_LOG_I(TAG, "Display init");
const esp_lcd_panel_io_spi_config_t panel_io_config = ILI9341_PANEL_IO_SPI_CONFIG(
CORE2_LCD_PIN_CS,
CORE2_LCD_PIN_DC,
nullptr,
nullptr
);
esp_lcd_panel_io_handle_t io_handle;
if (esp_lcd_new_panel_io_spi((esp_lcd_spi_bus_handle_t)CORE2_LCD_SPI_HOST, &panel_io_config, &io_handle) != ESP_OK) {
TT_LOG_E(TAG, "Failed to create panel");
return nullptr;
}
const esp_lcd_panel_dev_config_t panel_config = {
.reset_gpio_num = GPIO_NUM_NC,
.rgb_ele_order = LCD_RGB_ELEMENT_ORDER_BGR,
.data_endian = LCD_RGB_DATA_ENDIAN_BIG,
.bits_per_pixel = CORE2_LCD_BITS_PER_PIXEL,
.flags = {
.reset_active_high = false
},
.vendor_config = nullptr
};
esp_lcd_panel_handle_t panel_handle;
if (esp_lcd_new_panel_ili9341(io_handle, &panel_config, &panel_handle) != ESP_OK) {
TT_LOG_E(TAG, "Failed to create ili9341");
return nullptr;
}
if (esp_lcd_panel_reset(panel_handle) != ESP_OK) {
TT_LOG_E(TAG, "Failed to reset panel");
return nullptr;
}
if (esp_lcd_panel_init(panel_handle) != ESP_OK) {
TT_LOG_E(TAG, "Failed to init panel");
return nullptr;
}
if (esp_lcd_panel_invert_color(panel_handle, true) != ESP_OK) {
TT_LOG_E(TAG, "Failed to invert panel colours");
return nullptr;
}
if (esp_lcd_panel_disp_on_off(panel_handle, true) != ESP_OK) {
TT_LOG_E(TAG, "Failed to turn display on");
return nullptr;
}
const lvgl_port_display_cfg_t disp_cfg = {
.io_handle = io_handle,
.panel_handle = panel_handle,
.buffer_size = CORE2_LCD_DRAW_BUFFER_SIZE,
.double_buffer = false,
.trans_size = CORE2_SPI2_TRANSACTION_LIMIT,
.hres = CORE2_LCD_HORIZONTAL_RESOLUTION,
.vres = CORE2_LCD_VERTICAL_RESOLUTION,
.monochrome = false,
.rotation = {
.swap_xy = false,
.mirror_x = false,
.mirror_y = false,
},
.flags = {
.buff_dma = false,
.buff_spiram = true,
.sw_rotate = false,
.swap_bytes = true
}
};
lv_display_t* display = lvgl_port_add_disp(&disp_cfg);
return display;
}
#ifdef __cplusplus
}
#endif

14
boards/m5stack_core2/source/m5stack_core2.c
View File

@ -1,16 +1,14 @@
#include "m5stack_core2.h"
#include "bootstrap.h"
#include "lvgl_i.h"
#include "m5stack_shared.h"
extern const SdCard core2_sdcard;
extern Power core2_power; // Making it const fails the build
extern const SdCard m5stack_core2_sdcard;
const HardwareConfig m5stack_core2 = {
.bootstrap = &core2_bootstrap,
.bootstrap = &m5stack_bootstrap,
.display = {
.set_backlight_duty = NULL
},
.init_graphics = &core2_lvgl_init,
.sdcard = &core2_sdcard,
.power = &core2_power
.init_graphics = &m5stack_lvgl_init,
.sdcard = &m5stack_core2_sdcard,
.power = &m5stack_power
};

4
boards/m5stack_core2/source/sdcard.c → boards/m5stack_core2/source/m5stack_core2_sdcard.c
View File

@ -6,7 +6,7 @@
#include "esp_vfs_fat.h"
#include "sdmmc_cmd.h"
#define TAG "core2_sdcard"
#define TAG "m5stack_core2_sdcard"
typedef struct {
const char* mount_point;
@ -71,7 +71,7 @@ static bool sdcard_is_mounted(void* context) {
return (data != NULL) && (sdmmc_get_status(data->card) == ESP_OK);
}
const SdCard core2_sdcard = {
const SdCard m5stack_core2_sdcard = {
.mount = &sdcard_mount,
.unmount = &sdcard_unmount,
.is_mounted = &sdcard_is_mounted,

38
boards/m5stack_core2/source/touch.cpp
View File

@ -1,38 +0,0 @@
#include "tactility_core.h"
#include "lvgl.h"
#include "M5Unified.hpp"
#define TAG "core2_touch"
#ifdef __cplusplus
extern "C" {
#endif
/**
* Touch seems to be offset by a certain amount.
* The docs don't mention it, so this is the estimated value.
*/
#define TOUCH_Y_OFFSET 16
static void read_touch(TT_UNUSED lv_indev_t* indev, lv_indev_data_t* data) {
lgfx::touch_point_t point; // Making it static makes it unreliable
bool touched = M5.Lcd.getTouch(&point) > 0;
if (touched) {
data->point.x = point.x;
data->point.y = point.y - TOUCH_Y_OFFSET;
data->state = LV_INDEV_STATE_PRESSED;
} else {
data->state = LV_INDEV_STATE_RELEASED;
}
}
bool core2_touch_init() {
lv_indev_t _Nullable* touch_indev = lv_indev_create();
lv_indev_set_type(touch_indev, LV_INDEV_TYPE_POINTER);
lv_indev_set_read_cb(touch_indev, read_touch);
return true;
}
#ifdef __cplusplus
}
#endif

6
boards/m5stack_cores3/CMakeLists.txt Normal file
View File

@ -0,0 +1,6 @@
idf_component_register(
SRC_DIRS "source"
INCLUDE_DIRS "include"
PRIV_INCLUDE_DIRS "private"
REQUIRES tactility m5stack_shared vfs fatfs M5Unified
)

13
boards/m5stack_cores3/include/m5stack_cores3.h Normal file
View File

@ -0,0 +1,13 @@
#pragma once
#include "hardware_config.h"
#ifdef __cplusplus
extern "C" {
#endif
extern const HardwareConfig m5stack_cores3;
#ifdef __cplusplus
}
#endif

13
boards/m5stack_cores3/private/config.h Normal file
View File

@ -0,0 +1,13 @@
#pragma once
#include "driver/spi_common.h"
#include "driver/gpio.h"
// SD Card
#define CORES3_SDCARD_SPI_HOST SPI2_HOST
#define CORES3_SDCARD_PIN_CS GPIO_NUM_4
#define CORES3_SDCARD_SPI_FREQUENCY 800000U
#define CORES3_SDCARD_FORMAT_ON_MOUNT_FAILED false
#define CORES3_SDCARD_MAX_OPEN_FILES 4
#define CORES3_SDCARD_ALLOC_UNIT_SIZE (16 * 1024)
#define CORES3_SDCARD_STATUS_CHECK_ENABLED false

12
boards/m5stack_cores3/source/m5stack_cores3.c Normal file
View File

@ -0,0 +1,12 @@
#include "m5stack_cores3.h"
#include "m5stack_shared.h"
const HardwareConfig m5stack_cores3 = {
.bootstrap = &m5stack_bootstrap,
.display = {
.set_backlight_duty = NULL
},
.init_graphics = &m5stack_lvgl_init,
.sdcard = &m5stack_sdcard,
.power = &m5stack_power
};

79
boards/m5stack_cores3/source/m5stack_sdcard.c Normal file
View File

@ -0,0 +1,79 @@
#include "sdcard.h"
#include "check.h"
#include "log.h"
#include "config.h"
#include "esp_vfs_fat.h"
#include "sdmmc_cmd.h"
#define TAG "m5stack_cores3_sdcard"
typedef struct {
const char* mount_point;
sdmmc_card_t* card;
} MountData;
static void* sdcard_mount(const char* mount_point) {
TT_LOG_I(TAG, "Mounting %s", mount_point);
esp_vfs_fat_sdmmc_mount_config_t mount_config = {
.format_if_mount_failed = CORES3_SDCARD_FORMAT_ON_MOUNT_FAILED,
.max_files = CORES3_SDCARD_MAX_OPEN_FILES,
.allocation_unit_size = CORES3_SDCARD_ALLOC_UNIT_SIZE,
.disk_status_check_enable = CORES3_SDCARD_STATUS_CHECK_ENABLED
};
sdmmc_card_t* card;
// Init without card detect (CD) and write protect (WD)
sdspi_device_config_t slot_config = SDSPI_DEVICE_CONFIG_DEFAULT();
slot_config.gpio_cs = CORES3_SDCARD_PIN_CS;
slot_config.host_id = CORES3_SDCARD_SPI_HOST;
sdmmc_host_t host = SDSPI_HOST_DEFAULT();
host.max_freq_khz = CORES3_SDCARD_SPI_FREQUENCY;
esp_err_t ret = esp_vfs_fat_sdspi_mount(mount_point, &host, &slot_config, &mount_config, &card);
if (ret != ESP_OK) {
if (ret == ESP_FAIL) {
TT_LOG_E(TAG, "Mounting failed. Ensure the card is formatted with FAT.");
} else {
TT_LOG_E(TAG, "Mounting failed (%s)", esp_err_to_name(ret));
}
return NULL;
}
MountData* data = malloc(sizeof(MountData));
*data = (MountData) {
.card = card,
.mount_point = mount_point
};
sdmmc_card_print_info(stdout, data->card);
return data;
}
static void sdcard_unmount(void* context) {
MountData* data = (MountData*)context;
TT_LOG_I(TAG, "Unmounting %s", data->mount_point);
tt_assert(data != NULL);
if (esp_vfs_fat_sdcard_unmount(data->mount_point, data->card) != ESP_OK) {
TT_LOG_E(TAG, "Unmount failed for %s", data->mount_point);
}
free(data);
}
static bool sdcard_is_mounted(void* context) {
MountData* data = (MountData*)context;
return (data != NULL) && (sdmmc_get_status(data->card) == ESP_OK);
}
const SdCard m5stack_sdcard = {
.mount = &sdcard_mount,
.unmount = &sdcard_unmount,
.is_mounted = &sdcard_is_mounted,
.mount_behaviour = SdcardMountBehaviourAnytime
};

5
boards/m5stack_shared/CMakeLists.txt Normal file
View File

@ -0,0 +1,5 @@
idf_component_register(
SRC_DIRS "src"
INCLUDE_DIRS "src"
REQUIRES tactility esp_lvgl_port M5Unified
)

18
boards/m5stack_shared/src/m5stack_bootstrap.cpp Normal file
View File

@ -0,0 +1,18 @@
#include "M5Unified.hpp"
#include "log.h"
#ifdef __cplusplus
extern "C" {
#endif
#define TAG "m5stack_bootstrap"
bool m5stack_bootstrap() {
TT_LOG_I(TAG, "Initializing M5Unified");
M5.begin();
return true;
}
#ifdef __cplusplus
}
#endif

18
boards/m5stack_core2/source/lvgl.c → boards/m5stack_shared/src/m5stack_lvgl.c
View File

@ -1,13 +1,14 @@
#include "display_i.hpp"
#include "esp_lvgl_port.h"
#include "log.h"
#include "thread.h"
#include "touch_i.hpp"
#include "ui/lvgl_sync.h"
#define TAG "core2_lvgl"
#define TAG "cores3_lvgl"
bool core2_lvgl_init() {
extern _Nullable lv_disp_t* m5stack_lvgl_display(bool usePsram);
extern _Nullable lv_indev_t* m5stack_lvgl_touch();
bool m5stack_lvgl_init() {
static lv_display_t* display = NULL;
const lvgl_port_cfg_t lvgl_cfg = {
@ -19,21 +20,24 @@ bool core2_lvgl_init() {
};
if (lvgl_port_init(&lvgl_cfg) != ESP_OK) {
TT_LOG_E(TAG, "lvgl port init failed");
TT_LOG_E(TAG, "lvgl_port_init failed");
return false;
}
// Add display
display = core2_display_init();
display = m5stack_lvgl_display(true);
if (display == NULL) {
TT_LOG_E(TAG, "failed to add display");
return false;
}
// Add touch
if (!core2_touch_init()) {
lv_indev_t* touch_indev = m5stack_lvgl_touch();
if (touch_indev == NULL) {
TT_LOG_E(TAG, "failed to add touch");
return false;
}
lv_indev_set_display(touch_indev, display);
// Set syncing functions
tt_lvgl_sync_set(&lvgl_port_lock, &lvgl_port_unlock);

69
boards/m5stack_shared/src/m5stack_lvgl_display.cpp Normal file
View File

@ -0,0 +1,69 @@
#include "tactility_core.h"
#include "M5Unified.hpp"
#include "esp_err.h"
#include "esp_lvgl_port.h"
#ifdef __cplusplus
extern "C" {
#endif
static void flush_callback(lv_display_t* display, const lv_area_t* area, uint8_t* px_map) {
M5GFX& gfx = *(M5GFX*)lv_display_get_driver_data(display);
int32_t width = (area->x2 - area->x1 + 1);
int32_t height = (area->y2 - area->y1 + 1);
gfx.startWrite();
gfx.setAddrWindow(area->x1, area->y1, width, height);
gfx.writePixels((lgfx::rgb565_t*)px_map, width * height);
gfx.endWrite();
lv_display_flush_ready(display);
}
_Nullable lv_disp_t* m5stack_lvgl_display(bool usePsram) {
M5GFX& gfx = M5.Display;
static lv_display_t* display = lv_display_create(gfx.width(), gfx.height());
LV_ASSERT_MALLOC(display)
if (display == nullptr) {
return nullptr;
}
lv_display_set_driver_data(display, &gfx);
lv_display_set_flush_cb(display, flush_callback);
const size_t bytes_per_pixel = 2; // assume 16-bit color
const size_t buffer_size = gfx.width() * gfx.height() * bytes_per_pixel / 8;
if (usePsram) {
static auto* buffer1 = (uint8_t*)heap_caps_malloc(buffer_size, MALLOC_CAP_SPIRAM);
LV_ASSERT_MALLOC(buffer1)
static auto* buffer2 = (uint8_t*)heap_caps_malloc(buffer_size, MALLOC_CAP_SPIRAM);
LV_ASSERT_MALLOC(buffer2)
lv_display_set_buffers(
display,
(void*)buffer1,
(void*)buffer2,
buffer_size,
LV_DISPLAY_RENDER_MODE_PARTIAL
);
} else {
static auto* buffer = (uint8_t*)malloc(buffer_size);
LV_ASSERT_MALLOC(buffer)
lv_display_set_buffers(
display,
(void*)buffer,
nullptr,
buffer_size,
LV_DISPLAY_RENDER_MODE_PARTIAL
);
}
return display;
}
#ifdef __cplusplus
}
#endif

37
boards/m5stack_shared/src/m5stack_lvgl_touch.cpp Normal file
View File

@ -0,0 +1,37 @@
#include "M5Unified.hpp"
#include "lvgl.h"
#include "tactility_core.h"
#define TAG "cores3_touch"
#ifdef __cplusplus
extern "C" {
#endif
static void touch_read_callback(TT_UNUSED lv_indev_t* indev, lv_indev_data_t* data) {
lgfx::touch_point_t point; // Making it static makes it unreliable
bool touched = M5.Lcd.getTouch(&point) > 0;
if (!touched) {
data->state = LV_INDEV_STATE_REL;
} else {
data->state = LV_INDEV_STATE_PR;
data->point.x = point.x;
data->point.y = point.y;
}
}
_Nullable lv_indev_t* m5stack_lvgl_touch() {
static lv_indev_t* indev = lv_indev_create();
LV_ASSERT_MALLOC(indev)
if (indev == nullptr) {
return nullptr;
}
lv_indev_set_type(indev, LV_INDEV_TYPE_POINTER);
lv_indev_set_read_cb(indev, touch_read_callback);
return indev;
}
#ifdef __cplusplus
}
#endif

2
boards/m5stack_core2/source/power.cpp → boards/m5stack_shared/src/m5stack_power.cpp
View File

@ -33,7 +33,7 @@ static int32_t power_get_current() {
return M5.Power.getBatteryCurrent();
}
Power core2_power = {
Power m5stack_power = {
.is_charging = &power_is_charging,
.is_charging_enabled = &power_is_charging_enabled,
.set_charging_enabled = &power_set_charging_enabled,

18
boards/m5stack_shared/src/m5stack_shared.h Normal file
View File

@ -0,0 +1,18 @@
#pragma once
#include "power.h"
#include "sdcard.h"
#ifdef __cplusplus
extern "C" {
#endif
extern bool m5stack_lvgl_init();
extern bool m5stack_bootstrap();
extern Power m5stack_power;
extern const SdCard m5stack_sdcard;
#ifdef __cplusplus
}
#endif

41
sdkconfig.board.m5stack_cores3 Normal file
View File

@ -0,0 +1,41 @@
# Software defaults
CONFIG_LV_FONT_MONTSERRAT_14=y
CONFIG_LV_FONT_MONTSERRAT_18=y
CONFIG_LV_USE_USER_DATA=y
CONFIG_LV_USE_FS_STDIO=y
CONFIG_LV_FS_STDIO_LETTER=65
CONFIG_LV_FS_STDIO_PATH=""
CONFIG_LV_FS_STDIO_CACHE_SIZE=4096
CONFIG_LV_USE_LODEPNG=y
CONFIG_LV_USE_BUILTIN_MALLOC=n
CONFIG_LV_USE_CLIB_MALLOC=y
CONFIG_FREERTOS_HZ=1000
CONFIG_FREERTOS_TASK_NOTIFICATION_ARRAY_ENTRIES=2
CONFIG_FREERTOS_SMP=n
CONFIG_FREERTOS_UNICORE=y
CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
# Hardware: Main
CONFIG_TT_BOARD_M5STACK_CORES3=y
CONFIG_IDF_TARGET="esp32s3"
CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
CONFIG_FLASHMODE_QIO=y
# Hardware: SPI RAM
CONFIG_SPIRAM=y
CONFIG_SPIRAM_MODE_QUAD=y
CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
CONFIG_SPIRAM_CLK_IO=30
CONFIG_SPIRAM_CS_IO=26
CONFIG_SPIRAM_SPEED_40M=y
CONFIG_SPIRAM_SPEED=40
CONFIG_SPIRAM_BOOT_INIT=y
CONFIG_SPIRAM_USE_MALLOC=y
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
# LVGL
CONFIG_LV_DISP_DEF_REFR_PERIOD=17
CONFIG_LV_INDEV_DEF_READ_PERIOD=17
CONFIG_LV_DPI_DEF=139