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

Companion trainer modes OFF and Master-Multi available for all radios #1806

Merged
merged 3 commits into from
Apr 5, 2022

Conversation

elecpower
Copy link
Collaborator

Fixes #1796

Summary of changes:

  • update trainer modes list item availability
  • standardise trainer mode Off to OFF

@elecpower elecpower added bug 🪲 Something isn't working companion Related to the companion software labels Apr 5, 2022
radio/src/translations/de.h.txt Outdated Show resolved Hide resolved
@TheIsotopes
Copy link
Contributor

TheIsotopes commented Apr 5, 2022

@pfeerick Can not find commit 82c6181 in 2.7 Branch the over two commits from this PR are merged?!

EDIT: Ah now I see this PR here hasn't been merged into 2.7 branch yet. sry ;-)

@pfeerick pfeerick added this to the 2.7 milestone Apr 6, 2022
@pfeerick
Copy link
Member

pfeerick commented Apr 6, 2022

I was trying Fork for the cherry-picking for the first time, and ended up merging the commits separately rather than the squash merge... so it is in 2.7 ;)

0305ac7
6a22b0a

@TheIsotopes
Copy link
Contributor

@pfeerick pls, as you can see the commit 82c6181 with german translation fix was not landing in 2.7 branch.

#define LEN_VTRAINERMODES "\022"
#define TR_VTRAINER_MASTER_OFF "OFF\0 "
#define TR_VTRAINER_MASTER_JACK "Lehrer/Buchse\0 "
#define TR_VTRAINER_SLAVE_JACK "Schüler/Buchse\0 "
#define TR_VTRAINER_MASTER_SBUS_MODULE "Lehrer/SBUS Modul\0"
#define TR_VTRAINER_MASTER_CPPM_MODULE "Lehrer/CPPM Modul\0"
#define TR_VTRAINER_MASTER_BATTERY "Lehrer/Serial\0 "
#define TR_VTRAINER_BLUETOOTH TR("Master/BT\0 ""Slave/BT\0 ", "Master/Bluetooth\0 ""Slave/Bluetooth\0 ")
#define TR_VTRAINER_MULTI "Master/Multi"

@pfeerick
Copy link
Member

pfeerick commented Apr 6, 2022

Dammit... no, that commit isn't... I'll add it now so it goes into what is likely to be 2.7.0 baring a reason for a RC3...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug 🪲 Something isn't working companion Related to the companion software
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Companion - can not set Trainer Mode to OFF and Master/Multi
3 participants