Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-16 21:05:35 +03:00
Code Issues Wiki Activity

fix coding style

Browse source
This commit is contained in:
chibaron 2018-10-02 01:51:25 +09:00
parent cb5fc4fd63
commit 95d3200c92
5 changed files with 22 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/interface/cli.c
View file

@ -4467,8 +4467,8 @@ const clicmd_t cmdTable[] = {
#endif #endif
#endif #endif
#ifdef USE_RX_BIND #ifdef USE_RX_BIND
CLI_COMMAND_DEF("frsky_bind", "initiate binding for FrSky SPI RX", NULL, cliRxBind), /* legacy */ CLI_COMMAND_DEF("frsky_bind", "initiate binding for FrSky SPI RX", NULL, cliRxBind),
CLI_COMMAND_DEF("rx_bind", "initiate binding for RX", NULL, cliRxBind), CLI_COMMAND_DEF("sfhss_bind", "initiate binding for S-FHSS SPI RX", NULL, cliRxBind),
#endif #endif
CLI_COMMAND_DEF("get", "get variable value", "[name]", cliGet), CLI_COMMAND_DEF("get", "get variable value", "[name]", cliGet),
#ifdef USE_GPS #ifdef USE_GPS

4
src/main/interface/settings.c
View file

@ -1116,8 +1116,8 @@ const clivalue_t valueTable[] = {
{ "frsky_spi_use_external_adc", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_RX_FRSKY_SPI_CONFIG, offsetof(rxFrSkySpiConfig_t, useExternalAdc) }, { "frsky_spi_use_external_adc", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_RX_FRSKY_SPI_CONFIG, offsetof(rxFrSkySpiConfig_t, useExternalAdc) },
#endif #endif
#ifdef USE_RX_SFHSS_SPI #ifdef USE_RX_SFHSS_SPI
{ "sfhss_spi_tx_id", VAR_UINT8 | MASTER_VALUE | MODE_ARRAY, .config.array.length = 2, PG_RX_SFHSS_SPI_CONFIG, offsetof(rxSfhssSpiConfig_t, bindTxId) }, { "sfhss_tx_id", VAR_UINT8 | MASTER_VALUE | MODE_ARRAY, .config.array.length = 2, PG_RX_SFHSS_SPI_CONFIG, offsetof(rxSfhssSpiConfig_t, bindTxId) },
{ "sfhss_spi_offset", VAR_INT8 | MASTER_VALUE, .config.minmax = { -127, 127 }, PG_RX_SFHSS_SPI_CONFIG, offsetof(rxSfhssSpiConfig_t, bindOffset) }, { "sfhss_offset", VAR_INT8 | MASTER_VALUE, .config.minmax = { -127, 127 }, PG_RX_SFHSS_SPI_CONFIG, offsetof(rxSfhssSpiConfig_t, bindOffset) },
#endif #endif
{ "led_inversion", VAR_UINT8 | MASTER_VALUE, .config.minmax = { 0, ((1 << STATUS_LED_NUMBER) - 1) }, PG_STATUS_LED_CONFIG, offsetof(statusLedConfig_t, inversion) }, { "led_inversion", VAR_UINT8 | MASTER_VALUE, .config.minmax = { 0, ((1 << STATUS_LED_NUMBER) - 1) }, PG_STATUS_LED_CONFIG, offsetof(statusLedConfig_t, inversion) },
#ifdef USE_DASHBOARD #ifdef USE_DASHBOARD

1
src/main/rx/cc2500_common.h
View file

@ -40,4 +40,3 @@ void cc2500LedOn(void);
void cc2500LedOff(void); void cc2500LedOff(void);
void cc2500LedBlink(timeMs_t blinkms); void cc2500LedBlink(timeMs_t blinkms);
bool cc2500SpiInit(void); bool cc2500SpiInit(void);

1
src/main/rx/cc2500_frsky_common.h
View file

@ -38,4 +38,3 @@ PG_DECLARE(rxFrSkySpiConfig_t, rxFrSkySpiConfig);
bool frSkySpiInit(const rxSpiConfig_t *rxSpiConfig, rxRuntimeConfig_t *rxRuntimeConfig); bool frSkySpiInit(const rxSpiConfig_t *rxSpiConfig, rxRuntimeConfig_t *rxRuntimeConfig);
rx_spi_received_e frSkySpiDataReceived(uint8_t *packet); rx_spi_received_e frSkySpiDataReceived(uint8_t *packet);
void frSkySpiSetRcData(uint16_t *rcData, const uint8_t *payload); void frSkySpiSetRcData(uint16_t *rcData, const uint8_t *payload);

6
src/main/rx/cc2500_sfhss.c
View file

@ -130,12 +130,12 @@ static void initialise() {
cc2500WriteReg(CC2500_2E_TEST0, 0x0B); cc2500WriteReg(CC2500_2E_TEST0, 0x0B);
cc2500WriteReg(CC2500_3E_PATABLE, 0xFF); cc2500WriteReg(CC2500_3E_PATABLE, 0xFF);
for(unsigned c = 0;c < 30; c++) for(unsigned c = 0;c < 30; c++){
{ //calibrate all channels //calibrate all channels
cc2500Strobe(CC2500_SIDLE); cc2500Strobe(CC2500_SIDLE);
cc2500WriteReg(CC2500_0A_CHANNR, SFHSSCH2CHANNR(c)); cc2500WriteReg(CC2500_0A_CHANNR, SFHSSCH2CHANNR(c));
cc2500Strobe(CC2500_SCAL); cc2500Strobe(CC2500_SCAL);
delayMicroseconds(900); // delayMicroseconds(900);
calData[c][0] = cc2500ReadReg(CC2500_23_FSCAL3); calData[c][0] = cc2500ReadReg(CC2500_23_FSCAL3);
calData[c][1] = cc2500ReadReg(CC2500_24_FSCAL2); calData[c][1] = cc2500ReadReg(CC2500_24_FSCAL2);
calData[c][2] = cc2500ReadReg(CC2500_25_FSCAL1); calData[c][2] = cc2500ReadReg(CC2500_25_FSCAL1);