Commit Graph
100 Commits
Author SHA1 Message Date
Jack Humbert 335b398a5d Merge pull request #1152 from UnintendedFeature/bugfix/issue1151
readme keymap.h to quantum_keycodes.h
2017-03-15 11:18:32 -04:00
Jack Humbert b794719952 Merge pull request #1090 from qmk/backlight_softpwm
Adds soft PWM backlight for non-timed ports
2017-03-15 11:17:07 -04:00
Jack Humbert ce6dcc2b5d Merge pull request #1146 from khogeland/master
Colemak layout for Clueboard
2017-03-15 11:13:16 -04:00
Jack Humbert 71d6d7b22c Merge pull request #1147 from nooges/numpad20
Add handwired 20-key Numpad
2017-03-15 11:12:52 -04:00
Jack Humbert 8c184847f7 Merge pull request #1150 from nooges/ortho5x13
Add handwired 5x13 ortholinear keyboard
2017-03-15 11:12:30 -04:00
Jack Humbert 8685d73893 Merge pull request #1148 from nooges/hexwire-lets-split
Add Hexwire layout for Let's Split
2017-03-15 11:12:01 -04:00
Jack Humbert 09ee922a63 Merge pull request #1155 from deadcyclo/master
Worked on deadcyclo layout
2017-03-15 11:11:35 -04:00
Jack Humbert b4a3e5ebea Merge pull request #1145 from smt/smt/lets_split
Add smt keymap for Let's Split (based on serial)
2017-03-15 11:00:06 -04:00
Jack Humbert 3554b93cbd Merge pull request #1144 from milestogo/sculpt2
Microsoft sculpt mobile handwire and new shortcuts macro library
2017-03-15 10:59:34 -04:00
Jack Humbert 2e34d4bd85 update for infinity 2017-03-15 10:57:24 -04:00
Jack Humbert ec9210959f Update readme.md 2017-03-13 12:12:09 -04:00
Jack Humbert bfa7e6ce04 Merge pull request #1137 from Skrymir/patch-1
Fixed minor error in ergodox infinity section.
2017-03-08 18:37:30 -05:00
Jack Humbert 8d81667fbe Merge pull request #1138 from nooges/magicforce68
Add Handwired Magicforce68
2017-03-08 18:37:09 -05:00
Jack Humbert 97c4c570e2 Merge pull request #1140 from stites/freebsd
Add FreeBSD support in "util/install_dependencies.sh"
2017-03-08 18:36:34 -05:00
Jack Humbert 85121ec50e Merge pull request #1142 from guni77/my_keymap
My keymap
2017-03-08 18:35:37 -05:00
Jack Humbert f392f245f9 Merge pull request #1143 from UnintendedFeature/feature/keymap-german-lukas
keymap german lukas
2017-03-08 18:30:23 -05:00
Jack Humbert b042428d23 Merge pull request #1126 from folkert4/master
Various QOL changes to Espynn's keymap
2017-03-03 10:29:54 -05:00
Jack Humbert 4ab88f3a9e Merge pull request #1129 from unxmaal/unxmaal_spacefn
Layout: Spacebar long-press as fn, for GH60 and GH60 Satan boards
2017-03-03 10:29:19 -05:00
Jack Humbert 2a5d972004 Merge pull request #1130 from hot-leaf-juice/master
moar hotkeys
2017-03-03 10:28:55 -05:00
Jack Humbert 4c4cf3ca49 Merge pull request #1124 from jmdaly/roadkit_firmware
Add initial version of TheVan Keyboards Roadkit Firmware
2017-02-28 15:48:34 -05:00
Jack Humbert 72c5dd1c93 Merge pull request #1125 from cwhits/upstream
[Planck] Update default keymap for missing keys
2017-02-28 11:51:33 -05:00
Jack Humbert 4583955914 Merge pull request #1116 from hot-leaf-juice/master
keymap update
2017-02-27 22:18:55 -05:00
Jack Humbert 5bfeb229b8 Merge pull request #1119 from phongnh/master
Removes redundant {} which cause build failure when DEBUG_ACTION is set
2017-02-27 22:18:12 -05:00
Jack Humbert b851b0b2ae Merge pull request #1121 from Leszek111/master
add layout
2017-02-27 22:17:36 -05:00
Jack Humbert c62f3bd74d Merge pull request #1118 from priyadi/promethium
Various keymap updates
2017-02-23 10:21:23 -05:00
Jack Humbert 352c0e7baa Merge pull request #1117 from priyadi/fix_unicode_map
Fix UNICODE_MAP input_mode problem
2017-02-23 10:20:47 -05:00
Jack Humbert 84b2f86f24 Merge pull request #1113 from kesslern/master
Add dvorak_emacs_software layout for ergodox
2017-02-21 23:35:09 -05:00
Jack Humbert da41cd1adf Merge pull request #1115 from Skrymir/master
Update from upstream
2017-02-21 23:34:23 -05:00
Jack Humbert 7ff41df32c Merge pull request #1097 from stanleylai/master
Added support for LED backlight, XD60v2's RGB underglow LED
2017-02-20 11:10:20 -05:00
Jack Humbert db1e9a469a helps to save before committing 2017-02-19 00:11:55 -05:00
Jack Humbert c2239e6b96 merging 2017-02-19 00:04:14 -05:00
Jack Humbert 49e72632d2 remove more warnings 2017-02-16 13:13:38 -05:00
Jack Humbert 1ac5dc9e52 fix travis and reduce warnings 2017-02-16 11:37:46 -05:00
Jack Humbert 15dc540cac ignore PRs in versioning 2017-02-16 10:06:02 -05:00
Jack Humbert e34c3936b7 Merge pull request #1105 from nrrkeene/master
The Ordinary Layout v5
2017-02-16 09:49:24 -05:00
Jack Humbert 0b76f4f508 Merge pull request #1103 from priyadi/promethium
My keymap updates
2017-02-16 09:48:58 -05:00
Jack Humbert 77b6ac831e Merge pull request #1104 from qmk/layer_tap_toggle
Adds layer tap toggle as TT(layer)
2017-02-15 23:46:31 -05:00
Jack Humbert 58823b4e03 fix weirdness with arm and mods 2017-02-15 23:20:35 -05:00
Jack Humbert f89499e255 unique variable name 2017-02-15 18:14:07 -05:00
Jack Humbert c2a9acffd7 publicise variables 2017-02-15 17:39:51 -05:00
Jack Humbert 1bb574fe48 add unicode common file, get names right 2017-02-15 17:09:47 -05:00
Jack Humbert 09add35e7f add unicode common file, get names right 2017-02-15 17:09:35 -05:00
Jack Humbert cbabb4d417 split up unicode systems into different files 2017-02-15 16:36:31 -05:00
Jack Humbert 6788cbd762 give error if both unicode/map are enabled 2017-02-15 12:39:58 -05:00
Jack Humbert 69ea10f9a9 adds layer tap toggle 2017-02-15 11:25:33 -05:00
Jack Humbert 7bef285553 Merge pull request #1101 from priyadi/layer_state_set_kb
Add weak layer_state_set_kb hook
2017-02-14 21:33:04 -05:00
Jack Humbert fd2925efba Merge pull request #1094 from priyadi/faux_clicky
Implement faux-clicky feature
2017-02-13 10:58:50 -05:00
Jack Humbert 21ad0c5bcd Merge pull request #1095 from Mauin/gonnerd/reset_documentation
GON NerD: Add reset button to documentation and default keymap
2017-02-13 10:56:47 -05:00
Jack Humbert 4010360912 adds planck/rev3 makefile so subproject is found 2017-02-12 23:58:44 -05:00
Jack Humbert 1e97f77278 update travis badge 2017-02-12 20:01:04 -05:00
Jack Humbert 68970679e7 Merge pull request #1092 from lucwastiaux/master
updated ergodox/dvorak_programmer keymap
2017-02-12 19:38:59 -05:00
Jack Humbert 4505db5d0e Merge pull request #1091 from smt/smt/tv44
Add smt keymap for tv44 (MiniVan)
2017-02-12 18:42:44 -05:00
Jack Humbert a773124537 send travis stuff to gitter 2017-02-12 12:23:03 -05:00
Jack Humbert 8d0fdf1008 adds soft pwm for non-timed ports 2017-02-12 11:29:42 -05:00
Jack Humbert a0c2305bd1 Merge pull request #1089 from priyadi/fix_ps2_mouse_warning
Suppress warnings from ps2_mouse.h
2017-02-11 13:18:42 -05:00
Jack Humbert 6d6b3ee9fb Merge pull request #1065 from milestogo/master
Update to kinesis keymaps
2017-02-11 11:51:06 -05:00
Jack Humbert 3f0b491fc0 Merge pull request #1082 from priyadi/right-side-dual-function
Implement tap mod dual role for right side mods.
2017-02-11 11:50:32 -05:00
Jack Humbert 6bb479ea45 Merge pull request #1085 from priyadi/promethium
Promethium keyboard layout update
2017-02-11 11:49:00 -05:00
Jack Humbert 5bdddb7821 Merge pull request #1087 from mneme/master
Updated keymap for atreus62/mneme
2017-02-11 11:48:39 -05:00
Jack Humbert 199458378b Merge pull request #1088 from Mauin/gon_nerd
add GON NerD
2017-02-11 11:48:11 -05:00
Jack Humbert bfc33a56d7 don't try to build the readme 2017-02-11 11:39:57 -05:00
Jack Humbert 835556da91 Merge pull request #1083 from VoodaGod/bone2planck
fixed readme (i swear)
2017-02-10 11:03:43 -05:00
Jack Humbert 6c462e0c01 Merge pull request #1073 from qmk/backlight_changes
Open backlight functionality to all ports
2017-02-09 20:14:35 -05:00
Jack Humbert d537120eab Merge pull request #1078 from VoodaGod/bone2planck
updated Bone2Planck Keymap, Readme & fixed Makefile
2017-02-09 10:38:46 -05:00
Jack Humbert 93ee3bea37 Merge pull request #1079 from r2d2rogers/patch-1
[Typo] correct link to default keymap in readme.
2017-02-09 10:38:09 -05:00
Jack Humbert 0a9fda968d Merge pull request #1074 from dungdung/kc60_led
Moved KC60 capslock LED code to standard led_set_kb…
2017-02-07 21:25:00 -05:00
Jack Humbert ad1327cd00 accept numbers in travis build 2017-02-07 20:51:50 -05:00
Jack Humbert f5c8c5d4c8 Merge pull request #1070 from jimmyhchan/fixSplit
Lets split readme eeprom master hand fixes
2017-02-07 15:46:29 -05:00
Jack Humbert b4e30d3929 added functionality for just a port 2017-02-07 15:23:56 -05:00
Jack Humbert d639bd2021 Merge pull request #1072 from nicinabox/improve-ls-avrdude-target
Check for Pro Micro serial port automatically
2017-02-07 13:52:03 -05:00
Jack Humbert 42ea912fde Merge pull request #1062 from luizribeiro/fix-win
Fix V-USB bug on Windows 10
2017-02-07 13:49:10 -05:00
Jack Humbert 13c394fba4 Merge pull request #1071 from dungdung/rgb_tweaks
RGB tweaks
2017-02-07 13:32:31 -05:00
Jack Humbert c0c69a1a7c Merge pull request #1068 from adzenith/master
Minor cleanup
2017-02-07 13:27:41 -05:00
Jack Humbert 3c7fa0acc1 Merge pull request #1046 from LukeSilva/master
Add Tapping Macros to QMK
2017-02-07 13:18:47 -05:00
Jack Humbert 0c2b6951a6 Merge pull request #1057 from priyadi/selectable_output
Implement runtime selectable output (USB or BT)
2017-02-07 13:12:29 -05:00
Jack Humbert de659486f5 pass through travis errors 2017-02-07 12:36:25 -05:00
Jack Humbert c256ad51bd Merge pull request #1056 from upils/master
Add reddot handwired keyboard.
2017-02-07 12:20:29 -05:00
Jack Humbert 790dab27b6 Merge pull request #1053 from TerryMathews/master
Let's Split: establish rev2fliphalf subproject
2017-02-07 12:19:45 -05:00
Jack Humbert 616b8604b0 variable scope fix for travis 2017-02-07 11:53:43 -05:00
Jack Humbert 6a92cc2897 correctly assign bash variable 2017-02-07 02:00:07 -05:00
Jack Humbert c8d5376f11 fix typo 2017-02-07 01:54:58 -05:00
Jack Humbert f79f38d726 add comma 2017-02-07 01:53:46 -05:00
Jack Humbert 2179a548f4 Merge pull request #1069 from hot-leaf-juice/master
change cmd-l and cmd-r for actual home and end
2017-02-07 01:42:30 -05:00
Jack Humbert 19d63ad72c try building only keyboards needed 2017-02-07 01:35:10 -05:00
Jack Humbert e5a2306804 Merge pull request #1041 from folkert4/master
Added Espynn's keymap
2017-02-07 00:37:23 -05:00
Jack Humbert ab07d71b22 Merge pull request #1047 from lordchair/keymap_yale
yale planck layout
2017-02-07 00:30:56 -05:00
Jack Humbert d4c88626bd Merge pull request #1048 from smt/smt/planck
Add smt's keymap for Planck
2017-02-06 20:21:42 -05:00
Jack Humbert 198a2929ed Merge pull request #1059 from qmk/hf/algr_t
Introduces ALGR_T for dual-function AltGr
2017-02-06 19:33:33 -05:00
Jack Humbert b5159c964a Merge pull request #1036 from nicinabox/lets-split-improvements
Lets Split flashing improvements
2017-02-06 19:33:07 -05:00
Jack Humbert 4348fb54d6 Merge pull request #960 from ofples/feature/combos
Keyboard combination triggers
2017-02-06 19:31:45 -05:00
Jack Humbert b6ffda4849 Merge pull request #1010 from SjB/oneshot_timeout_fix
oneshot timeout would only timeout after an event.
2017-02-06 18:57:23 -05:00
Jack Humbert 449ab9109a Merge branch 'master' of github.com:jackhumbert/qmk_firmware 2017-02-06 18:28:50 -05:00
Jack Humbert 35edb382ee [skip build] testing travis script 2017-02-06 18:28:37 -05:00
Jack Humbert 0a3c5c06fe Merge pull request #981 from jonasoberschweiber/osx-surrogate-pairs
Add support for Unicode supplementary planes on OS X
2017-02-06 18:00:47 -05:00
Jack Humbert 5c8cdfd2b5 [skip build] testing travis script 2017-02-06 17:51:20 -05:00
Jack Humbert 246d2583ff Merge pull request #1030 from SjB/refactor_register_code16
speeding up (un)register_code16
2017-02-06 17:06:53 -05:00
Jack Humbert ee386a29d1 [skip build] testing travis script 2017-02-06 17:00:30 -05:00
Jack Humbert cf8dac3538 [skip build] testing travis script 2017-02-06 16:56:39 -05:00
Jack Humbert 98adda34c9 [skip build] testing travis script 2017-02-06 16:54:54 -05:00
Jack Humbert 470c8436c2 [skip build] testing travis script 2017-02-06 16:46:44 -05:00