Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

what did i miss #33

Closed
wants to merge 102 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
0d222db
infinity: Fix disabling watchdog
tmk Mar 22, 2015
2b7d217
Fix for dfu-programmer 0.7 #182
tmk Mar 26, 2015
d5ac544
Add alps64
tmk Apr 5, 2015
adfd5b9
hhkb: Fix bug of matrix initialization for JP
tmk Apr 7, 2015
63f462a
hhkb: Chane keymap for hasu
tmk Apr 7, 2015
08ec8bb
usb_hid: Update USB_Host_Shield_2.0
tmk Apr 7, 2015
b4e2d32
Change TOP_DIR to TMK_DIR in makefiles
tmk Apr 9, 2015
6746e37
Remove core library and build files
tmk Apr 9, 2015
1a02ebc
Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core'
tmk Apr 9, 2015
a074364
Squashed 'tmk_core/' content from commit 05caacc
tmk Apr 9, 2015
7860d09
Change TMK_DIR setting
tmk Apr 9, 2015
79cfa89
Merge commit 'a20ef7052c6e937d2f7672dd59456e55a5c08296' into master_ng
tmk Apr 22, 2015
a20ef70
Squashed 'tmk_core/' changes from 05caacc..7967731
tmk Apr 22, 2015
799993c
Update README
tmk Apr 22, 2015
5ea50bf
Add keymap codelet for 77-key and 107-key
yashikno Oct 27, 2014
d42aa47
Fix ibm4704 protocol with using interrupt
yashikno Oct 27, 2014
d5482f2
Fix debug print
yashikno Oct 28, 2014
e98b800
Move ring_buffer.h file
tmk Apr 22, 2015
c2485eb
Merge branch 'ibm4704_ext'
tmk Apr 22, 2015
c412300
sun_usb: import dastels's keymap of Type 3
tmk Apr 23, 2015
bd24de4
Fix dfu-programmer parameters
tmk Apr 23, 2015
b52e295
Improve anti-ghosting behavior for fast typing
mtharp Dec 14, 2014
4e50df4
Merge branch 'mtharp-anti-ghost'
tmk Apr 23, 2015
7c3f14b
Fix handling of consumer usage #199
tmk Apr 23, 2015
f9045be
Fix typo of doc/keycode.txt
tmk Apr 23, 2015
3f32b22
Fix URL of HID Usage Tables pdf
tmk Apr 23, 2015
1f4a22e
Remove unneeded tap delays #201
tmk Apr 23, 2015
22dd5da
Update for the latest mbed sdk
tmk Apr 24, 2015
1d5bac2
Fix README
tmk Apr 24, 2015
a3d96d3
Merge commit '1fe4406f374291ab2e86e95a97341fd9c475fcb8'
tmk Apr 24, 2015
1fe4406
Squashed 'tmk_core/' changes from 7967731..b9e0ea0
tmk Apr 24, 2015
55fc97f
Change mbed sdk path
tmk Apr 24, 2015
7780fd1
Add mouse support to ADB
Apr 26, 2015
d9fee55
Merge commit '4d116a04e94cf0d19317d5b44e4fa9f34a3e5594'
tmk Apr 28, 2015
4d116a0
Squashed 'tmk_core/' changes from b9e0ea0..caca2c0
tmk Apr 28, 2015
6639097
Merge branch 'mek-apelsin-lola'
tmk Apr 28, 2015
1c73e57
Add compile options '-fdata-sections'
tmk May 10, 2015
f1f2066
Merge commit 'f6d56675f9f981c5464f0ca7a1fbb0162154e8c5'
tmk May 13, 2015
f6d5667
Squashed 'tmk_core/' changes from caca2c0..dc0e46e
tmk May 13, 2015
6057e91
usb_usb: Fix initialize procedure
tmk May 13, 2015
1920241
Add description of AVR bootloader and boot section
tmk May 13, 2015
67137a9
Reduce code size of magic commands
tmk May 13, 2015
b8fba54
usb_usb: Change debug LED pin config
tmk May 13, 2015
9a7eeb4
usb_usb: Fix keymap
tmk May 13, 2015
e86166c
adb_usb: Change keymap
tmk May 13, 2015
177400b
alps64: Change keymap
tmk May 13, 2015
81fe1fd
hhkb: Change keymap
tmk May 13, 2015
b085d76
hhkb: Add build options
tmk May 13, 2015
a8822a1
hhkb: Fix scan rate for HHKB JP #203
tmk May 13, 2015
1ed54a5
adb_usb: Change README
tmk May 13, 2015
8e7153d
hhkb: Change document
tmk May 13, 2015
c01ecce
Revert "hhkb: Fix bug of matrix initialization for JP"
tmk May 13, 2015
2d9e0d5
ibm4704_usb: Add keymaps for 107 and 50-key
tmk May 5, 2015
965110a
Add 101-key Model M terminal keyboard
DigitalBrains1 May 17, 2015
6014d10
ps2_usb: Fix pin configuration
tmk May 18, 2015
9a22821
ibm4704_usb: Fix interrupt of clock(rising edge)
tmk May 14, 2015
6b588eb
Add keyboard_setup() and matrix_setup()
tmk May 17, 2015
80fd3b0
ibm4704_usb: Fix protocol handling
tmk May 18, 2015
81137b7
Merge branch 'ibm4704_fix_protocol'
tmk May 18, 2015
c17b8a5
Make action_for_key a weak symbol
dankm May 19, 2015
63c07c9
Merge pull request #217 from SaskatoonTechworks/tmk_core_action
tmk May 21, 2015
32abfac
Merge pull request #216 from DigitalBrains1/modelm101
tmk May 21, 2015
5b46031
Revert "Make action_for_key a weak symbol"
tmk May 21, 2015
fdce0c9
lufa: Fix console flush #223
tmk May 22, 2015
37af882
sun_usb: Fix serial recv intrrupt trriger edge #228
tmk Jun 2, 2015
49b0c7e
sun_usb: Fix LED status update at startup
tmk Jun 2, 2015
a551608
sun_usb: LED update for hotplug keyboard into converter
tmk Jun 2, 2015
070a6be
Add description for non-US keys on keycode.h
tmk Jun 25, 2015
507ebb3
alps64: Change keymaps and USB descriptors.
tmk Jun 25, 2015
ce8b1e5
m0110_usb: Change keymap and Makefile
tmk Jul 11, 2015
8746ad9
core: Add keymap section ldscript for ATMega32U2
tmk Jul 11, 2015
448aa73
ps2_usb: Fix for mbed build
tmk Jul 11, 2015
5f06f26
ps2_usb: Fix for V-USB build
tmk Jul 11, 2015
e1e0e5b
onekey: Add V-USB build
tmk Jul 11, 2015
6f5e8ce
usb_usb: Support locking key indicator LED
tmk Jul 15, 2015
1efdd86
usb_usb: Ignore error usage(0x01-03) report
tmk Jul 15, 2015
d4220ac
hhkb: Add power saving code of matrix scan for JP
tmk Jul 23, 2015
35203ca
core: Fix lufa suspend callback(#234)
tmk Jul 23, 2015
79cf2d5
Fix #239 unresponsive keys of HHKB JP during power saving
tmk Aug 8, 2015
455fd51
Fix 'enable break' commands for Alps models
tmk Sep 5, 2015
a63a9c7
ibm4704: Add keymap for Alps models
tmk Sep 6, 2015
9f1d23b
Add Ateml toolchain and remove specific chip name
tmk Sep 11, 2015
0c21b26
Fix weak modifier clear in action macro
tmk Sep 12, 2015
a8d4daa
Fix parenthesis
tmk Sep 12, 2015
dc04983
Merge branch 'ibm4704_alps102'
tmk Sep 16, 2015
bb8c1d2
Add an assignable RESET key
skullydazed Sep 15, 2015
498654f
Change to KC_BOOTLOADER(KC_BTLD)
tmk Sep 16, 2015
6147f57
Merge branch 'skullydazed-assignable_RESET'
tmk Sep 16, 2015
9b99f8f
next_usb: Fix next_kbd_set_leds()
tmk Sep 20, 2015
276fc93
next_usb: Fix keymap
tmk Sep 20, 2015
4fd703e
next_usb: Change for TMK converter configuration
tmk Sep 20, 2015
c1f3604
next_usb: Change LEDs usage for CapsLock status
tmk Sep 20, 2015
0b14b56
next_usb: Fix for mssing key event
tmk Sep 20, 2015
bf3d4b3
lufa: Fix endpoint bank mode for ATMega32u2
tmk Sep 20, 2015
e8a4a63
core: Fix message print of debug command
tmk Sep 20, 2015
ed9766a
core: Fix for disabling NKRO in Boot protocol
tmk Sep 20, 2015
79fd952
ibm4704: Add keymap for Alps 102-key
tmk Sep 23, 2015
77afc5a
core: Fix NKRO ifdef
tmk Sep 23, 2015
fdc38ef
Squashed 'tmk_core/' changes from dc0e46e..57d27a8
tmk Sep 24, 2015
5ce9bf8
Merge commit 'fdc38ef3f92af7adeeb4de49550d8838c8a39b5c'
tmk Sep 24, 2015
6fe4af8
Fix port setting of alps64/matrix.c
tmk Oct 15, 2015
fa33719
Add doc of HHKB original keycodes
tmk Oct 20, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 0 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +0,0 @@
[submodule "protocol/lufa/LUFA-git"]
path = protocol/lufa/LUFA-git
url = https://github.com/abcminiuser/lufa.git
[submodule "protocol/usb_hid/USB_Host_Shield_2.0"]
path = protocol/usb_hid/USB_Host_Shield_2.0
url = https://github.com/felis/USB_Host_Shield_2.0.git
106 changes: 27 additions & 79 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,17 @@ This is a keyboard firmware with some useful features for Atmel AVR controller.
Source code is available here: <http://github.com/tmk/tmk_keyboard>


Updates
-------
#### 2015/04/22
Core library was separated to other branch `core`. <https://github.com/tmk/tmk_keyboard/tree/core>

In `Makefile` you need to set `TMK_DIR` to indicate core library location now.

TMK_DIR = ../../tmk_core



Features
--------
These features can be used in your keyboard.
Expand All @@ -26,6 +37,7 @@ These features can be used in your keyboard.
* Backlight - Control backlight levels



Projects
--------
You can find some keyboard specific projects under `converter` and `keyboard` directory.
Expand Down Expand Up @@ -95,7 +107,8 @@ You can find some keyboard specific projects under `converter` and `keyboard` di
License
-------
**GPLv2** or later. Some protocol files are under **Modified BSD License**.
LUFA, PJRC and V-USB stack have their own license respectively.

Third party libraries like LUFA, PJRC and V-USB have their own license respectively.



Expand All @@ -115,7 +128,8 @@ Magic Commands
--------------
To see help press `Magic` + `H`.

`Magic` key bind may be `LShift` + `RShift` in many project, but `Power` key on ADB converter. `Magic` keybind can be vary on each project, check `config.h` in project directory.
`Magic` key combination is `LShift` + `RShift` in many project, but `Power` key on ADB converter.
`Magic` keybind can be vary on each project, check `config.h` in project directory.

Following commands can be also executed with `Magic` + key. In console mode `Magic` keybind is not needed.

Expand All @@ -139,13 +153,14 @@ Following commands can be also executed with `Magic` + key. In console mode `Mag
Caps: Lock Keyboard(Child Proof)
Paus: jump to bootloader

**TBD**

### Boot Magic Configuration - Virtual DIP Switch

Boot Magic Configuration - Virtual DIP Switch
---------------------------------------------
Boot Magic are executed during boot up time. Press Magic key below then plug in keyboard cable.
Note that you must use keys of **Layer 0** as Magic keys. These settings are stored in EEPROM so that retain your configure over power cycles.

To avoid configuring accidentally additive salt key `KC_SPACE` also needs to be pressed along with the following configuration keys. The salt key is configurable in `config.h`. See [common/bootmagic.h](common/bootmagic.h).
To avoid configuring accidentally additive salt key `KC_SPACE` also needs to be pressed along with the following configuration keys. The salt key is configurable in `config.h`. See [tmk_core/common/bootmagic.h](tmk_core/common/bootmagic.h).

#### General
- Skip reading EEPROM to start with default configuration(`ESC`)
Expand Down Expand Up @@ -180,108 +195,41 @@ To avoid configuring accidentally additive salt key `KC_SPACE` also needs to be
- Set Default Layer to 6(`6`)
- Set Default Layer to 7(`7`)

#### Caution
Unintentional use of this feature will cause user confusion.

TODO: Magic key combination to avoid unintentional press during plug in

**TBD**


Mechanical Locking support
--------------------------
This feature makes it possible for you to use mechanical switch for `CapsLock`, `NumLock` or `ScrollLock`. To enable this feature define these macros in `config.h` and use `KC_LCAP`, `KC_LNUM` or `KC_LSCR` in keymap for locking key instead of normal `KC_CAPS`, `KC_NLCK` or `KC_SLCK`. Resync option tries to keep lock switch state consistent with keyboard LED state.
This feature makes it possible for you to use mechanical locking switch for `CapsLock`, `NumLock`
or `ScrollLock`. To enable this feature define these macros in `config.h` and use `KC_LCAP`, `KC_LN
UM` or `KC_LSCR` in keymap for locking key instead of normal `KC_CAPS`, `KC_NLCK` or `KC_SLCK`. Res
ync option tries to keep switch state consistent with keyboard LED state.

#define LOCKING_SUPPORT_ENABLE
#define LOCKING_RESYNC_ENABLE



Start Your Own Project
-----------------------
**TBD**
### Config.h Options
#### 1. USB vendor/product ID and device description
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0xBEEF
#define MANUFACTURER t.m.k.
#define PRODUCT Macway mod
#define DESCRIPTION t.m.k. keyboard firmware for Macway mod

#### 2. Keyboard matrix configuration
#define MATRIX_ROWS 8
#define MATRIX_COLS 8
#define MATRIX_HAS_GHOST



Architecture
------------
Architecture Diagram
+---------------+---------------+-------------+
| Host | Keyboard | Matrix, LED |
___________ |-----------+-+ +-------------+ | +-----------|
/ /| Keys/Mouse | Protocol |d| | Action | | | Protocol |
/__________/ |<-----------| LUFA |r| | Layer, Tap | | | Matrix |
|.--------.| | LED | V-USB |i| |-------------| | | PS/2,IBM | __________________
|| || |----------->| PJRC |v| | Keymap | | | ADB,M0110| Keys / /_/_/_/_/_/_/_/ /|
|| Host || | Console | iWRAP(BT)|e| | Mousekey | | | SUN/NEWS |<----------/ /_/_/_/_/_/_/_/ / /
||________||/.<-----------| UART |r| | Report | | | X68K/PC98| Control / /_/_/_/_/_/_/_/ / /
`_========_'/| |---------------------------------------------|-------->/___ /_______/ ___/ /
|_o______o_|/ | Sendchar, Print, Debug, Command, ... | |_________________|/
+---------------------------------------------+ Keyboard



Debugging
--------
Use PJRC's `hid_listen` to see debug messages. You can use the tool for debug even if firmware use LUFA stack.

You can use xprintf() to display debug info on `hid_listen`, see `common/xprintf.h`.
You can use xprintf() to display debug info on `hid_listen`, see `tmk_core/common/xprintf.h`.



Files and Directories
-------------------
### Top
* common/ - common codes
* protocol/ - keyboard protocol support
* tmk_core/ - core library
* keyboard/ - keyboard projects
* converter/ - protocol converter projects
* doc/ - documents
* common.mk - Makefile for common
* protocol.mk - Makefile for protocol
* rules.mk - Makefile for build rules

### Common
* host.h
* host_driver.h
* keyboard.h
* command.h
* keymap.h
* action.h
* keycode.h
* matrix.h
* led.h
* mousekey.h
* report.h
* debug.h
* print.h
* bootloader.h
* sendchar.h
* timer.h
* util.h

### Keyboard Protocols
* lufa/ - LUFA USB stack
* pjrc/ - PJRC USB stack
* vusb/ - Objective Development V-USB
* iwrap/ - Bluetooth HID for Bluegiga iWRAP
* ps2.c - PS/2 protocol
* adb.c - Apple Desktop Bus protocol
* m0110.c - Macintosh 128K/512K/Plus keyboard protocol
* news.c - Sony NEWS keyboard protocol
* x68k.c - Sharp X68000 keyboard protocol
* serial_soft.c - Asynchronous Serial protocol implemented by software



Expand Down
77 changes: 0 additions & 77 deletions common.mk

This file was deleted.

Loading