Commit Graph

3267 Commits (73fdd8a769427590853e37106191a227ad022f76)
 

Author SHA1 Message Date
cbbrowne 73fdd8a769 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 8 years ago
Erez Zukerman 0f111182a6 Merge pull request #732 from romanzolotarev/master
Change CTL_T(KC_ESC) to KC_LCTRL and update readme
8 years ago
Erez Zukerman 74d72c724b Merge pull request #729 from joarau/master
norwegian programmer-friendly layout
8 years ago
Roman Zolotarev da16733e7a
Change CTL_T(KC_ESC) to KC_LCTRL and update readme 8 years ago
joar a3e7042084 norwegian programmer-friendly layout 8 years ago
Erez Zukerman 8b0769fe5a Merge pull request #728 from fitzsim/yoruian
Add new ErgoDox EZ keymap, YORUIAN
8 years ago
Thomas Fitzsimmons ce53c0643d Fix ergodox_yoruian XKB naming 8 years ago
Thomas Fitzsimmons e9ce4960c1 Add new ErgoDox EZ keymap, YORUIAN 8 years ago
Erez Zukerman 5bb29136b1 Merge pull request #686 from coderkun/coderkun_neo2
Merge Ergodox keymap “coderkun_neo2”
8 years ago
Erez Zukerman 45d68486a2 Merge pull request #678 from algernon/ergodox-ez/algernon
ergodox: Update algernon's keymap to v1.6
8 years ago
Jack Humbert 0468093b12 Merge pull request #724 from sgoodwin/master
Add my keymap.
8 years ago
Jack Humbert 751832192c Merge pull request #722 from fredizzimo/fix_always_linking
Fix the ldflags.txt and obj.txt checks
8 years ago
Jack Humbert 4769b85130 Merge pull request #719 from IBNobody/master
Updated docs to show more info on backlight breathing.
8 years ago
Jack Humbert fcc2d43943 Merge pull request #716 from MajorKoos/master
Add support for JD40 MKII PCB
8 years ago
Jack Humbert f1b6729921 Merge pull request #711 from hot-leaf-juice/master
Updated callum's keymap
8 years ago
Jack Humbert 0301d2fdc2 Merge pull request #710 from algernon/h/tap-dance/keyup-seq-start-fix
tap-dance: Do not start a sequence on keyup
8 years ago
Samuel Ryan Goodwin bf5941b335 Add my keymap. 8 years ago
Fred Sundvik 13f3c73386 Fix the ldflags.txt and obj.txt checks
There was a minor typo, which caused the files to not be generated
and therefore the elf files were always linked.
8 years ago
IBNobody f16fece283 Merge pull request #4 from IBNobody/update_atomic_planck_pvc_keymaps
Added diagonal mice macros, breathing ala Atomic
8 years ago
IBNobody f6cb08a5bd Added diagonal mice macros, breathing ala Atomic 8 years ago
IBNobody d55a705bbb Moved breathing backlighting section in readme.md 8 years ago
IBNobody f065652812 Updated doc to contain breathing information. 8 years ago
IBNobody 7fd5b6581a Updated readme to have better backlight breathing info. 8 years ago
IBNobody c20540984e Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 8 years ago
Major Koos 11224a00fe Add rules.mk file 8 years ago
Major Koos 295ef0d964 Add support for JD40 MKII PCB
RGB Included.
8 years ago
Callum Oakley e4167c8c53 fixed incorrect key combination for locking screen on macOS 8 years ago
Callum Oakley 4c67ccc81e changed some of the wording in the readme 8 years ago
Callum Oakley 8b2a235c8d changed order of modifiers after experimentation, updated readme 8 years ago
Callum Oakley 9c3193f225 Merge remote-tracking branch 'upstream/master' 8 years ago
Gergely Nagy acda2b793f tap-dance: Do not start a sequence on keyup
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>
8 years ago
Jack Humbert e28d151a8a Merge pull request #707 from algernon/f/unicode/get-mode
process_unicode: Add get_unicode_input_mode()
8 years ago
Gergely Nagy c9ea236fc3 process_unicode: Add get_unicode_input_mode()
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>
8 years ago
Jack Humbert 27f9671a3e Merge pull request #705 from VoodaGod/bone2planck
Bone2planck update
8 years ago
Jason Janse van Rensburg fc2ca62a3b Merge branch 'master'
Conflicts:
	keyboards/planck/keymaps/bone2planck/keymap.c
8 years ago
Jack Humbert 8e00c464e6 Merge pull request #703 from jhenahan/feature/jhenahan-keymap
jhenahan Planck layout
8 years ago
Jack Humbert 3301e2219f Merge pull request #700 from algernon/h/ucis/enable-fix
build_keyboard.mk: Restore UCIS_ENABLE support
8 years ago
cbbrowne fba509780e Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 8 years ago
Jack Henahan 6d7637ae3e Update README 8 years ago
Jack Henahan 42f1ce08dc jhenahan layout 8 years ago
Gergely Nagy 2f0395ce72 build_keyboard.mk: Restore UCIS_ENABLE support
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>
8 years ago
IBNobody 6da0eb2b2b Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 8 years ago
Jack Humbert 6d1e916851 Merge pull request #697 from fredizzimo/fix_gh_token_problem
Fix the .travis.yml so that GH_TOKEN works properly
8 years ago
Jack Humbert 25502277e8 Merge pull request #696 from fredizzimo/community_boards
Update list of community keyboards
8 years ago
Fred Sundvik 83eb9e4eed Fix the .travis.yml so that GH_TOKEN works properly 8 years ago
Fred Sundvik 3bdebd2270 Update list of community keyboards 8 years ago
Jack Humbert 326de65439 Merge pull request #689 from jeebak/tv44-jeebak
Port jeebak's Planck/JD45 keymap to TV44
8 years ago
Jack Humbert 2ac90ed704 Merge pull request #684 from tomb0y/kc60_workman_dead
Correct typo in kc60 workman-dead keymap
8 years ago
Jack Humbert bade8be66c Merge pull request #695 from fredizzimo/dfu-util_instructions
Add dfu-util to the instructions
8 years ago
Jack Humbert 98bedbeb75 Merge pull request #693 from fredizzimo/infinity60
Rename infinity_chibios to infinity60, and add readme
8 years ago