Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-16 04:45:24 +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);

32
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);
@ -280,7 +280,7 @@ void sfhssnextChannel(void)
if (sfhss_channel > 29) { if (sfhss_channel > 29) {
sfhss_channel -= 31; sfhss_channel -= 31;
} }
}while( sfhss_channel < 0); } while ( sfhss_channel < 0);
sfhssRx(); sfhssRx();
} }
@ -292,7 +292,7 @@ void sfhssSpiSetRcData(uint16_t *rcData, const uint8_t *payload)
rcData[5] = GET_CH2(payload); rcData[5] = GET_CH2(payload);
rcData[6] = GET_CH3(payload); rcData[6] = GET_CH3(payload);
rcData[7] = GET_CH4(payload); rcData[7] = GET_CH4(payload);
}else{ } else {
rcData[0] = GET_CH1(payload); rcData[0] = GET_CH1(payload);
rcData[1] = GET_CH2(payload); rcData[1] = GET_CH2(payload);
rcData[2] = GET_CH3(payload); rcData[2] = GET_CH3(payload);
@ -323,9 +323,9 @@ rx_spi_received_e sfhssSpiDataReceived(uint8_t *packet)
if (cc2500checkBindRequested(true)) { if (cc2500checkBindRequested(true)) {
cc2500LedOn(); cc2500LedOn();
initTuneRx(); initTuneRx();
SET_STATE( STATE_BIND_TUNING1 ); SET_STATE(STATE_BIND_TUNING1);
} else { } else {
SET_STATE( STATE_HUNT ); SET_STATE(STATE_HUNT);
sfhssnextChannel(); sfhssnextChannel();
setRssiDirect(0, RSSI_SOURCE_RX_PROTOCOL); setRssiDirect(0, RSSI_SOURCE_RX_PROTOCOL);
nextFrameReceiveStartTime = currentPacketReceivedTime + NEXT_CH_TIME_HUNT; nextFrameReceiveStartTime = currentPacketReceivedTime + NEXT_CH_TIME_HUNT;
@ -333,20 +333,20 @@ rx_spi_received_e sfhssSpiDataReceived(uint8_t *packet)
break; break;
case STATE_BIND_TUNING1: case STATE_BIND_TUNING1:
if (tune1Rx(packet)) { if (tune1Rx(packet)) {
SET_STATE( STATE_BIND_TUNING2 ); SET_STATE(STATE_BIND_TUNING2);
} }
break; break;
case STATE_BIND_TUNING2: case STATE_BIND_TUNING2:
if (tune2Rx(packet)) { if (tune2Rx(packet)) {
SET_STATE( STATE_BIND_TUNING3); SET_STATE(STATE_BIND_TUNING3);
} }
break; break;
case STATE_BIND_TUNING3: case STATE_BIND_TUNING3:
if (tune3Rx(packet)) { if (tune3Rx(packet)) {
if(((int16_t)bindOffset_max - (int16_t)bindOffset_min) <= 2){ if(((int16_t)bindOffset_max - (int16_t)bindOffset_min) <= 2){
initTuneRx(); initTuneRx();
SET_STATE( STATE_BIND_TUNING1 ); // retry SET_STATE(STATE_BIND_TUNING1); // retry
}else{ } else {
rxSfhssSpiConfigMutable()->bindOffset = ((int16_t)bindOffset_max + (int16_t)bindOffset_min)/2 ; rxSfhssSpiConfigMutable()->bindOffset = ((int16_t)bindOffset_max + (int16_t)bindOffset_min)/2 ;
SET_STATE(STATE_BIND_COMPLETE); SET_STATE(STATE_BIND_COMPLETE);
} }
@ -370,14 +370,14 @@ rx_spi_received_e sfhssSpiDataReceived(uint8_t *packet)
} }
} }
cc2500Strobe(CC2500_SRX); cc2500Strobe(CC2500_SRX);
}else if (cmpTimeUs(currentPacketReceivedTime, nextFrameReceiveStartTime) > 0) { } else if (cmpTimeUs(currentPacketReceivedTime, nextFrameReceiveStartTime) > 0) {
cc2500LedBlink(500); cc2500LedBlink(500);
#if defined(USE_RX_CC2500_SPI_PA_LNA) && defined(USE_RX_CC2500_SPI_DIVERSITY) // SE4311 chip #if defined(USE_RX_CC2500_SPI_PA_LNA) && defined(USE_RX_CC2500_SPI_DIVERSITY) // SE4311 chip
cc2500switchAntennae(); cc2500switchAntennae();
#endif #endif
sfhssnextChannel(); sfhssnextChannel();
nextFrameReceiveStartTime += NEXT_CH_TIME_HUNT; nextFrameReceiveStartTime += NEXT_CH_TIME_HUNT;
}else if (cc2500checkBindRequested(false)) { } else if (cc2500checkBindRequested(false)) {
SET_STATE(STATE_INIT); SET_STATE(STATE_INIT);
break; break;
} }
@ -389,7 +389,7 @@ rx_spi_received_e sfhssSpiDataReceived(uint8_t *packet)
if( GET_COMMAND(packet) & 0x8 ){ if( GET_COMMAND(packet) & 0x8 ){
nextFrameReceiveStartTime = currentPacketReceivedTime + NEXT_CH_TIME_SYNC2; nextFrameReceiveStartTime = currentPacketReceivedTime + NEXT_CH_TIME_SYNC2;
frame_recvd |= 0x2; /* ch5-8 */ frame_recvd |= 0x2; /* ch5-8 */
}else{ } else {
nextFrameReceiveStartTime = currentPacketReceivedTime + NEXT_CH_TIME_SYNC1; nextFrameReceiveStartTime = currentPacketReceivedTime + NEXT_CH_TIME_SYNC1;
cc2500Strobe(CC2500_SRX); cc2500Strobe(CC2500_SRX);
frame_recvd |= 0x1; /* ch1-4 */ frame_recvd |= 0x1; /* ch1-4 */
@ -400,7 +400,7 @@ rx_spi_received_e sfhssSpiDataReceived(uint8_t *packet)
return RX_SPI_RECEIVED_DATA; return RX_SPI_RECEIVED_DATA;
} }
cc2500Strobe(CC2500_SRX); cc2500Strobe(CC2500_SRX);
}else if (cmpTimeUs(currentPacketReceivedTime, nextFrameReceiveStartTime) > 0) { } else if (cmpTimeUs(currentPacketReceivedTime, nextFrameReceiveStartTime) > 0) {
nextFrameReceiveStartTime += NEXT_CH_TIME_SYNC0; nextFrameReceiveStartTime += NEXT_CH_TIME_SYNC0;
if (frame_recvd != 0x3){ if (frame_recvd != 0x3){
DEBUG_SET(DEBUG_RX_SFHSS_SPI, DEBUG_DATA_MISSING_FRAME, ++dataMissingFrame); DEBUG_SET(DEBUG_RX_SFHSS_SPI, DEBUG_DATA_MISSING_FRAME, ++dataMissingFrame);
@ -421,7 +421,7 @@ rx_spi_received_e sfhssSpiDataReceived(uint8_t *packet)
} }
frame_recvd = 0; frame_recvd = 0;
sfhssnextChannel(); sfhssnextChannel();
}else if (cc2500checkBindRequested(false)) { } else if (cc2500checkBindRequested(false)) {
SET_STATE(STATE_INIT); SET_STATE(STATE_INIT);
break; break;
} }