josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

analog-avr.c: take the opportunity to rewrite analog_read() here. 

The former implementation easily led to memory corruption, because
no range check happened.

Costs 22 bytes binary size, unfortunately.
This commit is contained in:
Markus Hitter 2015-08-06 20:04:42 +02:00
parent 7805e741cd
commit 1a2973a2de
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
analog-avr.c
View File

@ -82,23 +82,28 @@ ISR(ADC_vect, ISR_NOBLOCK) {
} }
} }
/*! Read analog value from saved result array /** Read analog value from saved result array.
\param channel Channel to be read
\return analog reading, 10-bit right aligned \param channel Channel to be read. Channel numbering starts at zero.
\return Analog reading, 10-bit right aligned.
*/ */
uint16_t analog_read(uint8_t index) { uint16_t analog_read(uint8_t index) {
if (analog_mask > 0) { uint16_t result = 0;
uint16_t r;
#ifdef AIO8_PIN
if (index < sizeof(adc_channel) && adc_channel[index] < 16) {
#else
if (index < sizeof(adc_channel) && adc_channel[index] < 8) {
#endif
ATOMIC_START ATOMIC_START
// atomic 16-bit copy // Atomic 16-bit copy.
r = adc_result[index]; result = adc_result[index];
ATOMIC_END ATOMIC_END
}
return r; return result;
} else {
return 0;
}
} }
#endif /* defined TEACUP_C_INCLUDE && defined __AVR__ */ #endif /* defined TEACUP_C_INCLUDE && defined __AVR__ */