From 3018728f50e5a8f5f73539da8c74f26393fbf286 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Sat, 6 May 2017 09:43:02 +1000
Subject: [PATCH] AP_UAVCAN: rename macros to avoid conflicts

---
 libraries/AP_UAVCAN/AP_UAVCAN.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/AP_UAVCAN/AP_UAVCAN.cpp b/libraries/AP_UAVCAN/AP_UAVCAN.cpp
index eec49dc807ff9..ca1e595f1ef17 100644
--- a/libraries/AP_UAVCAN/AP_UAVCAN.cpp
+++ b/libraries/AP_UAVCAN/AP_UAVCAN.cpp
@@ -78,8 +78,8 @@ static void gnss_fix_cb(const uavcan::ReceivedDataStructure<uavcan::equipment::g
                         uint64_t epoch_ms = uavcan::UtcTime(msg.gnss_timestamp).toUSec();
                         epoch_ms /= 1000;
                         uint64_t gps_ms = epoch_ms - UNIX_OFFSET_MSEC;
-                        state->time_week = (uint16_t)(gps_ms / MSEC_PER_WEEK);
-                        state->time_week_ms = (uint32_t)(gps_ms - (state->time_week) * MSEC_PER_WEEK);
+                        state->time_week = (uint16_t)(gps_ms / AP_MSEC_PER_WEEK);
+                        state->time_week_ms = (uint32_t)(gps_ms - (state->time_week) * AP_MSEC_PER_WEEK);
                     }
                 }