summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-09-06Fix ergodox_yoruian XKB namingThomas Fitzsimmons
2016-09-05Add new ErgoDox EZ keymap, YORUIANThomas Fitzsimmons
2016-09-05Merge pull request #686 from coderkun/coderkun_neo2Erez Zukerman
Merge Ergodox keymap “coderkun_neo2”
2016-09-05Merge pull request #678 from algernon/ergodox-ez/algernonErez Zukerman
ergodox: Update algernon's keymap to v1.6
2016-09-05Merge pull request #724 from sgoodwin/masterJack Humbert
Add my keymap.
2016-09-05Merge pull request #722 from fredizzimo/fix_always_linkingJack Humbert
Fix the ldflags.txt and obj.txt checks
2016-09-05Merge pull request #719 from IBNobody/masterJack Humbert
Updated docs to show more info on backlight breathing.
2016-09-05Merge pull request #716 from MajorKoos/masterJack Humbert
Add support for JD40 MKII PCB
2016-09-05Merge pull request #711 from hot-leaf-juice/masterJack Humbert
Updated callum's keymap
2016-09-05Merge pull request #710 from algernon/h/tap-dance/keyup-seq-start-fixJack Humbert
tap-dance: Do not start a sequence on keyup
2016-09-05Add my keymap.Samuel Ryan Goodwin
2016-09-04Fix the ldflags.txt and obj.txt checksFred Sundvik
There was a minor typo, which caused the files to not be generated and therefore the elf files were always linked.
2016-09-04Merge pull request #4 from IBNobody/update_atomic_planck_pvc_keymapsIBNobody
Added diagonal mice macros, breathing ala Atomic
2016-09-04Added diagonal mice macros, breathing ala AtomicIBNobody
2016-09-03Moved breathing backlighting section in readme.mdIBNobody
2016-09-03Updated doc to contain breathing information.IBNobody
2016-09-03Updated readme to have better backlight breathing info.IBNobody
2016-09-03Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody
2016-09-02Add rules.mk fileMajor Koos
2016-09-02Add support for JD40 MKII PCBMajor Koos
RGB Included.
2016-09-02Removing/editing non applicable readmeprofet23
2016-09-02Adding 80 Key Ergodox Supportprofet23
2016-09-02fixed incorrect key combination for locking screen on macOSCallum Oakley
2016-09-01changed some of the wording in the readmeCallum Oakley
2016-09-01changed order of modifiers after experimentation, updated readmeCallum Oakley
2016-09-01Merge remote-tracking branch 'upstream/master'Callum Oakley
2016-09-01tap-dance: Do not start a sequence on keyupGergely Nagy
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>
2016-08-31Merge pull request #707 from algernon/f/unicode/get-modeJack Humbert
process_unicode: Add get_unicode_input_mode()
2016-08-31process_unicode: Add get_unicode_input_mode()Gergely Nagy
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>
2016-08-30Merge pull request #705 from VoodaGod/bone2planckJack Humbert
Bone2planck update
2016-08-30Merge branch 'master'Jason Janse van Rensburg
Conflicts: keyboards/planck/keymaps/bone2planck/keymap.c
2016-08-29Merge pull request #703 from jhenahan/feature/jhenahan-keymapJack Humbert
jhenahan Planck layout
2016-08-29Merge pull request #700 from algernon/h/ucis/enable-fixJack Humbert
build_keyboard.mk: Restore UCIS_ENABLE support
2016-08-29Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne
2016-08-29Update READMEJack Henahan
2016-08-29jhenahan layoutJack Henahan
2016-08-29build_keyboard.mk: Restore UCIS_ENABLE supportGergely Nagy
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>
2016-08-28Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody
2016-08-27Merge pull request #697 from fredizzimo/fix_gh_token_problemJack Humbert
Fix the .travis.yml so that GH_TOKEN works properly
2016-08-27Merge pull request #696 from fredizzimo/community_boardsJack Humbert
Update list of community keyboards
2016-08-28Fix the .travis.yml so that GH_TOKEN works properlyFred Sundvik
2016-08-28Update list of community keyboardsFred Sundvik
2016-08-27Merge pull request #689 from jeebak/tv44-jeebakJack Humbert
Port jeebak's Planck/JD45 keymap to TV44
2016-08-27Merge pull request #684 from tomb0y/kc60_workman_deadJack Humbert
Correct typo in kc60 workman-dead keymap
2016-08-27Merge pull request #695 from fredizzimo/dfu-util_instructionsJack Humbert
Add dfu-util to the instructions
2016-08-27Merge pull request #693 from fredizzimo/infinity60Jack Humbert
Rename infinity_chibios to infinity60, and add readme
2016-08-27Merge pull request #694 from fredizzimo/keyboard_templateJack Humbert
Fix the keyboard template with new make syntax
2016-08-27Merge pull request #690 from fredizzimo/unit_testJack Humbert
Add Unit Testing support
2016-08-27Rename infinity_chibios to infinity60, and add readmeFred Sundvik
2016-08-27Add dfu-util to the instructionsFred Sundvik