From 825be9d121a9c698bf60bbdc384f2eeaf66f60d0 Mon Sep 17 00:00:00 2001
From: tmk <hasu@tmk-kbd.com>
Date: Tue, 2 Dec 2014 22:47:59 +0900
Subject: Disable input buffer for ADC

---
 keyboard/hhkb_rn42/rn42/battery.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'keyboard/hhkb_rn42/rn42/battery.c')

diff --git a/keyboard/hhkb_rn42/rn42/battery.c b/keyboard/hhkb_rn42/rn42/battery.c
index 0320e1baf..720d63beb 100644
--- a/keyboard/hhkb_rn42/rn42/battery.c
+++ b/keyboard/hhkb_rn42/rn42/battery.c
@@ -21,6 +21,10 @@ void battery_init(void)
     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<<ADC5D) | (1<<ADC7D);
+    DIDR1 = (1<<AIN0D);
+    DIDR2 = (1<<ADC8D) | (1<<ADC9D) | (1<<ADC11D) | (1<<ADC12D) | (1<<ADC13D);
 
     // ADC disable voltate divider(PF4)
     DDRF  |=  (1<<4);
-- 
cgit v1.2.3-24-g4f1b


From 25aee431bd83b46d694293c85a939d476943a5aa Mon Sep 17 00:00:00 2001
From: tmk <hasu@tmk-kbd.com>
Date: Wed, 3 Dec 2014 02:08:27 +0900
Subject: Clean ADC code of battery_voltage()

---
 keyboard/hhkb_rn42/rn42/battery.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'keyboard/hhkb_rn42/rn42/battery.c')

diff --git a/keyboard/hhkb_rn42/rn42/battery.c b/keyboard/hhkb_rn42/rn42/battery.c
index 720d63beb..3ecde5223 100644
--- a/keyboard/hhkb_rn42/rn42/battery.c
+++ b/keyboard/hhkb_rn42/rn42/battery.c
@@ -20,7 +20,6 @@ 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<<ADC5D) | (1<<ADC7D);
     DIDR1 = (1<<AIN0D);
@@ -92,23 +91,13 @@ 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);
 
     ADCSRA |= (1<<ADSC);
     while (ADCSRA & (1<<ADSC)) ;
     bat = ADC;
 
-    //ADCSRA &= ~(1<<ADEN);
+    ADCSRA &= ~(1<<ADEN);
 
     // ADC disable voltate divider(PF4)
     DDRF  |=  (1<<4);
-- 
cgit v1.2.3-24-g4f1b


From 2d7973fc3fa27b74379ba08392e2487e208b770a Mon Sep 17 00:00:00 2001
From: tmk <hasu@tmk-kbd.com>
Date: Wed, 3 Dec 2014 02:17:54 +0900
Subject: Fix: enable digital input for PF5

---
 keyboard/hhkb_rn42/rn42/battery.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'keyboard/hhkb_rn42/rn42/battery.c')

diff --git a/keyboard/hhkb_rn42/rn42/battery.c b/keyboard/hhkb_rn42/rn42/battery.c
index 3ecde5223..34aa18446 100644
--- a/keyboard/hhkb_rn42/rn42/battery.c
+++ b/keyboard/hhkb_rn42/rn42/battery.c
@@ -21,7 +21,7 @@ void battery_init(void)
     ADMUX = (1<<REFS1) | (1<<REFS0);
     ADCSRA = (1<<ADPS2) | (1<<ADPS1) | (1<<ADPS0);
     // digital input buffer disable(24.9.5)
-    DIDR0 = (1<<ADC0D) | (1<<ADC4D) | (1<<ADC5D) | (1<<ADC7D);
+    DIDR0 = (1<<ADC0D) | (1<<ADC4D) | (1<<ADC7D);
     DIDR1 = (1<<AIN0D);
     DIDR2 = (1<<ADC8D) | (1<<ADC9D) | (1<<ADC11D) | (1<<ADC12D) | (1<<ADC13D);
 
-- 
cgit v1.2.3-24-g4f1b


From 86f82dd02db577cd658ca4284cae15e9664db0f2 Mon Sep 17 00:00:00 2001
From: tmk <hasu@tmk-kbd.com>
Date: Wed, 3 Dec 2014 14:22:10 +0900
Subject: Add wait for charging capacitance of ADC S/H

---
 keyboard/hhkb_rn42/rn42/battery.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'keyboard/hhkb_rn42/rn42/battery.c')

diff --git a/keyboard/hhkb_rn42/rn42/battery.c b/keyboard/hhkb_rn42/rn42/battery.c
index 34aa18446..7e868c964 100644
--- a/keyboard/hhkb_rn42/rn42/battery.c
+++ b/keyboard/hhkb_rn42/rn42/battery.c
@@ -92,6 +92,7 @@ uint16_t battery_voltage(void)
 
     volatile uint16_t bat;
     ADCSRA |= (1<<ADEN);
+    _delay_ms(1);   // wait for charging S/H capacitance
 
     ADCSRA |= (1<<ADSC);
     while (ADCSRA & (1<<ADSC)) ;
-- 
cgit v1.2.3-24-g4f1b