Merge pull request #61 from ethz-asl/fix/DeviceTimePassThroughOwt

HannesSommer · web-flow · commit 9e9d782dc7bb · 2020-05-16T18:26:00.000+02:00
Fixed fatal bug in DeviceTimePassThroughOwt
diff --git a/cuckoo_time_translator_algorithms/src/OneWayTranslator.cpp b/cuckoo_time_translator_algorithms/src/OneWayTranslator.cpp
@@ -55,8 +55,8 @@ LocalTime DeviceTimePassThroughOwt::translateToLocalTimestamp(RemoteTime remoteT
   return LocalTime(static_cast<double>(remoteTimeTics));
 }
 
-LocalTime DeviceTimePassThroughOwt::updateAndTranslateToLocalTimestamp(RemoteTime /*remoteTimeTics*/, LocalTime localTimeSecs) {
-  return localTimeSecs;
+LocalTime DeviceTimePassThroughOwt::updateAndTranslateToLocalTimestamp(RemoteTime remoteTimeTics, LocalTime /*localTimeSecs*/) {
+  return translateToLocalTimestamp(remoteTimeTics);
 }
 
 bool DeviceTimePassThroughOwt::isReadyToTranslate() const {

Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,8 @@ LocalTime DeviceTimePassThroughOwt::translateToLocalTimestamp(RemoteTime remoteT`
`55`	`55`	`return LocalTime(static_cast<double>(remoteTimeTics));`
`56`	`56`	`}`
`57`	`57`
`58`		`-LocalTime DeviceTimePassThroughOwt::updateAndTranslateToLocalTimestamp(RemoteTime /remoteTimeTics/, LocalTime localTimeSecs) {`
`59`		`- return localTimeSecs;`
	`58`	`+LocalTime DeviceTimePassThroughOwt::updateAndTranslateToLocalTimestamp(RemoteTime remoteTimeTics, LocalTime /localTimeSecs/) {`
	`59`	`+ return translateToLocalTimestamp(remoteTimeTics);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`bool DeviceTimePassThroughOwt::isReadyToTranslate() const {`