rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4645 from martinbudden/bfa_vtx_powernames_tidy 

Removed duplicate SA VTX power names
This commit is contained in:
Michael Keller 2017-11-24 01:27:39 +13:00 committed by GitHub
parent 0a34f0e774 20d9359de9
commit f8b18a9a69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/cms/cms_menu_vtx_smartaudio.c
View File

@ -361,15 +361,7 @@ static OSD_TAB_t saCmsEntBand = { &saCmsBand, VTX_SMARTAUDIO_BAND_COUNT, vtx58Ba
static OSD_TAB_t saCmsEntChan = { &saCmsChan, VTX_SMARTAUDIO_CHANNEL_COUNT, vtx58ChannelNames };
static const char * const saCmsPowerNames[] = {
"---",
"25 ",
"200",
"500",
"800",
};
static OSD_TAB_t saCmsEntPower = { &saCmsPower, VTX_SMARTAUDIO_POWER_COUNT, saCmsPowerNames};
static OSD_TAB_t saCmsEntPower = { &saCmsPower, VTX_SMARTAUDIO_POWER_COUNT, saPowerNames};
static OSD_UINT16_t saCmsEntFreqRef = { &saCmsFreqRef, 5600, 5900, 0 };

2
src/main/io/vtx_smartaudio.c
View File

@ -71,7 +71,7 @@ serialPort_t *debugSerialPort = NULL;
static serialPort_t *smartAudioSerialPort = NULL;
#if defined(USE_CMS) || defined(VTX_COMMON)
static const char * const saPowerNames[VTX_SMARTAUDIO_POWER_COUNT+1] = {
const char * const saPowerNames[VTX_SMARTAUDIO_POWER_COUNT+1] = {
"---", "25 ", "200", "500", "800",
};
#endif

31
src/main/io/vtx_smartaudio.h
View File

@ -86,6 +86,7 @@ typedef struct smartAudioStat_s {
extern smartAudioDevice_t saDevice;
extern saPowerTable_t saPowerTable[];
extern const char * const saPowerNames[];
extern smartAudioStat_t saStat;
extern uint16_t sa_smartbaud;
@ -110,33 +111,3 @@ extern serialPort_t *debugSerialPort;
#else
#define dprintf(x)
#endif // SMARTAUDIO_DPRINTF
#if 0
#ifdef USE_CMS
uint16_t smartAudioSmartbaud;
uint16_t saerr_badpre;
uint16_t saerr_badlen;
uint16_t saerr_crcerr;
uint16_t saerr_oooresp;
uint8_t smartAudioOpModel;
uint8_t smartAudioStatus;
uint8_t smartAudioBand;
uint8_t smartAudioChan;
uint16_t smartAudioFreq;
uint8_t smartAudioPower;
uint8_t smartAudioTxMode;
uint8_t smartAudioPitFMode;
uint16_t smartAudioORFreq;
long smartAudioConfigureOpModelByGvar(displayPort_t *, const void *self);
long smartAudioConfigurePitFModeByGvar(displayPort_t *, const void *self);
long smartAudioConfigureBandByGvar(displayPort_t *, const void *self);
long smartAudioConfigureChanByGvar(displayPort_t *, const void *self);
long smartAudioConfigurePowerByGvar(displayPort_t *, const void *self);
long smartAudioSetTxModeByGvar(displayPort_t *, const void *self);
#endif
#endif