aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Common: remove checks for HAL_BOARD_APM2 and HAL_BOARD_APM1

Browse Source
This commit is contained in:
Lucas De Marchi 2015-11-03 11:46:29 -02:00 committed by Andrew Tridgell
parent 1c8f6c2ee5
commit b734777b95
2 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libraries/AP_Common/AP_Common.h
View File

@ -32,11 +32,7 @@
#pragma GCC diagnostic ignored "-Wredundant-decls"
// used to pack structures
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
#define PACKED
#else
#define PACKED __attribute__((__packed__))
#endif
// used to mark a function that may be unused in some builds
#define UNUSED_FUNCTION __attribute__((unused))
@ -149,22 +145,9 @@ enum HomeState {
/* Product IDs for all supported products follow */
#define AP_PRODUCT_ID_NONE 0x00 // Hardware in the loop
#define AP_PRODUCT_ID_APM1_1280 0x01 // APM1 with 1280 CPUs
#define AP_PRODUCT_ID_APM1_2560 0x02 // APM1 with 2560 CPUs
#define AP_PRODUCT_ID_SITL 0x03 // Software in the loop
#define AP_PRODUCT_ID_PX4 0x04 // PX4 on NuttX
#define AP_PRODUCT_ID_PX4_V2 0x05 // PX4 FMU2 on NuttX
#define AP_PRODUCT_ID_APM2ES_REV_C4 0x14 // APM2 with MPU6000ES_REV_C4
#define AP_PRODUCT_ID_APM2ES_REV_C5 0x15 // APM2 with MPU6000ES_REV_C5
#define AP_PRODUCT_ID_APM2ES_REV_D6 0x16 // APM2 with MPU6000ES_REV_D6
#define AP_PRODUCT_ID_APM2ES_REV_D7 0x17 // APM2 with MPU6000ES_REV_D7
#define AP_PRODUCT_ID_APM2ES_REV_D8 0x18 // APM2 with MPU6000ES_REV_D8
#define AP_PRODUCT_ID_APM2_REV_C4 0x54 // APM2 with MPU6000_REV_C4
#define AP_PRODUCT_ID_APM2_REV_C5 0x55 // APM2 with MPU6000_REV_C5
#define AP_PRODUCT_ID_APM2_REV_D6 0x56 // APM2 with MPU6000_REV_D6
#define AP_PRODUCT_ID_APM2_REV_D7 0x57 // APM2 with MPU6000_REV_D7
#define AP_PRODUCT_ID_APM2_REV_D8 0x58 // APM2 with MPU6000_REV_D8
#define AP_PRODUCT_ID_APM2_REV_D9 0x59 // APM2 with MPU6000_REV_D9
#define AP_PRODUCT_ID_FLYMAPLE 0x100 // Flymaple with ITG3205, ADXL345, HMC5883, BMP085
#define AP_PRODUCT_ID_L3G4200D 0x101 // Linux with L3G4200D and ADXL345
#define AP_PRODUCT_ID_PIXHAWK_FIRE_CAPE 0x102 // Linux with the PixHawk Fire Cape

14
libraries/AP_Common/c++.cpp
View File

@ -11,10 +11,7 @@
/*
globally override new and delete to ensure that we always start with
zero memory. This ensures consistent behaviour. Note that
initialising all members of all C++ classes separately takes a lot
of flash space. On APM1/APM2 it would mean we wouldn't fit on the
board at all.
zero memory. This ensures consistent behaviour.
*/
void * operator new(size_t size)
{
@ -43,14 +40,7 @@ void operator delete[](void * ptr)
}
#if CONFIG_HAL_BOARD == HAL_BOARD_APM1 || CONFIG_HAL_BOARD == HAL_BOARD_APM2 || CONFIG_HAL_BOARD == HAL_BOARD_FLYMAPLE
// Conflicts with libmaple wirish/cxxabi-compat.cpp
#if CONFIG_HAL_BOARD != HAL_BOARD_FLYMAPLE
extern "C" void __cxa_pure_virtual(){
while (1){}
}
#endif
#if CONFIG_HAL_BOARD == HAL_BOARD_FLYMAPLE
__extension__ typedef int __guard __attribute__((mode (__DI__)));