diff options
| author | tmk <hasu@tmk-kbd.com> | 2015-01-15 09:12:26 +0100 |
|---|---|---|
| committer | tmk <hasu@tmk-kbd.com> | 2015-01-15 09:12:26 +0100 |
| commit | 65a2ce94a305f46c8f258e2f1613201a69bc8114 (patch) | |
| tree | acd515b6e5f9ab0f010bc5eac9ae9677f9bad618 /keyboard/hhkb_rn42/rn42/battery.c | |
| parent | 10a6b2c7d8bc9c5d2657acdeefa1102be5035280 (diff) | |
| parent | 517817b9c7f00b180385c6bdf5310234185e5b98 (diff) | |
| download | qmk_firmware-65a2ce94a305f46c8f258e2f1613201a69bc8114.tar.gz qmk_firmware-65a2ce94a305f46c8f258e2f1613201a69bc8114.tar.xz | |
Merge branch 'rn42'
Diffstat (limited to 'keyboard/hhkb_rn42/rn42/battery.c')
| -rw-r--r-- | keyboard/hhkb_rn42/rn42/battery.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/keyboard/hhkb_rn42/rn42/battery.c b/keyboard/hhkb_rn42/rn42/battery.c index 0320e1baf..7e868c964 100644 --- a/keyboard/hhkb_rn42/rn42/battery.c +++ b/keyboard/hhkb_rn42/rn42/battery.c @@ -20,7 +20,10 @@ void battery_init(void) // Ref:2.56V band-gap, Input:ADC0(PF0), Prescale:128(16MHz/128=125KHz) ADMUX = (1<<REFS1) | (1<<REFS0); ADCSRA = (1<<ADPS2) | (1<<ADPS1) | (1<<ADPS0); - ADCSRA |= (1<<ADEN); + // digital input buffer disable(24.9.5) + DIDR0 = (1<<ADC0D) | (1<<ADC4D) | (1<<ADC7D); + DIDR1 = (1<<AIN0D); + DIDR2 = (1<<ADC8D) | (1<<ADC9D) | (1<<ADC11D) | (1<<ADC12D) | (1<<ADC13D); // ADC disable voltate divider(PF4) DDRF |= (1<<4); @@ -88,23 +91,14 @@ uint16_t battery_voltage(void) PORTF |= (1<<4); volatile uint16_t bat; - //ADCSRA |= (1<<ADEN); - - // discard first result - ADCSRA |= (1<<ADSC); - while (ADCSRA & (1<<ADSC)) ; - bat = ADC; - - // discard second result - ADCSRA |= (1<<ADSC); - while (ADCSRA & (1<<ADSC)) ; - bat = ADC; + ADCSRA |= (1<<ADEN); + _delay_ms(1); // wait for charging S/H capacitance ADCSRA |= (1<<ADSC); while (ADCSRA & (1<<ADSC)) ; bat = ADC; - //ADCSRA &= ~(1<<ADEN); + ADCSRA &= ~(1<<ADEN); // ADC disable voltate divider(PF4) DDRF |= (1<<4); |