diff options
| author | tmk <nobody@nowhere> | 2012-11-22 10:06:02 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2014-11-24 16:04:03 +0900 |
| commit | b92ea1f985de8f014974920fe982027b3d82b2e0 (patch) | |
| tree | cd1733048894a35823595d8283f8759fa27317c9 | |
| parent | ed52ebb9870a26496b13a0565c1aaca8ded3465b (diff) | |
| download | qmk_firmware-b92ea1f985de8f014974920fe982027b3d82b2e0.tar.gz qmk_firmware-b92ea1f985de8f014974920fe982027b3d82b2e0.zip | |
Fix endpoint buffer setting for AT90USB82/162.
| -rw-r--r-- | protocol/pjrc/MEMO.txt | 25 | ||||
| -rw-r--r-- | protocol/pjrc/usb.h | 2 | ||||
| -rw-r--r-- | protocol/pjrc/usb_mouse.h | 2 |
3 files changed, 27 insertions, 2 deletions
diff --git a/protocol/pjrc/MEMO.txt b/protocol/pjrc/MEMO.txt new file mode 100644 index 000000000..b0f059831 --- /dev/null +++ b/protocol/pjrc/MEMO.txt | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | Endpoint configuration | ||
| 2 | ---------------------- | ||
| 3 | 0 Control endpoint | ||
| 4 | 1 keyboard | ||
| 5 | 2 mouse | ||
| 6 | 3 debug | ||
| 7 | 4 extra key(consumer/system) | ||
| 8 | 5 nkro keyboard(supported only on ATmega32U4/16U4 and AT90USB64/128) | ||
| 9 | |||
| 10 | |||
| 11 | ATmega32U4/16U4, AT90USB64/128 | ||
| 12 | • Endpoint 0:programmable size FIFO up to 64 bytes, default control endpoint | ||
| 13 | • Endpoints 1 programmable size FIFO up to 256 bytes in ping-pong mode. | ||
| 14 | • Endpoints 2 to 6: programmable size FIFO up to 64 bytes in ping-pong mode. | ||
| 15 | |||
| 16 | AT90USB82/162, ATmega8U2/16U2/32U2 | ||
| 17 | • Endpoint 0:programmable size FIFO up to 64 bytes, default control endpoint | ||
| 18 | • Endpoints 1 and 2: programmable size FIFO up to 64 bytes. | ||
| 19 | • Endpoints 3 and 4: programmable size FIFO up to 64 bytes with ping-pong mode. | ||
| 20 | |||
| 21 | ping-pong mode means double buffer feature. | ||
| 22 | |||
| 23 | |||
| 24 | NOTE: ATmega8U2/16U2/32U2 is not supported with PJRC stack at this time. | ||
| 25 | TODO: Macro definition for ATmega8U2/16U2/32U2 in usb.h | ||
diff --git a/protocol/pjrc/usb.h b/protocol/pjrc/usb.h index 0eb58fc39..a195b671d 100644 --- a/protocol/pjrc/usb.h +++ b/protocol/pjrc/usb.h | |||
| @@ -122,7 +122,7 @@ void usb_remote_wakeup(void); | |||
| 122 | #define KBD_INTERFACE 0 | 122 | #define KBD_INTERFACE 0 |
| 123 | #define KBD_ENDPOINT 1 | 123 | #define KBD_ENDPOINT 1 |
| 124 | #define KBD_SIZE 8 | 124 | #define KBD_SIZE 8 |
| 125 | #define KBD_BUFFER EP_DOUBLE_BUFFER | 125 | #define KBD_BUFFER EP_SINGLE_BUFFER |
| 126 | #define KBD_REPORT_KEYS (KBD_SIZE - 2) | 126 | #define KBD_REPORT_KEYS (KBD_SIZE - 2) |
| 127 | 127 | ||
| 128 | // secondary keyboard | 128 | // secondary keyboard |
diff --git a/protocol/pjrc/usb_mouse.h b/protocol/pjrc/usb_mouse.h index eb3056126..ce26887c9 100644 --- a/protocol/pjrc/usb_mouse.h +++ b/protocol/pjrc/usb_mouse.h | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | #define MOUSE_INTERFACE 1 | 32 | #define MOUSE_INTERFACE 1 |
| 33 | #define MOUSE_ENDPOINT 2 | 33 | #define MOUSE_ENDPOINT 2 |
| 34 | #define MOUSE_SIZE 8 | 34 | #define MOUSE_SIZE 8 |
| 35 | #define MOUSE_BUFFER EP_DOUBLE_BUFFER | 35 | #define MOUSE_BUFFER EP_SINGLE_BUFFER |
| 36 | 36 | ||
| 37 | #define MOUSE_BTN1 (1<<0) | 37 | #define MOUSE_BTN1 (1<<0) |
| 38 | #define MOUSE_BTN2 (1<<1) | 38 | #define MOUSE_BTN2 (1<<1) |
