X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=keyboard%2Fhhkb_rn42%2Frn42%2Frn42_task.c;h=2813b1c5ff4490c1666ae305cb74f98b4d6a36a1;hb=e4b95410416d98f9d9753a1ce21846256de7c8fa;hp=437dd46f490983f2512efc02cc00b4bc7f03940e;hpb=4b2b32a14b805a363c5dc035a2d1384e60865ad3;p=tmk_firmware.git

diff --git a/keyboard/hhkb_rn42/rn42/rn42_task.c b/keyboard/hhkb_rn42/rn42/rn42_task.c
index 437dd46..2813b1c 100644
--- a/keyboard/hhkb_rn42/rn42/rn42_task.c
+++ b/keyboard/hhkb_rn42/rn42/rn42_task.c
@@ -13,6 +13,17 @@
 static bool config_mode = false;
 static bool force_usb = false;
 
+static void status_led(bool on)
+{
+    if (on) {
+        DDRE  |=  (1<<6);
+        PORTE &= ~(1<<6);
+    } else {
+        DDRE  |=  (1<<6);
+        PORTE |=  (1<<6);
+    }
+}
+
 static void battery_adc_init(void)
 {
     ADMUX = (1<<REFS1) | (1<<REFS0);                // Ref:2.56V band-gap, Input:ADC0(PF0)
@@ -43,10 +54,35 @@ static uint16_t battery_adc(void)
     return bat;
 }
 
+static void battery_led(bool on)
+{
+    if (on) {
+        DDRF  |=  (1<<5);
+        PORTF &= ~(1<<5);   // Low
+    } else {
+        DDRF  &= ~(1<<5);
+        PORTF &= ~(1<<5);   // HiZ
+    }
+}
+
+static bool battery_charging(void)
+{
+    // MCP73831:STAT
+    //   Hi-Z:   Shutdown/No Battery
+    //   Low:    Charging
+    //   Hi:     Charged
+    DDRF  &= ~(1<<5);
+    PORTF |=  (1<<5);
+    return PINF&(1<<5) ? false : true;
+}
 
 void rn42_task_init(void)
 {
     battery_adc_init();
+
+    // battery charging(HiZ)
+    DDRF  &= ~(1<<5);
+    PORTF &= ~(1<<5);
 }
 
 void rn42_task(void)
@@ -99,6 +135,15 @@ void rn42_task(void)
             host_set_driver(&lufa_driver);
         }
     }
+
+    /* Battery monitor */
+
+    /* Connection monitor */
+    if (rn42_linked()) {
+        status_led(true);
+    } else {
+        status_led(false);
+    }
 }
 
 
@@ -108,6 +153,8 @@ void rn42_task(void)
  ******************************************************************************/
 bool command_extra(uint8_t code)
 {
+    uint32_t t;
+    uint16_t b;
     static host_driver_t *prev_driver = &rn42_driver;
     switch (code) {
         case KC_H:
@@ -166,10 +213,16 @@ bool command_extra(uint8_t code)
             xprintf("rn42_rts(): %X\n", rn42_rts());
             xprintf("config_mode: %X\n", config_mode);
             xprintf("VBUS: %X\n", USBSTA&(1<<VBUS));
+            xprintf("battery_charging: %X\n", battery_charging());
             return true;
         case KC_B:
             // battery monitor
-            xprintf("BAT: %04X(%08lX)\n",  battery_adc(), timer_read32());
+            t = timer_read32()/1000;
+            b = battery_adc();
+            xprintf("BAT: %umV(%04X)\t",  (b-16)*5, b);
+            xprintf("%02u:",   t/3600);
+            xprintf("%02u:",   t%3600/60);
+            xprintf("%02u\n",  t%60);
             return true;
         default:
             if (config_mode)