AP_EFI: change to use HAL_EFI_ENABLED

This commit is contained in:
Andrew Tridgell 2021-06-08 14:16:33 +10:00
parent 519b1a6913
commit cc6d799e7a
4 changed files with 10 additions and 10 deletions

View File

@ -15,7 +15,7 @@
#include "AP_EFI.h"
#if EFI_ENABLED
#if HAL_EFI_ENABLED
#include "AP_EFI_Serial_MS.h"
#include "AP_EFI_NWPMU.h"
@ -241,5 +241,5 @@ AP_EFI *EFI()
}
}
#endif // EFI_ENABLED
#endif // HAL_EFI_ENABLED

View File

@ -21,11 +21,11 @@
#include <AP_Param/AP_Param.h>
#include <GCS_MAVLink/GCS.h>
#ifndef EFI_ENABLED
#define EFI_ENABLED !HAL_MINIMIZE_FEATURES
#ifndef HAL_EFI_ENABLED
#define HAL_EFI_ENABLED !HAL_MINIMIZE_FEATURES && BOARD_FLASH_SIZE > 1024
#endif
#if EFI_ENABLED
#if HAL_EFI_ENABLED
#include "AP_EFI_Backend.h"
#include "AP_EFI_State.h"
@ -107,4 +107,4 @@ namespace AP {
AP_EFI *EFI();
};
#endif // EFI_ENABLED
#endif // HAL_EFI_ENABLED

View File

@ -15,7 +15,7 @@
#include "AP_EFI.h"
#if EFI_ENABLED
#if HAL_EFI_ENABLED
#include "AP_EFI_Backend.h"
@ -41,4 +41,4 @@ float AP_EFI_Backend::get_coef2(void) const
{
return frontend.coef2;
}
#endif // EFI_ENABLED
#endif // HAL_EFI_ENABLED

View File

@ -16,7 +16,7 @@
#include <AP_HAL/AP_HAL.h>
#include "AP_EFI_Serial_MS.h"
#if EFI_ENABLED
#if HAL_EFI_ENABLED
#include <AP_SerialManager/AP_SerialManager.h>
extern const AP_HAL::HAL &hal;
@ -229,4 +229,4 @@ uint32_t AP_EFI_Serial_MS::CRC32_compute_byte(uint32_t crc, uint8_t data)
return crc;
}
#endif // EFI_ENABLED
#endif // HAL_EFI_ENABLED