Skip to content

Fix compilation error regarding to gettimeofday #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fmrico wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix compilation error regarding to gettimeofday #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions SmartCdlServer/smartsoft/src/CdlTask.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//--------------------------------------------------------------------------
// Code generated by the SmartSoft MDSD Toolchain
// The SmartSoft Toolchain has been developed by:
//
//
// Service Robotics Research Center
// University of Applied Sciences Ulm
// Prittwitzstr. 10
Expand All @@ -10,8 +10,8 @@
// Information about the SmartSoft MDSD Toolchain is available at:
// www.servicerobotik-ulm.de
//
// This file is generated once. Modify this file to your needs.
// If you want the toolchain to re-generate this file, please
// This file is generated once. Modify this file to your needs.
// If you want the toolchain to re-generate this file, please
// delete it before running the code generator.
//--------------------------------------------------------------------------

Expand Down Expand Up @@ -75,12 +75,12 @@ double angle00(double a)
return(a);
}

CdlTask::CdlTask(SmartACE::SmartComponent *comp)
CdlTask::CdlTask(SmartACE::SmartComponent *comp)
: CdlTaskCore(comp)
{
std::cout << "constructor CdlTask\n";
}
CdlTask::~CdlTask()
CdlTask::~CdlTask()
{
std::cout << "destructor CdlTask\n";
}
Expand Down Expand Up @@ -1164,7 +1164,7 @@ int CdlTask::on_execute()
//COMP->cdlLookup->calculateSpeedValues(v, w, x, y, a, COMP->localState.vmin, COMP->localState.vmax, COMP->localState.wmin, COMP->localState.wmax, CDL_STRATEGY_6, evalFunction, vres, wres, vaccres, waccres);
COMP->cdlLookup->setDesiredTranslationalSpeed(local_vmax);
// COMP->cdlLookup->calculateSpeedValues(v, w, x, y, a, local_vmin, local_vmax, local_wmin, local_wmax, CDL_STRATEGY_12, evalFunction, vres, wres, vaccres, waccres);
//TODO THIS SHOULD BE SEPARATED USING PARAMETER (INI)
//TODO THIS SHOULD BE SEPARATED USING PARAMETER (INI)
//FOR ROBOTINO AND FACTORY 4 SETTING
COMP->cdlLookup->calculateSpeedValues(v, w, x, y, a, local_vmin, local_vmax, local_wmin, local_wmax, CDL_STRATEGY_14, evalFunction, vres, wres, vaccres, waccres);
std::cout << "vres = " << vres << "; wres = " << wres << std::endl;
Expand Down Expand Up @@ -1996,12 +1996,12 @@ int CdlTask::on_execute()
std::cout<<"Robot is stalled first time"<<std::endl;
// first occurence of stalling situation
stalledFlag = 1;
gettimeofday(&beginStalledTime,0);
::gettimeofday(&beginStalledTime,0);
}
else
{
// not the first occurence of stalling situation
gettimeofday(&currentTime,0);
::gettimeofday(&currentTime,0);
timeDiff = (double)(currentTime.tv_usec - beginStalledTime.tv_usec)/1000000.0;
timeDiff += (double)(currentTime.tv_sec - beginStalledTime.tv_sec);

Expand Down
16 changes: 8 additions & 8 deletions SmartPlannerBreadthFirstSearch/smartsoft/src/PlannerTask.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//--------------------------------------------------------------------------
// Code generated by the SmartSoft MDSD Toolchain
// The SmartSoft Toolchain has been developed by:
//
//
// Service Robotics Research Center
// University of Applied Sciences Ulm
// Prittwitzstr. 10
Expand All @@ -10,8 +10,8 @@
// Information about the SmartSoft MDSD Toolchain is available at:
// www.servicerobotik-ulm.de
//
// This file is generated once. Modify this file to your needs.
// If you want the toolchain to re-generate this file, please
// This file is generated once. Modify this file to your needs.
// If you want the toolchain to re-generate this file, please
// delete it before running the code generator.
//--------------------------------------------------------------------------

Expand Down Expand Up @@ -52,12 +52,12 @@

#include <iostream>

PlannerTask::PlannerTask(SmartACE::SmartComponent *comp)
PlannerTask::PlannerTask(SmartACE::SmartComponent *comp)
: PlannerTaskCore(comp)
{
std::cout << "constructor PlannerTask\n";
}
PlannerTask::~PlannerTask()
PlannerTask::~PlannerTask()
{
std::cout << "destructor PlannerTask\n";
}
Expand Down Expand Up @@ -98,7 +98,7 @@ int PlannerTask::on_execute()
// this method is called from an outside loop,
// hence, NEVER use an infinite loop (like "while(1)") here inside!!!
// also do not use blocking calls which do not result from smartsoft kernel

int robotX,robotY,robotZ,robotA; // current position of the robot

double x1g,y1g,x2g,y2g;
Expand Down Expand Up @@ -410,12 +410,12 @@ int PlannerTask::on_execute()
{
// first occurence of noPath situation
COMP->noPathFlag = 1;
gettimeofday(&(COMP->beginNoPathTime),0);
::gettimeofday(&(COMP->beginNoPathTime),0);
}
else
{
// not the first occurence of noPath situation
gettimeofday(&(COMP->currentTime),0);
::gettimeofday(&(COMP->currentTime),0);
timeDiff = (double)(COMP->currentTime.tv_usec - COMP->beginNoPathTime.tv_usec)/1000000.0;
timeDiff += (double)(COMP->currentTime.tv_sec - COMP->beginNoPathTime.tv_sec);

Expand Down