Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-10 09:58:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_PX4: rename macros to avoid conflicts

Browse Source 
these macros were also defined in NuttX in clock.h
This commit is contained in:
Andrew Tridgell 2017-05-05 20:09:29 +10:00
parent 279c1b9d9c
commit b72532164b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_HAL_PX4/I2CWrapper.h
View File

@ -1,3 +1,5 @@
#pragma once
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_PX4

4
libraries/AP_HAL_PX4/RCOutput_Tap.cpp
View File

@ -79,7 +79,7 @@ extern const AP_HAL::HAL &hal;
/****** ESC data types ******/
#define ESC_HAVE_CURRENT_SENSOR
#define MIN_BOOT_TIME_USEC (550 * USEC_PER_MSEC)
#define MIN_BOOT_TIME_USEC (550 * AP_USEC_PER_MSEC)
static const uint8_t crcTable[256] = {
0x00, 0xE7, 0x29, 0xCE, 0x52, 0xB5, 0x7B, 0x9C, 0xA4, 0x43, 0x8D, 0x6A,
@ -362,7 +362,7 @@ void RCOutput_Tap::init()
hrt_abstime uptime_usec = hrt_absolute_time();
if (uptime_usec < MIN_BOOT_TIME_USEC) {
hal.scheduler->delay((MIN_BOOT_TIME_USEC - uptime_usec) / USEC_PER_MSEC);
hal.scheduler->delay((MIN_BOOT_TIME_USEC - uptime_usec) / AP_USEC_PER_MSEC);
}
/* Issue Basic Config */