diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-08-30 15:09:40 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-08-30 15:09:40 +0200 |
| commit | b53c0d6d7faa24e4ab9988586b8de2b6a6f07ca4 (patch) | |
| tree | 99ca6ca21eeb2dadaf35c9e79dcbab0daa76b4f9 | |
| parent | 37910d2230ae85db980e07b1e946da2d09169ff9 (diff) | |
| parent | 593df0ae12e0a255c1291dedf914482b4f1da496 (diff) | |
| download | px4-firmware-b53c0d6d7faa24e4ab9988586b8de2b6a6f07ca4.tar.gz px4-firmware-b53c0d6d7faa24e4ab9988586b8de2b6a6f07ca4.tar.bz2 px4-firmware-b53c0d6d7faa24e4ab9988586b8de2b6a6f07ca4.zip | |
Merge branch 'master' of github.com:PX4/Firmware into swissfang
| -rw-r--r-- | src/modules/uavcan/uavcan_clock.cpp | 2 | ||||
| m--------- | uavcan | 0 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/modules/uavcan/uavcan_clock.cpp b/src/modules/uavcan/uavcan_clock.cpp index e41d5f953..fe8ba406a 100644 --- a/src/modules/uavcan/uavcan_clock.cpp +++ b/src/modules/uavcan/uavcan_clock.cpp @@ -62,6 +62,8 @@ void adjustUtc(uavcan::UtcDuration adjustment) (void)adjustment; } +uavcan::uint64_t getUtcUSecFromCanInterrupt(); + uavcan::uint64_t getUtcUSecFromCanInterrupt() { return 0; diff --git a/uavcan b/uavcan -Subproject c7872def16e82a8b318d571829fe9622e2d35ff +Subproject c4c14c60fbbd9acd281ee97d5bb2a4027d0ae2d |