fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-02 06:41:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge collision

Browse Source
This commit is contained in:
Lorenz Meier
2016-10-19 18:29:34 +02:00
parent 3f5f74399e
commit 7b2898eaee
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/px4fmu/fmu.cpp
-4
View File
@@ -1281,11 +1281,7 @@ PX4FMU::cycle()
} }
// read all available data from the serial RC input UART // read all available data from the serial RC input UART
<<<<<<< f7f406c45de427793c5475eee52f8d318de5b2ee
int newBytes = ::read(_rcs_fd, &_rcs_buf[0], sizeof(_rcs_buf) / sizeof(_rcs_buf[0]));
=======
int newBytes = ::read(_rcs_fd, &_rcs_buf[0], SBUS_BUFFER_SIZE); int newBytes = ::read(_rcs_fd, &_rcs_buf[0], SBUS_BUFFER_SIZE);
>>>>>>> Increased SBUS buffer size for more reliable SBUS and DSM parsing
switch (_rc_scan_state) { switch (_rc_scan_state) {
case RC_SCAN_SBUS: case RC_SCAN_SBUS: