Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_HAL: remove HIL support

This commit is contained in:
Peter Barker 2021-06-09 21:31:35 +10:00 committed by Andrew Tridgell
parent 2ff4ec80ad
commit 3a8d3c38e7
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_HAL/AP_HAL_Boards.h
View File

@ -62,7 +62,7 @@
#define HAL_INS_NONE 0 #define HAL_INS_NONE 0
#define HAL_INS_MPU60XX_SPI 2 #define HAL_INS_MPU60XX_SPI 2
#define HAL_INS_MPU60XX_I2C 3 #define HAL_INS_MPU60XX_I2C 3
#define HAL_INS_HIL 4 #define HAL_INS_HIL_UNUSED 4 // unused
#define HAL_INS_VRBRAIN 8 #define HAL_INS_VRBRAIN 8
#define HAL_INS_MPU9250_SPI 9 #define HAL_INS_MPU9250_SPI 9
#define HAL_INS_MPU9250_I2C 13 #define HAL_INS_MPU9250_I2C 13
@ -73,14 +73,14 @@
/* Barometer driver types */ /* Barometer driver types */
#define HAL_BARO_NONE 0 #define HAL_BARO_NONE 0
#define HAL_BARO_HIL 6 #define HAL_BARO_HIL_UNUSED 6 // unused
#define HAL_BARO_20789_I2C_I2C 14 #define HAL_BARO_20789_I2C_I2C 14
#define HAL_BARO_20789_I2C_SPI 15 #define HAL_BARO_20789_I2C_SPI 15
#define HAL_BARO_LPS25H_IMU_I2C 17 #define HAL_BARO_LPS25H_IMU_I2C 17
/* Compass driver types */ /* Compass driver types */
#define HAL_COMPASS_NONE 0 #define HAL_COMPASS_NONE 0
#define HAL_COMPASS_HIL 3 #define HAL_COMPASS_HIL_UNUSED 3 // unused
/* Heat Types */ /* Heat Types */
#define HAL_LINUX_HEAT_PWM 1 #define HAL_LINUX_HEAT_PWM 1

6
libraries/AP_HAL/board/empty.h
View File

@ -5,9 +5,9 @@
#define HAL_MEM_CLASS HAL_MEM_CLASS_192 #define HAL_MEM_CLASS HAL_MEM_CLASS_192
#define HAL_STORAGE_SIZE 16384 #define HAL_STORAGE_SIZE 16384
#define HAL_STORAGE_SIZE_AVAILABLE HAL_STORAGE_SIZE #define HAL_STORAGE_SIZE_AVAILABLE HAL_STORAGE_SIZE
#define HAL_INS_DEFAULT HAL_INS_HIL #define HAL_INS_DEFAULT HAL_INS_NONE
#define HAL_BARO_DEFAULT HAL_BARO_HIL #define HAL_BARO_DEFAULT HAL_BARO_NONE
#define HAL_COMPASS_DEFAULT HAL_COMPASS_HIL #define HAL_COMPASS_DEFAULT HAL_COMPASS_NONE
#define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_NONE #define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_NONE
#define HAL_HAVE_BOARD_VOLTAGE 1 #define HAL_HAVE_BOARD_VOLTAGE 1

12
libraries/AP_HAL/board/linux.h
View File

@ -27,9 +27,9 @@
#define HAL_BOARD_LOG_DIRECTORY "logs" #define HAL_BOARD_LOG_DIRECTORY "logs"
#define HAL_BOARD_TERRAIN_DIRECTORY "terrain" #define HAL_BOARD_TERRAIN_DIRECTORY "terrain"
#define HAL_BOARD_STORAGE_DIRECTORY "." #define HAL_BOARD_STORAGE_DIRECTORY "."
#define HAL_INS_DEFAULT HAL_INS_HIL #define HAL_INS_DEFAULT HAL_INS_NONE
#define HAL_BARO_DEFAULT HAL_BARO_HIL #define HAL_BARO_DEFAULT HAL_BARO_NONE
#define HAL_COMPASS_DEFAULT HAL_COMPASS_HIL #define HAL_COMPASS_DEFAULT HAL_COMPASS_NONE
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_PXF || CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_ERLEBOARD #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_PXF || CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_ERLEBOARD
#if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_PXF #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_PXF
#define HAL_INS_PROBE_LIST PROBE_IMU_SPI(Invensense, "mpu9250", ROTATION_ROLL_180_YAW_270) #define HAL_INS_PROBE_LIST PROBE_IMU_SPI(Invensense, "mpu9250", ROTATION_ROLL_180_YAW_270)
@ -157,9 +157,9 @@
#define HAL_GPIO_LED_OFF 1 #define HAL_GPIO_LED_OFF 1
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_ZYNQ #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_ZYNQ
// Stub the sensors out for now, at least we can build and run // Stub the sensors out for now, at least we can build and run
#define HAL_INS_DEFAULT HAL_INS_HIL #define HAL_INS_DEFAULT HAL_INS_NONE
#define HAL_BARO_DEFAULT HAL_BARO_HIL #define HAL_BARO_DEFAULT HAL_BARO_NONE
#define HAL_COMPASS_DEFAULT HAL_COMPASS_HIL #define HAL_COMPASS_DEFAULT HAL_COMPASS_NONE
// only external compasses // only external compasses
#define HAL_PROBE_EXTERNAL_I2C_COMPASSES #define HAL_PROBE_EXTERNAL_I2C_COMPASSES
#define HAL_COMPASS_DEFAULT HAL_COMPASS_NONE #define HAL_COMPASS_DEFAULT HAL_COMPASS_NONE

6
libraries/AP_HAL/board/sitl.h
View File

@ -43,9 +43,9 @@
#define HAL_BOARD_LOG_DIRECTORY "logs" #define HAL_BOARD_LOG_DIRECTORY "logs"
#define HAL_BOARD_TERRAIN_DIRECTORY "terrain" #define HAL_BOARD_TERRAIN_DIRECTORY "terrain"
#define HAL_PARAM_DEFAULTS_PATH nullptr #define HAL_PARAM_DEFAULTS_PATH nullptr
#define HAL_INS_DEFAULT HAL_INS_HIL #define HAL_INS_DEFAULT HAL_INS_NONE
#define HAL_BARO_DEFAULT HAL_BARO_HIL #define HAL_BARO_DEFAULT HAL_BARO_NONE
#define HAL_COMPASS_DEFAULT HAL_COMPASS_HIL #define HAL_COMPASS_DEFAULT HAL_COMPASS_NONE
#define HAL_GPIO_A_LED_PIN 61 #define HAL_GPIO_A_LED_PIN 61
#define HAL_GPIO_B_LED_PIN 48 #define HAL_GPIO_B_LED_PIN 48
#define HAL_GPIO_C_LED_PIN 117 #define HAL_GPIO_C_LED_PIN 117