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

Merge branch 'RedGl0w-patch-1' into omega-hotfix

Browse Source
This commit is contained in:
Quentin
2020-04-08 13:47:41 +02:00
parent 53d9a9ec25 765ac98044
commit e77e26e2de
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -112,7 +112,7 @@ include quiz/Makefile # Quiz needs to be included at the end
all_src = $(apps_src) $(escher_src) $(ion_src) $(kandinsky_src) $(liba_src) $(libaxx_src) $(poincare_src) $(python_src) $(runner_src) $(ion_device_flasher_src) $(ion_device_bench_src) $(tests_src)
# Make palette.h a dep for every source-file.
# This ensures that the theming engine works correctly.
$(call object_for,$(apps_src) $(tests_src)): $(BUILD_DIR)/escher/palette.h
$(call object_for,$(all_src)): $(BUILD_DIR)/escher/palette.h
all_objs = $(call object_for,$(all_src))
.SECONDARY: $(all_objs)

2
apps/external/extapp_api.cpp vendored
View File

@@ -269,7 +269,7 @@ int extapp_getKey(bool allowSuspend, bool *alphaWasActive) {
continue;
}
if (event.isKeyboardEvent()) {
key = event.id();
key = static_cast<uint8_t>(event);
if (key == 17 || key == 4 || key == 5 || key == 52) {
extapp_resetKeyboard();
}