summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortmk2014-07-23 12:23:00 +0900
committertmk2014-07-30 14:38:26 +0900
commit4b2b32a14b805a363c5dc035a2d1384e60865ad3 (patch)
tree1ffefa89e3180b684e5662bc43f8bb53eefac9cc
parent3e7875455ed392ce5238efa0734e82995e1f8040 (diff)
Add rn42_lined(): connection status(GPIO2)
-rw-r--r--keyboard/hhkb_rn42/rn42/rn42.c5
-rw-r--r--keyboard/hhkb_rn42/rn42/rn42.h1
-rw-r--r--keyboard/hhkb_rn42/rn42/rn42_task.c2
3 files changed, 8 insertions, 0 deletions
diff --git a/keyboard/hhkb_rn42/rn42/rn42.c b/keyboard/hhkb_rn42/rn42/rn42.c
index 3fcd64ad6..e7d8ba45c 100644
--- a/keyboard/hhkb_rn42/rn42/rn42.c
+++ b/keyboard/hhkb_rn42/rn42/rn42.c
@@ -86,6 +86,11 @@ void rn42_cts_lo(void)
PORTD &= ~(1<<5);
}
+bool rn42_linked(void)
+{
+ return PINF&(1<<6);
+}
+
static uint8_t keyboard_leds(void) { return 0; }
diff --git a/keyboard/hhkb_rn42/rn42/rn42.h b/keyboard/hhkb_rn42/rn42/rn42.h
index 4189733b4..72cbb2d72 100644
--- a/keyboard/hhkb_rn42/rn42/rn42.h
+++ b/keyboard/hhkb_rn42/rn42/rn42.h
@@ -14,5 +14,6 @@ void rn42_disconnect(void);
bool rn42_rts(void);
void rn42_cts_hi(void);
void rn42_cts_lo(void);
+bool rn42_linked(void);
#endif
diff --git a/keyboard/hhkb_rn42/rn42/rn42_task.c b/keyboard/hhkb_rn42/rn42/rn42_task.c
index 2bc1c7fd0..437dd46f4 100644
--- a/keyboard/hhkb_rn42/rn42/rn42_task.c
+++ b/keyboard/hhkb_rn42/rn42/rn42_task.c
@@ -162,8 +162,10 @@ 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));
return true;
case KC_B:
// battery monitor