summary refs log tree commit diff
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2011-05-04 08:12:27 +0900
committertmk <nobody@nowhere>2011-05-04 08:12:27 +0900
commit13e4662baee972a6df340bfabe5fcb8aa00646e3 (patch)
tree7046098953dbf41572677552e4131397fcadae7b
parentcec254950509038ca9c805e87feea9091d77d29f (diff)
minor fix for HHKB Makefile and doc
-rwxr-xr-x[-rw-r--r--]hhkb/Makefile2
-rw-r--r--hhkb/doc/HHKB.txt16
2 files changed, 9 insertions, 9 deletions
diff --git a/hhkb/Makefile b/hhkb/Makefile
index 2c8cd5afcf..4a0af1cdcb 100644..100755
--- a/hhkb/Makefile
+++ b/hhkb/Makefile
@@ -42,7 +42,7 @@ USB_NKRO_ENABLE = yes	# USB Nkey Rollover
 
 
 #---------------- Programming Options --------------------------
-PROGRAM_CMD = teensy_loader_cli.exe -mmcu=$(MCU) -w -v $(TARGET).hex
+PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
 
 
 
diff --git a/hhkb/doc/HHKB.txt b/hhkb/doc/HHKB.txt
index e9f41adab0..ace931de38 100644
--- a/hhkb/doc/HHKB.txt
+++ b/hhkb/doc/HHKB.txt
@@ -68,7 +68,7 @@ Keyswitch PCB:
                 http://www.alldatasheet.com/datasheet-pdf/pdf/27373/TI/SN74LS145D.html
     BU9831      Non-volatile electronic potentiometer: for calibration?
                 http://www.alldatasheet.com/datasheet-pdf/pdf/36387/ROHM/BU9831.html
-    TP1684      Capacitive Sensing controller: no datasheet available.
+    TP1683/4    Capacitive Sensing controller: no datasheet available.
 
     (HHKB_keyswitch.jpg)
 
@@ -120,16 +120,16 @@ Matrix diagram:
              |bias control?            - - - - - - - -     ---
              |                  3.9K*8 R R R R R R R R      |
     +--------^+      +--------+        - - - - - - - -      |  
-    | TP 1684 |      | HC4051 <0-------|-|-|-|-|-|-|-|--|R|-+
+    |        2|      | HC4051 <0-------|-|-|-|-|-|-|-|--|R|-+
     |         |capa. |        <1-------|-|-|-|-|-|-|-|--|R|-+
-    |         |sense |        <2-------|-|-|-|-|-|-|-|--|R|-+
-    |         <------|        <3-------|-|-|-|-|-|-|-|--|R|-+
+    | TP1684  |sense |        <2-------|-|-|-|-|-|-|-|--|R|-+
+    |       11<------|        <3-------|-|-|-|-|-|-|-|--|R|-+
     |         |      |        <4-------|-|-|-|-|-|-|-|--|R|-+
     |         |      |        <5-------|-|-|-|-|-|-|-|--|R|-+
-    |         |calib.|        <6-------|-|-|-|-|-|-|-|--|R|-+
-    |         <-+?   |        <7-------|-|-|-|-|-|-|-|--|R|-+
-    +---V-----+ |    +-^-^-^--+        0 1 2 3 4 5 6 7  33K*8
-       KEY ???  |      A B C         +-----------------+
+    |         <-+    |        <6-------|-|-|-|-|-|-|-|--|R|-+
+    |   1   4 | |    |        <7-------|-|-|-|-|-|-|-|--|R|-+
+    +---V---^-+ |    +-^-^-^--+        0 1 2 3 4 5 6 7  33K*8
+       KEY PREV |      A B C         +-----------------+
         |   | +-^----+ | | |         |      LS145      |
     Vcc |   | |BU9831| | | |         +-^--^--^--^------+
     --- |   | +------+ | | |           A  B  C  D   +------+