summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2014-09-04 17:08:23 +0900
committertmk <nobody@nowhere>2014-09-04 17:08:23 +0900
commit3b81ffc16c8cdf260c25f0778d32c721af4f105c (patch)
tree4d9ef22491bfc77a0956d87718b715742e07497f
parent02939ab1d831ab7bb02edb28cb0b21fb61bced56 (diff)
Monitor battery and alert low voltage
-rw-r--r--keyboard/hhkb_rn42/rn42/battery.c13
-rw-r--r--keyboard/hhkb_rn42/rn42/battery.h1
-rw-r--r--keyboard/hhkb_rn42/rn42/rn42_task.c47
3 files changed, 52 insertions, 9 deletions
diff --git a/keyboard/hhkb_rn42/rn42/battery.c b/keyboard/hhkb_rn42/rn42/battery.c
index 32de864481..c6988fe336 100644
--- a/keyboard/hhkb_rn42/rn42/battery.c
+++ b/keyboard/hhkb_rn42/rn42/battery.c
@@ -49,10 +49,11 @@ bool battery_charging(void)
{
if (!(USBSTA&(1<<VBUS))) return false;
- // MCP73831:STAT
- // HiZ: Shutdown/No Battery
- // Low: Charging
- // Hi: Charged
+ // Charger Status:
+ // MCP73831 MCP73832 LTC4054 Status
+ // Hi-Z Hi-Z Hi-Z Shutdown/No Battery
+ // Low Low Low Charging
+ // Hi Hi-Z Hi-Z Charged
// preserve last register status
uint8_t ddrf_prev = DDRF;
@@ -68,6 +69,10 @@ bool battery_charging(void)
DDRF = (DDRF&~(1<<5)) | (ddrf_prev&(1<<5));
PORTF = (PORTF&~(1<<5)) | (portf_prev&(1<<5));
+ // TODO: With MCP73831 this can not get stable status when charging.
+ // LED is powered from PSEL line(USB or Lipo)
+ // due to weak low output of STAT pin?
+ // due to pull-up'd via resitor and LED?
return charging;
}
diff --git a/keyboard/hhkb_rn42/rn42/battery.h b/keyboard/hhkb_rn42/rn42/battery.h
index 60fc8adfcb..180d4dcfaa 100644
--- a/keyboard/hhkb_rn42/rn42/battery.h
+++ b/keyboard/hhkb_rn42/rn42/battery.h
@@ -9,6 +9,7 @@ typedef enum {
CHARGING,
DISCHARGING,
LOW_VOLTAGE,
+ UNKNOWN,
} battery_status_t;
typedef enum {
diff --git a/keyboard/hhkb_rn42/rn42/rn42_task.c b/keyboard/hhkb_rn42/rn42/rn42_task.c
index 07b34e111a..30914452e5 100644
--- a/keyboard/hhkb_rn42/rn42/rn42_task.c
+++ b/keyboard/hhkb_rn42/rn42/rn42_task.c
@@ -81,13 +81,50 @@ void rn42_task(void)
}
}
- /* Low voltage alert */
- if (battery_status() == LOW_VOLTAGE) {
- battery_led(LED_ON);
- } else {
- battery_led(LED_CHARGER);
+
+ static uint16_t prev_timer = 0;
+ static uint8_t sec = 0;
+ // NOTE: not exact 1 sec
+ if (timer_elapsed(prev_timer) > 1000) {
+ /* every second */
+ prev_timer = timer_read();
+
+ /* Low voltage alert */
+ uint8_t bs = battery_status();
+ if (bs == LOW_VOLTAGE) {
+ battery_led(LED_ON);
+ } else {
+ battery_led(LED_CHARGER);
+ }
+
+ static uint8_t prev_status = UNKNOWN;
+ if (bs != prev_status) {
+ prev_status = bs;
+ switch (bs) {
+ case FULL_CHARGED: xprintf("FULL_CHARGED\n"); break;
+ case CHARGING: xprintf("CHARGING\n"); break;
+ case DISCHARGING: xprintf("DISCHARGING\n"); break;
+ case LOW_VOLTAGE: xprintf("LOW_VOLTAGE\n"); break;
+ default: xprintf("UNKNOWN STATUS\n"); break;
+ };
+ }
+
+ /* every minute */
+ if (sec == 0) {
+ uint32_t t = timer_read32()/1000;
+ uint16_t v = battery_voltage();
+ uint8_t h = t/3600;
+ uint8_t m = t%3600/60;
+ uint8_t s = t%60;
+ xprintf("%02u:%02u:%02u\t%umV\n", h, m, s, v);
+ /* TODO: xprintf doesn't work for this.
+ xprintf("%02u:%02u:%02u\t%umV\n", (t/3600), (t%3600/60), (t%60), v);
+ */
+ }
+ sec++; sec = sec%60;
}
+
/* Connection monitor */
if (rn42_linked()) {
status_led(true);