Fixed ADC code
Merge