|
@@ -516,7 +516,7 @@ void DataExchangeClient::updateData(uint64_t timeInterval_ms)
|
|
|
gMutex_GPSIMU.lock();
|
|
|
mileage += (speed * timeInterval_ms/1000.0)/1000.0; // kilometer
|
|
|
gMutex_GPSIMU.unlock();
|
|
|
-// speed = 0.1; // m/s
|
|
|
+// speed = 0.0; // m/s
|
|
|
// shiftFeedback = ShiftStatus::SHIFT_DRIVE;
|
|
|
// steeringWheelAngleFeedback = 1.23; //+/-540 degree
|
|
|
// throttleFeedback = 0.12;
|
|
@@ -592,7 +592,7 @@ void DataExchangeClient::run()
|
|
|
|
|
|
QFile mileageFile;
|
|
|
mileageFile.setFileName("./mileage.txt");
|
|
|
- uint64_t fileWriteTime = xTime.elapsed();
|
|
|
+ int fileWriteTime = xTime.elapsed();
|
|
|
if(mileageFile.exists())
|
|
|
{
|
|
|
if(mileageFile.open(QIODevice::ReadOnly | QIODevice::Text))
|
|
@@ -613,20 +613,20 @@ void DataExchangeClient::run()
|
|
|
mileageFile.close();
|
|
|
}
|
|
|
|
|
|
- uint64_t lastTime = xTime.elapsed();
|
|
|
+ int lastTime = xTime.elapsed();
|
|
|
uint64_t interval = std::atoi(gstruploadInterval.c_str());
|
|
|
while (true)
|
|
|
{
|
|
|
- if((xTime.elapsed() - lastTime)>=interval)
|
|
|
+ if(abs(xTime.elapsed() - lastTime)>=interval)
|
|
|
{
|
|
|
updateData(xTime.elapsed() - lastTime);
|
|
|
std::string reply = uploadVehicleInfo();
|
|
|
std::cout<< reply <<std::endl;
|
|
|
- std::cout<<std::setprecision(8)<<destinationPosition.latitude()<<","<<destinationPosition.longitude()<<std::endl;
|
|
|
+// std::cout<<std::setprecision(8)<<destinationPosition.latitude()<<","<<destinationPosition.longitude()<<std::endl;
|
|
|
lastTime = xTime.elapsed();
|
|
|
}
|
|
|
|
|
|
- if((xTime.elapsed() - fileWriteTime) >= 2500)
|
|
|
+ if(abs(xTime.elapsed() - fileWriteTime) >= 2500)
|
|
|
{
|
|
|
if(mileageFile.open(QIODevice::WriteOnly | QIODevice::Text))
|
|
|
{
|