diff options
| author | Mark Charlebois <charlebm@gmail.com> | 2015-04-20 12:11:27 -0700 |
|---|---|---|
| committer | Mark Charlebois <charlebm@gmail.com> | 2015-04-20 12:11:27 -0700 |
| commit | 710fe76cdf8b0c39932200f41e230dcf1694f7d6 (patch) | |
| tree | cfbeaa9ca0010c41b7d019fcd42bbf1c5099ae9b | |
| parent | 36d17a061e24993ca033c44058e6873ba043336c (diff) | |
| download | px4-firmware-710fe76cdf8b0c39932200f41e230dcf1694f7d6.tar.gz px4-firmware-710fe76cdf8b0c39932200f41e230dcf1694f7d6.tar.bz2 px4-firmware-710fe76cdf8b0c39932200f41e230dcf1694f7d6.zip | |
Linux: minor fixups for rebase to master
These changes were required after the rebase to master.
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
| -rw-r--r-- | src/drivers/drv_gpio.h | 2 | ||||
| -rw-r--r-- | src/drivers/hil/hil_linux.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/drv_gpio.h b/src/drivers/drv_gpio.h index e11a035c2..c023ae742 100644 --- a/src/drivers/drv_gpio.h +++ b/src/drivers/drv_gpio.h @@ -120,7 +120,7 @@ #if !defined(CONFIG_ARCH_BOARD_PX4IO_V1) && !defined(CONFIG_ARCH_BOARD_PX4IO_V2) && \ !defined(CONFIG_ARCH_BOARD_PX4FMU_V1) && !defined(CONFIG_ARCH_BOARD_PX4FMU_V2) && \ - !defined(CONFIG_ARCH_BOARD_AEROCORE) && !defined(CONFIG_ARCH_BOARD_PX4_STM32F4DISCOVERY) \ + !defined(CONFIG_ARCH_BOARD_AEROCORE) && !defined(CONFIG_ARCH_BOARD_PX4_STM32F4DISCOVERY) && \ !defined(CONFIG_ARCH_BOARD_LINUXTEST) # error No CONFIG_ARCH_BOARD_xxxx set #endif diff --git a/src/drivers/hil/hil_linux.cpp b/src/drivers/hil/hil_linux.cpp index 93b3af781..eca2ec8ba 100644 --- a/src/drivers/hil/hil_linux.cpp +++ b/src/drivers/hil/hil_linux.cpp @@ -401,7 +401,7 @@ HIL::task_main() if (_mixers != nullptr) { /* do mixing */ - outputs.noutputs = _mixers->mix(&outputs.output[0], num_outputs); + outputs.noutputs = _mixers->mix(&outputs.output[0], num_outputs, NULL); outputs.timestamp = hrt_absolute_time(); /* iterate actuators */ |