Revision 439
Brace issue. For Jason's happiness.
analog.c | ||
---|---|---|
58 | 58 |
* |
59 | 59 |
* @see analog8, analog10, analog_get8, analog_get10 |
60 | 60 |
**/ |
61 |
void analog_init(int start_conversion) |
|
62 |
{ |
|
61 |
void analog_init(int start_conversion) { |
|
63 | 62 |
for (int i = 0; i < 11; i++) { |
64 | 63 |
an_val[i].adc10 = 0; |
65 | 64 |
an_val[i].adc8 = 0; |
... | ... | |
172 | 171 |
* |
173 | 172 |
* @see analog_init, analog10 |
174 | 173 |
**/ |
175 |
unsigned int analog_get8(int which) |
|
176 |
{ |
|
174 |
unsigned int analog_get8(int which) { |
|
177 | 175 |
// Let any previous conversion finish |
178 | 176 |
while (ADCSRA & _BV(ADSC)); |
179 | 177 |
|
... | ... | |
205 | 203 |
* |
206 | 204 |
* @see analog_init, analog8 |
207 | 205 |
**/ |
208 |
unsigned int analog_get10(int which) |
|
209 |
{ |
|
206 |
unsigned int analog_get10(int which) { |
|
210 | 207 |
int adc_h; |
211 | 208 |
int adc_l; |
212 | 209 |
|
... | ... | |
242 | 239 |
* |
243 | 240 |
* @see analog_init |
244 | 241 |
**/ |
245 |
int wheel(void) |
|
246 |
{ |
|
242 |
int wheel(void) { |
|
247 | 243 |
return analog8(WHEEL_PORT); |
248 | 244 |
} |
249 | 245 |
|
... | ... | |
262 | 258 |
* |
263 | 259 |
* @see analog_init |
264 | 260 |
**/ |
265 |
void set_adc_mux(int which) |
|
266 |
{ |
|
261 |
void set_adc_mux(int which) { |
|
267 | 262 |
// mask so only proper bits are possible. |
268 | 263 |
PORTG = (PORTG & 0xE3) | ((which & 0x03) << 3) | (which & 0x04); |
269 | 264 |
} |
Also available in: Unified diff