From b0b93f8928bca96275fbfc8cba193b832fad6525 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Wed, 9 Nov 2016 12:47:38 +1100
Subject: [PATCH] AP_BoardConfig: switch pixracer to always use in-tree drivers
---
libraries/AP_BoardConfig/AP_BoardConfig.h | 3 +--
libraries/AP_BoardConfig/px4_drivers.cpp | 8 ++++++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/libraries/AP_BoardConfig/AP_BoardConfig.h b/libraries/AP_BoardConfig/AP_BoardConfig.h
index 0ced0a5814..b7a96b4fef 100644
--- a/libraries/AP_BoardConfig/AP_BoardConfig.h
+++ b/libraries/AP_BoardConfig/AP_BoardConfig.h
@@ -57,8 +57,7 @@ public:
#endif
PX4_BOARD_TEST_V1 = 101,
PX4_BOARD_TEST_V2 = 102,
- PX4_BOARD_TEST_V3 = 103,
- PX4_BOARD_TEST_V4 = 104,
+ PX4_BOARD_TEST_V3 = 103
};
#endif
diff --git a/libraries/AP_BoardConfig/px4_drivers.cpp b/libraries/AP_BoardConfig/px4_drivers.cpp
index 38fe761d21..f9619bf5fc 100644
--- a/libraries/AP_BoardConfig/px4_drivers.cpp
+++ b/libraries/AP_BoardConfig/px4_drivers.cpp
@@ -659,11 +659,15 @@ void AP_BoardConfig::px4_setup_drivers(void)
}
#endif
+#if defined(CONFIG_ARCH_BOARD_PX4FMU_V4)
+ px4.board_type.set_and_notify(PX4_BOARD_PIXRACER);
+#endif
+
if (px4.board_type == PX4_BOARD_TEST_V1 ||
px4.board_type == PX4_BOARD_TEST_V2 ||
px4.board_type == PX4_BOARD_TEST_V3 ||
- px4.board_type == PX4_BOARD_TEST_V4 ||
- px4.board_type == PX4_BOARD_PHMINI) {
+ px4.board_type == PX4_BOARD_PHMINI ||
+ px4.board_type == PX4_BOARD_PIXRACER) {
// use in-tree drivers
printf("Using in-tree drivers\n");
px4_configured_board = (enum px4_board_type)px4.board_type.get();
--
GitLab