summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add new ErgoDox EZ keymap, YORUIANThomas Fitzsimmons2016-09-056-0/+277
|
* 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/+389
|\ \ \ \ \ \ | | | | | | | | | | | | | | jhenahan Planck layout
| * | | | | | Update READMEJack Henahan2016-08-291-3/+9
| | | | | | |
| * | | | | | jhenahan layoutJack Henahan2016-08-294-0/+383
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #700 from algernon/h/ucis/enable-fixJack Humbert2016-08-291-0/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | build_keyboard.mk: Restore UCIS_ENABLE support
| * | | | | build_keyboard.mk: Restore UCIS_ENABLE supportGergely Nagy2016-08-291-0/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During the build system refactor, support for enabling UCIS seems to have been lost. This little patch adds that back, so that keymaps using UCIS can be compiled again. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
* | | | | Merge pull request #697 from fredizzimo/fix_gh_token_problemJack Humbert2016-08-271-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Fix the .travis.yml so that GH_TOKEN works properly
| * | | | | Fix the .travis.yml so that GH_TOKEN works properlyFred Sundvik2016-08-281-3/+3
| | | | | |
* | | | | | Merge pull request #696 from fredizzimo/community_boardsJack Humbert2016-08-271-19/+28
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Update list of community keyboards
| * | | | | Update list of community keyboardsFred Sundvik2016-08-281-19/+28
| | | | | |
* | | | | | Merge pull request #689 from jeebak/tv44-jeebakJack Humbert2016-08-274-0/+596
|\ \ \ \ \ \ | | | | | | | | | | | | | | Port jeebak's Planck/JD45 keymap to TV44
| * | | | | | [tv44] Port jeebak's planck keymap to tv44JeeBak Kim2016-08-263-69/+538
| | | | | | |
| * | | | | | [tv44] Add "jeebak" keymap folder as a copy of the "default" folderJeeBak Kim2016-08-264-0/+127
| | | | | | |
* | | | | | | Merge pull request #684 from tomb0y/kc60_workman_deadJack Humbert2016-08-272-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Correct typo in kc60 workman-dead keymap
| * | | | | | | Correct typo in kc60 workman-dead keymapzs2016-08-262-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and rename README.md to readme.md
* | | | | | | | Merge pull request #695 from fredizzimo/dfu-util_instructionsJack Humbert2016-08-271-5/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add dfu-util to the instructions
| * | | | | | | | Add dfu-util to the instructionsFred Sundvik2016-08-271-5/+10
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #693 from fredizzimo/infinity60Jack Humbert2016-08-2716-9/+37
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Rename infinity_chibios to infinity60, and add readme
| * | | | | | | | Rename infinity_chibios to infinity60, and add readmeFred Sundvik2016-08-2716-9/+37
| |/ / / / / / /
* | | | | | | | Merge pull request #694 from fredizzimo/keyboard_templateJack Humbert2016-08-271-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix the keyboard template with new make syntax