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

chore: more OTX to ETX housekeeping #5396

Merged
merged 4 commits into from
Aug 14, 2024
Merged

chore: more OTX to ETX housekeeping #5396

merged 4 commits into from
Aug 14, 2024

Conversation

pfeerick
Copy link
Member

@pfeerick pfeerick commented Aug 7, 2024

Summary of changes:

  • rename opentx and helper files
  • update translation reference to OTX for upgrade

Although it affects significant number of files, should be unobtrusive enough to not break other PRs. Next up is changing over to #PRAGMA...

@pfeerick pfeerick added compilation Related to compiling the firmware and firmware options house keeping 🧹 Cleanup of code and house keeping labels Aug 7, 2024
@pfeerick pfeerick added this to the 2.11 milestone Aug 7, 2024
@pfeerick pfeerick force-pushed the pfeerick/otx-to-etx branch 2 times, most recently from 1d9b123 to c74155e Compare August 12, 2024 09:47
@philmoz
Copy link
Collaborator

philmoz commented Aug 12, 2024

Curious as to what this means: '- LVGL font code doesn't like pragma,'

@pfeerick
Copy link
Member Author

pfeerick commented Aug 12, 2024

You could try it yourself :-P And witness all the noise from the compiler about pragma being used in the font headers source files

@philmoz
Copy link
Collaborator

philmoz commented Aug 12, 2024

I changed lv_conf.h and had no issues?

@pfeerick
Copy link
Member Author

Wasn't that changed in this PR, so shouldn't be one of the listed exceptions?

I'm referring to these include style guard defines... in the LVGL font code c files...

#ifndef LV_FONT_ARIMO_HE_16
#define LV_FONT_ARIMO_HE_16 1
#endif

#if LV_FONT_ARIMO_HE_16
///blah
#endif /*#if LV_FONT_ARIMO_HE_16*/

@philmoz
Copy link
Collaborator

philmoz commented Aug 12, 2024

I didn't consider those as they are auto-generated by the lv_font_conv tool - hence my confusion.

@pfeerick
Copy link
Member Author

Sorry about that! Yeah, and no apparent options to change that formatting, so it got added to the ignore list. This is probably done for now anyway, as I'm not touching Companion side at all (yet?!).

@pfeerick pfeerick marked this pull request as ready for review August 13, 2024 10:02
@pfeerick pfeerick merged commit 839cfbd into main Aug 14, 2024
47 checks passed
@pfeerick pfeerick deleted the pfeerick/otx-to-etx branch August 14, 2024 11:02
richardclli added a commit that referenced this pull request Aug 18, 2024
pfeerick added a commit that referenced this pull request Aug 19, 2024
richardclli added a commit that referenced this pull request Aug 21, 2024
richardclli added a commit that referenced this pull request Aug 23, 2024
richardclli added a commit that referenced this pull request Aug 26, 2024
richardclli added a commit that referenced this pull request Aug 28, 2024
pfeerick added a commit that referenced this pull request Aug 28, 2024
pfeerick added a commit that referenced this pull request Aug 29, 2024
richardclli added a commit that referenced this pull request Sep 2, 2024
richardclli added a commit that referenced this pull request Sep 5, 2024
richardclli added a commit that referenced this pull request Sep 6, 2024
richardclli added a commit that referenced this pull request Sep 11, 2024
richardclli added a commit that referenced this pull request Sep 12, 2024
richardclli added a commit that referenced this pull request Sep 18, 2024
richardclli added a commit that referenced this pull request Sep 20, 2024
richardclli added a commit that referenced this pull request Sep 29, 2024
richardclli added a commit that referenced this pull request Oct 1, 2024
richardclli added a commit that referenced this pull request Oct 14, 2024
richardclli added a commit that referenced this pull request Oct 16, 2024
richardclli added a commit that referenced this pull request Nov 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
compilation Related to compiling the firmware and firmware options house keeping 🧹 Cleanup of code and house keeping
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants