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

Fix trainer sbus taranis #5140

Closed
wants to merge 2 commits into from
Closed

Fix trainer sbus taranis #5140

wants to merge 2 commits into from

Conversation

bug400
Copy link
Contributor

@bug400 bug400 commented Jun 9, 2024

Fixes #5139

Summary of changes:
The definition for trainer module sbus/cppm are in the "Trainer / Trainee from the module bay" section of hal.h for Taranis radios. The initialization of the module ports is in trainer_init_module_sbus() (trainer.cpp) and isTrainerMode available (gui_common.cpp). In both files the proper init of the UART is controlled by the identifier TRAINER_MODULE_SBUS_USART which is not defined in the hal section for Taranis radios. Therefore I reintroduced an identifier TARANIS_MODULE_SBUS.
Trainer/SBUS function tested on 2.10.1 and 2.11 with radio Taranis QX7ACCESS. Tested on 2.11 with Tx16s simulator only.

@raphaelcoeffic
Copy link
Member

@bug400 adding TRAINER_MODULE_SBUS makes no sense to me, especially because this is going to break it for everyone else (I don't see this #define anywhere else).

In fact, it should be sufficient to just remove the #if defined(...) and test both potential ports with the heartbeat pin being the preferred one and falling back automatically to S.PORT.

@raphaelcoeffic
Copy link
Member

@bug400 could please check #5149?

@pfeerick
Copy link
Member

Closing as #5149 resolves this in a cleaner manner

@pfeerick pfeerick closed this Jun 10, 2024
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.

Trainer SBUS does not work on TARANIS QX7-Access
3 participants