dbroqua
c3469b8d21
Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware
2016-12-17 22:28:56 +01:00
Damien
c9803f78b2
Merge pull request #14 from jackhumbert/master
...
Merged from jackhumbert/qmk_firmware
2016-12-17 22:28:45 +01:00
dbroqua
df50bee5a8
Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware
2016-12-17 22:25:21 +01:00
dbroqua
46b93f02d5
- Added capslock key
2016-12-17 22:25:08 +01:00
Erez Zukerman
8a65c640ec
Adds a troubleshooting layout for resetting the EEPROM
2016-12-16 20:53:42 -05:00
Erez Zukerman
df32d5b769
Removes alt/j dual function
2016-12-16 20:13:40 -05:00
Pavlos Vinieratos
34d6f07d2c
make a sysctl MO button so i can quickly use the arrows
2016-12-16 09:46:03 +01:00
Priyadi Iman Nurcahyo
c641e46567
QWERTZ style dot & comma, move QUOT to SCLN position
2016-12-16 01:16:55 +07:00
Samuel Ryan Goodwin
826c929c49
Make keymap compile again.
2016-12-15 09:52:57 +01:00
Jack Humbert
36dddd45fb
Merge pull request #949 from priyadi/promethium
...
Promethium firmware update
2016-12-15 00:03:18 -05:00
Jack Humbert
803040d4ee
Merge pull request #952 from pvinis/master
...
update my keymap a bit
2016-12-15 00:03:02 -05:00
Jack Humbert
97f9b05efb
Merge pull request #953 from priyadi/ibm_terminal
...
IBM Terminal M-122 converter support
2016-12-15 00:02:45 -05:00
Kyle Smith
83e613ad23
Allow power consumption to be set per-keyboard.
2016-12-14 23:29:33 -05:00
climbalima
16483409cf
better switch spacing in svg
2016-12-14 23:11:04 -05:00
lucwastiaux
ebe351a690
enable brackets using the - key on the right, and cleanups
2016-12-15 07:22:31 +08:00
Priyadi Iman Nurcahyo
e58304c094
My layout for M-122 terminal keyboard
2016-12-14 22:34:23 +07:00
Priyadi Iman Nurcahyo
dc49231391
Update KEYMAP macro to be consistent with the rest of QMK
2016-12-14 22:33:56 +07:00
Priyadi Iman Nurcahyo
bd5f323bec
IBM Terminal M-122 converter support
...
Code ported from TMK to QMK.
2016-12-14 16:21:01 +07:00
Priyadi Iman Nurcahyo
e5b165c255
fine tune trackpoint initialization
2016-12-14 07:10:28 +07:00
Priyadi Iman Nurcahyo
32e952bda9
disable remote mode
2016-12-14 06:03:27 +07:00
Priyadi Iman Nurcahyo
0b54b32361
Enable Adafruit BLE support
2016-12-14 06:03:27 +07:00
Priyadi Iman Nurcahyo
9838ddcead
Pretend to be Thinkpad USB Keyboard
2016-12-14 06:03:27 +07:00
Priyadi Iman Nurcahyo
a747343b61
Enable PS2 remote mode
2016-12-14 06:03:27 +07:00
Jack Humbert
20892bf706
Merge pull request #948 from climbalima/master
...
svg bug fix and added pilcrow to hand wire
2016-12-12 23:32:14 -05:00
climbalima
5dce74d0ff
svg bug fix and added pilcrow to hand wire
2016-12-12 22:36:16 -05:00
Jack Humbert
0edfe55bfe
re-enable audio and extrakeys
2016-12-12 15:39:07 -05:00
Jack Humbert
0213acbdbe
Merge pull request #946 from climbalima/master
...
Changed lets split svg to support boston meetup pcb
2016-12-12 00:47:48 -05:00
Jack Humbert
6cd55d89e6
Merge pull request #945 from priyadi/planck_priyadi
...
Remove unneeded options to reduce firmware size
2016-12-12 00:47:29 -05:00
climbalima
7bc1caa21c
changed svg after merge
2016-12-10 23:18:46 -05:00
climbalima
73d6018296
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-12-10 23:15:47 -05:00
climbalima
56515ba503
changed svg to support proto pcb
2016-12-10 23:13:36 -05:00
Priyadi Iman Nurcahyo
a6db20e518
Remove unneeded options to reduce firmware size
2016-12-10 21:08:22 +07:00
lucwastiaux
75d7eb9cb5
put home/end on thumb cluster
2016-12-10 13:20:05 +08:00
lucwastiaux
a3c8949627
readme updates
2016-12-10 12:52:59 +08:00
lucwastiaux
9240f27ba9
Merge remote-tracking branch 'upstream/master'
2016-12-10 12:49:47 +08:00
lucwastiaux
dc4c8875ba
use thumb cluster key to toggle brackets layer
2016-12-10 12:37:32 +08:00
Damien
13c4080a1d
Merge pull request #13 from jackhumbert/master
...
Merged from qmk
2016-12-09 19:44:03 +01:00
Pavlos Vinieratos
9a59fee667
tap dance for some layers. one tap sysctl, two taps mouse.
2016-12-09 16:01:11 +01:00
Pavlos Vinieratos
063ade6bb5
add light for some layers
2016-12-09 16:00:46 +01:00
Pavlos Vinieratos
be2863e56d
separate sysctl and mouse layers
2016-12-09 16:00:10 +01:00
Pavlos Vinieratos
d5914a4dfe
add alt key
2016-12-09 14:37:22 +01:00
Pavlos Vinieratos
5d241479f5
media keys
2016-12-09 14:37:07 +01:00
Daniel
1f52dbcac0
removes double-tab brackets and adds back quot to left cmd.
2016-12-06 14:15:23 -06:00
Erez Zukerman
cd41355069
Merge pull request #936 from jackhumbert/f/shine_default
...
Official default factory firmware for ErgoDox EZ Shine
2016-12-06 07:57:02 -05:00
Erez Zukerman
82922a4937
A new default layout that supports Shine
2016-12-05 20:35:03 -05:00
Erez Zukerman
a05b6a72d9
Adjusts config for better mousekey support
2016-12-05 20:34:24 -05:00
Jack Humbert
c87d039839
Merge pull request #921 from Wilba6582/raw_hid
...
Initial version of Raw HID interface
2016-12-05 00:13:37 -05:00
Jack Humbert
1eec2b7277
Update planck.c
2016-12-04 23:11:22 -05:00
Jack Humbert
7e4341e437
Update rules.mk
2016-12-04 23:01:07 -05:00
Priyadi Iman Nurcahyo
c7d11fd001
Remove unnecessary build options
2016-12-05 02:15:38 +07:00
Priyadi Iman Nurcahyo
e18a75609d
Merge branch 'master' into promethium
2016-12-05 02:01:20 +07:00
Jack Humbert
dd2911151b
Merge pull request #932 from climbalima/master
...
Added ponoko svg for lets split
2016-12-04 13:53:25 -05:00
Priyadi Iman Nurcahyo
73073f270b
Trackpoint initialization
2016-12-05 01:15:04 +07:00
Priyadi Iman Nurcahyo
fc80aa9974
Merge branch 'master' into promethium
2016-12-04 23:57:47 +07:00
Priyadi Iman Nurcahyo
a8e5f61805
fix emoji LED indicators.
2016-12-04 23:55:06 +07:00
Priyadi Iman Nurcahyo
75b18773bd
fix RGB LED order
2016-12-04 14:51:27 +07:00
climbalima
0f71c81df8
having trouble with conflicts
2016-12-03 17:37:41 -05:00
climbalima
45b7718fb1
cleaned up personal projects
2016-12-03 17:30:40 -05:00
climbalima
59c54d651b
Merge https://github.com/climbalima/qmk_firmware
2016-12-03 17:15:22 -05:00
climbalima
ae66f0d702
added plate files for lets split
2016-12-03 17:09:11 -05:00
climbalima
2186e5ae85
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-12-03 17:01:26 -05:00
Jack Humbert
7f88c9506c
Merge pull request #930 from cbbrowne/master
...
Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929
2016-12-02 15:21:04 -05:00
cbbrowne
cee0cf8a6e
Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929
2016-12-02 14:12:55 -05:00
Jack Humbert
245c9508bd
adds warnings to 4 keymaps
2016-12-02 13:32:50 -05:00
Jack Humbert
4bcec04c01
Merge pull request #924 from cbbrowne/master
...
Keymapping revs, revisions to documentation on API_SYSEX_ENABLE
2016-12-02 13:06:31 -05:00
Erez Zukerman
aa70aa3962
Tweaks Kristian's layout again
2016-12-02 13:03:39 -05:00
Erez Zukerman
5d43a2aecf
Kristian's keymap
2016-12-02 12:53:18 -05:00
cbbrowne
f6e86cd2c9
I also want page-down/page-up on UPPER layer
2016-12-02 12:35:03 -05:00
cbbrowne
570e784140
I want page-down/page-up - put those on LOWER-Left/Right near bottom corner
2016-12-02 12:31:43 -05:00
cbbrowne
af4c44deef
Improve docs on SYSEX bit
2016-12-01 16:31:30 -05:00
cbbrowne
1f290f6213
Make my builds smaller
2016-12-01 16:21:15 -05:00
cbbrowne
13eb2f826b
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-12-01 12:54:16 -05:00
Erez Zukerman
66b13a66e9
Better layout
2016-11-30 22:22:57 -05:00
Wilba6582
fe001d46fd
Initial version of Raw HID interface
2016-12-01 00:44:54 +11:00
cbbrowne
ff1b563e85
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-11-29 12:20:26 -05:00
Erez Zukerman
4094544d41
Test layout for ErgoDox EZ manufacturing robot
2016-11-29 09:23:16 -05:00
Erez Zukerman
51ae6da99e
Merge pull request #918 from jackhumbert/wu5y7
...
Adds Ergodox EZ RGB lights (both sides using I2C) and implements API base, Midi SysEx API
2016-11-29 08:16:04 -05:00
Jack Humbert
f946d830f9
guess i didnt pull
2016-11-29 00:11:11 -05:00
Jack Humbert
efbc205efd
Merge branch 'wu5y7' of github.com:jackhumbert/qmk_firmware into wu5y7
2016-11-29 00:10:06 -05:00
Jack Humbert
d0cefef946
enable rgblight by default for ez
2016-11-29 00:09:56 -05:00
Jack Humbert
06f18e95d4
enable api sysex for ez
2016-11-29 00:06:12 -05:00
Jack Humbert
6e0f994950
Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7
2016-11-28 23:51:07 -05:00
cbbrowne
5776f39667
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-11-28 12:27:42 -05:00
Olivier
5a2501d90f
Add the AZERTY compatibility layer.
2016-11-28 16:38:03 +01:00
Olivier
f02eccbb29
Change layer names (cosmetic change) and reorder them so that the "shift" layer can be accessed from the "alt" layer when in QWERTY compat mode.
2016-11-28 14:16:42 +01:00
Erez Zukerman
84735836e3
Tweaks position of TOG not to conflict with MO
2016-11-28 08:13:32 -05:00
Olivier
d2b6438e39
A little cleanup, add some comments, change others.
2016-11-28 14:10:31 +01:00
Erez Zukerman
9caf866618
Tweaks EZ Makefile
2016-11-28 07:59:01 -05:00
Erez Zukerman
2d0ada0190
Pulls LED config into common config for EZ
2016-11-28 07:55:02 -05:00
Olivier
3f1fca2eb8
Adjust comment.
2016-11-28 11:21:23 +01:00
Olivier
e26a80508f
Reorganize the numeric keypad layer more like a traditional numeric keypad.
2016-11-28 11:20:00 +01:00
Olivier
d6d0b7eada
Merge https://github.com/jackhumbert/qmk_firmware
2016-11-27 23:23:21 +01:00
Daniel
a94eb16bd7
removes the double actions from the metakeys.
2016-11-27 16:12:32 -06:00
dbroqua
a849bdc581
- Merged
2016-11-27 11:44:30 +01:00
Jack Humbert
7edac212c8
separated into api files/folder
2016-11-26 15:38:44 -05:00
Priyadi Iman Nurcahyo
12c1314b02
update docs
2016-11-27 00:40:31 +07:00
Priyadi Iman Nurcahyo
0f39ab5219
remove ifdef on chip type
2016-11-26 23:48:11 +07:00
Priyadi Iman Nurcahyo
7f3c9c6a39
protocols.mk is already included in latest QMK
2016-11-26 23:48:11 +07:00
Priyadi Iman Nurcahyo
b5019bef05
change init delay to 2000ms
2016-11-26 23:48:11 +07:00
Priyadi Iman Nurcahyo
8ee389c9b6
My Promethium keyboard firmware
2016-11-26 23:48:11 +07:00
Jack Humbert
f25596b8dc
rgblight fixes
2016-11-23 21:28:12 -05:00
Jack Humbert
cefa8468fb
travis pls
2016-11-23 20:16:38 -05:00
cbbrowne
c05cbaf534
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-11-23 17:47:16 -05:00
Jack Humbert
450a8fb5b6
Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7
2016-11-21 20:17:45 -05:00
Jack Humbert
06a2677b7e
fix infinity
2016-11-21 20:17:32 -05:00
Jack Humbert
af119baf71
Merge pull request #894 from dchagniot/ergodoxDvorakEmacs
...
Ergodox dvorak emacs
2016-11-21 20:00:40 -05:00
Jack Humbert
4bb0eaef26
Merge pull request #893 from Sihui/sh-hhkb-jp
...
[HHKB JP with Dvorak]
2016-11-21 20:00:13 -05:00
Jack Humbert
be265decae
Merge pull request #892 from fredizzimo/disable_ergodox_lcd
...
Always initialize the Infinity Ergodox backlight
2016-11-21 19:59:39 -05:00
Jack Humbert
377583d9f3
Merge pull request #891 from g-sam/galson-keymap
...
adds galson keymap
2016-11-21 19:59:17 -05:00
Jack Humbert
e0fc186c28
Merge pull request #888 from climbalima/master
...
Added pro micro to maxipad
2016-11-21 19:58:24 -05:00
Jack Humbert
ea472fb018
Merge pull request #887 from profet23/atreus62
...
atreus62 Keyboard Support
2016-11-21 19:58:00 -05:00
Jack Humbert
27ebacb15d
merging lets_split
2016-11-21 19:18:47 -05:00
Jack Humbert
c1037b1dc0
working with helper, qmk_helper_windows@05b0105
2016-11-21 18:05:06 -05:00
Sihui Huang
b75538c0bf
add del to new cmd
2016-11-20 14:45:51 -08:00
Sihui Huang
390a1bda8b
add space to NewCmd layer
2016-11-20 13:32:25 -08:00
Sihui Huang
ccc34851f2
add space to NewCmd layer
2016-11-20 13:31:41 -08:00
Didier Chagniot
6f24344be7
typo fix
2016-11-20 20:51:05 +01:00
Sihui Huang
23f63ed1b9
Update README.md
2016-11-20 11:18:08 -08:00
Sihui Huang
34aa59c6d5
Update README.md
2016-11-20 11:13:57 -08:00
Sihui Huang
11f17e3b23
Update README.md
2016-11-20 11:12:48 -08:00
Sihui Huang
a8b1c47f0f
add sh-hhkb-jp layers
2016-11-20 11:10:26 -08:00
Fred Sundvik
c86bbf474e
Always initialze the Infinity Ergodox backlight
...
Otherwise it will stay lit. The set_led functionality is also disabled
since it doesn't work properly for slaves.
2016-11-20 19:28:10 +02:00
Seth Chandler
df8724ce08
remove KC expansion from GH60
2016-11-19 12:19:21 -05:00
Seth Chandler
620e4f74d3
move KC expansion to separate macros
2016-11-19 11:37:12 -05:00
Seth Chandler
ac7d202d4f
merge upstream/master
2016-11-19 11:20:41 -05:00
samgalson@gmail.com
7f5e71d79f
adds galson keymap
2016-11-19 14:21:12 +00:00
climbalima
102a830bbd
changed readme
2016-11-19 00:49:20 -05:00
climbalima
e356de2220
added the pinout for pro micro into maxipad
2016-11-19 00:44:52 -05:00
climbalima
01736a502e
just saving
2016-11-18 23:40:34 -05:00
Jack Humbert
ab6557c1a0
wqMerge branch 'wu5y7' of https://github.com/jackhumbert/qmk_firmware into wu5y7
2016-11-18 22:22:29 -05:00
Jack Humbert
161bd5596b
midi back and forth
2016-11-18 22:22:24 -05:00
Daniel
abee809298
moves brackets to top row.
2016-11-18 11:11:08 -06:00
Erez Zukerman
285c5a91f2
Groundwork for dedicated color keycodes
2016-11-17 20:56:36 -05:00
Erez Zukerman
9bbc9a7ce0
Initial Erez Experimental keymap tweaks
2016-11-17 19:47:08 -05:00
Jack Humbert
3774a7fcda
rgb light through midi
2016-11-17 17:42:14 -05:00
Benjamin Grabkowitz
6c5fce5c1a
Adding readme placeholder
2016-11-16 23:59:42 -05:00
Benjamin Grabkowitz
00d88b74ad
Adding Support for atreus62 keyboard. https://github.com/profet23/atreus62
2016-11-16 23:52:36 -05:00
climbalima
b085a34506
fixed readme conflicts
2016-11-16 20:44:49 -05:00
climbalima
21b6b4e6c4
should have fixed conflixed
2016-11-16 19:49:38 -05:00
climbalima
668c739702
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-11-16 19:28:30 -05:00
climbalima
5cac51a773
Merge https://github.com/climbalima/qmk_firmware
2016-11-16 19:26:38 -05:00
climbalima
1dd6ceb45d
Updated my repo to current qmk
2016-11-16 19:18:54 -05:00
cbbrowne
5b88e7ab9a
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-11-16 17:05:11 -05:00
Seebs
4da698fda3
dvorak/plover keyboard layout
...
Plover's steno support likes quasi-qwerty, and gaming likes qwerty,
and I like dvorak, so... what if I could have it all?
Signed-off-by: seebs <seebs@seebs.net>
2016-11-16 15:44:26 -06:00
Jack Humbert
9f1b27c5ba
Merge pull request #880 from psyill/master
...
Added keymap "videck", an ErgoDox keymap for Vi(m) users.
2016-11-16 14:54:18 -05:00
Jack Humbert
e025a94bc2
Merge pull request #879 from sethbc/update_sethbc_ergodox_keymap
...
update sethbc ergodox keymap
2016-11-16 14:53:52 -05:00
Jack Humbert
d85f6deb9b
Merge pull request #877 from sethbc/update_sethbc_satan_keymap
...
update sethbc keymap
2016-11-16 14:51:18 -05:00
Jack Humbert
6dde65c2a9
Merge pull request #876 from Dbroqua/master
...
Updated kc60/dbroqua layout and added satan/dbroqua_hhkb
2016-11-16 14:49:55 -05:00
Jack Humbert
17e1a4f825
Merge pull request #866 from fredizzimo/infinity60_clockfixes
...
Increase the infinity60 system tick frequency
2016-11-16 14:42:53 -05:00
climbalima
bce6e52391
fixed conflict
2016-11-14 23:08:10 -05:00