Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Renamed shouldUS to pShouldUpdateScreen and removed old code. #37

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Renamed shouldUS to pShouldUpdateScreen and removed old code. #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions src/interface/LovyanGFX/LGFX_SDL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,16 @@
#include <LovyanGFX.hpp>
#include <LGFX_AUTODETECT.hpp>
#include <iostream>
#include <atomic>

struct Rectangle {
uint16_t x;
uint16_t y;
uint16_t width;
uint16_t height;
};


void setup(bool *shouldUpdateScreen, Rectangle* *screenUpdateZones);

bool shouldUpdateScreen = true;
Rectangle* screenUpdateZones;
void setup(bool *shouldUS);

void loop(void);

static void loopThread(void)
{
setup(&shouldUpdateScreen, &screenUpdateZones);
// Will be available globally with pShouldUpdateScreen defined in main.cpp.
bool SDLShouldUpdateScreen = true;
setup(&SDLShouldUpdateScreen);
for (;;)
{
std::this_thread::yield();
Expand Down Expand Up @@ -60,4 +50,4 @@ int main(int, char**)
}


#endif
#endif
8 changes: 4 additions & 4 deletions src/interface/LovyanGFX/lgfx/v1/platforms/sdl/Panel_sdl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,12 @@ namespace lgfx
}
}

void Panel_sdl::sdl_event_handler(bool *shouldUpdateScreen)
void Panel_sdl::sdl_event_handler(bool *pShouldUpdateScreen)
{
if (*shouldUpdateScreen)
if (*pShouldUpdateScreen)
{
sdl_update_handler();
*shouldUpdateScreen = false;
*pShouldUpdateScreen = false;
}

SDL_Event event;
Expand Down Expand Up @@ -178,7 +178,7 @@ namespace lgfx
if (event.type == SDL_MOUSEBUTTONDOWN && event.button.button == SDL_BUTTON_LEFT)
{
mon->touched = true;
*shouldUpdateScreen = true;
*pShouldUpdateScreen = true;
}
if (event.type == SDL_MOUSEBUTTONUP && event.button.button == SDL_BUTTON_LEFT)
{
Expand Down
52 changes: 13 additions & 39 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,6 @@

#include "app/launcher.hpp"

#include "interface/interface.hpp"
#include "widgets/gui.hpp"
#include "tasks/tasks.hpp"
#include "lua/lua.hpp"
#include "app/CApp.hpp"
#include "network/network.hpp"
#include "app/message/message.hpp"

using namespace std;

#if defined(__linux__) || defined(_WIN32) || defined(_WIN64) || defined(__APPLE__)
#include <atomic>

struct Rectangle {
uint16_t x;
uint16_t y;
uint16_t width;
uint16_t height;
};

bool *shouldUS;
struct Rectangle* *screenUZ;

void flushScreen()
{
*shouldUS = true;
}
#endif

/*
HEADERS OF THE PAXOS_8
*/
Expand All @@ -47,6 +18,16 @@ using namespace std;
#include "network/network.hpp"
#include "app/message/message.hpp"

#if defined(__linux__) || defined(_WIN32) || defined(_WIN64) || defined(__APPLE__)
// Note that SDL will only redraw the screen if pShouldUpdateScreen is true, SDL set it to true if the screen has been touched.
bool *pShouldUpdateScreen;

void flushScreen()
{
*pShouldUpdateScreen = true;
}
#endif

#ifdef ESP32
void setup()
{
Expand All @@ -55,17 +36,10 @@ void setup()
esp_task_wdt_deinit();
#endif

#if defined(__linux__) || defined(__APPLE__)
void setup(bool *shouldUpdateScreen, Rectangle* *screenUpdateZones)
{
shouldUS = shouldUpdateScreen;
screenUZ = screenUpdateZones;
#elif defined(_WIN32) || defined(_WIN64)

void setup(bool *shouldUpdateScreen, struct Rectangle* *screenUpdateZones)
#if defined(__linux__) || defined(__APPLE__) || defined(_WIN32) || defined(_WIN64)
void setup(bool *shouldUS)
{
shouldUS = shouldUpdateScreen;
screenUZ = screenUpdateZones;
pShouldUpdateScreen = shouldUS;
#endif

screen::init();
Expand Down