Browse Source

Fix simulation timestamp update

master
Stefan Bühler 11 years ago
parent
commit
06ecdf245c
3 changed files with 8 additions and 7 deletions
  1. 6
    5
      src/radar_main.c
  2. 1
    1
      testitradar
  3. 1
    1
      wscript

+ 6
- 5
src/radar_main.c View File

@@ -33,11 +33,12 @@ void trial_loop(trial *t) {
}
while (t->alive) {
timestamp step=getcurts(t) + LATENCY - t->sim.tm.ts;
t->sim.tm.vehicle.w = turn2w(t, t->sim.tm.vehicle.turn);

dgl(t,&t->sim.tm.vehicle,&t->sim.tm.vehicle,step,step);
t->sim.steps++;
if (step > 0) {
t->sim.tm.vehicle.w = turn2w(t, t->sim.tm.vehicle.turn);
dgl(t,&t->sim.tm.vehicle,&t->sim.tm.vehicle,step,step);
t->sim.tm.ts += step;
t->sim.steps++;
}
// simulate(t, getcurts(t) + LATENCY);
goradar(t);
if (-1 == trial_check_input(t)) return;

+ 1
- 1
testitradar View File

@@ -7,7 +7,7 @@ CMD="./build/default/src/icfp08radar localhost 17676"
if [ "$1" == "--gdb" ]; then
CMD="gdb --args ${CMD}"
elif [ "$1" == "--valgrind" ]; then
CMD="valgrind ${CMD}"
CMD="valgrind --leak-check=full ${CMD}"
fi

exec $CMD

+ 1
- 1
wscript View File

@@ -70,7 +70,7 @@ def configure(conf):
common_ccflags = [
'-std=gnu99', '-Wall', '-g', '-Wshadow', '-W', '-pedantic',
'-O2',
#'-O2',
# '-fPIC', '-D_GNU_SOURCE',
]
conf.env['CCFLAGS'] += common_ccflags

Loading…
Cancel
Save