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

Port new VTX API and settings from Betaflight #3401

Merged
merged 1 commit into from Jun 22, 2018

Conversation

Projects
None yet
2 participants
@fiam
Copy link
Member

commented Jun 19, 2018

  • VTX with support for FC control are now totally managed from the
    FC. The FC will store the VTX configuration and override any changes
    made manually (e.g. with a button). Users can disable VTX control
    to manage channels manually.
  • OSD VTX item now shows the power level too.
  • Added new parameters for VTX configuration: vtx_band, vtx_channel,
    vtx_freq, vtx_halfduplex, vtx_low_power_disarm, vtx_pit_mode_freq
    and vtx_power.
  • Added support for automatically switching the VTX power when
    arming (fixes #3112).

Note that there are a several changes from the BF code. We do support
an additional setting for the low power during disarm option and
the MSP messages contain more data to allow users to configure the
VTX channel/power from the configurator. Our MSP messages also work
when the VTX is offline (the settings are stored in the FC and applied
later once the VTX is powered up).

Thanks to Matek (http://www.mateksys.com) for providing an FCHUB-VTX
to test the Tramp protocol.

Thanks to AKK (https://www.akktek.com) for providing an X2-ultimate
to test SmartAudio.

Configurator PR iNavFlight/inav-configurator#481

@fiam fiam added this to the 2.0 milestone Jun 19, 2018

@fiam fiam force-pushed the agh_vtx_settings branch 2 times, most recently from 4d7db4a to c873dcf Jun 19, 2018

Port new VTX API and settings from Betaflight
- VTX with support for FC control are now totally managed from the
FC. The FC will store the VTX configuration and override any changes
made manually (e.g. with a button). Users can disable VTX control
to manage channels manually.
- OSD VTX item now shows the power level too.
- Added new parameters for VTX configuration: vtx_band, vtx_channel,
vtx_freq, vtx_halfduplex, vtx_low_power_disarm, vtx_pit_mode_freq
and vtx_power.
- Added support for automatically switching the VTX power when
arming (fixes #3112).

Note that there are a several changes from the BF code. We do support
an additional setting for the low power during disarm option and
the MSP messages contain more data to allow users to configure the
VTX channel/power from the configurator. Our MSP messages also work
when the VTX is offline (the settings are stored in the FC and applied
later once the VTX is powered up).

Thanks to Matek (http://www.mateksys.com) for providing an FCHUB-VTX
to test the Tramp protocol.

Thanks to AKK (https://www.akktek.com) for providing an X2-ultimate
to test SmartAudio.

@fiam fiam force-pushed the agh_vtx_settings branch from c873dcf to 7b223eb Jun 20, 2018

@fiam fiam merged commit 5ed9236 into development Jun 22, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@fiam fiam deleted the agh_vtx_settings branch Jun 22, 2018

uint8_t band=0, channel=0;
vtxCommonGetBandAndChannel(&band,&channel);
uint8_t deviceType = 0;
vtxCommonGetDeviceType(vtxDevice);

This comment has been minimized.

Copy link
@mikeller

mikeller Jun 23, 2018

Contributor

This doesn't actually do anything.

This comment has been minimized.

Copy link
@fiam

fiam Jun 23, 2018

Author Member

Nice catch. Thanks! It worked by chance because the configurator only checks for deviceType != 0xff and this was writing a zero. I’ll PR a fix tomorrow.

sbufWriteU8(dst, pitmode);

// Betaflight doesn't send these fields

This comment has been minimized.

Copy link
@mikeller

mikeller Jun 23, 2018

Contributor

This is outdated: betaflight/betaflight#6200 😝

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.