| /demos/trunk/auto/makefile |
|---|
| 12,11 → 12,12 |
| 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__ __GRX__" |
| 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__ |
| 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__ __GRX__" |
| 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__ |
| 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__ __GRX__" |
| 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__ |
| /demos/trunk/auto/control.c |
|---|
| 21,11 → 21,11 |
| /** |
| ------------ |
| CVS : $Id: control.c,v 1.2 2003-03-24 13:29:08 giacomo Exp $ |
| CVS : $Id: control.c,v 1.1.1.1 2002-09-02 09:37:42 pj Exp $ |
| File: $File$ |
| Revision: $Revision: 1.2 $ |
| Last update: $Date: 2003-03-24 13:29:08 $ |
| Revision: $Revision: 1.1.1.1 $ |
| Last update: $Date: 2002-09-02 09:37:42 $ |
| ------------ |
| **/ |
| 604,8 → 604,7 |
| /* ------------------------------------------------------------------ */ |
| 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 |
| 699,3 → 698,14 |
| sem_post(&grx_mutex); |
| } |