From c634a676be986dbbb943ff4041c23d151a030df6 Mon Sep 17 00:00:00 2001 From: Pavel Kirienko Date: Fri, 11 Apr 2014 15:38:00 +0400 Subject: [PATCH] Removed assert() in time sync master --- libuavcan/src/protocol/uc_global_time_sync_master.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libuavcan/src/protocol/uc_global_time_sync_master.cpp b/libuavcan/src/protocol/uc_global_time_sync_master.cpp index 39c83c2e5b..6604d7e722 100644 --- a/libuavcan/src/protocol/uc_global_time_sync_master.cpp +++ b/libuavcan/src/protocol/uc_global_time_sync_master.cpp @@ -35,7 +35,7 @@ void GlobalTimeSyncMaster::IfaceMaster::setTxTimestamp(UtcTime ts) } if (!prev_tx_utc_.isZero()) { - assert(0); + prev_tx_utc_ = UtcTime(); // Reset again, because there's something broken in the driver and we don't trust it pub_.getNode().registerInternalFailure("GlobalTimeSyncMaster publication conflict"); return; }