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

ExpressLRS: Minor style fix and clean up

Browse source
This commit is contained in:
Mathias Rasmussen 2021-12-29 21:11:27 +01:00 • committed by KarateBrot
parent 6a06f0e408
commit 4e8f866e9d
3 changed files with 13 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main/rx/expresslrs.c
View file

@ -127,11 +127,11 @@ static bool phaseLockEprHaveBothEvents(void)
static int32_t phaseLockEprResult(void) static int32_t phaseLockEprResult(void)
{ {
if (!phaseLockEprHaveBothEvents()) { if (phaseLockEprHaveBothEvents()) {
return 0; return (int32_t)(eprState.eventAtUs[EPR_SECOND] - eprState.eventAtUs[EPR_FIRST]);
} }
return (int32_t)(eprState.eventAtUs[EPR_SECOND] - eprState.eventAtUs[EPR_FIRST]); return 0;
} }
static void phaseLockEprReset(void) static void phaseLockEprReset(void)
@ -872,15 +872,10 @@ bool expressLrsSpiInit(const struct rxSpiConfig_s *rxConfig, struct rxRuntimeSta
switch (rxExpressLrsSpiConfig()->domain) { switch (rxExpressLrsSpiConfig()->domain) {
#ifdef USE_RX_SX127X #ifdef USE_RX_SX127X
case AU433: case AU433:
FALLTHROUGH;
case AU915: case AU915:
FALLTHROUGH;
case EU433: case EU433:
FALLTHROUGH;
case EU868: case EU868:
FALLTHROUGH;
case IN866: case IN866:
FALLTHROUGH;
case FCC915: case FCC915:
configureReceiverForSX127x(); configureReceiverForSX127x();
bindingRateIndex = ELRS_BINDING_RATE_900; bindingRateIndex = ELRS_BINDING_RATE_900;

28
src/main/rx/expresslrs_common.c
View file

@ -275,11 +275,10 @@ static linkQuality_t lq;
void lqIncrease(void) void lqIncrease(void)
{ {
if (lqPeriodIsSet()) { if (!lqPeriodIsSet()) {
return; lq.array[lq.index] |= lq.mask;
lq.value += 1;
} }
lq.array[lq.index] |= lq.mask;
lq.value += 1;
} }
void lqNewPeriod(void) void lqNewPeriod(void)
@ -327,20 +326,13 @@ uint16_t convertSwitch1b(const uint16_t val)
uint16_t convertSwitch3b(const uint16_t val) uint16_t convertSwitch3b(const uint16_t val)
{ {
switch (val) { switch (val) {
case 0: case 0: return 1000;
return 1000; case 1: return 1275;
case 1: case 2: return 1425;
return 1275; case 3: return 1575;
case 2: case 4: return 1725;
return 1425; case 5: return 2000;
case 3: default: return 1500;
return 1575;
case 4:
return 1725;
case 5:
return 2000;
default:
return 1500;
} }
} }

1
src/main/rx/expresslrs_telemetry.c
View file

@ -288,7 +288,6 @@ void processMspPacket(uint8_t *packet)
deviceInfoReplyPending = true; deviceInfoReplyPending = true;
break; break;
case CRSF_FRAMETYPE_MSP_REQ: case CRSF_FRAMETYPE_MSP_REQ:
FALLTHROUGH;
case CRSF_FRAMETYPE_MSP_WRITE: case CRSF_FRAMETYPE_MSP_WRITE:
if (bufferCrsfMspFrame(&packet[ELRS_MSP_PACKET_OFFSET], CRSF_FRAME_RX_MSP_FRAME_SIZE)) { if (bufferCrsfMspFrame(&packet[ELRS_MSP_PACKET_OFFSET], CRSF_FRAME_RX_MSP_FRAME_SIZE)) {
handleCrsfMspFrameBuffer(&bufferMspResponse); handleCrsfMspFrameBuffer(&bufferMspResponse);