mirror of
https://github.com/ArduPilot/ardupilot
synced 2025-02-28 18:53:57 -04:00
Tools: use new AP_PERIPH_EFI_ENABLED define
This commit is contained in:
parent
49755d6212
commit
82a0347657
@ -201,7 +201,7 @@ void AP_Periph_FW::init()
|
||||
adsb_init();
|
||||
#endif
|
||||
|
||||
#ifdef HAL_PERIPH_ENABLE_EFI
|
||||
#if AP_PERIPH_EFI_ENABLED
|
||||
if (efi.enabled() && g.efi_port >= 0) {
|
||||
auto *uart = hal.serial(g.efi_port);
|
||||
if (uart != nullptr) {
|
||||
|
@ -192,7 +192,7 @@ public:
|
||||
void prepare_reboot();
|
||||
bool canfdout() const { return (g.can_fdmode == 1); }
|
||||
|
||||
#ifdef HAL_PERIPH_ENABLE_EFI
|
||||
#if AP_PERIPH_EFI_ENABLED
|
||||
void can_efi_update();
|
||||
#endif
|
||||
|
||||
@ -326,7 +326,7 @@ public:
|
||||
void hwesc_telem_update();
|
||||
#endif
|
||||
|
||||
#ifdef HAL_PERIPH_ENABLE_EFI
|
||||
#if AP_PERIPH_EFI_ENABLED
|
||||
AP_EFI efi;
|
||||
uint32_t efi_update_ms;
|
||||
#endif
|
||||
@ -446,7 +446,7 @@ public:
|
||||
|
||||
static const AP_Param::Info var_info[];
|
||||
|
||||
#ifdef HAL_PERIPH_ENABLE_EFI
|
||||
#if AP_PERIPH_EFI_ENABLED
|
||||
uint32_t last_efi_update_ms;
|
||||
#endif
|
||||
#if AP_PERIPH_MAG_ENABLED
|
||||
|
@ -518,7 +518,7 @@ const AP_Param::Info AP_Periph_FW::var_info[] = {
|
||||
GOBJECT(node_stats, "STAT", AP_Stats),
|
||||
#endif
|
||||
|
||||
#ifdef HAL_PERIPH_ENABLE_EFI
|
||||
#if AP_PERIPH_EFI_ENABLED
|
||||
// @Param: EFI_BAUDRATE
|
||||
// @DisplayName: EFI serial baudrate
|
||||
// @Description: EFI serial baudrate.
|
||||
|
@ -208,7 +208,7 @@ public:
|
||||
AP_Int32 battery_hide_mask;
|
||||
#endif
|
||||
|
||||
#ifdef HAL_PERIPH_ENABLE_EFI
|
||||
#if AP_PERIPH_EFI_ENABLED
|
||||
AP_Int32 efi_baudrate;
|
||||
AP_Int8 efi_port;
|
||||
#endif
|
||||
|
@ -1960,7 +1960,7 @@ void AP_Periph_FW::can_update()
|
||||
#ifdef HAL_PERIPH_ENABLE_RC_OUT
|
||||
rcout_update();
|
||||
#endif
|
||||
#ifdef HAL_PERIPH_ENABLE_EFI
|
||||
#if AP_PERIPH_EFI_ENABLED
|
||||
can_efi_update();
|
||||
#endif
|
||||
#ifdef HAL_PERIPH_ENABLE_DEVICE_TEMPERATURE
|
||||
|
@ -1,6 +1,6 @@
|
||||
#include "AP_Periph.h"
|
||||
|
||||
#ifdef HAL_PERIPH_ENABLE_EFI
|
||||
#if AP_PERIPH_EFI_ENABLED
|
||||
|
||||
/*
|
||||
EFI support
|
||||
@ -204,4 +204,4 @@ void AP_Periph_FW::can_efi_update(void)
|
||||
}
|
||||
}
|
||||
|
||||
#endif // HAL_PERIPH_ENABLE_EFI
|
||||
#endif // AP_PERIPH_EFI_ENABLED
|
||||
|
@ -960,7 +960,7 @@ class sitl_periph_universal(sitl_periph):
|
||||
AP_PERIPH_RANGEFINDER_ENABLED = 1,
|
||||
AP_PERIPH_BATTERY_ENABLED = 1,
|
||||
AP_PERIPH_BATTERY_BALANCE_ENABLED = 0,
|
||||
HAL_PERIPH_ENABLE_EFI = 1,
|
||||
AP_PERIPH_EFI_ENABLED = 1,
|
||||
AP_PERIPH_RPM_ENABLED = 1,
|
||||
AP_PERIPH_RPM_STREAM_ENABLED = 1,
|
||||
AP_RPM_STREAM_ENABLED = 1,
|
||||
@ -996,6 +996,7 @@ class sitl_periph_gps(sitl_periph):
|
||||
AP_PERIPH_MAG_ENABLED = 0,
|
||||
AP_PERIPH_BATTERY_BALANCE_ENABLED = 0,
|
||||
AP_PERIPH_BARO_ENABLED = 0,
|
||||
AP_PERIPH_EFI_ENABLED = 0,
|
||||
AP_PERIPH_RANGEFINDER_ENABLED = 0,
|
||||
AP_PERIPH_RTC_ENABLED = 0,
|
||||
AP_PERIPH_RCIN_ENABLED = 0,
|
||||
@ -1023,6 +1024,7 @@ class sitl_periph_battmon(sitl_periph):
|
||||
AP_PERIPH_GPS_ENABLED = 0,
|
||||
AP_PERIPH_IMU_ENABLED = 0,
|
||||
AP_PERIPH_MAG_ENABLED = 0,
|
||||
AP_PERIPH_EFI_ENABLED = 0,
|
||||
AP_PERIPH_RTC_ENABLED = 0,
|
||||
AP_PERIPH_RCIN_ENABLED = 0,
|
||||
AP_PERIPH_RPM_ENABLED = 0,
|
||||
|
Loading…
Reference in New Issue
Block a user