mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-06-02 03:49:12 +08:00
Removed load of string vs file for qurt build
DSPAL now supports reading from a file so the change is no longer required. Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
committed by
Julian Oes
parent
cb788d2c4f
commit
8ed263eda7
@@ -121,8 +121,6 @@ load(const char *devname, const char *fname)
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef __PX4_QURT
|
|
||||||
|
|
||||||
char buf[2048];
|
char buf[2048];
|
||||||
|
|
||||||
if (load_mixer_file(fname, &buf[0], sizeof(buf)) < 0) {
|
if (load_mixer_file(fname, &buf[0], sizeof(buf)) < 0) {
|
||||||
@@ -132,24 +130,6 @@ load(const char *devname, const char *fname)
|
|||||||
|
|
||||||
/* XXX pass the buffer to the device */
|
/* XXX pass the buffer to the device */
|
||||||
int ret = px4_ioctl(dev, MIXERIOCLOADBUF, (unsigned long)buf);
|
int ret = px4_ioctl(dev, MIXERIOCLOADBUF, (unsigned long)buf);
|
||||||
#else
|
|
||||||
char newbuf[] =
|
|
||||||
"R: 4x 10000 10000 10000 0\n"
|
|
||||||
"M: 1\n"
|
|
||||||
"O: 10000 10000 0 -10000 10000\n"
|
|
||||||
"S: 0 4 10000 10000 0 -10000 10000\n"
|
|
||||||
"M: 1\n"
|
|
||||||
"O: 10000 10000 0 -10000 10000\n"
|
|
||||||
"S: 0 5 10000 10000 0 -10000 10000\n"
|
|
||||||
"M: 1\n"
|
|
||||||
"O: 10000 10000 0 -10000 10000\n"
|
|
||||||
"S: 0 6 10000 10000 0 -10000 10000\n"
|
|
||||||
"M: 1\n"
|
|
||||||
"O: 10000 10000 0 -10000 10000\n"
|
|
||||||
"S: 0 7 10000 10000 0 -10000 10000\n";
|
|
||||||
/* XXX pass the buffer to the device */
|
|
||||||
int ret = px4_ioctl(dev, MIXERIOCLOADBUF, (unsigned long)newbuf);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
warnx("error loading mixers from %s", fname);
|
warnx("error loading mixers from %s", fname);
|
||||||
|
|||||||
Reference in New Issue
Block a user