fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-20 06:43:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into io

Browse Source
This commit is contained in:
Julian Oes
2012-11-13 14:18:59 -08:00
parent a8dfcaace2 e52c7e3c4b
commit 359cc4bb86
19 changed files with 1296 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/systemlib/mixer/mixer_group.cpp
+1
View File
@@ -168,6 +168,7 @@ mixer_load_simple(Mixer::ControlCallback control_cb, uintptr_t cb_handle, int fd
/* let's assume we're going to read a simple mixer */
mixinfo = (mixer_simple_s *)malloc(MIXER_SIMPLE_SIZE(inputs));
mixinfo->control_count = inputs;
/* first, get the output scaler */
ret = mixer_getline(fd, buf, sizeof(buf));