Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 17:55:30 +03:00
Code Issues Wiki Activity

rebase correction

Browse source
This commit is contained in:
borisbstyle 2015-09-02 00:41:12 +02:00
parent 6e37b352e7
commit 4899c0898d
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -83,7 +83,6 @@ int16_t rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT]; // interval [1000;2000]
rxRuntimeConfig_t rxRuntimeConfig; rxRuntimeConfig_t rxRuntimeConfig;
static rxConfig_t *rxConfig; static rxConfig_t *rxConfig;
<<<<<<< HEAD
static uint16_t nullReadRawRC(rxRuntimeConfig_t *rxRuntimeConfig, uint8_t channel) { static uint16_t nullReadRawRC(rxRuntimeConfig_t *rxRuntimeConfig, uint8_t channel) {
UNUSED(rxRuntimeConfig); UNUSED(rxRuntimeConfig);
UNUSED(channel); UNUSED(channel);