X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=keyboard%2Fhhkb_rn42%2Frn42%2Frn42_task.c;h=fd5a814b294fc459679a3cb96f63022fe2e4992e;hb=ae28b16fc630cc8219676f1bfb9cee41f0b36a79;hp=7ec4c1b540cbeb0fa11813c1547670c1f4abafbb;hpb=59ea5e02f76a37e5021c5f9d02af149e48e7c07c;p=tmk_firmware.git

diff --git a/keyboard/hhkb_rn42/rn42/rn42_task.c b/keyboard/hhkb_rn42/rn42/rn42_task.c
index 7ec4c1b..fd5a814 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);
+    } else {
+        DDRF  &= ~(1<<5);
+        PORTF |=  (1<<5);
+    }
+}
+
+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(input with pull-up)
+    DDRF  &= ~(1<<5);
+    PORTF |=  (1<<5);
 }
 
 void rn42_task(void)
@@ -56,9 +92,7 @@ void rn42_task(void)
         // Config mode: print output from RN-42
         while ((c = serial_recv2()) != -1) {
             // without flow control it'll fail to receive data when flooded
-            rn42_cts_hi();
             xprintf("%c", c);
-            rn42_cts_lo();
         }
     } else {
         // Raw mode: interpret output report of LED state
@@ -110,6 +144,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:
@@ -164,12 +200,20 @@ bool command_extra(uint8_t code)
             xprintf("protocol: %s\n", (host_get_driver() == &rn42_driver) ? "RN-42" : "LUFA");
             xprintf("force_usb: %X\n", force_usb);
             xprintf("rn42_autoconnecting(): %X\n", rn42_autoconnecting());
+            xprintf("rn42_linked(): %X\n", rn42_linked());
             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)