summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-09-08Merge pull request #730 from IBNobody/masterJack Humbert23-120/+303
Change NKRO Report Size = 32, User Print
2016-09-08Added User Print - A "light" console out option (#8)IBNobody6-26/+166
User print disables the normal print messages in the body of QMK/TMK code and is meant as a lightweight alternative to NOPRINT. Use it when you only want to do a spot of debugging but lack flash resources for allowing all of the codebase to print (and store their wasteful strings).
2016-09-07Use keyboard config for nkro (#7)IBNobody17-101/+131
* removing nkro references - wip * changed NKRO to be defined by keymap_config
2016-09-07Merge pull request #732 from romanzolotarev/masterErez Zukerman2-27/+40
Change CTL_T(KC_ESC) to KC_LCTRL and update readme
2016-09-07Merge pull request #729 from joarau/masterErez Zukerman6-0/+420
norwegian programmer-friendly layout
2016-09-07Change CTL_T(KC_ESC) to KC_LCTRL and update readmeRoman Zolotarev2-27/+40
2016-09-07Merge pull request #6 from IBNobody/fix_magic_key_binding_NKROIBNobody1-0/+13
Set keyboard_nkro (used by TMK) w/ MAGIC_HOST_NKRO
2016-09-07Set keyboard_nkro (used by TMK) w/ MAGIC_HOST_NKROIBNobody1-0/+13
If NKRO is enabled, also set keyboard_nkro with MAGIC_HOST_NKRO and MAGIC_UNHOST_NKRO.
2016-09-06Merge pull request #5 from IBNobody/make_nkro_report_32_bytesIBNobody1-6/+6
Change NKRO size fron 16 bytes to 32 bytes.
2016-09-06Change NKRO size fron 16 bytes to 32 bytes.IBNobody1-6/+6
2016-09-06Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody30-553/+1624
2016-09-06norwegian programmer-friendly layoutjoar6-0/+420
2016-09-06Merge pull request #728 from fitzsim/yoruianErez Zukerman6-0/+277
Add new ErgoDox EZ keymap, YORUIAN
2016-09-06Fix ergodox_yoruian XKB namingThomas Fitzsimmons2-2/+2
2016-09-06Add new ErgoDox EZ keymap, YORUIANThomas Fitzsimmons6-0/+277
2016-09-06Merge pull request #686 from coderkun/coderkun_neo2Erez Zukerman2-7/+19
Merge Ergodox keymap “coderkun_neo2”
2016-09-06Merge pull request #678 from algernon/ergodox-ez/algernonErez Zukerman8-523/+552
ergodox: Update algernon's keymap to v1.6
2016-09-05Merge pull request #724 from sgoodwin/masterJack Humbert3-0/+268
Add my keymap.
2016-09-05Merge pull request #722 from fredizzimo/fix_always_linkingJack Humbert1-2/+4
Fix the ldflags.txt and obj.txt checks
2016-09-05Merge pull request #719 from IBNobody/masterJack Humbert3-221/+319
Updated docs to show more info on backlight breathing.
2016-09-05Merge pull request #716 from MajorKoos/masterJack Humbert7-0/+474
Add support for JD40 MKII PCB
2016-09-05Merge pull request #711 from hot-leaf-juice/masterJack Humbert2-19/+27
Updated callum's keymap
2016-09-05Merge pull request #710 from algernon/h/tap-dance/keyup-seq-start-fixJack Humbert1-2/+3
tap-dance: Do not start a sequence on keyup
2016-09-05Add my keymap.Samuel Ryan Goodwin3-0/+268
2016-09-04Fix the ldflags.txt and obj.txt checksFred Sundvik1-2/+4
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_keymapsIBNobody2-199/+238
Added diagonal mice macros, breathing ala Atomic
2016-09-04Added diagonal mice macros, breathing ala AtomicIBNobody2-199/+238
2016-09-04Moved breathing backlighting section in readme.mdIBNobody1-60/+60
2016-09-04Updated doc to contain breathing information.IBNobody1-29/+144
2016-09-04Updated readme to have better backlight breathing info.IBNobody1-160/+104
2016-09-03Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody10-22/+443
2016-09-03Add rules.mk fileMajor Koos1-0/+69
2016-09-03Add support for JD40 MKII PCBMajor Koos6-0/+405
RGB Included.
2016-09-02fixed incorrect key combination for locking screen on macOSCallum Oakley2-5/+5
2016-09-01changed some of the wording in the readmeCallum Oakley1-4/+4
2016-09-01changed order of modifiers after experimentation, updated readmeCallum Oakley2-12/+7
2016-09-01Merge remote-tracking branch 'upstream/master'Callum Oakley441-13735/+31253
2016-09-01tap-dance: Do not start a sequence on keyupGergely Nagy1-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>
2016-08-31Merge pull request #707 from algernon/f/unicode/get-modeJack Humbert2-0/+5
process_unicode: Add get_unicode_input_mode()
2016-08-31process_unicode: Add get_unicode_input_mode()Gergely Nagy2-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>
2016-08-31Merge pull request #705 from VoodaGod/bone2planckJack Humbert3-22/+44
Bone2planck update
2016-08-30Merge branch 'master'Jason Janse van Rensburg694-13851/+35464
Conflicts: keyboards/planck/keymaps/bone2planck/keymap.c
2016-08-30Merge pull request #703 from jhenahan/feature/jhenahan-keymapJack Humbert4-0/+389
jhenahan Planck layout
2016-08-30Merge pull request #700 from algernon/h/ucis/enable-fixJack Humbert1-0/+5
build_keyboard.mk: Restore UCIS_ENABLE support
2016-08-29Update READMEJack Henahan1-3/+9
2016-08-29jhenahan layoutJack Henahan4-0/+383
2016-08-29build_keyboard.mk: Restore UCIS_ENABLE supportGergely Nagy1-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>
2016-08-29Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody238-10423/+14343
2016-08-28Merge pull request #697 from fredizzimo/fix_gh_token_problemJack Humbert1-3/+3
Fix the .travis.yml so that GH_TOKEN works properly
2016-08-28Merge pull request #696 from fredizzimo/community_boardsJack Humbert1-19/+28
Update list of community keyboards