fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-24 16:53:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merged DSM fixes

Browse Source
This commit is contained in:
Lorenz Meier
2012-12-05 19:55:33 +01:00
parent 126e6ac207 fd771f67f2
commit 1ebb3b4ada
22 changed files with 784 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/px4io/comms.c
+4 -10
View File
@@ -100,8 +100,8 @@ comms_main(void)
debug("FMU: ready");
for (;;) {
/* wait for serial data, but no more than 100ms */
poll(&fds, 1, 100);
/* wait for serial data, but no more than 10ms */
poll(&fds, 1, 10);
/*
* Pull bytes from FMU and feed them to the HX engine.
@@ -130,15 +130,9 @@ comms_main(void)
last_report_time = now;
/* populate the report */
for (int i = 0; i < system_state.rc_channels; i++)
for (unsigned i = 0; i < system_state.rc_channels; i++)
report.rc_channel[i] = system_state.rc_channel_data[i];
if (system_state.sbus_input_ok || system_state.dsm_input_ok || system_state.ppm_input_ok) {
report.channel_count = system_state.rc_channels;
} else {
report.channel_count = 0;
}
report.channel_count = system_state.rc_channels;
report.armed = system_state.armed;
/* and send it */