Skip to content

Q
qgroundcontrol
Commit 8556a2a2 authored by pixhawk's avatar pixhawk
Browse files
Options

Fixed issue in Simulation link introduced by change to usec

parent f898f78f
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
src/comm/MAVLinkSimulationLink.cc
View file @ 8556a2a2
...@@ -76,7 +76,7 @@ MAVLinkSimulationLink::MAVLinkSimulationLink(QString readFile, QString writeFile ...@@ -76,7 +76,7 @@ MAVLinkSimulationLink::MAVLinkSimulationLink(QString readFile, QString writeFile
simulationHeader = simulationFile->readLine(); simulationHeader = simulationFile->readLine();
} }
receiveFile = new QFile(writeFile, this); receiveFile = new QFile(writeFile, this);
lastSent = MG::TIME::getGroundTimeNow(); lastSent = MG::TIME::getGroundTimeNow() * 1000;
if (simulationFile->exists()) if (simulationFile->exists())
{ {
...@@ -218,6 +218,8 @@ void MAVLinkSimulationLink::mainloop() ...@@ -218,6 +218,8 @@ void MAVLinkSimulationLink::mainloop()
static quint64 lastTime = 0; static quint64 lastTime = 0;
static quint64 baseTime = 0; static quint64 baseTime = 0;
quint64 time = QString(parts.first()).toLongLong(&ok, 10); quint64 time = QString(parts.first()).toLongLong(&ok, 10);
// FIXME Remove multiplicaton by 1000
time *= 1000;
if (ok) if (ok)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment