varl/qmk_firmware
1
0
Fork 0
forked from forks/qmk_firmware
Code Pull requests Activity
3344 commits 2 branches 1545 tags 870 MiB
Commit graph

3344 commits

This branch
This branch
All branches
Author SHA1 Message Date
profet23 1406118c71 Removing separate ergodox80 project. 
Created KEYMAP_80 in ez.h to support 80 key ergodoxes.
Creating default_80 keymap as ez keymap.
 2016-09-06 21:59:47 -04:00
Erez Zukerman 0f111182a6 Merge pull request #732 from romanzolotarev/master 
Change CTL_T(KC_ESC) to KC_LCTRL and update readme
 2016-09-06 21:35:15 -04:00
Erez Zukerman 74d72c724b Merge pull request #729 from joarau/master 
norwegian programmer-friendly layout
 2016-09-06 21:33:55 -04:00
Roman Zolotarev da16733e7a
Change CTL_T(KC_ESC) to KC_LCTRL and update readme 2016-09-07 08:03:19 +08:00
IBNobody f0388a5b13 Merge pull request #6 from IBNobody/fix_magic_key_binding_NKRO 
Set keyboard_nkro (used by TMK) w/ MAGIC_HOST_NKRO
 2016-09-06 18:07:48 -05:00
IBNobody e571d4656c Set keyboard_nkro (used by TMK) w/ MAGIC_HOST_NKRO 
If NKRO is enabled, also set keyboard_nkro with MAGIC_HOST_NKRO and
MAGIC_UNHOST_NKRO.
 2016-09-06 18:02:43 -05:00
IBNobody 91e0f62417 Merge pull request #5 from IBNobody/make_nkro_report_32_bytes 
Change NKRO size fron 16 bytes to 32 bytes.
 2016-09-06 15:00:51 -05:00
IBNobody 16e706214f Change NKRO size fron 16 bytes to 32 bytes. 2016-09-06 14:59:12 -05:00
IBNobody ff53e16767 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-09-06 14:57:12 -05:00
joar a3e7042084 norwegian programmer-friendly layout 2016-09-06 16:00:08 +02:00
Erez Zukerman 8b0769fe5a Merge pull request #728 from fitzsim/yoruian 
Add new ErgoDox EZ keymap, YORUIAN
 2016-09-06 07:07:25 -04:00
Thomas Fitzsimmons ce53c0643d Fix ergodox_yoruian XKB naming 2016-09-06 00:09:14 -04:00
Thomas Fitzsimmons e9ce4960c1 Add new ErgoDox EZ keymap, YORUIAN 2016-09-05 20:53:35 -04:00
Erez Zukerman 5bb29136b1 Merge pull request #686 from coderkun/coderkun_neo2 
Merge Ergodox keymap “coderkun_neo2”
 2016-09-05 20:33:09 -04:00
Erez Zukerman 45d68486a2 Merge pull request #678 from algernon/ergodox-ez/algernon 
ergodox: Update algernon's keymap to v1.6
 2016-09-05 20:32:46 -04:00
Jack Humbert 0468093b12 Merge pull request #724 from sgoodwin/master 
Add my keymap.
 2016-09-05 13:21:24 -04:00
Jack Humbert 751832192c Merge pull request #722 from fredizzimo/fix_always_linking 
Fix the ldflags.txt and obj.txt checks
 2016-09-05 13:20:59 -04:00
Jack Humbert 4769b85130 Merge pull request #719 from IBNobody/master 
Updated docs to show more info on backlight breathing.
 2016-09-05 13:20:48 -04:00
Jack Humbert fcc2d43943 Merge pull request #716 from MajorKoos/master 
Add support for JD40 MKII PCB
 2016-09-05 13:19:58 -04:00
Jack Humbert f1b6729921 Merge pull request #711 from hot-leaf-juice/master 
Updated callum's keymap
 2016-09-05 13:17:14 -04:00
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
 2016-09-05 13:16:58 -04:00
Samuel Ryan Goodwin bf5941b335 Add my keymap. 2016-09-05 15:53:52 +02:00
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.
 2016-09-04 23:26:49 +03:00
IBNobody f16fece283 Merge pull request #4 from IBNobody/update_atomic_planck_pvc_keymaps 
Added diagonal mice macros, breathing ala Atomic
 2016-09-04 01:08:36 -05:00
IBNobody f6cb08a5bd Added diagonal mice macros, breathing ala Atomic 2016-09-04 01:07:36 -05:00
IBNobody d55a705bbb Moved breathing backlighting section in readme.md 2016-09-03 23:21:24 -05:00
IBNobody f065652812 Updated doc to contain breathing information. 2016-09-03 20:33:34 -05:00
IBNobody 7fd5b6581a Updated readme to have better backlight breathing info. 2016-09-03 20:29:29 -05:00
IBNobody c20540984e Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-09-03 11:52:55 -05:00
Major Koos 11224a00fe Add rules.mk file 2016-09-02 16:42:40 -07:00
Major Koos 295ef0d964 Add support for JD40 MKII PCB 
RGB Included.
 2016-09-02 16:14:40 -07:00
profet23 36e16b46e3 Removing/editing non applicable readme 2016-09-02 17:18:39 -04:00
profet23 a485e13afe Adding 80 Key Ergodox Support 2016-09-02 16:24:05 -04:00
Callum Oakley e4167c8c53 fixed incorrect key combination for locking screen on macOS 2016-09-02 09:03:39 +01:00
Callum Oakley 4c67ccc81e changed some of the wording in the readme 2016-09-01 18:30:49 +01:00
Callum Oakley 8b2a235c8d changed order of modifiers after experimentation, updated readme 2016-09-01 18:14:39 +01:00
Callum Oakley 9c3193f225 Merge remote-tracking branch 'upstream/master' 2016-09-01 17:55:00 +01:00
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>
 2016-09-01 08:32:47 +02:00
Jack Humbert e28d151a8a Merge pull request #707 from algernon/f/unicode/get-mode 
process_unicode: Add get_unicode_input_mode()
 2016-08-31 11:28:52 -04:00
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>
 2016-08-31 08:21:52 +02:00
Jack Humbert 27f9671a3e Merge pull request #705 from VoodaGod/bone2planck 
Bone2planck update
 2016-08-30 23:07:24 -04:00
Jason Janse van Rensburg fc2ca62a3b Merge branch 'master' 
Conflicts:
	keyboards/planck/keymaps/bone2planck/keymap.c
 2016-08-30 14:54:00 +02:00
Jack Humbert 8e00c464e6 Merge pull request #703 from jhenahan/feature/jhenahan-keymap 
jhenahan Planck layout
 2016-08-29 20:16:20 -04:00
Jack Humbert 3301e2219f Merge pull request #700 from algernon/h/ucis/enable-fix 
build_keyboard.mk: Restore UCIS_ENABLE support
 2016-08-29 20:15:46 -04:00
cbbrowne fba509780e Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-29 12:32:03 -04:00
Jack Henahan 6d7637ae3e Update README 2016-08-29 11:43:06 -04:00
Jack Henahan 42f1ce08dc jhenahan layout 2016-08-29 11:35:07 -04:00
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>
 2016-08-29 11:30:38 +02:00
IBNobody 6da0eb2b2b Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-08-28 18:50:06 -05:00
Jack Humbert 6d1e916851 Merge pull request #697 from fredizzimo/fix_gh_token_problem 
Fix the .travis.yml so that GH_TOKEN works properly
 2016-08-27 19:00:21 -04:00