mirror of
https://github.com/meshtastic/firmware.git
synced 2025-10-27 23:12:39 +00:00
Pull in panel_sdl directly and drop native-sdl target
This commit is contained in:
Jonathan Bennett
parent
1e4bcb04d5
commit
9ded6a5215
687
src/graphics/Panel_sdl.cpp
Normal file
687
src/graphics/Panel_sdl.cpp
Normal file
@ -0,0 +1,687 @@
|
||||
/*----------------------------------------------------------------------------/
|
||||
Lovyan GFX - Graphics library for embedded devices.
|
||||
|
||||
Original Source:
|
||||
https://github.com/lovyan03/LovyanGFX/
|
||||
|
||||
Licence:
|
||||
[FreeBSD](https://github.com/lovyan03/LovyanGFX/blob/master/license.txt)
|
||||
|
||||
Author:
|
||||
[lovyan03](https://twitter.com/lovyan03)
|
||||
|
||||
Contributors:
|
||||
[ciniml](https://github.com/ciniml)
|
||||
[mongonta0716](https://github.com/mongonta0716)
|
||||
[tobozo](https://github.com/tobozo)
|
||||
|
||||
Porting for SDL:
|
||||
[imliubo](https://github.com/imliubo)
|
||||
/----------------------------------------------------------------------------*/
|
||||
#include "Panel_sdl.hpp"
|
||||
|
||||
#if defined(SDL_h_)
|
||||
|
||||
// #include "../common.hpp"
|
||||
// #include "../../misc/common_function.hpp"
|
||||
// #include "../../Bus.hpp"
|
||||
|
||||
#include <list>
|
||||
#include <math.h>
|
||||
#include <vector>
|
||||
#ifndef M_PI
|
||||
#define M_PI 3.14159265358979323846
|
||||
#endif
|
||||
|
||||
namespace lgfx
|
||||
{
|
||||
inline namespace v1
|
||||
{
|
||||
SDL_Keymod Panel_sdl::_keymod = KMOD_NONE;
|
||||
static SDL_semaphore *_update_in_semaphore = nullptr;
|
||||
static SDL_semaphore *_update_out_semaphore = nullptr;
|
||||
volatile static uint32_t _in_step_exec = 0;
|
||||
volatile static uint32_t _msec_step_exec = 512;
|
||||
static bool _inited = false;
|
||||
static bool _all_close = false;
|
||||
|
||||
volatile uint8_t Panel_sdl::_gpio_dummy_values[EMULATED_GPIO_MAX];
|
||||
|
||||
static inline void *heap_alloc_dma(size_t length)
|
||||
{
|
||||
return malloc(length);
|
||||
} // aligned_alloc(16, length);
|
||||
static inline void heap_free(void *buf)
|
||||
{
|
||||
free(buf);
|
||||
}
|
||||
|
||||
static std::list<monitor_t *> _list_monitor;
|
||||
|
||||
static monitor_t *const getMonitorByWindowID(uint32_t windowID)
|
||||
{
|
||||
for (auto &m : _list_monitor) {
|
||||
if (SDL_GetWindowID(m->window) == windowID) {
|
||||
return m;
|
||||
}
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
static std::vector<Panel_sdl::KeyCodeMapping_t> _key_code_map;
|
||||
|
||||
void Panel_sdl::addKeyCodeMapping(SDL_KeyCode keyCode, uint8_t gpio)
|
||||
{
|
||||
if (gpio > EMULATED_GPIO_MAX)
|
||||
return;
|
||||
KeyCodeMapping_t map;
|
||||
map.keycode = keyCode;
|
||||
map.gpio = gpio;
|
||||
_key_code_map.push_back(map);
|
||||
}
|
||||
|
||||
int Panel_sdl::getKeyCodeMapping(SDL_KeyCode keyCode)
|
||||
{
|
||||
for (const auto &i : _key_code_map) {
|
||||
if (i.keycode == keyCode)
|
||||
return i.gpio;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
void Panel_sdl::_event_proc(void)
|
||||
{
|
||||
SDL_Event event;
|
||||
while (SDL_PollEvent(&event)) {
|
||||
if ((event.type == SDL_KEYDOWN) || (event.type == SDL_KEYUP)) {
|
||||
auto mon = getMonitorByWindowID(event.button.windowID);
|
||||
int gpio = -1;
|
||||
|
||||
/// Check key mapping
|
||||
gpio = getKeyCodeMapping((SDL_KeyCode)event.key.keysym.sym);
|
||||
if (gpio < 0) {
|
||||
switch (event.key.keysym.sym) { /// M5StackのBtnA～BtnCのエミュレート;
|
||||
// case SDLK_LEFT: gpio = 39; break;
|
||||
// case SDLK_DOWN: gpio = 38; break;
|
||||
// case SDLK_RIGHT: gpio = 37; break;
|
||||
// case SDLK_UP: gpio = 36; break;
|
||||
|
||||
/// L/Rキーで画面回転
|
||||
case SDLK_r:
|
||||
case SDLK_l:
|
||||
if (event.type == SDL_KEYDOWN && event.key.keysym.mod == _keymod) {
|
||||
if (mon != nullptr) {
|
||||
mon->frame_rotation = (mon->frame_rotation += event.key.keysym.sym == SDLK_r ? 1 : -1);
|
||||
int x, y, w, h;
|
||||
SDL_GetWindowSize(mon->window, &w, &h);
|
||||
SDL_GetWindowPosition(mon->window, &x, &y);
|
||||
SDL_SetWindowSize(mon->window, h, w);
|
||||
SDL_SetWindowPosition(mon->window, x + (w - h) / 2, y + (h - w) / 2);
|
||||
mon->panel->sdl_invalidate();
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
/// 1～6キーで画面拡大率変更
|
||||
case SDLK_1:
|
||||
case SDLK_2:
|
||||
case SDLK_3:
|
||||
case SDLK_4:
|
||||
case SDLK_5:
|
||||
case SDLK_6:
|
||||
if (event.type == SDL_KEYDOWN && event.key.keysym.mod == _keymod) {
|
||||
if (mon != nullptr) {
|
||||
int size = 1 + (event.key.keysym.sym - SDLK_1);
|
||||
_update_scaling(mon, size, size);
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if (event.type == SDL_KEYDOWN) {
|
||||
Panel_sdl::gpio_lo(gpio);
|
||||
} else {
|
||||
Panel_sdl::gpio_hi(gpio);
|
||||
}
|
||||
} else if (event.type == SDL_MOUSEBUTTONDOWN || event.type == SDL_MOUSEBUTTONUP || event.type == SDL_MOUSEMOTION) {
|
||||
auto mon = getMonitorByWindowID(event.button.windowID);
|
||||
if (mon != nullptr) {
|
||||
{
|
||||
int x, y, w, h;
|
||||
SDL_GetWindowSize(mon->window, &w, &h);
|
||||
SDL_GetMouseState(&x, &y);
|
||||
float sf = sinf(mon->frame_angle * M_PI / 180);
|
||||
float cf = cosf(mon->frame_angle * M_PI / 180);
|
||||
x -= w / 2.0f;
|
||||
y -= h / 2.0f;
|
||||
float nx = y * sf + x * cf;
|
||||
float ny = y * cf - x * sf;
|
||||
if (mon->frame_rotation & 1) {
|
||||
std::swap(w, h);
|
||||
}
|
||||
x = (nx * mon->frame_width / w) + (mon->frame_width >> 1);
|
||||
y = (ny * mon->frame_height / h) + (mon->frame_height >> 1);
|
||||
mon->touch_x = x - mon->frame_inner_x;
|
||||
mon->touch_y = y - mon->frame_inner_y;
|
||||
}
|
||||
if (event.type == SDL_MOUSEBUTTONDOWN && event.button.button == SDL_BUTTON_LEFT) {
|
||||
mon->touched = true;
|
||||
}
|
||||
if (event.type == SDL_MOUSEBUTTONUP && event.button.button == SDL_BUTTON_LEFT) {
|
||||
mon->touched = false;
|
||||
}
|
||||
}
|
||||
} else if (event.type == SDL_WINDOWEVENT) {
|
||||
auto monitor = getMonitorByWindowID(event.window.windowID);
|
||||
if (monitor) {
|
||||
if (event.window.event == SDL_WINDOWEVENT_RESIZED) {
|
||||
int mw, mh;
|
||||
SDL_GetRendererOutputSize(monitor->renderer, &mw, &mh);
|
||||
if (monitor->frame_rotation & 1) {
|
||||
std::swap(mw, mh);
|
||||
}
|
||||
monitor->scaling_x = (mw * 2 / monitor->frame_width) / 2.0f;
|
||||
monitor->scaling_y = (mh * 2 / monitor->frame_height) / 2.0f;
|
||||
monitor->panel->sdl_invalidate();
|
||||
} else if (event.window.event == SDL_WINDOWEVENT_CLOSE) {
|
||||
monitor->closing = true;
|
||||
}
|
||||
}
|
||||
} else if (event.type == SDL_QUIT) {
|
||||
for (auto &m : _list_monitor) {
|
||||
m->closing = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// デバッガでステップ実行されていることを検出するスレッド用関数。
|
||||
static int detectDebugger(bool *running)
|
||||
{
|
||||
uint32_t prev_ms = SDL_GetTicks();
|
||||
do {
|
||||
SDL_Delay(1);
|
||||
uint32_t ms = SDL_GetTicks();
|
||||
/// 時間間隔が広すぎる場合はステップ実行中 (ブレークポイントで止まった)と判断する。
|
||||
/// また、解除されたと判断した後も1023msecほど状態を維持する。
|
||||
if (ms - prev_ms > 64) {
|
||||
_in_step_exec = _msec_step_exec;
|
||||
} else if (_in_step_exec) {
|
||||
--_in_step_exec;
|
||||
}
|
||||
prev_ms = ms;
|
||||
} while (*running);
|
||||
return 0;
|
||||
}
|
||||
|
||||
void Panel_sdl::_update_proc(void)
|
||||
{
|
||||
for (auto it = _list_monitor.begin(); it != _list_monitor.end();) {
|
||||
if ((*it)->closing) {
|
||||
if ((*it)->texture_frameimage) {
|
||||
SDL_DestroyTexture((*it)->texture_frameimage);
|
||||
}
|
||||
SDL_DestroyTexture((*it)->texture);
|
||||
SDL_DestroyRenderer((*it)->renderer);
|
||||
SDL_DestroyWindow((*it)->window);
|
||||
_list_monitor.erase(it++);
|
||||
if (_list_monitor.empty()) {
|
||||
_all_close = true;
|
||||
return;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
(*it)->panel->sdl_update();
|
||||
++it;
|
||||
}
|
||||
}
|
||||
|
||||
int Panel_sdl::setup(void)
|
||||
{
|
||||
if (_inited)
|
||||
return 1;
|
||||
_inited = true;
|
||||
|
||||
/// Add default keycode mapping
|
||||
/// M5StackのBtnA～BtnCのエミュレート;
|
||||
addKeyCodeMapping(SDLK_LEFT, 39);
|
||||
addKeyCodeMapping(SDLK_DOWN, 38);
|
||||
addKeyCodeMapping(SDLK_RIGHT, 37);
|
||||
addKeyCodeMapping(SDLK_UP, 36);
|
||||
|
||||
SDL_CreateThread((SDL_ThreadFunction)detectDebugger, "dbg", &_inited);
|
||||
|
||||
_update_in_semaphore = SDL_CreateSemaphore(0);
|
||||
_update_out_semaphore = SDL_CreateSemaphore(0);
|
||||
for (size_t pin = 0; pin < EMULATED_GPIO_MAX; ++pin) {
|
||||
gpio_hi(pin);
|
||||
}
|
||||
/*Initialize the SDL*/
|
||||
SDL_Init(SDL_INIT_VIDEO);
|
||||
SDL_StartTextInput();
|
||||
|
||||
// SDL_SetThreadPriority(SDL_ThreadPriority::SDL_THREAD_PRIORITY_HIGH);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int Panel_sdl::loop(void)
|
||||
{
|
||||
if (!_inited)
|
||||
return 1;
|
||||
|
||||
_event_proc();
|
||||
SDL_SemWaitTimeout(_update_in_semaphore, 1);
|
||||
_update_proc();
|
||||
_event_proc();
|
||||
if (SDL_SemValue(_update_out_semaphore) == 0) {
|
||||
SDL_SemPost(_update_out_semaphore);
|
||||
}
|
||||
|
||||
return _all_close;
|
||||
}
|
||||
|
||||
int Panel_sdl::close(void)
|
||||
{
|
||||
if (!_inited)
|
||||
return 1;
|
||||
_inited = false;
|
||||
|
||||
SDL_StopTextInput();
|
||||
SDL_DestroySemaphore(_update_in_semaphore);
|
||||
SDL_DestroySemaphore(_update_out_semaphore);
|
||||
SDL_Quit();
|
||||
return 0;
|
||||
}
|
||||
|
||||
int Panel_sdl::main(int (*fn)(bool *), uint32_t msec_step_exec)
|
||||
{
|
||||
_msec_step_exec = msec_step_exec;
|
||||
|
||||
/// SDLの準備
|
||||
if (0 != Panel_sdl::setup()) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/// ユーザコード関数の動作・停止フラグ
|
||||
bool running = true;
|
||||
|
||||
/// ユーザコード関数を起動する
|
||||
auto thread = SDL_CreateThread((SDL_ThreadFunction)fn, "fn", &running);
|
||||
|
||||
/// 全部のウィンドウが閉じられるまでSDLのイベント・描画処理を継続
|
||||
while (0 == Panel_sdl::loop()) {
|
||||
};
|
||||
|
||||
/// ユーザコード関数を終了する
|
||||
running = false;
|
||||
SDL_WaitThread(thread, nullptr);
|
||||
|
||||
/// SDLを終了する
|
||||
return Panel_sdl::close();
|
||||
}
|
||||
|
||||
void Panel_sdl::setScaling(uint_fast8_t scaling_x, uint_fast8_t scaling_y)
|
||||
{
|
||||
monitor.scaling_x = scaling_x;
|
||||
monitor.scaling_y = scaling_y;
|
||||
}
|
||||
|
||||
void Panel_sdl::setFrameImage(const void *frame_image, int frame_width, int frame_height, int inner_x, int inner_y)
|
||||
{
|
||||
monitor.frame_image = frame_image;
|
||||
monitor.frame_width = frame_width;
|
||||
monitor.frame_height = frame_height;
|
||||
monitor.frame_inner_x = inner_x;
|
||||
monitor.frame_inner_y = inner_y;
|
||||
}
|
||||
|
||||
void Panel_sdl::setFrameRotation(uint_fast16_t frame_rotation)
|
||||
{
|
||||
monitor.frame_rotation = frame_rotation;
|
||||
monitor.frame_angle = (monitor.frame_rotation) * 90;
|
||||
}
|
||||
|
||||
Panel_sdl::~Panel_sdl(void)
|
||||
{
|
||||
_list_monitor.remove(&monitor);
|
||||
SDL_DestroyMutex(_sdl_mutex);
|
||||
}
|
||||
|
||||
Panel_sdl::Panel_sdl(void) : Panel_FrameBufferBase()
|
||||
{
|
||||
_sdl_mutex = SDL_CreateMutex();
|
||||
_auto_display = true;
|
||||
monitor.panel = this;
|
||||
}
|
||||
|
||||
bool Panel_sdl::init(bool use_reset)
|
||||
{
|
||||
initFrameBuffer(_cfg.panel_width * 4, _cfg.panel_height);
|
||||
bool res = Panel_FrameBufferBase::init(use_reset);
|
||||
|
||||
_list_monitor.push_back(&monitor);
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
color_depth_t Panel_sdl::setColorDepth(color_depth_t depth)
|
||||
{
|
||||
auto bits = depth & color_depth_t::bit_mask;
|
||||
if (bits >= 16) {
|
||||
depth = (bits > 16) ? rgb888_3Byte : rgb565_2Byte;
|
||||
} else {
|
||||
depth = (depth == color_depth_t::grayscale_8bit) ? grayscale_8bit : rgb332_1Byte;
|
||||
}
|
||||
_write_depth = depth;
|
||||
_read_depth = depth;
|
||||
|
||||
return depth;
|
||||
}
|
||||
|
||||
Panel_sdl::lock_t::lock_t(Panel_sdl *parent) : _parent{parent}
|
||||
{
|
||||
SDL_LockMutex(parent->_sdl_mutex);
|
||||
};
|
||||
|
||||
Panel_sdl::lock_t::~lock_t(void)
|
||||
{
|
||||
++_parent->_modified_counter;
|
||||
SDL_UnlockMutex(_parent->_sdl_mutex);
|
||||
if (SDL_SemValue(_update_in_semaphore) < 2) {
|
||||
SDL_SemPost(_update_in_semaphore);
|
||||
if (!_in_step_exec) {
|
||||
SDL_SemWaitTimeout(_update_out_semaphore, 1);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
void Panel_sdl::drawPixelPreclipped(uint_fast16_t x, uint_fast16_t y, uint32_t rawcolor)
|
||||
{
|
||||
lock_t lock(this);
|
||||
Panel_FrameBufferBase::drawPixelPreclipped(x, y, rawcolor);
|
||||
}
|
||||
|
||||
void Panel_sdl::writeFillRectPreclipped(uint_fast16_t x, uint_fast16_t y, uint_fast16_t w, uint_fast16_t h, uint32_t rawcolor)
|
||||
{
|
||||
lock_t lock(this);
|
||||
Panel_FrameBufferBase::writeFillRectPreclipped(x, y, w, h, rawcolor);
|
||||
}
|
||||
|
||||
void Panel_sdl::writeBlock(uint32_t rawcolor, uint32_t length)
|
||||
{
|
||||
// lock_t lock(this);
|
||||
Panel_FrameBufferBase::writeBlock(rawcolor, length);
|
||||
}
|
||||
|
||||
void Panel_sdl::writeImage(uint_fast16_t x, uint_fast16_t y, uint_fast16_t w, uint_fast16_t h, pixelcopy_t *param, bool use_dma)
|
||||
{
|
||||
lock_t lock(this);
|
||||
Panel_FrameBufferBase::writeImage(x, y, w, h, param, use_dma);
|
||||
}
|
||||
|
||||
void Panel_sdl::writeImageARGB(uint_fast16_t x, uint_fast16_t y, uint_fast16_t w, uint_fast16_t h, pixelcopy_t *param)
|
||||
{
|
||||
lock_t lock(this);
|
||||
Panel_FrameBufferBase::writeImageARGB(x, y, w, h, param);
|
||||
}
|
||||
|
||||
void Panel_sdl::writePixels(pixelcopy_t *param, uint32_t len, bool use_dma)
|
||||
{
|
||||
lock_t lock(this);
|
||||
Panel_FrameBufferBase::writePixels(param, len, use_dma);
|
||||
}
|
||||
|
||||
void Panel_sdl::display(uint_fast16_t x, uint_fast16_t y, uint_fast16_t w, uint_fast16_t h)
|
||||
{
|
||||
(void)x;
|
||||
(void)y;
|
||||
(void)w;
|
||||
(void)h;
|
||||
if (_in_step_exec) {
|
||||
if (_display_counter != _modified_counter) {
|
||||
do {
|
||||
SDL_SemPost(_update_in_semaphore);
|
||||
SDL_SemWaitTimeout(_update_out_semaphore, 1);
|
||||
} while (_display_counter != _modified_counter);
|
||||
SDL_Delay(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
uint_fast8_t Panel_sdl::getTouchRaw(touch_point_t *tp, uint_fast8_t count)
|
||||
{
|
||||
(void)count;
|
||||
tp->x = monitor.touch_x;
|
||||
tp->y = monitor.touch_y;
|
||||
tp->size = monitor.touched ? 1 : 0;
|
||||
tp->id = 0;
|
||||
return monitor.touched;
|
||||
}
|
||||
|
||||
void Panel_sdl::setWindowTitle(const char *title)
|
||||
{
|
||||
_window_title = title;
|
||||
if (monitor.window) {
|
||||
SDL_SetWindowTitle(monitor.window, _window_title);
|
||||
}
|
||||
}
|
||||
|
||||
void Panel_sdl::_update_scaling(monitor_t *mon, float sx, float sy)
|
||||
{
|
||||
mon->scaling_x = sx;
|
||||
mon->scaling_y = sy;
|
||||
int nw = mon->frame_width;
|
||||
int nh = mon->frame_height;
|
||||
if (mon->frame_rotation & 1) {
|
||||
std::swap(nw, nh);
|
||||
}
|
||||
|
||||
int x, y, w, h;
|
||||
int rw, rh;
|
||||
SDL_GetRendererOutputSize(mon->renderer, &rw, &rh);
|
||||
SDL_GetWindowSize(mon->window, &w, &h);
|
||||
nw = nw * sx * w / rw;
|
||||
nh = nh * sy * h / rh;
|
||||
SDL_GetWindowPosition(mon->window, &x, &y);
|
||||
SDL_SetWindowSize(mon->window, nw, nh);
|
||||
SDL_SetWindowPosition(mon->window, x + (w - nw) / 2, y + (h - nh) / 2);
|
||||
mon->panel->sdl_invalidate();
|
||||
}
|
||||
|
||||
void Panel_sdl::sdl_create(monitor_t *m)
|
||||
{
|
||||
int flag = SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI;
|
||||
#if SDL_FULLSCREEN
|
||||
flag |= SDL_WINDOW_FULLSCREEN;
|
||||
#endif
|
||||
|
||||
if (m->frame_width < _cfg.panel_width) {
|
||||
m->frame_width = _cfg.panel_width;
|
||||
}
|
||||
if (m->frame_height < _cfg.panel_height) {
|
||||
m->frame_height = _cfg.panel_height;
|
||||
}
|
||||
|
||||
int window_width = m->frame_width * m->scaling_x;
|
||||
int window_height = m->frame_height * m->scaling_y;
|
||||
int scaling_x = m->scaling_x;
|
||||
int scaling_y = m->scaling_y;
|
||||
if (m->frame_rotation & 1) {
|
||||
std::swap(window_width, window_height);
|
||||
std::swap(scaling_x, scaling_y);
|
||||
}
|
||||
|
||||
{
|
||||
m->window = SDL_CreateWindow(_window_title, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, window_width, window_height,
|
||||
flag); /*last param. SDL_WINDOW_BORDERLESS to hide borders*/
|
||||
}
|
||||
m->renderer = SDL_CreateRenderer(m->window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
|
||||
m->texture =
|
||||
SDL_CreateTexture(m->renderer, SDL_PIXELFORMAT_RGB24, SDL_TEXTUREACCESS_STREAMING, _cfg.panel_width, _cfg.panel_height);
|
||||
SDL_SetTextureBlendMode(m->texture, SDL_BLENDMODE_NONE);
|
||||
|
||||
if (m->frame_image) {
|
||||
// 枠画像用のサーフェイスを作成
|
||||
auto sf = SDL_CreateRGBSurfaceFrom((void *)m->frame_image, m->frame_width, m->frame_height, 32, m->frame_width * 4,
|
||||
0xFF000000, 0xFF0000, 0xFF00, 0xFF);
|
||||
if (sf != nullptr) {
|
||||
// 枠画像からテクスチャを作成
|
||||
m->texture_frameimage = SDL_CreateTextureFromSurface(m->renderer, sf);
|
||||
SDL_FreeSurface(sf);
|
||||
}
|
||||
}
|
||||
SDL_SetTextureBlendMode(m->texture_frameimage, SDL_BLENDMODE_BLEND);
|
||||
_update_scaling(m, scaling_x, scaling_y);
|
||||
}
|
||||
|
||||
void Panel_sdl::sdl_update(void)
|
||||
{
|
||||
if (monitor.renderer == nullptr) {
|
||||
sdl_create(&monitor);
|
||||
}
|
||||
|
||||
bool step_exec = _in_step_exec;
|
||||
|
||||
if (_texupdate_counter != _modified_counter) {
|
||||
pixelcopy_t pc(nullptr, color_depth_t::rgb888_3Byte, _write_depth, false);
|
||||
if (_write_depth == rgb565_2Byte) {
|
||||
pc.fp_copy = pixelcopy_t::copy_rgb_fast<bgr888_t, swap565_t>;
|
||||
} else if (_write_depth == rgb888_3Byte) {
|
||||
pc.fp_copy = pixelcopy_t::copy_rgb_fast<bgr888_t, bgr888_t>;
|
||||
} else if (_write_depth == rgb332_1Byte) {
|
||||
pc.fp_copy = pixelcopy_t::copy_rgb_fast<bgr888_t, rgb332_t>;
|
||||
} else if (_write_depth == grayscale_8bit) {
|
||||
pc.fp_copy = pixelcopy_t::copy_rgb_fast<bgr888_t, grayscale_t>;
|
||||
}
|
||||
|
||||
if (0 == SDL_LockMutex(_sdl_mutex)) {
|
||||
_texupdate_counter = _modified_counter;
|
||||
for (int y = 0; y < _cfg.panel_height; ++y) {
|
||||
pc.src_x32 = 0;
|
||||
pc.src_data = _lines_buffer[y];
|
||||
pc.fp_copy(&_texturebuf[y * _cfg.panel_width], 0, _cfg.panel_width, &pc);
|
||||
}
|
||||
SDL_UnlockMutex(_sdl_mutex);
|
||||
SDL_UpdateTexture(monitor.texture, nullptr, _texturebuf, _cfg.panel_width * sizeof(rgb888_t));
|
||||
}
|
||||
}
|
||||
|
||||
int angle = monitor.frame_angle;
|
||||
int target = (monitor.frame_rotation) * 90;
|
||||
angle = (((target * 4) + (angle * 4) + (angle < target ? 8 : 0)) >> 3);
|
||||
|
||||
if (monitor.frame_angle != angle) { // 表示する向きを変える
|
||||
monitor.frame_angle = angle;
|
||||
sdl_invalidate();
|
||||
} else if (monitor.frame_rotation & ~3u) {
|
||||
monitor.frame_rotation &= 3;
|
||||
monitor.frame_angle = (monitor.frame_rotation) * 90;
|
||||
sdl_invalidate();
|
||||
}
|
||||
|
||||
if (_invalidated || (_display_counter != _texupdate_counter)) {
|
||||
SDL_RendererInfo info;
|
||||
if (0 == SDL_GetRendererInfo(monitor.renderer, &info)) {
|
||||
// ステップ実行中はVSYNCを待機しない
|
||||
if (((bool)(info.flags & SDL_RENDERER_PRESENTVSYNC)) == step_exec) {
|
||||
SDL_RenderSetVSync(monitor.renderer, !step_exec);
|
||||
}
|
||||
}
|
||||
{
|
||||
int red = 0;
|
||||
int green = 0;
|
||||
int blue = 0;
|
||||
#if defined(M5GFX_BACK_COLOR)
|
||||
red = ((M5GFX_BACK_COLOR) >> 16) & 0xFF;
|
||||
green = ((M5GFX_BACK_COLOR) >> 8) & 0xFF;
|
||||
blue = ((M5GFX_BACK_COLOR)) & 0xFF;
|
||||
#endif
|
||||
SDL_SetRenderDrawColor(monitor.renderer, red, green, blue, 0xFF);
|
||||
}
|
||||
SDL_RenderClear(monitor.renderer);
|
||||
if (_invalidated) {
|
||||
_invalidated = false;
|
||||
int mw, mh;
|
||||
SDL_GetRendererOutputSize(monitor.renderer, &mw, &mh);
|
||||
}
|
||||
render_texture(monitor.texture, monitor.frame_inner_x, monitor.frame_inner_y, _cfg.panel_width, _cfg.panel_height, angle);
|
||||
render_texture(monitor.texture_frameimage, 0, 0, monitor.frame_width, monitor.frame_height, angle);
|
||||
SDL_RenderPresent(monitor.renderer);
|
||||
_display_counter = _texupdate_counter;
|
||||
if (_invalidated) {
|
||||
_invalidated = false;
|
||||
SDL_SetRenderDrawColor(monitor.renderer, 0, 0, 0, 0xFF);
|
||||
SDL_RenderClear(monitor.renderer);
|
||||
render_texture(monitor.texture, monitor.frame_inner_x, monitor.frame_inner_y, _cfg.panel_width, _cfg.panel_height,
|
||||
angle);
|
||||
render_texture(monitor.texture_frameimage, 0, 0, monitor.frame_width, monitor.frame_height, angle);
|
||||
SDL_RenderPresent(monitor.renderer);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Panel_sdl::render_texture(SDL_Texture *texture, int tx, int ty, int tw, int th, float angle)
|
||||
{
|
||||
SDL_Point pivot;
|
||||
pivot.x = (monitor.frame_width / 2.0f - tx) * (float)monitor.scaling_x;
|
||||
pivot.y = (monitor.frame_height / 2.0f - ty) * (float)monitor.scaling_y;
|
||||
SDL_Rect dstrect;
|
||||
dstrect.w = tw * monitor.scaling_x;
|
||||
dstrect.h = th * monitor.scaling_y;
|
||||
int mw, mh;
|
||||
SDL_GetRendererOutputSize(monitor.renderer, &mw, &mh);
|
||||
dstrect.x = mw / 2.0f - pivot.x;
|
||||
dstrect.y = mh / 2.0f - pivot.y;
|
||||
SDL_RenderCopyEx(monitor.renderer, texture, nullptr, &dstrect, angle, &pivot, SDL_RendererFlip::SDL_FLIP_NONE);
|
||||
}
|
||||
|
||||
bool Panel_sdl::initFrameBuffer(size_t width, size_t height)
|
||||
{
|
||||
uint8_t **lineArray = (uint8_t **)heap_alloc_dma(height * sizeof(uint8_t *));
|
||||
if (nullptr == lineArray) {
|
||||
return false;
|
||||
}
|
||||
|
||||
_texturebuf = (rgb888_t *)heap_alloc_dma(width * height * sizeof(rgb888_t));
|
||||
|
||||
/// 8byte alignment;
|
||||
width = (width + 7) & ~7u;
|
||||
|
||||
_lines_buffer = lineArray;
|
||||
memset(lineArray, 0, height * sizeof(uint8_t *));
|
||||
|
||||
uint8_t *framebuffer = (uint8_t *)heap_alloc_dma(width * height + 16);
|
||||
|
||||
auto fb = framebuffer;
|
||||
{
|
||||
for (size_t y = 0; y < height; ++y) {
|
||||
lineArray[y] = fb;
|
||||
fb += width;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
void Panel_sdl::deinitFrameBuffer(void)
|
||||
{
|
||||
auto lines = _lines_buffer;
|
||||
_lines_buffer = nullptr;
|
||||
if (lines != nullptr) {
|
||||
heap_free(lines[0]);
|
||||
heap_free(lines);
|
||||
}
|
||||
if (_texturebuf) {
|
||||
heap_free(_texturebuf);
|
||||
_texturebuf = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
} // namespace v1
|
||||
} // namespace lgfx
|
||||
|
||||
#endif
|
||||
165
src/graphics/Panel_sdl.hpp
Normal file
165
src/graphics/Panel_sdl.hpp
Normal file
@ -0,0 +1,165 @@
|
||||
/*----------------------------------------------------------------------------/
|
||||
Lovyan GFX - Graphics library for embedded devices.
|
||||
|
||||
Original Source:
|
||||
https://github.com/lovyan03/LovyanGFX/
|
||||
|
||||
Licence:
|
||||
[FreeBSD](https://github.com/lovyan03/LovyanGFX/blob/master/license.txt)
|
||||
|
||||
Author:
|
||||
[lovyan03](https://twitter.com/lovyan03)
|
||||
|
||||
Contributors:
|
||||
[ciniml](https://github.com/ciniml)
|
||||
[mongonta0716](https://github.com/mongonta0716)
|
||||
[tobozo](https://github.com/tobozo)
|
||||
|
||||
Porting for SDL:
|
||||
[imliubo](https://github.com/imliubo)
|
||||
/----------------------------------------------------------------------------*/
|
||||
#pragma once
|
||||
|
||||
#define SDL_MAIN_HANDLED
|
||||
#if __has_include(<SDL2/SDL.h>)
|
||||
#include <SDL2/SDL.h>
|
||||
#include <SDL2/SDL_main.h>
|
||||
#elif __has_include(<SDL.h>)
|
||||
#include <SDL.h>
|
||||
#include <SDL_main.h>
|
||||
#endif
|
||||
|
||||
#if defined(SDL_h_)
|
||||
#include "lgfx/v1/Touch.hpp"
|
||||
#include "lgfx/v1/misc/range.hpp"
|
||||
#include "lgfx/v1/panel/Panel_FrameBufferBase.hpp"
|
||||
#include <cstdint>
|
||||
|
||||
namespace lgfx
|
||||
{
|
||||
inline namespace v1
|
||||
{
|
||||
|
||||
struct Panel_sdl;
|
||||
struct monitor_t {
|
||||
SDL_Window *window = nullptr;
|
||||
SDL_Renderer *renderer = nullptr;
|
||||
SDL_Texture *texture = nullptr;
|
||||
SDL_Texture *texture_frameimage = nullptr;
|
||||
Panel_sdl *panel = nullptr;
|
||||
|
||||
// 外枠
|
||||
const void *frame_image = 0;
|
||||
uint_fast16_t frame_width = 0;
|
||||
uint_fast16_t frame_height = 0;
|
||||
uint_fast16_t frame_inner_x = 0;
|
||||
uint_fast16_t frame_inner_y = 0;
|
||||
int_fast16_t frame_rotation = 0;
|
||||
int_fast16_t frame_angle = 0;
|
||||
|
||||
float scaling_x = 1;
|
||||
float scaling_y = 1;
|
||||
int_fast16_t touch_x, touch_y;
|
||||
bool touched = false;
|
||||
bool closing = false;
|
||||
};
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
struct Touch_sdl : public ITouch {
|
||||
bool init(void) override { return true; }
|
||||
void wakeup(void) override {}
|
||||
void sleep(void) override {}
|
||||
bool isEnable(void) override { return true; };
|
||||
uint_fast8_t getTouchRaw(touch_point_t *tp, uint_fast8_t count) override { return 0; }
|
||||
};
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
struct Panel_sdl : public Panel_FrameBufferBase {
|
||||
static constexpr size_t EMULATED_GPIO_MAX = 128;
|
||||
static volatile uint8_t _gpio_dummy_values[EMULATED_GPIO_MAX];
|
||||
|
||||
public:
|
||||
Panel_sdl(void);
|
||||
virtual ~Panel_sdl(void);
|
||||
|
||||
bool init(bool use_reset) override;
|
||||
|
||||
color_depth_t setColorDepth(color_depth_t depth) override;
|
||||
|
||||
void display(uint_fast16_t x, uint_fast16_t y, uint_fast16_t w, uint_fast16_t h) override;
|
||||
|
||||
// void setInvert(bool invert) override {}
|
||||
void drawPixelPreclipped(uint_fast16_t x, uint_fast16_t y, uint32_t rawcolor) override;
|
||||
void writeFillRectPreclipped(uint_fast16_t x, uint_fast16_t y, uint_fast16_t w, uint_fast16_t h, uint32_t rawcolor) override;
|
||||
void writeBlock(uint32_t rawcolor, uint32_t length) override;
|
||||
void writeImage(uint_fast16_t x, uint_fast16_t y, uint_fast16_t w, uint_fast16_t h, pixelcopy_t *param,
|
||||
bool use_dma) override;
|
||||
void writeImageARGB(uint_fast16_t x, uint_fast16_t y, uint_fast16_t w, uint_fast16_t h, pixelcopy_t *param) override;
|
||||
void writePixels(pixelcopy_t *param, uint32_t len, bool use_dma) override;
|
||||
|
||||
uint_fast8_t getTouchRaw(touch_point_t *tp, uint_fast8_t count) override;
|
||||
|
||||
void setWindowTitle(const char *title);
|
||||
void setScaling(uint_fast8_t scaling_x, uint_fast8_t scaling_y);
|
||||
void setFrameImage(const void *frame_image, int frame_width, int frame_height, int inner_x, int inner_y);
|
||||
void setFrameRotation(uint_fast16_t frame_rotaion);
|
||||
void setBrightness(uint8_t brightness) override{};
|
||||
|
||||
static volatile void gpio_hi(uint32_t pin) { _gpio_dummy_values[pin & (EMULATED_GPIO_MAX - 1)] = 1; }
|
||||
static volatile void gpio_lo(uint32_t pin) { _gpio_dummy_values[pin & (EMULATED_GPIO_MAX - 1)] = 0; }
|
||||
static volatile bool gpio_in(uint32_t pin) { return _gpio_dummy_values[pin & (EMULATED_GPIO_MAX - 1)]; }
|
||||
|
||||
static int setup(void);
|
||||
static int loop(void);
|
||||
static int close(void);
|
||||
|
||||
static int main(int (*fn)(bool *), uint32_t msec_step_exec = 512);
|
||||
|
||||
static void setShortcutKeymod(SDL_Keymod keymod) { _keymod = keymod; }
|
||||
|
||||
struct KeyCodeMapping_t {
|
||||
SDL_KeyCode keycode = SDLK_UNKNOWN;
|
||||
uint8_t gpio = 0;
|
||||
};
|
||||
static void addKeyCodeMapping(SDL_KeyCode keyCode, uint8_t gpio);
|
||||
static int getKeyCodeMapping(SDL_KeyCode keyCode);
|
||||
|
||||
protected:
|
||||
const char *_window_title = "LGFX Simulator";
|
||||
SDL_mutex *_sdl_mutex = nullptr;
|
||||
|
||||
void sdl_create(monitor_t *m);
|
||||
void sdl_update(void);
|
||||
|
||||
touch_point_t _touch_point;
|
||||
monitor_t monitor;
|
||||
|
||||
rgb888_t *_texturebuf = nullptr;
|
||||
uint_fast16_t _modified_counter;
|
||||
uint_fast16_t _texupdate_counter;
|
||||
uint_fast16_t _display_counter;
|
||||
bool _invalidated;
|
||||
|
||||
static void _event_proc(void);
|
||||
static void _update_proc(void);
|
||||
static void _update_scaling(monitor_t *m, float sx, float sy);
|
||||
void sdl_invalidate(void) { _invalidated = true; }
|
||||
void render_texture(SDL_Texture *texture, int tx, int ty, int tw, int th, float angle);
|
||||
bool initFrameBuffer(size_t width, size_t height);
|
||||
void deinitFrameBuffer(void);
|
||||
|
||||
static SDL_Keymod _keymod;
|
||||
|
||||
struct lock_t {
|
||||
lock_t(Panel_sdl *parent);
|
||||
~lock_t();
|
||||
|
||||
protected:
|
||||
Panel_sdl *_parent;
|
||||
};
|
||||
};
|
||||
//----------------------------------------------------------------------------
|
||||
} // namespace v1
|
||||
} // namespace lgfx
|
||||
#endif
|
||||
@ -751,10 +751,8 @@ static LGFX *tft = nullptr;
|
||||
|
||||
static TFT_eSPI *tft = nullptr; // Invoke library, pins defined in User_Setup.h
|
||||
#elif ARCH_PORTDUINO
|
||||
#include "Panel_sdl.hpp"
|
||||
#include <LovyanGFX.hpp> // Graphics and font library for ST7735 driver chip
|
||||
#if defined(LGFX_SDL)
|
||||
#include <lgfx/v1/platforms/sdl/Panel_sdl.hpp>
|
||||
#endif
|
||||
|
||||
class LGFX : public lgfx::LGFX_Device
|
||||
{
|
||||
@ -783,10 +781,10 @@ class LGFX : public lgfx::LGFX_Device
|
||||
_panel_instance = new lgfx::Panel_ILI9488;
|
||||
else if (portduino_config.displayPanel == hx8357d)
|
||||
_panel_instance = new lgfx::Panel_HX8357D;
|
||||
#if defined(LGFX_SDL)
|
||||
else if (portduino_config.displayPanel == x11) {
|
||||
#if defined(SDL_h_)
|
||||
|
||||
else if (portduino_config.displayPanel == x11)
|
||||
_panel_instance = new lgfx::Panel_sdl;
|
||||
}
|
||||
#endif
|
||||
else {
|
||||
_panel_instance = new lgfx::Panel_NULL;
|
||||
@ -799,8 +797,9 @@ class LGFX : public lgfx::LGFX_Device
|
||||
|
||||
buscfg.pin_dc = portduino_config.displayDC.pin; // Set SPI DC pin number (-1 = disable)
|
||||
|
||||
_bus_instance.config(buscfg); // applies the set value to the bus.
|
||||
_panel_instance->setBus(&_bus_instance); // set the bus on the panel.
|
||||
_bus_instance.config(buscfg); // applies the set value to the bus.
|
||||
if (portduino_config.displayPanel != x11)
|
||||
_panel_instance->setBus(&_bus_instance); // set the bus on the panel.
|
||||
|
||||
auto cfg = _panel_instance->config(); // Gets a structure for display panel settings.
|
||||
LOG_DEBUG("Width: %d, Height: %d", portduino_config.displayWidth, portduino_config.displayHeight);
|
||||
@ -848,7 +847,7 @@ class LGFX : public lgfx::LGFX_Device
|
||||
_touch_instance->config(touch_cfg);
|
||||
_panel_instance->setTouch(_touch_instance);
|
||||
}
|
||||
#if defined(LGFX_SDL)
|
||||
#if defined(SDL_h_)
|
||||
if (portduino_config.displayPanel == x11) {
|
||||
lgfx::Panel_sdl *sdl_panel_ = (lgfx::Panel_sdl *)_panel_instance;
|
||||
sdl_panel_->setup();
|
||||
@ -1237,7 +1236,7 @@ void TFTDisplay::display(bool fromBlank)
|
||||
|
||||
void TFTDisplay::sdlLoop()
|
||||
{
|
||||
#if defined(LGFX_SDL)
|
||||
#if defined(SDL_h_)
|
||||
static int lastPressed = 0;
|
||||
static int shuttingDown = false;
|
||||
if (portduino_config.displayPanel == x11) {
|
||||
@ -1247,27 +1246,26 @@ void TFTDisplay::sdlLoop()
|
||||
InputEvent event = {.inputEvent = (input_broker_event)INPUT_BROKER_SHUTDOWN, .kbchar = 0, .touchX = 0, .touchY = 0};
|
||||
inputBroker->injectInputEvent(&event);
|
||||
}
|
||||
|
||||
// debounce
|
||||
if (lastPressed != 0 && !lgfx::v1::gpio_in(lastPressed))
|
||||
if (lastPressed != 0 && !sdl_panel_->gpio_in(lastPressed))
|
||||
return;
|
||||
if (!lgfx::v1::gpio_in(37)) {
|
||||
if (!sdl_panel_->gpio_in(37)) {
|
||||
lastPressed = 37;
|
||||
InputEvent event = {.inputEvent = (input_broker_event)INPUT_BROKER_RIGHT, .kbchar = 0, .touchX = 0, .touchY = 0};
|
||||
inputBroker->injectInputEvent(&event);
|
||||
} else if (!lgfx::v1::gpio_in(36)) {
|
||||
} else if (!sdl_panel_->gpio_in(36)) {
|
||||
lastPressed = 36;
|
||||
InputEvent event = {.inputEvent = (input_broker_event)INPUT_BROKER_UP, .kbchar = 0, .touchX = 0, .touchY = 0};
|
||||
inputBroker->injectInputEvent(&event);
|
||||
} else if (!lgfx::v1::gpio_in(38)) {
|
||||
} else if (!sdl_panel_->gpio_in(38)) {
|
||||
lastPressed = 38;
|
||||
InputEvent event = {.inputEvent = (input_broker_event)INPUT_BROKER_DOWN, .kbchar = 0, .touchX = 0, .touchY = 0};
|
||||
inputBroker->injectInputEvent(&event);
|
||||
} else if (!lgfx::v1::gpio_in(39)) {
|
||||
} else if (!sdl_panel_->gpio_in(39)) {
|
||||
lastPressed = 39;
|
||||
InputEvent event = {.inputEvent = (input_broker_event)INPUT_BROKER_LEFT, .kbchar = 0, .touchX = 0, .touchY = 0};
|
||||
inputBroker->injectInputEvent(&event);
|
||||
} else if (!lgfx::v1::gpio_in(SDL_SCANCODE_KP_ENTER)) {
|
||||
} else if (!sdl_panel_->gpio_in(SDL_SCANCODE_KP_ENTER)) {
|
||||
lastPressed = SDL_SCANCODE_KP_ENTER;
|
||||
InputEvent event = {.inputEvent = (input_broker_event)INPUT_BROKER_SELECT, .kbchar = 0, .touchX = 0, .touchY = 0};
|
||||
inputBroker->injectInputEvent(&event);
|
||||
|
||||
@ -1604,8 +1604,9 @@ void loop()
|
||||
if (inputBroker)
|
||||
inputBroker->processInputEventQueue();
|
||||
#endif
|
||||
#if defined(LGFX_SDL)
|
||||
if (screen) {
|
||||
#if ARCH_PORTDUINO && HAS_TFT
|
||||
if (screen && portduino_config.displayPanel == x11 &&
|
||||
config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
|
||||
auto dispdev = screen->getDisplayDevice();
|
||||
if (dispdev)
|
||||
static_cast<TFTDisplay *>(dispdev)->sdlLoop();
|
||||
|
||||
@ -40,28 +40,10 @@ build_flags = ${native_base.build_flags} -Os -lX11 -linput -lxkbcommon -ffunctio
|
||||
-D VIEW_320x240
|
||||
!pkg-config --libs libulfius --silence-errors || :
|
||||
!pkg-config --libs openssl --silence-errors || :
|
||||
!pkg-config --cflags --libs sdl2 --silence-errors || :
|
||||
build_src_filter =
|
||||
${native_base.build_src_filter}
|
||||
|
||||
[env:native-sdl]
|
||||
extends = native_base
|
||||
build_type = release
|
||||
lib_deps =
|
||||
${env.lib_deps}
|
||||
${networking_base.lib_deps}
|
||||
${radiolib_base.lib_deps}
|
||||
${environmental_base.lib_deps}
|
||||
# renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
|
||||
rweather/Crypto@0.4.0
|
||||
# renovate: datasource=git-refs depName=libch341-spi-userspace packageName=https://github.com/pine64/libch341-spi-userspace gitBranch=main
|
||||
https://github.com/pine64/libch341-spi-userspace/archive/af9bc27c9c30fa90772279925b7c5913dff789b4.zip
|
||||
# renovate: datasource=custom.pio depName=adafruit/Adafruit seesaw Library packageName=adafruit/library/Adafruit seesaw Library
|
||||
adafruit/Adafruit seesaw Library@1.7.9
|
||||
https://github.com/jp-bennett/LovyanGFX/archive/7458f84a126c1f8fdc7b038074f71be903f6e4c0.zip
|
||||
build_flags = ${native_base.build_flags}
|
||||
!pkg-config --cflags --libs sdl2 --silence-errors || :
|
||||
-D LGFX_SDL=1
|
||||
|
||||
[env:native-fb]
|
||||
extends = native_base
|
||||
build_type = release
|
||||
|
||||
Loading…
Reference in New Issue
Block a user