]> git.donarmstrong.com Git - tmk_firmware.git/commitdiff
Fix rn42_linked() to use pullup
authortmk <nobody@nowhere>
Sat, 30 Aug 2014 06:59:41 +0000 (15:59 +0900)
committertmk <nobody@nowhere>
Sat, 30 Aug 2014 06:59:41 +0000 (15:59 +0900)
keyboard/hhkb_rn42/rn42/rn42.c

index 556c61af9589e7e971a11e621d46d37e4a3a6a2a..bdffad766777af1c965cd070e5f6cf54eadf18fd 100644 (file)
@@ -34,7 +34,7 @@ void rn42_init(void)
 
     // PF6: linked(input without pull-up)
     DDRF  &= ~(1<<6);
 
     // PF6: linked(input without pull-up)
     DDRF  &= ~(1<<6);
-    PORTF &= ~(1<<6);
+    PORTF |=  (1<<6);
 
     // PF1: RTS(low: allowed to send, high: not allowed)
     DDRF &= ~(1<<1);
 
     // PF1: RTS(low: allowed to send, high: not allowed)
     DDRF &= ~(1<<1);
@@ -93,7 +93,11 @@ void rn42_cts_lo(void)
 
 bool rn42_linked(void)
 {
 
 bool rn42_linked(void)
 {
-    return PINF&(1<<6);
+    // RN-42 GPIO2
+    //   Hi-Z:  Not powered
+    //   High:  Linked
+    //   Low:   Connecting
+    return !rn42_rts() && PINF&(1<<6);
 }
 
 
 }