summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-08-15Merge remote-tracking branch 'origin/master' into iso_split_rshiftToni49-1278/+3141
no idea what is merged
2016-08-15Merge pull request #635 from algernon/f/ucisJack Humbert4-30/+221
Symbolic Unicode Input System
2016-08-15process_unicode: Introduce a slight delayGergely Nagy2-0/+8
When entering unicode codes, use some delay, so the OS has time to process the information. This is not needed on all systems, but some seem to require it. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-15process_unicode: Replace register_hex32Gergely Nagy2-13/+32
It turns out that register_hex32 did not work reliably, and some systems only allow 7 chars after the unicode magic sequence, while others allow 8. To remedy the situation, store the codes as strings, and type those in instead of doing bit shifting magic. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-15process_unicode: Use uint32_t for UCIS purposesGergely Nagy2-6/+13
Use a single uint32_t to store the unicode of a symbol, instead of an array of uint16_ts. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-15process_unicode: Make the startup overridableGergely Nagy2-0/+6
Extract out the part of `qk_ucis_start` that inputs the placeholder symbol, and make it weak, so it can be overridden. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-15process_unicode: Call process_ucis() automaticallyGergely Nagy3-2/+5
If UCIS is enabled, call process_ucis() automatically from process_record_quantum(). Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-15process_unicode: Handle too long UCIS symbol namesGergely Nagy1-1/+9
If the symbol name being entered is longer than the max, stop recording it, and stop processing keycodes apart from the ones that can delete, finish or cancel the sequence. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-15process_unicode: Add a way to enter unicode symbols by nameGergely Nagy3-3/+126
The purpose of this change is to allow keymaps to specify a dictionary of unicode symbol name to code mappings, and let the person at the keyboard enter unicode symbols by name. This is done by having a way to trigger unicode symbol input mode, when all keys are cached until Esc, Enter or Space are pressed. Once that happens, we try to look up the symbol from our lookup table. If found, we erase back, and type the unicode magic in to get that symbol. If not found, we still erase back, start unicode input mode, and replay what the user typed in. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-15process_unicode: Small refactor & linux fixGergely Nagy2-31/+48
This moves the unicode input start / end sequences into their own functions, so keymaps and other functionality can build on it too. At the same time, it changes how the Linux variant works, to match reality: CTRL+SHIFT must be unregistered too, and we close the thing with a Space instead. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-15Merge pull request #634 from di0ib/masterJack Humbert17-0/+440
minorca handwired
2016-08-15moved to handwired folderdi0ib17-3/+3
2016-08-15Merge branch 'master' of https://github.com/di0ib/qmk_firmwaredi0ib1-0/+2
2016-08-15Merge remote-tracking branch 'refs/remotes/jackhumbert/master'di0ib22-9/+1234
2016-08-15Merge pull request #631 from jacwib/masterJack Humbert4-0/+246
Jacwib's keymap
2016-08-15Merge pull request #627 from algernon/h/set-unicode-input-modeJack Humbert1-1/+1
process_unicode: Fix set_unicode_input_mode()
2016-08-15Merge pull request #624 from Xyverz/masterJack Humbert17-8/+987
Added Ergodox Layout with persistent layers, Atreus corrections
2016-08-14Updated readmedi0ib1-0/+2
Added link to Minorca/Sebright blog.
2016-08-14cleanup readmedi0ib1-3/+3
2016-08-14Correct data pin to D5di0ib1-1/+1
2016-08-14Fix listdi0ib1-9/+9
2016-08-14clean up readnmedi0ib1-8/+10
2016-08-14Merge remote-tracking branch 'refs/remotes/jackhumbert/master'di0ib54-1420/+3698
2016-08-14minorcadi0ib17-0/+436
minirca with RGB keymap
2016-08-14increased readability with a definceToni1-14/+18
2016-08-14Fix bugjacwib1-1/+1
2016-08-14Remove pointless commentsjacwib1-21/+21
2016-08-14Update readme.mdjacwib1-1/+2
2016-08-14Update Makefilejacwib1-5/+0
2016-08-14Update config.hjacwib1-1/+0
2016-08-14Update keymap.cjacwib1-1/+1
2016-08-14Update readme.mdjacwib1-2/+2
2016-08-14Jack's keymap.jacwib4-0/+251
2016-08-14Added my own layout to the Phantom.Xyverz1-0/+104
2016-08-14Fixing a mixup. Tidying up the keymap.Xyverz1-10/+0
2016-08-14Merge remote-tracking branch 'upstream/master'Xyverz50-1420/+2937
2016-08-14Merge pull request #623 from algernon/ergodox-ez/algernonErez Zukerman6-1237/+1244
ergodox: Update my keymap to v1.5
2016-08-14Merge pull request #626 from tenderlove/readme-linkErez Zukerman1-2/+2
fix link to ErgoDox EZ
2016-08-13Removal of old minivan44 folder.Ian Sterling13-564/+0
2016-08-13Renamed minivan44 to tv44 in all occurrences per wishes ofIan Sterling13-0/+564
Jack and Evan.
2016-08-13process_unicode: Fix set_unicode_input_mode()Gergely Nagy1-1/+1
In the header, this was defined as `set_unicode_input_mode`, but the implementation had `set_unicode_mode` for a name. Changed the implementation to match the header. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-13Merge remote-tracking branch 'origin/master' into iso_split_rshiftToni308-2380/+7761
update from Upstream
2016-08-13Adding the MiniVan44 aka TheVan 44 by u/evangs to the repo.Ian Sterling13-0/+564
Initial Commit.
2016-08-13Update keymap.cXyverz1-4/+0
2016-08-13Corrections to the Atreus Makefile and updates to my keymapIan Sterling1-1/+5
2016-08-13fix link to ErgoDox EZAaron Patterson1-2/+2
This just fixes the readme link to the ErgoDox EZ directory
2016-08-13forces all ergodox keymaps to be ez on qmk.fm (were infinity)Jack Humbert1-0/+2
2016-08-12Merge pull request #622 from shelaf/masterJack Humbert7-0/+395
My HHKB layout
2016-08-12Merge pull request #621 from shelaf/fixJack Humbert1-11/+11
Fix typo
2016-08-12only aestheticsToni1-4/+4