Project

General

Profile

Revision 1969

Added by Alexander Lam about 13 years ago

Traffic Navigation:
Started integration of the new intersection queue code.
(main-intersectionDebug.c, main-new.c, & traffic_navigation.h).
The new code will not be compiled by default.
Additionally, I added #defines to all orb control statements because
they were interfering with each other. To turn some orb control statements on,
define them in traffic_navigation.h

View differences:

highways.c
46 46 
       		usb_puts(" : ");
47 47 
	        usb_puti(averagei);
48 48 
	        usb_puts("\r\n");
49 
#ifdef ORB_HIGHWAY
49 50 
		orb1_set_color(CYAN);
51 
#endif
50 52 
       		if(range == -1){
51 53 
                	range = PASS_DISTANCE+50;
52 54 
	        }
......
66 68 
	case 2:
67 69 
			if(changeLanes()){
68 70 
			   states = 0;
71 
#ifdef ORB_HIGHWAY
69 72 
			   orb1_set_color(GREEN);
73 
#endif
70 74 
			}
75 
#ifdef ORB_HIGHWAY
71 76 
			else orb1_set_color(YELLOW);
77 
#endif
72 78 
			break;
73 79 
	}
74 80 
	return 0;
......
90 96 
	average += range;
91 97 
	if(count >= COUNT_MAX){
92 98 
		if(state[0] != MERGELEFT){
99 
#ifdef ORB_HIGHWAY
93 100 
			orb1_set_color(ORANGE);
101 
#endif
94 102 
			if(average / COUNT_MAX < PASS_DISTANCE){
95 103 
				merge(ILEFT);
96 104 
				usb_puts("MERGE \r\n");
......
100 108 
		count =0;
101 109 
		average = 0;
102 110 
	}
111 
#ifdef ORB_HIGHWAY
103 112 
	//else orb1_set_color(GREEN);
113 
#endif
104 114 
}
105 115 
*/

Also available in: Unified diff