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

Merge pull request #1908 from blckmn/patch-6

Browse source 
Minor whitespace cleanup
This commit is contained in:
J Blackman 2016-12-28 14:00:35 +11:00 • committed by GitHub
commit 74cd69268c
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/main/rx/xbus.c
View file

@ -65,8 +65,8 @@
// However, the JR XG14 that is used for test at the moment // However, the JR XG14 that is used for test at the moment
// does only use 0xA1 as its output. This is why the implementation // does only use 0xA1 as its output. This is why the implementation
// is based on these numbers only. Maybe update this in the future? // is based on these numbers only. Maybe update this in the future?
#define XBUS_START_OF_FRAME_BYTE_A1 (0xA1) //12 channels #define XBUS_START_OF_FRAME_BYTE_A1 (0xA1) //12 channels
#define XBUS_START_OF_FRAME_BYTE_A2 (0xA2) //16 channels transfare, but only 12 channels use for #define XBUS_START_OF_FRAME_BYTE_A2 (0xA2) //16 channels transfare, but only 12 channels use for
// Pulse length convertion from [0...4095] to µs: // Pulse length convertion from [0...4095] to µs:
// 800µs -> 0x000 // 800µs -> 0x000
@ -85,7 +85,7 @@ static uint8_t xBusProvider;
// Use max values for ram areas // Use max values for ram areas
static volatile uint8_t xBusFrame[XBUS_FRAME_SIZE_A2]; //siz 35 for 16 channels in xbus_Mode_B static volatile uint8_t xBusFrame[XBUS_FRAME_SIZE_A2]; //siz 35 for 16 channels in xbus_Mode_B
static uint16_t xBusChannelData[XBUS_RJ01_CHANNEL_COUNT]; static uint16_t xBusChannelData[XBUS_RJ01_CHANNEL_COUNT];
// The xbus mode B CRC calculations // The xbus mode B CRC calculations
@ -227,14 +227,14 @@ static void xBusDataReceive(uint16_t c)
} }
// Check if we shall start a frame? // Check if we shall start a frame?
if (xBusFramePosition == 0) { if (xBusFramePosition == 0) {
if (c == XBUS_START_OF_FRAME_BYTE_A1) { if (c == XBUS_START_OF_FRAME_BYTE_A1) {
xBusDataIncoming = true; xBusDataIncoming = true;
xBusFrameLength = XBUS_FRAME_SIZE_A1; //decrease framesize (when receiver change, otherwise board must reboot) xBusFrameLength = XBUS_FRAME_SIZE_A1; //decrease framesize (when receiver change, otherwise board must reboot)
} else if (c == XBUS_START_OF_FRAME_BYTE_A2) {//16channel packet } else if (c == XBUS_START_OF_FRAME_BYTE_A2) {//16channel packet
xBusDataIncoming = true; xBusDataIncoming = true;
xBusFrameLength = XBUS_FRAME_SIZE_A2; //increase framesize xBusFrameLength = XBUS_FRAME_SIZE_A2; //increase framesize
} }
} }
// Only do this if we are receiving to a frame // Only do this if we are receiving to a frame
@ -294,7 +294,7 @@ bool xBusInit(const rxConfig_t *rxConfig, rxRuntimeConfig_t *rxRuntimeConfig)
xBusDataIncoming = false; xBusDataIncoming = false;
xBusFramePosition = 0; xBusFramePosition = 0;
baudRate = XBUS_BAUDRATE; baudRate = XBUS_BAUDRATE;
xBusFrameLength = XBUS_FRAME_SIZE_A1; xBusFrameLength = XBUS_FRAME_SIZE_A1;
xBusChannelCount = XBUS_CHANNEL_COUNT; xBusChannelCount = XBUS_CHANNEL_COUNT;
xBusProvider = SERIALRX_XBUS_MODE_B; xBusProvider = SERIALRX_XBUS_MODE_B;
break; break;