Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-19 14:25:20 +03:00
Code Issues Wiki Activity

Merge pull request #2730 from mikeller/fixed_serial_resource_display

Browse source 
Fixed display of SERIAL resources in CLI.
This commit is contained in:
Martin Budden 2017-03-22 21:38:13 +00:00 • committed by GitHub
commit 95f4b80c89
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main/fc/cli.c
View file

@ -923,6 +923,7 @@ static motorMixer_t customMotorMixerCopy[MAX_SUPPORTED_MOTORS];
static mixerConfig_t mixerConfigCopy; static mixerConfig_t mixerConfigCopy;
static flight3DConfig_t flight3DConfigCopy; static flight3DConfig_t flight3DConfigCopy;
static serialConfig_t serialConfigCopy; static serialConfig_t serialConfigCopy;
static serialPinConfig_t serialPinConfigCopy;
static imuConfig_t imuConfigCopy; static imuConfig_t imuConfigCopy;
static armingConfig_t armingConfigCopy; static armingConfig_t armingConfigCopy;
static rcControlsConfig_t rcControlsConfigCopy; static rcControlsConfig_t rcControlsConfigCopy;
@ -1238,6 +1239,10 @@ static const cliCurrentAndDefaultConfig_t *getCurrentAndDefaultConfigs(pgn_t pgn
ret.currentConfig = &serialConfigCopy; ret.currentConfig = &serialConfigCopy;
ret.defaultConfig = serialConfig(); ret.defaultConfig = serialConfig();
break; break;
case PG_SERIAL_PIN_CONFIG:
ret.currentConfig = &serialPinConfigCopy;
ret.defaultConfig = serialPinConfig();
break;
case PG_IMU_CONFIG: case PG_IMU_CONFIG:
ret.currentConfig = &imuConfigCopy; ret.currentConfig = &imuConfigCopy;
ret.defaultConfig = imuConfig(); ret.defaultConfig = imuConfig();
@ -3916,8 +3921,8 @@ const cliResourceValue_t resourceTable[] = {
#ifdef LED_STRIP #ifdef LED_STRIP
{ OWNER_LED_STRIP, PG_LED_STRIP_CONFIG, offsetof(ledStripConfig_t, ioTag), 0 }, { OWNER_LED_STRIP, PG_LED_STRIP_CONFIG, offsetof(ledStripConfig_t, ioTag), 0 },
#endif #endif
{ OWNER_SERIAL_TX, PG_SERIAL_CONFIG, offsetof(serialPinConfig_t, ioTagTx[0]), SERIAL_PORT_MAX_INDEX }, { OWNER_SERIAL_TX, PG_SERIAL_PIN_CONFIG, offsetof(serialPinConfig_t, ioTagTx[0]), SERIAL_PORT_MAX_INDEX },
{ OWNER_SERIAL_RX, PG_SERIAL_CONFIG, offsetof(serialPinConfig_t, ioTagRx[0]), SERIAL_PORT_MAX_INDEX }, { OWNER_SERIAL_RX, PG_SERIAL_PIN_CONFIG, offsetof(serialPinConfig_t, ioTagRx[0]), SERIAL_PORT_MAX_INDEX },
}; };
static ioTag_t *getIoTag(const cliResourceValue_t value, uint8_t index) static ioTag_t *getIoTag(const cliResourceValue_t value, uint8_t index)