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

Pacman warning fix #2298

Merged
merged 5 commits into from
Oct 14, 2024
+11 −5
Merged

Pacman warning fix #2298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bc18828
fix missing NULL initializers
Oct 14, 2024
33d7634
fix mispelled OnKeyboad
Oct 14, 2024
c9a864c
clang
Oct 14, 2024
1598fb1
Merge branch 'next' of github.com:gullradriel/portapack-mayhem into p…
Oct 14, 2024
b8d9d1a
set header version to 1
Oct 14, 2024
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
2 changes: 1 addition & 1 deletion firmware/application/apps/ui_standalone_view.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ bool StandaloneView::on_touch(const TouchEvent event) {

bool StandaloneView::on_keyboard(const KeyboardEvent event) {
if (get_application_information()->header_version > 1) {
return get_application_information()->OnKeyboad((uint8_t)event);
return get_application_information()->OnKeyboard((uint8_t)event);
}
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion firmware/common/standalone_app.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ struct standalone_application_information_t {
void (*OnFocus)();
bool (*OnKeyEvent)(uint8_t key);
bool (*OnEncoder)(int32_t delta);
bool (*OnKeyboad)(uint8_t key);
bool (*OnKeyboard)(uint8_t key);
};

#endif /*__UI_STANDALONE_APP_H__*/
12 changes: 9 additions & 3 deletions firmware/standalone/pacman/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const standalone_application_api_t* _api;

extern "C" {
__attribute__((section(".standalone_application_information"), used)) standalone_application_information_t _standalone_application_information = {
/*.header_version = */ CURRENT_STANDALONE_APPLICATION_API_VERSION,
/*.header_version = */ 1,

/*.app_name = */ "Pac-Man",
/*.bitmap_data = */ {
Expand Down Expand Up @@ -70,12 +70,18 @@ __attribute__((section(".standalone_application_information"), used)) standalone
/*.initialize_app = */ initialize,
/*.on_event = */ on_event,
/*.shutdown = */ shutdown,
};
/*PaintViewMirror */ NULL,
/*OnTouchEvent */ NULL,
/*OnFocus */ NULL,
/*OnKeyEvent */ NULL,
/*OnEncoder */ NULL,
/*OnKeyboard */ NULL};
}

/* Implementing abort() eliminates requirement for _getpid(), _kill(), _exit(). */
extern "C" void abort() {
while (true);
while (true)
;
}

// replace memory allocations to use heap from chibios
Expand Down
Loading