FreeCalypso > hg > fc-magnetite
comparison src/cs/services/cst/cst_exts.c @ 314:a90812ea82c9
AT%A output changed from hex to decimal with more descriptive names
fixed C sequence points violation while at it
| author | Mychaela Falconia <falcon@freecalypso.org> |
|---|---|
| date | Wed, 15 Nov 2017 07:22:06 +0000 |
| parents | 945cf7f506b2 |
| children | 855b3c5bb4b5 |
comparison
equal
deleted
inserted
replaced
| 313:5b1358df7e3c | 314:a90812ea82c9 |
|---|---|
| 294 CHAR buf[80]; | 294 CHAR buf[80]; |
| 295 #endif | 295 #endif |
| 296 UCHAR size; | 296 UCHAR size; |
| 297 | 297 |
| 298 adc_conversion = csf_return_adc (); | 298 adc_conversion = csf_return_adc (); |
| 299 #ifdef ALR | 299 #if 1 /* FreeCalypso change */ |
| 300 sprintf (buf, "VBAT=%u, VCHG=%u, ICHG=%u, VBACKUP=%u, ADIN1=%u, ADIN2=%u, ADIN3=%u, RFTEMP=%u, ADIN5=%u", | |
| 301 adc_conversion[0], adc_conversion[1], adc_conversion[2], | |
| 302 adc_conversion[3], adc_conversion[4], adc_conversion[5], | |
| 303 adc_conversion[6], adc_conversion[7], adc_conversion[8]); | |
| 304 #elif defined(ALR) | |
| 300 sprintf (buf, "ADC 0 = %x, ADC 1 = %x, ADC 2 = %x, ADC 3 = %x, ADC 4 = %x, ADC 5 = %x, ADC 6 = %x, ADC 7 = %x, ADC 8 = %x", | 305 sprintf (buf, "ADC 0 = %x, ADC 1 = %x, ADC 2 = %x, ADC 3 = %x, ADC 4 = %x, ADC 5 = %x, ADC 6 = %x, ADC 7 = %x, ADC 8 = %x", |
| 301 *adc_conversion++, *adc_conversion++, *adc_conversion++, | 306 *adc_conversion++, *adc_conversion++, *adc_conversion++, |
| 302 *adc_conversion++, *adc_conversion++, *adc_conversion++, | 307 *adc_conversion++, *adc_conversion++, *adc_conversion++, |
| 303 *adc_conversion++, *adc_conversion++, *adc_conversion); | 308 *adc_conversion++, *adc_conversion++, *adc_conversion); |
| 304 | |
| 305 #else | 309 #else |
| 306 sprintf (buf, "ADC 0 = %x, ADC 1 = %x, ADC 2 = %x, ADC 3 = %x, ADC 4 = %x", | 310 sprintf (buf, "ADC 0 = %x, ADC 1 = %x, ADC 2 = %x, ADC 3 = %x, ADC 4 = %x", |
| 307 *adc_conversion++, *adc_conversion++, *adc_conversion++, | 311 *adc_conversion++, *adc_conversion++, *adc_conversion++, |
| 308 *adc_conversion++, *adc_conversion); | 312 *adc_conversion++, *adc_conversion); |
| 309 #endif | 313 #endif |
