UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/external] Add simulator support (#238)

Browse Source
This commit is contained in:
Yaya-Cout
2022-05-21 17:38:26 +02:00
committed by GitHub
parent 19de87f9b5
commit e4718fcb95
2 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@@ -31,14 +31,11 @@ ifeq ($(filter reader,$(apps_list)),)
HAS_READER := 1 HAS_READER := 1
endif endif
ifeq (${MODEL}, n0110) # Remove the external apps for the n0100
apps_list = ${EPSILON_APPS} ifeq (${MODEL}, n0100)
else
ifeq (${MODEL},bootloader)
apps_list = ${EPSILON_APPS}
else
apps_list = $(foreach i, ${EPSILON_APPS}, $(if $(filter external, $(i)),,$(i))) apps_list = $(foreach i, ${EPSILON_APPS}, $(if $(filter external, $(i)),,$(i)))
endif else
apps_list = ${EPSILON_APPS}
endif endif
ifdef FORCE_EXTERNAL ifdef FORCE_EXTERNAL

22
apps/external/extapp_api.cpp vendored
View File

@@ -37,18 +37,30 @@ void extapp_pushRect(int16_t x, int16_t y, uint16_t w, uint16_t h, const uint16_
KDRect rect(x, y, w, h); KDRect rect(x, y, w, h);
Ion::Display::pushRect(rect, reinterpret_cast<const KDColor *>(pixels)); Ion::Display::pushRect(rect, reinterpret_cast<const KDColor *>(pixels));
#ifndef DEVICE
// Refresh the display.
Ion::Keyboard::scan();
#endif
} }
void extapp_pushRectUniform(int16_t x, int16_t y, uint16_t w, uint16_t h, uint16_t color) { void extapp_pushRectUniform(int16_t x, int16_t y, uint16_t w, uint16_t h, uint16_t color) {
KDRect rect(x, y, w, h); KDRect rect(x, y, w, h);
Ion::Display::pushRectUniform(rect, KDColor::RGB16(color)); Ion::Display::pushRectUniform(rect, KDColor::RGB16(color));
#ifndef DEVICE
// Refresh the display.
Ion::Keyboard::scan();
#endif
} }
void extapp_pullRect(int16_t x, int16_t y, uint16_t w, uint16_t h, uint16_t * pixels) { void extapp_pullRect(int16_t x, int16_t y, uint16_t w, uint16_t h, uint16_t * pixels) {
KDRect rect(x, y, w, h); KDRect rect(x, y, w, h);
Ion::Display::pullRect(rect, (KDColor *)pixels); Ion::Display::pullRect(rect, (KDColor *)pixels);
#ifndef DEVICE
// Refresh the display.
Ion::Keyboard::scan();
#endif
} }
int16_t extapp_drawTextLarge(const char * text, int16_t x, int16_t y, uint16_t fg, uint16_t bg, bool fake) { int16_t extapp_drawTextLarge(const char * text, int16_t x, int16_t y, uint16_t fg, uint16_t bg, bool fake) {
@@ -59,6 +71,11 @@ int16_t extapp_drawTextLarge(const char * text, int16_t x, int16_t y, uint16_t f
ctx->setOrigin(KDPoint(0, 0)); ctx->setOrigin(KDPoint(0, 0));
point = ctx->drawString(text, point, KDFont::LargeFont, KDColor::RGB16(fg), KDColor::RGB16(bg)); point = ctx->drawString(text, point, KDFont::LargeFont, KDColor::RGB16(fg), KDColor::RGB16(bg));
#ifndef DEVICE
// Refresh the display.
Ion::Keyboard::scan();
#endif
return point.x(); return point.x();
} }
@@ -70,6 +87,11 @@ int16_t extapp_drawTextSmall(const char * text, int16_t x, int16_t y, uint16_t f
ctx->setOrigin(KDPoint(0, 0)); ctx->setOrigin(KDPoint(0, 0));
point = ctx->drawString(text, point, KDFont::SmallFont, KDColor::RGB16(fg), KDColor::RGB16(bg)); point = ctx->drawString(text, point, KDFont::SmallFont, KDColor::RGB16(fg), KDColor::RGB16(bg));
#ifndef DEVICE
// Refresh the display.
Ion::Keyboard::scan();
#endif
return point.x(); return point.x();
} }