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.

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

🐛 PROS 4: Fix llemu.h and llemu.hpp includes #560

Merged
merged 5 commits into from
Mar 26, 2023

Conversation

Richard-Stump
Copy link
Contributor

@Richard-Stump Richard-Stump commented Mar 24, 2023

Overview:

This PR is part of the fix for lcd::print() issue on the liblvgl repo: purduesigbots/liblvgl#25

This moves the weak symbols for liblvgl into new llemu.hpp and llemu.h files. Then, the actual llemu headers in the liblvgl repo are conditionally included if they are found by common.mk. This ensures that when liblvgl is present, the llemu headers are included in api.h as they were in PROS 3. When the llemu headers are not included in api.h, the user program only sees the weak symbols (despite the fact strong symbols are present), and will not link to the strong ones.

There are two sperate PRS for the liblvgl repo that implement the necessary changes for liblvgl: one for LVGL 5.3.x and another for LVGL 8.3.x:

Tests:

  • Ensure the kernel compiles
  • Ensure that the weak symbols work properly

Copy link
Member

@WillXuCodes WillXuCodes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this work with hardware and with the liblvgl template yet?

common.mk Outdated
WARNFLAGS+=-Wno-psabi

SPACE := $() $()
COMMA := ,

C_STANDARD?=gnu11
CXX_STANDARD?=gnu++20
CXX_STANDARD?=gnu++2a
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

revert

common.mk Outdated Show resolved Hide resolved
@WillXuCodes WillXuCodes merged commit 23239c2 into develop-pros-4 Mar 26, 2023
@Richard-Stump Richard-Stump mentioned this pull request Apr 8, 2023
@noam987 noam987 mentioned this pull request Apr 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants