1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-19 14:25:20 +03:00

Merge branch 'master' into betaflight

Conflicts:
	src/main/config/config.c
	src/main/flight/imu.c
This commit is contained in:
borisbstyle 2015-09-29 01:03:25 +02:00
commit c944083f73
11 changed files with 765 additions and 69 deletions

View file

@ -1329,9 +1329,13 @@ static bool processInCommand(void)
if (channelCount > MAX_SUPPORTED_RC_CHANNEL_COUNT) {
headSerialError(0);
} else {
for (i = 0; i < channelCount; i++)
rcData[i] = read16();
rxMspFrameRecieve();
uint16_t frame[MAX_SUPPORTED_RC_CHANNEL_COUNT];
for (i = 0; i < channelCount; i++) {
frame[i] = read16();
}
rxMspFrameReceive(frame, channelCount);
}
}
break;