Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 1144 → Rev 1145

/demos/trunk/auto/control.c
21,11 → 21,11
 
/**
------------
CVS : $Id: control.c,v 1.1.1.1 2002-09-02 09:37:42 pj Exp $
CVS : $Id: control.c,v 1.2 2003-03-24 13:29:08 giacomo Exp $
 
File: $File$
Revision: $Revision: 1.1.1.1 $
Last update: $Date: 2002-09-02 09:37:42 $
Revision: $Revision: 1.2 $
Last update: $Date: 2003-03-24 13:29:08 $
------------
**/
 
604,7 → 604,8
/* ------------------------------------------------------------------ */
 
void show_display(int rs, int ca, float speed, float max_speed,
float acc, float max_acc) {
float acc, float max_acc)
{
point hw, mx, mz; // three road states
point tl, ct, tr; // three car alignments
point sp1, sp2; // speed display coordinates
698,14 → 699,3
sem_post(&grx_mutex);
}
 
 
 
 
 
 
 
 
 
 
 
 
/demos/trunk/auto/makefile
12,12 → 12,11
include $(BASE)/config/example.mk
 
auto:
make -f $(SUBMAKE) APP=auto INIT= OTHEROBJS="initfil1.o sensor.o control.o keyb.o info.o utils.o tracks.o jetctrl.o" SHARKOPT=__OLDCHAR__
make -f $(SUBMAKE) APP=auto INIT= OTHEROBJS="initfil1.o sensor.o control.o keyb.o info.o utils.o tracks.o jetctrl.o" SHARKOPT="__OLDCHAR__ __GRX__"
 
auto2:
make -f $(SUBMAKE) APP=auto INIT= OTHEROBJS="initfil2.o sensor.o control.o keyb.o info.o utils.o tracks.o jetctrl.o" SHARKOPT=__OLDCHAR__
make -f $(SUBMAKE) APP=auto INIT= OTHEROBJS="initfil2.o sensor.o control.o keyb.o info.o utils.o tracks.o jetctrl.o" SHARKOPT="__OLDCHAR__ __GRX__"
 
auto3:
make -f $(SUBMAKE) APP=auto INIT= OTHEROBJS="initfil3.o sensor.o control.o keyb.o info.o utils.o tracks.o edfact.o jetctrl.o" SHARKOPT=__OLDCHAR__
make -f $(SUBMAKE) APP=auto INIT= OTHEROBJS="initfil3.o sensor.o control.o keyb.o info.o utils.o tracks.o edfact.o jetctrl.o" SHARKOPT="__OLDCHAR__ __GRX__"