diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-10-24 10:39:27 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-10-24 10:39:27 +0200 |
| commit | 4d03d020af38c5c11f13f4ea60152683d596412d (patch) | |
| tree | ee3cb50981e92c3174021f259bddb2c168d58a36 /apps/gps | |
| parent | 18c009d2c1585e05e2cee456a8cf91c517e006d2 (diff) | |
| parent | 1065118ebc963dbed75da5c7093b1863f0e099a6 (diff) | |
| download | px4-firmware-4d03d020af38c5c11f13f4ea60152683d596412d.tar.gz px4-firmware-4d03d020af38c5c11f13f4ea60152683d596412d.tar.bz2 px4-firmware-4d03d020af38c5c11f13f4ea60152683d596412d.zip | |
Merge branch 'master' of github.com:PX4/Firmware into gps
Diffstat (limited to 'apps/gps')
| -rw-r--r-- | apps/gps/mtk.c | 2 | ||||
| -rw-r--r-- | apps/gps/nmea_helper.c | 2 | ||||
| -rw-r--r-- | apps/gps/ubx.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/apps/gps/mtk.c b/apps/gps/mtk.c index 2e90f50b1..374280d28 100644 --- a/apps/gps/mtk.c +++ b/apps/gps/mtk.c @@ -43,7 +43,7 @@ #include <pthread.h> #include <poll.h> #include <fcntl.h> -#include <arch/board/up_hrt.h> +#include <drivers/drv_hrt.h> #include <uORB/uORB.h> #include <uORB/topics/vehicle_gps_position.h> #include <mavlink/mavlink_log.h> diff --git a/apps/gps/nmea_helper.c b/apps/gps/nmea_helper.c index d1c9d364b..577a3a01c 100644 --- a/apps/gps/nmea_helper.c +++ b/apps/gps/nmea_helper.c @@ -44,7 +44,7 @@ #include <uORB/uORB.h> #include <uORB/topics/vehicle_gps_position.h> #include <mavlink/mavlink_log.h> -#include <arch/board/up_hrt.h> +#include <drivers/drv_hrt.h> #define NMEA_HEALTH_SUCCESS_COUNTER_LIMIT 2 #define NMEA_HEALTH_FAIL_COUNTER_LIMIT 2 diff --git a/apps/gps/ubx.c b/apps/gps/ubx.c index 2632aebab..f029a9e37 100644 --- a/apps/gps/ubx.c +++ b/apps/gps/ubx.c @@ -40,7 +40,7 @@ #include "gps.h" #include <sys/prctl.h> #include <poll.h> -#include <arch/board/up_hrt.h> +#include <drivers/drv_hrt.h> #include <uORB/uORB.h> #include <string.h> #include <stdbool.h> |