summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-09-0751-823/+2846
|\
| * Merge pull request #732 from romanzolotarev/masterErez Zukerman2016-09-062-27/+40
| |\ | | | | | | Change CTL_T(KC_ESC) to KC_LCTRL and update readme
| | * Change CTL_T(KC_ESC) to KC_LCTRL and update readmeRoman Zolotarev2016-09-072-27/+40
| | |
| * | Merge pull request #729 from joarau/masterErez Zukerman2016-09-066-0/+420
| |\ \ | | |/ | |/| norwegian programmer-friendly layout
| | * norwegian programmer-friendly layoutjoar2016-09-066-0/+420
| |/
| * Merge pull request #728 from fitzsim/yoruianErez Zukerman2016-09-066-0/+277
| |\ | | | | | | Add new ErgoDox EZ keymap, YORUIAN
| | * Fix ergodox_yoruian XKB namingThomas Fitzsimmons2016-09-062-2/+2
| | |
| | * Add new ErgoDox EZ keymap, YORUIANThomas Fitzsimmons2016-09-056-0/+277
| | |
| * | Merge pull request #686 from coderkun/coderkun_neo2Erez Zukerman2016-09-052-7/+19
| |\ \ | | | | | | | | Merge Ergodox keymap “coderkun_neo2”
| | * | Add box-drawing Unicode characters to keymap “coderkun_neo2”coderkun2016-08-261-6/+6
| | | |
| | * | Set Unicode input mode and override unicode_input_start() method to keymap ↵coderkun2016-08-261-2/+14
| | | | | | | | | | | | | | | | “coderkun_neo2”
| | * | Disable debugging for Ergodox keymap “coderkun_neo2”coderkun2016-08-262-1/+1
| | | |
| * | | Merge pull request #678 from algernon/ergodox-ez/algernonErez Zukerman2016-09-058-523/+552
| |\ \ \ | | |_|/ | |/| | ergodox: Update algernon's keymap to v1.6
| | * | ergodox: Update algernon's keymap to v1.6Gergely Nagy2016-08-248-523/+552
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Major changes include: Base layer changes ------------------ * The parentheses & bracket keys have been merged: tapping them results in `[` or `{` (if it was shifted), double tapping leads to `(`. * The `:;` and `-_` keys are now available on the base layer, on their **ADORE** location, too, just below `[{(`/`]})`. * The `Apps` key has been replaced by `F12`. * The `-`/`_` is no longer a tap-dance key. ADORE layer changes ------------------- * Adjustments were made to the **ADORE** layer, to separate some inconvenient combinations. Miscellaneous changes --------------------- * `LEAD u` now starts the symbolic unicode input system, instead of the OS-one. * The mouse acceleration keys on the **Navigation and Media* layer have been turned into toggles: tap them once to turn them on, until tapped again. Tapping an accelerator button will turn all the others off. * When the **ARROW** layer is on, the *red* and *blue* LEDs light up now. Heatmap ------- * The built-in keylogger has been greatly enhanced, it now outputs the pressed state, and the layer (Dvorak or ADORE). As such, the `ADORE_AUTOLOG` option has been removed, instead there is `AUTOLOG_ENABLE` now, which when enabled, makes the keylogger start when the keyboard boots. It defaults to off. * The heatmap generator received a lot of updates. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
| * | | Merge pull request #724 from sgoodwin/masterJack Humbert2016-09-053-0/+268
| |\ \ \ | | | | | | | | | | Add my keymap.
| | * | | Add my keymap.Samuel Ryan Goodwin2016-09-053-0/+268
| | | | |
| * | | | Merge pull request #722 from fredizzimo/fix_always_linkingJack Humbert2016-09-051-2/+4
| |\ \ \ \ | | | | | | | | | | | | Fix the ldflags.txt and obj.txt checks
| | * | | | Fix the ldflags.txt and obj.txt checksFred Sundvik2016-09-041-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a minor typo, which caused the files to not be generated and therefore the elf files were always linked.
| * | | | | Merge pull request #719 from IBNobody/masterJack Humbert2016-09-053-221/+319
| |\ \ \ \ \ | | | | | | | | | | | | | | Updated docs to show more info on backlight breathing.
| | * \ \ \ \ Merge pull request #4 from IBNobody/update_atomic_planck_pvc_keymapsIBNobody2016-09-042-199/+238
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Added diagonal mice macros, breathing ala Atomic
| | | * | | | | Added diagonal mice macros, breathing ala AtomicIBNobody2016-09-042-199/+238
| | |/ / / / /
| | * | | | | Moved breathing backlighting section in readme.mdIBNobody2016-09-031-60/+60
| | | | | | |
| | * | | | | Updated doc to contain breathing information.IBNobody2016-09-031-29/+144
| | | | | | |
| | * | | | | Updated readme to have better backlight breathing info.IBNobody2016-09-031-160/+104
| | | | | | |
| | * | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-09-0310-22/+443
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-08-28238-10423/+14343
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| * | | | | | Merge pull request #716 from MajorKoos/masterJack Humbert2016-09-057-0/+474
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Add support for JD40 MKII PCB
| | * | | | | | Add rules.mk fileMajor Koos2016-09-021-0/+69
| | | | | | | |
| | * | | | | | Add support for JD40 MKII PCBMajor Koos2016-09-026-0/+405
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | RGB Included.
| * | | | | | Merge pull request #711 from hot-leaf-juice/masterJack Humbert2016-09-052-19/+27
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Updated callum's keymap
| | * | | | | | fixed incorrect key combination for locking screen on macOSCallum Oakley2016-09-022-5/+5
| | | | | | | |
| | * | | | | | changed some of the wording in the readmeCallum Oakley2016-09-011-4/+4
| | | | | | | |
| | * | | | | | changed order of modifiers after experimentation, updated readmeCallum Oakley2016-09-012-12/+7
| | | | | | | |
| | * | | | | | Merge remote-tracking branch 'upstream/master'Callum Oakley2016-09-01441-13735/+31253
| | |\| | | | |
| | * | | | | | added a lock screen keyCallum Oakley2016-08-121-3/+16
| | | | | | | |
| | * | | | | | Merge remote-tracking branch 'upstream/master'Callum Oakley2016-08-09274-2508/+5133
| | |\ \ \ \ \ \
| | * | | | | | | updated readme.md to reflect keymap changesCallum Oakley2016-08-091-2/+2
| | | | | | | | |
| | * | | | | | | changed order of bottom row of symbol layer to ease acess to bracketsCallum Oakley2016-08-091-2/+2
| | | | | | | | |
| * | | | | | | | Merge pull request #710 from algernon/h/tap-dance/keyup-seq-start-fixJack Humbert2016-09-051-2/+3
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | tap-dance: Do not start a sequence on keyup
| | * | | | | | | tap-dance: Do not start a sequence on keyupGergely Nagy2016-09-011-2/+3
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was an odd case, which confused the hell out of tap-dance: suppose you had a number of tap-dance keys, on a layer, and as part of the tap-dance, you turned that layer off - or had it on one-shot to begin with. In this case, the keydown event would trigger the tap-dance key, but the keyup would not. This had two funky consequences: - tap-dance did not correctly register that the dance has ended. - pressing any other tap-dance key would interrupt the previous tap-dance, and potentially input unwanted characters. To fix this, we simply do not start a tap-dance sequence on keyup, only when it is pressed. This way the previous sequence has enough time to time-out and finish properly, and we don't get confused. This fixes algernon/ergodox-layout#107. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
| * | | | | | | Merge pull request #707 from algernon/f/unicode/get-modeJack Humbert2016-08-312-0/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | process_unicode: Add get_unicode_input_mode()
| | * | | | | | | process_unicode: Add get_unicode_input_mode()Gergely Nagy2016-08-312-0/+5
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There may be cases where one would like to know the current Unicode input mode, without having to keep track of it themselves. Add a function that does just this. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
| * | | | | | | Merge pull request #705 from VoodaGod/bone2planckJack Humbert2016-08-303-22/+44
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Bone2planck update
| | * \ \ \ \ \ \ Merge branch 'master'Jason Janse van Rensburg2016-08-30694-13851/+35464
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: keyboards/planck/keymaps/bone2planck/keymap.c
| * | | | | | | | Merge pull request #703 from jhenahan/feature/jhenahan-keymapJack Humbert2016-08-294-0/