Sat, 10 Dec 2011 16:37:55 +0100
added live init to slotcli
0
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
1 | #include <avr/interrupt.h> |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
2 | #include <avr/io.h> |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
3 | #include <avr/wdt.h> |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
4 | #include <avr/eeprom.h> |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
5 | #include <stdlib.h> |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
6 | #include <stdint.h> |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
7 | #include <avr/pgmspace.h> |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
8 | #include <util/delay.h> |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
9 | |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
10 | #include "driver/rs232.h" |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
11 | #include "driver/adc.h" |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
12 | |
2
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
13 | #include "main.h" |
0
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
14 | #include "lowlevel.h" |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
15 | |
37
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
16 | char ok[] PROGMEM="OK\n"; |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
17 | char busy[] PROGMEM="BUSY\n"; |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
18 | char prepare[] PROGMEM="!RACE PREPARE\n"; |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
19 | char countdownstart[] PROGMEM="!COUNTDOWN\n"; |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
20 | char racestart[] PROGMEM="!RACE START\n"; |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
21 | |
45 | 22 | typedef union { |
46
d200e3d8a550
corrected lap times, packed data struct for each slotcar
Malte Bayer <mbayer@neo-soft.org>
parents:
45
diff
changeset
|
23 | uint32_t value; |
45 | 24 | uint16_t word[2]; // high, low word |
25 | uint8_t byte[4]; // all four bytes | |
26 | } u32; | |
37
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
27 | |
59
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
28 | #define FUEL_FULL 10000 |
62
66dd5763dfb3
added car5+6 to trackswitch detector
Malte Bayer <mbayer@neo-soft.org>
parents:
60
diff
changeset
|
29 | #define FUEL_DIVISOR 25 |
66dd5763dfb3
added car5+6 to trackswitch detector
Malte Bayer <mbayer@neo-soft.org>
parents:
60
diff
changeset
|
30 | //#define FUEL_DIVISOR 10 |
46
d200e3d8a550
corrected lap times, packed data struct for each slotcar
Malte Bayer <mbayer@neo-soft.org>
parents:
45
diff
changeset
|
31 | typedef struct { |
49
3957ff8e86c6
more memsave through packed structure#
Malte Bayer <mbayer@neo-soft.org>
parents:
48
diff
changeset
|
32 | unsigned speedlimit:4; // 4bits speedlimit |
3957ff8e86c6
more memsave through packed structure#
Malte Bayer <mbayer@neo-soft.org>
parents:
48
diff
changeset
|
33 | unsigned speedminimum:4; // 4bits speedminimum |
59
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
34 | unsigned seccnt:4; // 4 bits tenth seconds counter |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
35 | unsigned accel:4; // 4 bits last configured acceleration |
49
3957ff8e86c6
more memsave through packed structure#
Malte Bayer <mbayer@neo-soft.org>
parents:
48
diff
changeset
|
36 | unsigned trackswitch:1; // 1bit bool |
60
bfc2f2d6913c
added refueling mechanism by stopping the car
Malte Bayer <mbayer@neo-soft.org>
parents:
59
diff
changeset
|
37 | unsigned canrefuel:1; // 1bit bool |
59
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
38 | uint16_t jumpstart_time, laps, fuel; |
46
d200e3d8a550
corrected lap times, packed data struct for each slotcar
Malte Bayer <mbayer@neo-soft.org>
parents:
45
diff
changeset
|
39 | u32 lap_time_start, lap_time; |
d200e3d8a550
corrected lap times, packed data struct for each slotcar
Malte Bayer <mbayer@neo-soft.org>
parents:
45
diff
changeset
|
40 | } cardata; |
d200e3d8a550
corrected lap times, packed data struct for each slotcar
Malte Bayer <mbayer@neo-soft.org>
parents:
45
diff
changeset
|
41 | |
59
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
42 | static char s[8]; |
37
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
43 | static uint8_t countdown, countdown_loops; |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
44 | uint8_t mode = 0; |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
45 | // valid race modes: |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
46 | // 0: free drive / idle |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
47 | // 1: waiting for countdown start |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
48 | // 2: race countdown initiated |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
49 | // 3: Race start condition |
73
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
50 | uint8_t liveinfo = 0; |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
51 | uint8_t fuel_enabled = 1; |
37
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
52 | |
45 | 53 | volatile u32 sysclk; |
42
018d4d63ad3b
implemented 500ns timer and set jumpstart time
Malte Bayer <mbayer@neo-soft.org>
parents:
41
diff
changeset
|
54 | volatile uint8_t sysclk_packettimer = 0; |
46
d200e3d8a550
corrected lap times, packed data struct for each slotcar
Malte Bayer <mbayer@neo-soft.org>
parents:
45
diff
changeset
|
55 | volatile cardata slot[MAX_SLOTS]; |
44
4f4326794ba4
implemented lap time, there is some bug in 32bit substraction yet
Malte Bayer <mbayer@neo-soft.org>
parents:
43
diff
changeset
|
56 | |
48
5bba01aad0a6
memsave and implemented minimum slot speed for virtual cars
Malte Bayer <mbayer@neo-soft.org>
parents:
47
diff
changeset
|
57 | volatile uint8_t car0, car1; |
41
9857c18c5e64
implemented car detection to cu
Malte Bayer <mbayer@neo-soft.org>
parents:
37
diff
changeset
|
58 | volatile uint16_t car0_new, car0_old; |
9857c18c5e64
implemented car detection to cu
Malte Bayer <mbayer@neo-soft.org>
parents:
37
diff
changeset
|
59 | volatile uint16_t car1_new, car1_old; |
9857c18c5e64
implemented car detection to cu
Malte Bayer <mbayer@neo-soft.org>
parents:
37
diff
changeset
|
60 | uint8_t car0_state, car1_state; |
36
aea84f4f5a12
feature: program a specific controller speed limit without changing the car's acceleration
Malte Bayer <mbayer@neo-soft.org>
parents:
35
diff
changeset
|
61 | |
4
58529e14c45c
implemented rs232 program word injection
Malte Bayer <mbayer@neo-soft.org>
parents:
3
diff
changeset
|
62 | volatile uint8_t program_count = 0; |
58529e14c45c
implemented rs232 program word injection
Malte Bayer <mbayer@neo-soft.org>
parents:
3
diff
changeset
|
63 | volatile uint8_t program_id; |
58529e14c45c
implemented rs232 program word injection
Malte Bayer <mbayer@neo-soft.org>
parents:
3
diff
changeset
|
64 | volatile uint8_t program_command; |
58529e14c45c
implemented rs232 program word injection
Malte Bayer <mbayer@neo-soft.org>
parents:
3
diff
changeset
|
65 | volatile uint8_t program_parameter; |
58529e14c45c
implemented rs232 program word injection
Malte Bayer <mbayer@neo-soft.org>
parents:
3
diff
changeset
|
66 | |
0
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
67 | volatile uint8_t datalen = 0; |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
68 | char data[10]; // 8 bytes data buffer + string termination |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
69 | |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
70 | static char buffer[RS232_BUFSIZE+1]; |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
71 | static uint8_t buffer_len; |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
72 | |
6
2405aff29a51
added response receiver timer
Malte Bayer <mbayer@neo-soft.org>
parents:
5
diff
changeset
|
73 | volatile uint16_t transmit_buffer; |
2405aff29a51
added response receiver timer
Malte Bayer <mbayer@neo-soft.org>
parents:
5
diff
changeset
|
74 | volatile uint16_t transmit_buffer_queue; |
2405aff29a51
added response receiver timer
Malte Bayer <mbayer@neo-soft.org>
parents:
5
diff
changeset
|
75 | volatile uint8_t transmit_len; |
2405aff29a51
added response receiver timer
Malte Bayer <mbayer@neo-soft.org>
parents:
5
diff
changeset
|
76 | volatile uint8_t transmit_len_next; |
2405aff29a51
added response receiver timer
Malte Bayer <mbayer@neo-soft.org>
parents:
5
diff
changeset
|
77 | volatile uint8_t transmit_len_queue; |
2405aff29a51
added response receiver timer
Malte Bayer <mbayer@neo-soft.org>
parents:
5
diff
changeset
|
78 | |
69
27c0c0095e26
implemented responsewire in CU firmware
Malte Bayer <mbayer@neo-soft.org>
parents:
64
diff
changeset
|
79 | volatile uint16_t responsewire_data = 0; |
6
2405aff29a51
added response receiver timer
Malte Bayer <mbayer@neo-soft.org>
parents:
5
diff
changeset
|
80 | volatile uint16_t response; |
33 | 81 | volatile uint8_t response_len; |
6
2405aff29a51
added response receiver timer
Malte Bayer <mbayer@neo-soft.org>
parents:
5
diff
changeset
|
82 | volatile uint8_t timer0_delay; |
2405aff29a51
added response receiver timer
Malte Bayer <mbayer@neo-soft.org>
parents:
5
diff
changeset
|
83 | |
2405aff29a51
added response receiver timer
Malte Bayer <mbayer@neo-soft.org>
parents:
5
diff
changeset
|
84 | |
73
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
85 | /* RESPONSEWIRE frame format: |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
86 | 1 startbit |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
87 | 2 car id bit 1 |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
88 | 3 car id bit 2 |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
89 | 4 car id bit 3 |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
90 | 5 track change status bit 1 |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
91 | 6 track change status bit 2 |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
92 | 7 track change status bit 3 |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
93 | 8 track change status bit 4 |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
94 | 9 sender id bit 1 |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
95 | 10 sender id bit 2 |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
96 | 11 sender id bit 3 |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
97 | 12 sender id bit 4 |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
98 | 13 device type bit 1 |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
99 | 14 device type bit 2 |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
100 | 15 device type bit 3 |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
101 | 16 stopbit |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
102 | */ |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
103 | |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
104 | /* PITLANE STATUS DEFINITION |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
105 | 1 = AA |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
106 | 2 = AB |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
107 | 3 = BB |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
108 | 4 = BA |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
109 | 5 = BC |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
110 | 6 = ZZ -> pitlane exit |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
111 | */ |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
112 | |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
113 | #define STARTSTOP 0b1000000000000001 |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
114 | void decode_responsewire(void) { |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
115 | uint16_t data = responsewire_data; |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
116 | // first check if start + stopbit are set |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
117 | // todo future: unsure but last bit doesnt get set?! |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
118 | /* |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
119 | if ((data & STARTSTOP) != STARTSTOP) { |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
120 | RS232_puts("RW BAD\n"); |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
121 | return; // incomplete response |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
122 | } |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
123 | */ |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
124 | // now extract the car id, track change status |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
125 | uint8_t car = ((data >> 1) & 0b111); |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
126 | uint8_t status = ((data >> 4) & 0b1111); |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
127 | uint8_t sender = ((data >> 8) & 0b1111); |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
128 | uint8_t type = ((data >> 12) & 0b111); |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
129 | if (type == 4) { |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
130 | // pitlane response |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
131 | if (status == 5) slot[car].canrefuel = 1; |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
132 | if (status == 6) for (data=0; data<MAX_SLOTS; data++) slot[data].canrefuel = 0; |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
133 | } |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
134 | RS232_puts("RW:"); |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
135 | itoa(car, s, 16); |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
136 | RS232_puts(s); |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
137 | RS232_putc(':'); |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
138 | itoa(type, s, 16); |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
139 | RS232_puts(s); |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
140 | RS232_putc(':'); |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
141 | itoa(sender, s, 16); |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
142 | RS232_puts(s); |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
143 | RS232_putc(':'); |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
144 | itoa(status, s, 16); |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
145 | RS232_puts(s); |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
146 | RS232_putc('\n'); |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
147 | } |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
148 | |
35
00166228a419
cli: implemented setting of fuel, brake, speed, blinkstate for any car
Malte Bayer <mbayer@neo-soft.org>
parents:
34
diff
changeset
|
149 | int insert_queue(uint16_t tmp, uint8_t len) { |
00166228a419
cli: implemented setting of fuel, brake, speed, blinkstate for any car
Malte Bayer <mbayer@neo-soft.org>
parents:
34
diff
changeset
|
150 | if (transmit_buffer_queue == 0) { |
00166228a419
cli: implemented setting of fuel, brake, speed, blinkstate for any car
Malte Bayer <mbayer@neo-soft.org>
parents:
34
diff
changeset
|
151 | transmit_buffer_queue = tmp; |
00166228a419
cli: implemented setting of fuel, brake, speed, blinkstate for any car
Malte Bayer <mbayer@neo-soft.org>
parents:
34
diff
changeset
|
152 | transmit_len_queue = len; |
00166228a419
cli: implemented setting of fuel, brake, speed, blinkstate for any car
Malte Bayer <mbayer@neo-soft.org>
parents:
34
diff
changeset
|
153 | return 1; |
00166228a419
cli: implemented setting of fuel, brake, speed, blinkstate for any car
Malte Bayer <mbayer@neo-soft.org>
parents:
34
diff
changeset
|
154 | } |
00166228a419
cli: implemented setting of fuel, brake, speed, blinkstate for any car
Malte Bayer <mbayer@neo-soft.org>
parents:
34
diff
changeset
|
155 | return 0; |
00166228a419
cli: implemented setting of fuel, brake, speed, blinkstate for any car
Malte Bayer <mbayer@neo-soft.org>
parents:
34
diff
changeset
|
156 | } |
00166228a419
cli: implemented setting of fuel, brake, speed, blinkstate for any car
Malte Bayer <mbayer@neo-soft.org>
parents:
34
diff
changeset
|
157 | |
0
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
158 | ISR ( USART_RXC_vect ) { |
36
aea84f4f5a12
feature: program a specific controller speed limit without changing the car's acceleration
Malte Bayer <mbayer@neo-soft.org>
parents:
35
diff
changeset
|
159 | uint8_t tmp; |
0
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
160 | char c = UDR; |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
161 | |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
162 | // check for buffer overflow |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
163 | if (buffer_len==sizeof(buffer)) { |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
164 | buffer_len=0; |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
165 | } else { |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
166 | // collect characters until end of line |
35
00166228a419
cli: implemented setting of fuel, brake, speed, blinkstate for any car
Malte Bayer <mbayer@neo-soft.org>
parents:
34
diff
changeset
|
167 | if ( (c=='\n') ) { |
0
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
168 | buffer[buffer_len]=0; |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
169 | |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
170 | // packet end received, parse the received packet |
4
58529e14c45c
implemented rs232 program word injection
Malte Bayer <mbayer@neo-soft.org>
parents:
3
diff
changeset
|
171 | switch (buffer[0]) { |
58529e14c45c
implemented rs232 program word injection
Malte Bayer <mbayer@neo-soft.org>
parents:
3
diff
changeset
|
172 | case 'P': // inject a program data word to the rails |
5
7319de27d44a
added queue busy response on command injection
Malte Bayer <mbayer@neo-soft.org>
parents:
4
diff
changeset
|
173 | if (program_count == 0) { |
7319de27d44a
added queue busy response on command injection
Malte Bayer <mbayer@neo-soft.org>
parents:
4
diff
changeset
|
174 | program_id = buffer[3]-'0'; |
7319de27d44a
added queue busy response on command injection
Malte Bayer <mbayer@neo-soft.org>
parents:
4
diff
changeset
|
175 | program_command = buffer[1]-'0'; |
10 | 176 | if (program_command > 9) |
177 | program_command = buffer[1]-'A'+10; | |
5
7319de27d44a
added queue busy response on command injection
Malte Bayer <mbayer@neo-soft.org>
parents:
4
diff
changeset
|
178 | program_parameter = buffer[2]-'0'; |
10 | 179 | if (program_parameter > 9) |
180 | program_parameter = buffer[2]-'A'+10; | |
5
7319de27d44a
added queue busy response on command injection
Malte Bayer <mbayer@neo-soft.org>
parents:
4
diff
changeset
|
181 | if (program_command < 4) |
7319de27d44a
added queue busy response on command injection
Malte Bayer <mbayer@neo-soft.org>
parents:
4
diff
changeset
|
182 | program_count = 0x02; // send commands twice (fuel, speed, brake) |
7319de27d44a
added queue busy response on command injection
Malte Bayer <mbayer@neo-soft.org>
parents:
4
diff
changeset
|
183 | else |
7319de27d44a
added queue busy response on command injection
Malte Bayer <mbayer@neo-soft.org>
parents:
4
diff
changeset
|
184 | program_count = 0x01; |
36
aea84f4f5a12
feature: program a specific controller speed limit without changing the car's acceleration
Malte Bayer <mbayer@neo-soft.org>
parents:
35
diff
changeset
|
185 | RS232_puts_p(ok); |
aea84f4f5a12
feature: program a specific controller speed limit without changing the car's acceleration
Malte Bayer <mbayer@neo-soft.org>
parents:
35
diff
changeset
|
186 | } else RS232_puts_p(busy); |
aea84f4f5a12
feature: program a specific controller speed limit without changing the car's acceleration
Malte Bayer <mbayer@neo-soft.org>
parents:
35
diff
changeset
|
187 | break; |
aea84f4f5a12
feature: program a specific controller speed limit without changing the car's acceleration
Malte Bayer <mbayer@neo-soft.org>
parents:
35
diff
changeset
|
188 | |
aea84f4f5a12
feature: program a specific controller speed limit without changing the car's acceleration
Malte Bayer <mbayer@neo-soft.org>
parents:
35
diff
changeset
|
189 | case 'L': // Limit maximum speed for a car |
aea84f4f5a12
feature: program a specific controller speed limit without changing the car's acceleration
Malte Bayer <mbayer@neo-soft.org>
parents:
35
diff
changeset
|
190 | tmp = buffer[2]-'0'; |
aea84f4f5a12
feature: program a specific controller speed limit without changing the car's acceleration
Malte Bayer <mbayer@neo-soft.org>
parents:
35
diff
changeset
|
191 | if (tmp > 9) |
aea84f4f5a12
feature: program a specific controller speed limit without changing the car's acceleration
Malte Bayer <mbayer@neo-soft.org>
parents:
35
diff
changeset
|
192 | tmp = buffer[2]-'A'+10; |
46
d200e3d8a550
corrected lap times, packed data struct for each slotcar
Malte Bayer <mbayer@neo-soft.org>
parents:
45
diff
changeset
|
193 | slot[buffer[1]-'0'].speedlimit = tmp; |
36
aea84f4f5a12
feature: program a specific controller speed limit without changing the car's acceleration
Malte Bayer <mbayer@neo-soft.org>
parents:
35
diff
changeset
|
194 | RS232_puts_p(ok); |
5
7319de27d44a
added queue busy response on command injection
Malte Bayer <mbayer@neo-soft.org>
parents:
4
diff
changeset
|
195 | break; |
4
58529e14c45c
implemented rs232 program word injection
Malte Bayer <mbayer@neo-soft.org>
parents:
3
diff
changeset
|
196 | |
48
5bba01aad0a6
memsave and implemented minimum slot speed for virtual cars
Malte Bayer <mbayer@neo-soft.org>
parents:
47
diff
changeset
|
197 | case 'S': // set minimum speed for a car |
5bba01aad0a6
memsave and implemented minimum slot speed for virtual cars
Malte Bayer <mbayer@neo-soft.org>
parents:
47
diff
changeset
|
198 | tmp = buffer[2]-'0'; |
5bba01aad0a6
memsave and implemented minimum slot speed for virtual cars
Malte Bayer <mbayer@neo-soft.org>
parents:
47
diff
changeset
|
199 | if (tmp > 9) |
5bba01aad0a6
memsave and implemented minimum slot speed for virtual cars
Malte Bayer <mbayer@neo-soft.org>
parents:
47
diff
changeset
|
200 | tmp = buffer[2]-'A'+10; |
5bba01aad0a6
memsave and implemented minimum slot speed for virtual cars
Malte Bayer <mbayer@neo-soft.org>
parents:
47
diff
changeset
|
201 | slot[buffer[1]-'0'].speedminimum = tmp; |
5bba01aad0a6
memsave and implemented minimum slot speed for virtual cars
Malte Bayer <mbayer@neo-soft.org>
parents:
47
diff
changeset
|
202 | RS232_puts_p(ok); |
5bba01aad0a6
memsave and implemented minimum slot speed for virtual cars
Malte Bayer <mbayer@neo-soft.org>
parents:
47
diff
changeset
|
203 | break; |
5bba01aad0a6
memsave and implemented minimum slot speed for virtual cars
Malte Bayer <mbayer@neo-soft.org>
parents:
47
diff
changeset
|
204 | |
73
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
205 | case 'F': // set fuel enabled |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
206 | fuel_enabled = buffer[1]-'0'; |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
207 | RS232_puts_p(ok); |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
208 | break; |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
209 | |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
210 | case '*': // set live information |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
211 | liveinfo = buffer[1]-'0'; |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
212 | RS232_puts_p(ok); |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
213 | break; |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
214 | |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
215 | |
37
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
216 | case 'I': // get Information data (incl. important global parameter dump) |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
217 | RS232_puts(VERSION); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
218 | RS232_putc(':'); |
46
d200e3d8a550
corrected lap times, packed data struct for each slotcar
Malte Bayer <mbayer@neo-soft.org>
parents:
45
diff
changeset
|
219 | for (tmp=0;tmp<MAX_SLOTS;tmp++) RS232_putc(slot[tmp].speedlimit); // output speed limits |
37
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
220 | RS232_putc(':'); |
48
5bba01aad0a6
memsave and implemented minimum slot speed for virtual cars
Malte Bayer <mbayer@neo-soft.org>
parents:
47
diff
changeset
|
221 | for (tmp=0;tmp<MAX_SLOTS;tmp++) RS232_putc(slot[tmp].speedminimum); // output minimum speed |
5bba01aad0a6
memsave and implemented minimum slot speed for virtual cars
Malte Bayer <mbayer@neo-soft.org>
parents:
47
diff
changeset
|
222 | RS232_putc(':'); |
43
4e5d389f7b83
jumpstart time output via interface
Malte Bayer <mbayer@neo-soft.org>
parents:
42
diff
changeset
|
223 | for (tmp=0;tmp<MAX_SLOTS;tmp++) { |
46
d200e3d8a550
corrected lap times, packed data struct for each slotcar
Malte Bayer <mbayer@neo-soft.org>
parents:
45
diff
changeset
|
224 | itoa(slot[tmp].fuel, s, 16); |
43
4e5d389f7b83
jumpstart time output via interface
Malte Bayer <mbayer@neo-soft.org>
parents:
42
diff
changeset
|
225 | RS232_putc(s); // output fuel levels (0=empty, 100=full, 0xff=no fuel option) |
4e5d389f7b83
jumpstart time output via interface
Malte Bayer <mbayer@neo-soft.org>
parents:
42
diff
changeset
|
226 | RS232_putc(','); |
4e5d389f7b83
jumpstart time output via interface
Malte Bayer <mbayer@neo-soft.org>
parents:
42
diff
changeset
|
227 | } |
37
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
228 | RS232_putc(':'); |
43
4e5d389f7b83
jumpstart time output via interface
Malte Bayer <mbayer@neo-soft.org>
parents:
42
diff
changeset
|
229 | for (tmp=0;tmp<MAX_SLOTS;tmp++) { |
46
d200e3d8a550
corrected lap times, packed data struct for each slotcar
Malte Bayer <mbayer@neo-soft.org>
parents:
45
diff
changeset
|
230 | itoa(slot[tmp].jumpstart_time, s, 16); |
43
4e5d389f7b83
jumpstart time output via interface
Malte Bayer <mbayer@neo-soft.org>
parents:
42
diff
changeset
|
231 | RS232_puts(s); // output jumpstart times |
4e5d389f7b83
jumpstart time output via interface
Malte Bayer <mbayer@neo-soft.org>
parents:
42
diff
changeset
|
232 | RS232_putc(','); |
4e5d389f7b83
jumpstart time output via interface
Malte Bayer <mbayer@neo-soft.org>
parents:
42
diff
changeset
|
233 | } |
37
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
234 | RS232_putc(':'); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
235 | RS232_putc('\n'); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
236 | break; |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
237 | |
4
58529e14c45c
implemented rs232 program word injection
Malte Bayer <mbayer@neo-soft.org>
parents:
3
diff
changeset
|
238 | } |
0
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
239 | |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
240 | // wait for the next packet |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
241 | buffer_len=0; |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
242 | } else { |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
243 | buffer[buffer_len++]=c; |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
244 | } |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
245 | } |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
246 | } |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
247 | |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
248 | |
37
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
249 | void jumpstart(uint8_t controller) { |
46
d200e3d8a550
corrected lap times, packed data struct for each slotcar
Malte Bayer <mbayer@neo-soft.org>
parents:
45
diff
changeset
|
250 | if (slot[controller].jumpstart_time == 0) { |
d200e3d8a550
corrected lap times, packed data struct for each slotcar
Malte Bayer <mbayer@neo-soft.org>
parents:
45
diff
changeset
|
251 | slot[controller].jumpstart_time = sysclk.word[0]; // low word |
37
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
252 | RS232_putc('~'); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
253 | RS232_putc('0'-controller); |
46
d200e3d8a550
corrected lap times, packed data struct for each slotcar
Malte Bayer <mbayer@neo-soft.org>
parents:
45
diff
changeset
|
254 | RS232_putc(':'); |
d200e3d8a550
corrected lap times, packed data struct for each slotcar
Malte Bayer <mbayer@neo-soft.org>
parents:
45
diff
changeset
|
255 | itoa(slot[controller].jumpstart_time, s, 16); |
43
4e5d389f7b83
jumpstart time output via interface
Malte Bayer <mbayer@neo-soft.org>
parents:
42
diff
changeset
|
256 | RS232_puts(s); |
37
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
257 | RS232_putc('\n'); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
258 | } |
0
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
259 | |
37
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
260 | } |
0
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
261 | |
59
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
262 | uint8_t do_controller(uint8_t controller) { |
0
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
263 | // read controller X speed & encode controller data packet |
37
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
264 | uint16_t tmp = 0; |
59
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
265 | uint8_t speed; |
51
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
266 | uint8_t trackchange = 0xff; |
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
267 | |
48
5bba01aad0a6
memsave and implemented minimum slot speed for virtual cars
Malte Bayer <mbayer@neo-soft.org>
parents:
47
diff
changeset
|
268 | if ( (PIN(SW_PACECAR_PORT) & _BV(SW_PACECAR)) == 0 ) { |
5bba01aad0a6
memsave and implemented minimum slot speed for virtual cars
Malte Bayer <mbayer@neo-soft.org>
parents:
47
diff
changeset
|
269 | // map controller 1+2 to 5+6 |
51
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
270 | if (controller == 4) tmp = ((getADC(CONTROLLER1_SPEED) / CONTROLLER_DIVISOR) & 0x0F); |
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
271 | if (controller == 5) tmp = ((getADC(CONTROLLER2_SPEED) / CONTROLLER_DIVISOR) & 0x0F); |
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
272 | if (controller == 4) trackchange = (PIN(CONTROLLER_PORT) & _BV(CONTROLLER1_SW)); |
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
273 | if (controller == 5) trackchange = (PIN(CONTROLLER_PORT) & _BV(CONTROLLER2_SW)); |
59
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
274 | speed = tmp; |
51
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
275 | } else { |
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
276 | // read speeds |
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
277 | if ((controller == 0) && (mode!=1)) tmp = ((getADC(CONTROLLER1_SPEED) / CONTROLLER_DIVISOR) & 0x0F); |
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
278 | if ((controller == 1) && (mode!=1)) tmp = ((getADC(CONTROLLER2_SPEED) / CONTROLLER_DIVISOR) & 0x0F); |
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
279 | if ((controller == 2) && (mode!=1)) tmp = ((getADC(CONTROLLER3_SPEED) / CONTROLLER_DIVISOR) & 0x0F); |
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
280 | if ((controller == 3) && (mode!=1)) tmp = ((getADC(CONTROLLER4_SPEED) / CONTROLLER_DIVISOR) & 0x0F); |
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
281 | if (controller == 0) trackchange = (PIN(CONTROLLER_PORT) & _BV(CONTROLLER1_SW)); |
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
282 | if (controller == 1) trackchange = (PIN(CONTROLLER_PORT) & _BV(CONTROLLER2_SW)); |
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
283 | if (controller == 2) trackchange = (PIN(CONTROLLER_PORT) & _BV(CONTROLLER3_SW)); |
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
284 | if (controller == 3) trackchange = (PIN(CONTROLLER_PORT) & _BV(CONTROLLER4_SW)); |
52
6b26d7e3ecd0
simplified do_controller function
Malte Bayer <mbayer@neo-soft.org>
parents:
51
diff
changeset
|
285 | |
6b26d7e3ecd0
simplified do_controller function
Malte Bayer <mbayer@neo-soft.org>
parents:
51
diff
changeset
|
286 | if (controller < 4) { |
6b26d7e3ecd0
simplified do_controller function
Malte Bayer <mbayer@neo-soft.org>
parents:
51
diff
changeset
|
287 | if (tmp < slot[controller].speedminimum) tmp = slot[controller].speedminimum; |
6b26d7e3ecd0
simplified do_controller function
Malte Bayer <mbayer@neo-soft.org>
parents:
51
diff
changeset
|
288 | if ((mode == 2) && (tmp != 0)) { jumpstart(controller); tmp = 0; } |
6b26d7e3ecd0
simplified do_controller function
Malte Bayer <mbayer@neo-soft.org>
parents:
51
diff
changeset
|
289 | if (tmp > slot[controller].speedlimit) tmp = slot[controller].speedlimit; |
59
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
290 | speed = tmp; |
52
6b26d7e3ecd0
simplified do_controller function
Malte Bayer <mbayer@neo-soft.org>
parents:
51
diff
changeset
|
291 | tmp = tmp << 1; |
6b26d7e3ecd0
simplified do_controller function
Malte Bayer <mbayer@neo-soft.org>
parents:
51
diff
changeset
|
292 | } else { |
6b26d7e3ecd0
simplified do_controller function
Malte Bayer <mbayer@neo-soft.org>
parents:
51
diff
changeset
|
293 | if ((mode == 0) && (tmp < slot[controller].speedminimum)) tmp = slot[controller].speedminimum; |
6b26d7e3ecd0
simplified do_controller function
Malte Bayer <mbayer@neo-soft.org>
parents:
51
diff
changeset
|
294 | if (tmp > slot[controller].speedlimit) tmp = slot[controller].speedlimit; |
59
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
295 | speed = tmp; |
52
6b26d7e3ecd0
simplified do_controller function
Malte Bayer <mbayer@neo-soft.org>
parents:
51
diff
changeset
|
296 | tmp = tmp << 1; |
6b26d7e3ecd0
simplified do_controller function
Malte Bayer <mbayer@neo-soft.org>
parents:
51
diff
changeset
|
297 | if (trackchange || slot[controller].trackswitch) tmp |= (1<<5); |
6b26d7e3ecd0
simplified do_controller function
Malte Bayer <mbayer@neo-soft.org>
parents:
51
diff
changeset
|
298 | } |
59
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
299 | |
48
5bba01aad0a6
memsave and implemented minimum slot speed for virtual cars
Malte Bayer <mbayer@neo-soft.org>
parents:
47
diff
changeset
|
300 | } |
5bba01aad0a6
memsave and implemented minimum slot speed for virtual cars
Malte Bayer <mbayer@neo-soft.org>
parents:
47
diff
changeset
|
301 | |
0
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
302 | switch (controller) { |
3 | 303 | case 0: |
51
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
304 | if (trackchange != 0) { |
10 | 305 | tmp |= (1<<5); |
37
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
306 | if (mode == 0) LED(1,0); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
307 | } else if (mode == 0) LED(1,1); |
3 | 308 | break; |
309 | case 1: | |
51
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
310 | if (trackchange != 0) { |
10 | 311 | tmp |= (1<<5); |
37
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
312 | if (mode == 0) LED(2,0); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
313 | } else if (mode == 0) LED(2,1); |
3 | 314 | break; |
315 | case 2: | |
51
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
316 | if (trackchange != 0) { |
10 | 317 | tmp |= (1<<5); |
37
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
318 | if (mode == 0) LED(4,0); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
319 | } else if (mode == 0) LED(4,1); |
3 | 320 | break; |
321 | case 3: | |
51
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
322 | if (trackchange != 0) { |
10 | 323 | tmp |= (1<<5); |
37
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
324 | if (mode == 0) LED(5,0); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
325 | } else if (mode == 0) LED(5,1); |
3 | 326 | break; |
52
6b26d7e3ecd0
simplified do_controller function
Malte Bayer <mbayer@neo-soft.org>
parents:
51
diff
changeset
|
327 | } |
48
5bba01aad0a6
memsave and implemented minimum slot speed for virtual cars
Malte Bayer <mbayer@neo-soft.org>
parents:
47
diff
changeset
|
328 | |
34 | 329 | tmp |= (0b1000000000 | (controller << 6)); |
60
bfc2f2d6913c
added refueling mechanism by stopping the car
Malte Bayer <mbayer@neo-soft.org>
parents:
59
diff
changeset
|
330 | // FUEL BIT GETS SET WHEN FUEL == 0, |
bfc2f2d6913c
added refueling mechanism by stopping the car
Malte Bayer <mbayer@neo-soft.org>
parents:
59
diff
changeset
|
331 | // THIS REQUIRES PHYSICAL CAR FUEL LEVEL SET TO ZERO BEFORE! |
bfc2f2d6913c
added refueling mechanism by stopping the car
Malte Bayer <mbayer@neo-soft.org>
parents:
59
diff
changeset
|
332 | if ( ((PIN(SW_FUEL_PORT) & _BV(SW_FUEL)) != 0) | (slot[controller].fuel == 0)) tmp |= 1; // benzinstand aktiv - tankmodusschalter |
59
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
333 | if (insert_queue(tmp, 9)) { |
73
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
334 | if (fuel_enabled) { |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
335 | if (speed != 0) { |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
336 | // do the fuel calculation, regardless if fuel logic active or not |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
337 | tmp = (uint8_t)(((slot[controller].accel * speed) + 1) / FUEL_DIVISOR); |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
338 | if (tmp == 0) tmp = 1; |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
339 | if (slot[controller].fuel > 0) { |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
340 | // enough fuel left to decrement? |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
341 | if (slot[controller].fuel > tmp) { |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
342 | slot[controller].fuel -= tmp; // decrement fuel level |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
343 | } else slot[controller].fuel = 0; |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
344 | } |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
345 | } else if (slot[controller].canrefuel) { |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
346 | // increase fuel by 5%/sec, this equals by adding 50 to the counter |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
347 | slot[controller].fuel += 50; |
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
348 | if (slot[controller].fuel > FUEL_FULL) slot[controller].fuel = FUEL_FULL; |
59
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
349 | } |
73
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
350 | return 1; |
59
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
351 | } |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
352 | } else return 0; |
0
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
353 | } |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
354 | |
4
58529e14c45c
implemented rs232 program word injection
Malte Bayer <mbayer@neo-soft.org>
parents:
3
diff
changeset
|
355 | uint8_t mirror( uint8_t n ) { |
0
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
356 | n = ((n >> 1) & 0x55) | ((n << 1) & 0xaa); |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
357 | n = ((n >> 2) & 0x33) | ((n << 2) & 0xcc); |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
358 | n = ((n >> 4) & 0x0f) | ((n << 4) & 0xf0); |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
359 | return n; |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
360 | } |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
361 | |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
362 | int do_program(uint8_t controller, uint8_t command, uint8_t parameter) { |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
363 | // send program data packet |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
364 | uint16_t tmp; |
4
58529e14c45c
implemented rs232 program word injection
Malte Bayer <mbayer@neo-soft.org>
parents:
3
diff
changeset
|
365 | parameter = mirror(parameter); |
58529e14c45c
implemented rs232 program word injection
Malte Bayer <mbayer@neo-soft.org>
parents:
3
diff
changeset
|
366 | controller = mirror(controller); |
58529e14c45c
implemented rs232 program word injection
Malte Bayer <mbayer@neo-soft.org>
parents:
3
diff
changeset
|
367 | command = mirror(command); |
58529e14c45c
implemented rs232 program word injection
Malte Bayer <mbayer@neo-soft.org>
parents:
3
diff
changeset
|
368 | tmp = 0b1000000000000 | (parameter << 4) | command | (controller >> 5); |
0
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
369 | return insert_queue(tmp, 12); |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
370 | } |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
371 | |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
372 | int do_active(void) { |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
373 | // send controller active data packet |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
374 | uint16_t tmp = 0b10000000; |
51
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
375 | if ( (PIN(SW_PACECAR_PORT) & _BV(SW_PACECAR)) == 0 ) { |
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
376 | // map controller 1+2 to 5+6 |
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
377 | if ((getADC(CONTROLLER1_SPEED) / CONTROLLER_DIVISOR) > 0) tmp |= 0b10000101; |
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
378 | if ((getADC(CONTROLLER2_SPEED) / CONTROLLER_DIVISOR) > 0) tmp |= 0b10000011; |
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
379 | } else { |
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
380 | if ((slot[0].speedminimum != 0) || ((getADC(CONTROLLER1_SPEED) / CONTROLLER_DIVISOR) > 0)) tmp |= 0b11000001; |
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
381 | if ((slot[1].speedminimum != 0) || ((getADC(CONTROLLER2_SPEED) / CONTROLLER_DIVISOR) > 0)) tmp |= 0b10100001; |
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
382 | if ((slot[2].speedminimum != 0) || ((getADC(CONTROLLER3_SPEED) / CONTROLLER_DIVISOR) > 0)) tmp |= 0b10010001; |
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
383 | if ((slot[3].speedminimum != 0) || ((getADC(CONTROLLER4_SPEED) / CONTROLLER_DIVISOR) > 0)) tmp |= 0b10001001; |
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
384 | if (slot[4].speedminimum != 0) tmp |= 0b10000101; |
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
385 | if (slot[5].speedminimum != 0) tmp |= 0b10000011; |
ec9e8cc27012
car id setting for slot 5+6 working via pressing pacecar button
Malte Bayer <mbayer@neo-soft.org>
parents:
49
diff
changeset
|
386 | } |
4
58529e14c45c
implemented rs232 program word injection
Malte Bayer <mbayer@neo-soft.org>
parents:
3
diff
changeset
|
387 | // todo: wenn Daten enpfangen wurden hier eine Quittierung senden anstatt dem Active Word |
0
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
388 | |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
389 | return insert_queue(tmp, 7); |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
390 | } |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
391 | |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
392 | int do_pace_ghost(void) { |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
393 | // send ghost and pacecar data packet |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
394 | // todo: at the moment, both disabled! |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
395 | uint16_t tmp = 0b1111100000; |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
396 | if ( (PIN(SW_FUEL_PORT) & _BV(SW_FUEL)) != 0) tmp |= 1; // benzinstand aktiv - tankmodusschalter |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
397 | // todo: PC, NH, TK, (KFR, FR) |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
398 | |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
399 | return insert_queue(tmp, 9); |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
400 | } |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
401 | |
53
f659e6faf18f
moved ISRs from main.c to interrupts.c
Malte Bayer <mbayer@neo-soft.org>
parents:
52
diff
changeset
|
402 | #include "interrupts.c" |
7
f4e250d5402b
fixes, bound lap counter reset to race start button
Malte Bayer <mbayer@neo-soft.org>
parents:
6
diff
changeset
|
403 | |
36
aea84f4f5a12
feature: program a specific controller speed limit without changing the car's acceleration
Malte Bayer <mbayer@neo-soft.org>
parents:
35
diff
changeset
|
404 | void reset_vars(void) { |
aea84f4f5a12
feature: program a specific controller speed limit without changing the car's acceleration
Malte Bayer <mbayer@neo-soft.org>
parents:
35
diff
changeset
|
405 | uint8_t i; |
aea84f4f5a12
feature: program a specific controller speed limit without changing the car's acceleration
Malte Bayer <mbayer@neo-soft.org>
parents:
35
diff
changeset
|
406 | for (i=0; i<MAX_SLOTS; i++) { |
48
5bba01aad0a6
memsave and implemented minimum slot speed for virtual cars
Malte Bayer <mbayer@neo-soft.org>
parents:
47
diff
changeset
|
407 | slot[i].speedlimit = 15; |
5bba01aad0a6
memsave and implemented minimum slot speed for virtual cars
Malte Bayer <mbayer@neo-soft.org>
parents:
47
diff
changeset
|
408 | slot[i].speedminimum = 0; |
5bba01aad0a6
memsave and implemented minimum slot speed for virtual cars
Malte Bayer <mbayer@neo-soft.org>
parents:
47
diff
changeset
|
409 | slot[i].trackswitch = 0; |
59
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
410 | slot[i].fuel = FUEL_FULL; |
46
d200e3d8a550
corrected lap times, packed data struct for each slotcar
Malte Bayer <mbayer@neo-soft.org>
parents:
45
diff
changeset
|
411 | slot[i].jumpstart_time = 0; |
47
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
412 | slot[i].laps = 0; |
59
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
413 | slot[i].seccnt = 0; |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
414 | slot[i].accel = 15; // full acceleration per default - TODO |
73
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
415 | slot[i].canrefuel = 0; |
37
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
416 | } |
46
d200e3d8a550
corrected lap times, packed data struct for each slotcar
Malte Bayer <mbayer@neo-soft.org>
parents:
45
diff
changeset
|
417 | sysclk.value = 0; |
37
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
418 | } |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
419 | |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
420 | void countdown_progress(void) { |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
421 | // decrement COUNTDOWN_LOOPS |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
422 | if (countdown_loops>0) { |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
423 | countdown_loops--; |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
424 | } else { |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
425 | countdown--; |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
426 | countdown_loops = COUNTDOWN_DELAY; |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
427 | } |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
428 | switch (countdown) { |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
429 | case 5: LED(1, 1); break; |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
430 | case 4: LED(2, 1); break; |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
431 | case 3: LED(3, 1); break; |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
432 | case 2: LED(4, 1); break; |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
433 | case 1: LED(5, 1); break; |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
434 | case 0: { // RACE START! |
46
d200e3d8a550
corrected lap times, packed data struct for each slotcar
Malte Bayer <mbayer@neo-soft.org>
parents:
45
diff
changeset
|
435 | sysclk.value = 0; |
37
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
436 | LEDS_OFF(); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
437 | LED(3, 1); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
438 | mode = 3; |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
439 | } break; |
36
aea84f4f5a12
feature: program a specific controller speed limit without changing the car's acceleration
Malte Bayer <mbayer@neo-soft.org>
parents:
35
diff
changeset
|
440 | } |
aea84f4f5a12
feature: program a specific controller speed limit without changing the car's acceleration
Malte Bayer <mbayer@neo-soft.org>
parents:
35
diff
changeset
|
441 | } |
aea84f4f5a12
feature: program a specific controller speed limit without changing the car's acceleration
Malte Bayer <mbayer@neo-soft.org>
parents:
35
diff
changeset
|
442 | |
41
9857c18c5e64
implemented car detection to cu
Malte Bayer <mbayer@neo-soft.org>
parents:
37
diff
changeset
|
443 | void check_cars(void) { |
46
d200e3d8a550
corrected lap times, packed data struct for each slotcar
Malte Bayer <mbayer@neo-soft.org>
parents:
45
diff
changeset
|
444 | u32 clk, diff; |
d200e3d8a550
corrected lap times, packed data struct for each slotcar
Malte Bayer <mbayer@neo-soft.org>
parents:
45
diff
changeset
|
445 | clk.value = sysclk.value; // freeze system clock time |
44
4f4326794ba4
implemented lap time, there is some bug in 32bit substraction yet
Malte Bayer <mbayer@neo-soft.org>
parents:
43
diff
changeset
|
446 | |
41
9857c18c5e64
implemented car detection to cu
Malte Bayer <mbayer@neo-soft.org>
parents:
37
diff
changeset
|
447 | if (car0 != car0_state) { |
9857c18c5e64
implemented car detection to cu
Malte Bayer <mbayer@neo-soft.org>
parents:
37
diff
changeset
|
448 | car0_state = car0; |
9857c18c5e64
implemented car detection to cu
Malte Bayer <mbayer@neo-soft.org>
parents:
37
diff
changeset
|
449 | if (car0_state != 0) { |
46
d200e3d8a550
corrected lap times, packed data struct for each slotcar
Malte Bayer <mbayer@neo-soft.org>
parents:
45
diff
changeset
|
450 | diff.value = clk.value - slot[car0-1].lap_time_start.value; |
d200e3d8a550
corrected lap times, packed data struct for each slotcar
Malte Bayer <mbayer@neo-soft.org>
parents:
45
diff
changeset
|
451 | if ( diff.value > 3000 ) { // minimum 1.5 second for 1 lap! |
47
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
452 | if (slot[car0-1].lap_time_start.value != 0) { |
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
453 | slot[car0-1].lap_time.value = diff.value; |
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
454 | slot[car0-1].laps++; |
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
455 | RS232_putc('L'); |
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
456 | RS232_putc(':'); |
73
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
457 | RS232_putc('B'); |
47
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
458 | RS232_putc(':'); |
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
459 | itoa(slot[car0-1].laps, s, 16); |
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
460 | RS232_puts(s); |
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
461 | RS232_putc(':'); |
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
462 | RS232_putc('0'+car0_state); |
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
463 | RS232_putc(':'); |
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
464 | ultoa(diff.value, s, 16); |
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
465 | RS232_puts(s); |
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
466 | RS232_putc('\n'); |
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
467 | } |
46
d200e3d8a550
corrected lap times, packed data struct for each slotcar
Malte Bayer <mbayer@neo-soft.org>
parents:
45
diff
changeset
|
468 | slot[car0-1].lap_time_start.value = clk.value; |
44
4f4326794ba4
implemented lap time, there is some bug in 32bit substraction yet
Malte Bayer <mbayer@neo-soft.org>
parents:
43
diff
changeset
|
469 | } |
41
9857c18c5e64
implemented car detection to cu
Malte Bayer <mbayer@neo-soft.org>
parents:
37
diff
changeset
|
470 | } |
9857c18c5e64
implemented car detection to cu
Malte Bayer <mbayer@neo-soft.org>
parents:
37
diff
changeset
|
471 | } car0 = 0; |
9857c18c5e64
implemented car detection to cu
Malte Bayer <mbayer@neo-soft.org>
parents:
37
diff
changeset
|
472 | |
9857c18c5e64
implemented car detection to cu
Malte Bayer <mbayer@neo-soft.org>
parents:
37
diff
changeset
|
473 | if (car1 != car1_state) { |
9857c18c5e64
implemented car detection to cu
Malte Bayer <mbayer@neo-soft.org>
parents:
37
diff
changeset
|
474 | car1_state = car1; |
9857c18c5e64
implemented car detection to cu
Malte Bayer <mbayer@neo-soft.org>
parents:
37
diff
changeset
|
475 | if (car1_state != 0) { |
46
d200e3d8a550
corrected lap times, packed data struct for each slotcar
Malte Bayer <mbayer@neo-soft.org>
parents:
45
diff
changeset
|
476 | diff.value = clk.value - slot[car1-1].lap_time_start.value; |
d200e3d8a550
corrected lap times, packed data struct for each slotcar
Malte Bayer <mbayer@neo-soft.org>
parents:
45
diff
changeset
|
477 | if ( diff.value > 3000 ) { // minimum 1.5 second for 1 lap! |
47
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
478 | if (slot[car1-1].lap_time_start.value != 0) { |
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
479 | slot[car1-1].lap_time.value = diff.value; |
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
480 | slot[car1-1].laps++; |
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
481 | RS232_putc('L'); |
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
482 | RS232_putc(':'); |
73
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
483 | RS232_putc('A'); |
47
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
484 | RS232_putc(':'); |
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
485 | itoa(slot[car1-1].laps, s, 16); |
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
486 | RS232_puts(s); |
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
487 | RS232_putc(':'); |
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
488 | RS232_putc('0'+car1_state); |
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
489 | RS232_putc(':'); |
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
490 | ultoa(diff.value, s, 16); |
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
491 | RS232_puts(s); |
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
492 | RS232_putc('\n'); |
34ac9f92bc1e
implemented lap counter, doesnt count first sensor touch
Malte Bayer <mbayer@neo-soft.org>
parents:
46
diff
changeset
|
493 | } |
46
d200e3d8a550
corrected lap times, packed data struct for each slotcar
Malte Bayer <mbayer@neo-soft.org>
parents:
45
diff
changeset
|
494 | slot[car1-1].lap_time_start.value = clk.value; |
44
4f4326794ba4
implemented lap time, there is some bug in 32bit substraction yet
Malte Bayer <mbayer@neo-soft.org>
parents:
43
diff
changeset
|
495 | } |
41
9857c18c5e64
implemented car detection to cu
Malte Bayer <mbayer@neo-soft.org>
parents:
37
diff
changeset
|
496 | } |
9857c18c5e64
implemented car detection to cu
Malte Bayer <mbayer@neo-soft.org>
parents:
37
diff
changeset
|
497 | } car1 = 0; |
9857c18c5e64
implemented car detection to cu
Malte Bayer <mbayer@neo-soft.org>
parents:
37
diff
changeset
|
498 | } |
9857c18c5e64
implemented car detection to cu
Malte Bayer <mbayer@neo-soft.org>
parents:
37
diff
changeset
|
499 | |
59
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
500 | void slot_liveinfo(uint8_t idx) { |
73
ec888cfa024e
bugfix: responsewire bitmap, todo: trackswitch response
Malte Bayer <mbayer@neo-soft.org>
parents:
69
diff
changeset
|
501 | if (liveinfo == 0) return; |
59
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
502 | // increment packet counter, if == 10 output some live info |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
503 | if (slot[idx].seccnt == 10) { |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
504 | // output current fuel status |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
505 | RS232_putc('F'); |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
506 | RS232_putc(':'); |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
507 | RS232_putc(idx + '0'); |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
508 | RS232_putc(':'); |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
509 | itoa(slot[idx].fuel, s, 16); |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
510 | RS232_puts(s); |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
511 | RS232_putc('\n'); |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
512 | |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
513 | slot[idx].seccnt = 0; |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
514 | } else slot[idx].seccnt++; |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
515 | } |
0
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
516 | |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
517 | int main(void) |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
518 | { |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
519 | |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
520 | uint8_t packet_index = 1; |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
521 | |
8 | 522 | uint8_t btn_start = _BV(SW_START); |
523 | uint8_t old_start = btn_start; | |
0
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
524 | |
41
9857c18c5e64
implemented car detection to cu
Malte Bayer <mbayer@neo-soft.org>
parents:
37
diff
changeset
|
525 | |
0
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
526 | init_hardware(); |
36
aea84f4f5a12
feature: program a specific controller speed limit without changing the car's acceleration
Malte Bayer <mbayer@neo-soft.org>
parents:
35
diff
changeset
|
527 | reset_vars(); |
37
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
528 | LED(3, 1); // enable middle led == idle mode |
0
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
529 | |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
530 | // switch on rails power |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
531 | RAIL_POWER_PORT |= _BV(RAIL_POWER); |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
532 | |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
533 | while (1) { |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
534 | // check for short circuit on the rails |
2
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
535 | check_rails_shortcut(); |
41
9857c18c5e64
implemented car detection to cu
Malte Bayer <mbayer@neo-soft.org>
parents:
37
diff
changeset
|
536 | check_cars(); |
0
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
537 | |
33 | 538 | if (response_len > 0) { |
539 | itoa(response, s, 2); | |
540 | response_len = 0; | |
541 | RS232_puts("ANSWER RX: "); | |
542 | RS232_puts(s); | |
543 | RS232_putc('\n'); | |
544 | } | |
545 | ||
546 | ||
7
f4e250d5402b
fixes, bound lap counter reset to race start button
Malte Bayer <mbayer@neo-soft.org>
parents:
6
diff
changeset
|
547 | // read in button presses |
8 | 548 | btn_start = (PIN(SW_START_PORT) & _BV(SW_START)); |
549 | if (old_start != btn_start) { | |
550 | // start button changed | |
551 | if (btn_start == 0) { | |
552 | // start button press active | |
553 | if (mode == 0) { | |
37
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
554 | mode = 1; // set wait for race start mode |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
555 | reset_vars(); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
556 | LED(1, 1); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
557 | LED(2, 1); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
558 | LED(3, 1); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
559 | LED(4, 1); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
560 | LED(5, 1); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
561 | RS232_puts_p(prepare); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
562 | } else if (mode == 1) { |
8 | 563 | // Initiate race countdown |
46
d200e3d8a550
corrected lap times, packed data struct for each slotcar
Malte Bayer <mbayer@neo-soft.org>
parents:
45
diff
changeset
|
564 | sysclk.value = 0; |
37
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
565 | countdown = 5; |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
566 | countdown_loops = COUNTDOWN_DELAY; |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
567 | mode = 2; |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
568 | LED(1, 0); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
569 | LED(2, 0); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
570 | LED(3, 0); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
571 | LED(4, 0); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
572 | LED(5, 0); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
573 | RS232_puts_p(countdownstart); |
8 | 574 | } |
575 | } | |
37
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
576 | old_start = btn_start; |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
577 | } |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
578 | |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
579 | if (mode==3) { |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
580 | // RACE START! |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
581 | // issue reset command to lap counter |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
582 | mode = 0; |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
583 | RS232_puts_p(racestart); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
584 | program_command = 6; |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
585 | program_parameter = 9; |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
586 | program_id = 0; |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
587 | program_count = 1; |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
588 | LAP_COUNTER_PORT |= _BV(LAP_COUNTER); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
589 | // TODO: beep long |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
590 | _delay_us(50); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
591 | LAP_COUNTER_PORT &= ~_BV(LAP_COUNTER); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
592 | } |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
593 | |
7
f4e250d5402b
fixes, bound lap counter reset to race start button
Malte Bayer <mbayer@neo-soft.org>
parents:
6
diff
changeset
|
594 | |
2
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
595 | switch (packet_index) { |
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
596 | case 1: |
4
58529e14c45c
implemented rs232 program word injection
Malte Bayer <mbayer@neo-soft.org>
parents:
3
diff
changeset
|
597 | if (program_count > 0) { |
58529e14c45c
implemented rs232 program word injection
Malte Bayer <mbayer@neo-soft.org>
parents:
3
diff
changeset
|
598 | // command in queue |
58529e14c45c
implemented rs232 program word injection
Malte Bayer <mbayer@neo-soft.org>
parents:
3
diff
changeset
|
599 | if (do_program(program_id, program_command, program_parameter)) { |
58529e14c45c
implemented rs232 program word injection
Malte Bayer <mbayer@neo-soft.org>
parents:
3
diff
changeset
|
600 | packet_index++; |
58529e14c45c
implemented rs232 program word injection
Malte Bayer <mbayer@neo-soft.org>
parents:
3
diff
changeset
|
601 | program_count--; |
58529e14c45c
implemented rs232 program word injection
Malte Bayer <mbayer@neo-soft.org>
parents:
3
diff
changeset
|
602 | } |
58529e14c45c
implemented rs232 program word injection
Malte Bayer <mbayer@neo-soft.org>
parents:
3
diff
changeset
|
603 | } else { |
58529e14c45c
implemented rs232 program word injection
Malte Bayer <mbayer@neo-soft.org>
parents:
3
diff
changeset
|
604 | // output idle command |
11
69c2a1408619
done code for sniffing the rails
Malte Bayer <mbayer@neo-soft.org>
parents:
10
diff
changeset
|
605 | if (do_program(7, 19, 0)) packet_index++; // reset |
8 | 606 | //if (do_program(7, 20, 15)) packet_index++; // reset / pitstop detect |
11
69c2a1408619
done code for sniffing the rails
Malte Bayer <mbayer@neo-soft.org>
parents:
10
diff
changeset
|
607 | //if (insert_queue(0, 0)) packet_index++; // null command |
4
58529e14c45c
implemented rs232 program word injection
Malte Bayer <mbayer@neo-soft.org>
parents:
3
diff
changeset
|
608 | } |
37
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
609 | |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
610 | if ( (packet_index>1) && (mode == 2) ) countdown_progress(); |
136a79772098
implemented race prepare phase, countdown and jumpstart detection
Malte Bayer <mbayer@neo-soft.org>
parents:
36
diff
changeset
|
611 | |
2
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
612 | break; |
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
613 | case 2: |
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
614 | if (do_pace_ghost()) packet_index++; |
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
615 | break; |
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
616 | case 3: |
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
617 | if (do_active()) packet_index++; |
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
618 | break; |
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
619 | case 4: |
59
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
620 | if (do_controller(0)) { packet_index++; |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
621 | slot_liveinfo(0); |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
622 | } |
2
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
623 | break; |
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
624 | case 5: |
59
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
625 | if (do_controller(4)) { packet_index++; |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
626 | slot_liveinfo(4); |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
627 | } |
2
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
628 | break; |
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
629 | case 6: |
59
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
630 | if (do_controller(1)) { packet_index++; |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
631 | slot_liveinfo(1); |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
632 | } |
2
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
633 | break; |
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
634 | case 7: |
59
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
635 | if (do_controller(5)) { packet_index++; |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
636 | slot_liveinfo(5); |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
637 | } |
2
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
638 | break; |
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
639 | case 8: |
59
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
640 | if (do_controller(2)) { packet_index++; |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
641 | slot_liveinfo(2); |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
642 | } |
2
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
643 | break; |
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
644 | case 9: |
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
645 | if (do_active()) packet_index++; |
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
646 | break; |
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
647 | case 10: |
59
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
648 | if (do_controller(3)) { packet_index = 1; |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
649 | slot_liveinfo(3); |
361bc4602cf7
added fuel management to blackbox, cars dont get stuck at the moment
Malte Bayer <mbayer@neo-soft.org>
parents:
53
diff
changeset
|
650 | } |
2
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
651 | // last packet, so reset packet index |
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
652 | break; |
6c59b4293fa9
finished: rails short circuit check
Malte Bayer <mbayer@neo-soft.org>
parents:
0
diff
changeset
|
653 | } |
0
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
654 | |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
655 | |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
656 | } // main loop end |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
657 | }; |
9b7de464f0ea
initial commit - controller1 working
Malte Bayer <mbayer@neo-soft.org>
parents:
diff
changeset
|
658 |