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

PR2995 carryTrim cleanup #3121

Merged
merged 7 commits into from
Feb 5, 2023
Merged

PR2995 carryTrim cleanup #3121

merged 7 commits into from
Feb 5, 2023

Conversation

pfeerick
Copy link
Member

Fixes issue with #2995 where the data model is actually changed. This is part 1 of the intended 2-part fix... to simply resolve the issue for 2.8.1 and Companion 2.8.1. Ideally, Companion 2.9 would refer to carryTime as trimSource internally to remove any confusion.

@pfeerick pfeerick added color Related generally to color LCD radios B&W Related generally to black and white LCD radios companion Related to the companion software bug/regression ↩️ A new version of EdgeTX broke something labels Jan 28, 2023
@pfeerick pfeerick added this to the 2.8.1 milestone Jan 28, 2023
@pfeerick pfeerick marked this pull request as draft January 28, 2023 02:22
@pfeerick pfeerick self-assigned this Feb 3, 2023
@pfeerick pfeerick marked this pull request as ready for review February 5, 2023 03:27
@pfeerick
Copy link
Member Author

pfeerick commented Feb 5, 2023

  • verified the yaml indentation commit only appears to fix the offending yaml indentation fault via diff with before and after model and radio yaml
  • TX16S silently migrated carryTrim => trimSource
  • Companion was able to read old and write new parameter transparently

@pfeerick pfeerick merged commit 46cc979 into main Feb 5, 2023
@pfeerick pfeerick deleted the 2995-fixup branch February 5, 2023 03:46
pfeerick added a commit that referenced this pull request Feb 5, 2023
* chore: Run `generate-yaml.sh`

* chore(cpn): carryTrim -> trimSource

* fix(build): Boxer missing from `generate-yaml`

* dodgy attempt to read old carryTrim

* fix: Don't break the byte boundary + reorder

* fix(yaml): indentation for attributes that should not be output

* chore: Regenerate YAML after rebase

---------

Co-authored-by: raphaelcoeffic <[email protected]>
philmoz pushed a commit to philmoz/edgetx that referenced this pull request Feb 13, 2023
* main: (30 commits)
  feat(cpn): Radiomaster Boxer support (EdgeTX#2910)
  chore: Move __global_locale to FLASH (frees some RAM!) (EdgeTX#3169)
  chore: Remove obsolete language defines, single source for telemetry sensor names (EdgeTX#3119)
  feat(lua): Port of NodeMCU Lua53 read-only tables (EdgeTX#2994)
  chore: New module/serial API (EdgeTX#3055)
  chore: Updated SE translations 🇸🇪 (EdgeTX#3148)
  Update README.md
  fix(color): Duplicate selected theme, update color list (EdgeTX#3122)
  fix: Regenerate yaml, carryTrim => trimSource cleanup (EdgeTX#3121)
  chore(color): LVGLify custom mixer scripts page (EdgeTX#3071)
  fix(translation): String casting for CZ/IT/FR Fixes EdgeTX#3145
  fix(cpn): Save "set main view" number for special/global function (EdgeTX#3132)
  chore(color): LVGLify statistics and debug screens (EdgeTX#3072)
  chore(color): LVGLify and enhance model -> telemetry page (EdgeTX#3070)
  chore: Updates to Danish translations 🇩🇰 (EdgeTX#3128)
  chore: CN/TW translations for theme save and delete strings (EdgeTX#3129)
  chore: fix STM32 HAL headers
  fix(color): Overlap in logical switch monitor footer (EdgeTX#3137)
  fix(doc): LUA doc link to units.md
  feat(color): Change global variables layout to better match other pages (EdgeTX#3116)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
B&W Related generally to black and white LCD radios bug/regression ↩️ A new version of EdgeTX broke something color Related generally to color LCD radios companion Related to the companion software
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants