mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-19 19:13:34 +08:00
Merge pull request #2378 from mcharleb/sitl-rename
SITL: changed posix_default to posix_sitl
This commit is contained in:
@@ -114,14 +114,14 @@
|
||||
/* no GPIO driver on the PX4_STM32F4DISCOVERY board */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_ARCH_BOARD_POSIXTEST
|
||||
/* no GPIO driver on the POSIXTEST board */
|
||||
#ifdef CONFIG_ARCH_BOARD_SITL
|
||||
/* no GPIO driver on the SITL configuration */
|
||||
#endif
|
||||
|
||||
#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_POSIXTEST)
|
||||
!defined(CONFIG_ARCH_BOARD_SITL)
|
||||
# error No CONFIG_ARCH_BOARD_xxxx set
|
||||
#endif
|
||||
/*
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
#define HW_ARCH "PX4_STM32F4DISCOVERY"
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_ARCH_BOARD_POSIXTEST
|
||||
#ifdef CONFIG_ARCH_BOARD_SITL
|
||||
#define HW_ARCH "LINUXTEST"
|
||||
#endif
|
||||
#endif /* VERSION_H_ */
|
||||
|
||||
@@ -274,7 +274,7 @@ adcsim_main(int argc, char *argv[])
|
||||
int ret = 0;
|
||||
|
||||
if (g_adc == nullptr) {
|
||||
/* XXX this hardcodes the default channel set for POSIXTEST - should be configurable */
|
||||
/* FIXME - this hardcodes the default channel set for SITL - should be configurable */
|
||||
g_adc = new ADCSIM((1 << 10) | (1 << 11) | (1 << 12) | (1 << 13));
|
||||
|
||||
if (g_adc == nullptr) {
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
#define CONFIG_SCHED_WORKQUEUE 1
|
||||
#define CONFIG_SCHED_HPWORK 1
|
||||
#define CONFIG_SCHED_LPWORK 1
|
||||
#define CONFIG_ARCH_BOARD_POSIXTEST 1
|
||||
#define CONFIG_ARCH_BOARD_SITL 1
|
||||
|
||||
/** time in ms between checks for work in work queues **/
|
||||
#define CONFIG_SCHED_WORKPERIOD 50000
|
||||
|
||||
Reference in New Issue
Block a user