From 710fe76cdf8b0c39932200f41e230dcf1694f7d6 Mon Sep 17 00:00:00 2001 From: Mark Charlebois Date: Mon, 20 Apr 2015 12:11:27 -0700 Subject: [PATCH] Linux: minor fixups for rebase to master These changes were required after the rebase to master. Signed-off-by: Mark Charlebois --- src/drivers/drv_gpio.h | 2 +- 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 e11a035c20..c023ae7420 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 93b3af7811..eca2ec8ba5 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 */