e0ab1dcf4c
merging
2016-04-17 18:15:35 -04:00
ce463ef424
audio fixes
2016-04-17 18:14:42 -04:00
6732d6cf1a
new png
2016-04-17 23:04:43 +02:00
a9d8c61dbd
new iteration, change of lower row
2016-04-17 23:02:29 +02:00
6d40f7c506
added new experimental layout - works with ErgodoxLayoutGenerator
2016-04-17 22:19:47 +02:00
7c3345f9b9
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-04-17 22:17:40 +02:00
23231fa577
Converted goodbye to notes, fixed eighth dotted note macro
2016-04-17 14:16:03 -05:00
3103ea542f
Merge remote-tracking branch 'remotes/jackhumbert/master' into personal_atomic_planck
2016-04-17 12:55:19 -05:00
319fbe344b
Merge branch 'personal_atomic_planck' of github.com:IBNobody/qmk_firmware
2016-04-17 10:56:12 -04:00
29e495be2a
Added trimble and tempo adjustments!
2016-04-17 02:52:38 -05:00
943b5b7709
Adding folding to #if, etc
2016-04-17 00:24:58 -05:00
a67d425f4d
planck default layout updates
2016-04-17 01:00:39 -04:00
e7b9959819
no need for length of play_notes array with macro
2016-04-16 23:15:40 -04:00
45f10b4c4b
Fixed how note arrays are used.
2016-04-16 22:10:18 -05:00
720e67e558
Merge branch 'personal_atomic_planck' of github.com:IBNobody/qmk_firmware
2016-04-16 23:08:12 -04:00
8bbd064cf5
changes to play_notes, goodbye
2016-04-16 23:07:50 -04:00
12a9b2b9ae
Merge remote-tracking branch 'remotes/jackhumbert/master' into personal_atomic_planck
2016-04-16 20:37:44 -05:00
a87522033d
Merging with QMK main to fix rest issues
2016-04-16 20:37:22 -05:00
41cc35425a
rests between notes as an argument
2016-04-16 21:31:40 -04:00
8f4ce501eb
Merge pull request #260 from IBNobody/personal_atomic_planck
...
Atomic TLC and musical note freqs for audio
2016-04-16 21:02:17 -04:00
bc65f73c64
Merge remote-tracking branch 'remotes/jackhumbert/master' into personal_atomic_planck
2016-04-16 19:32:29 -05:00
4aea806aa8
Adding Musical Notes
2016-04-16 19:31:32 -05:00
b5c22ab5b5
Merging with QMK main to fix audio issues
2016-04-16 19:27:21 -05:00
c83aa16f1d
fixes audio prescaler to emit correct freq
2016-04-16 20:26:02 -04:00
ab19ebd08a
MAGIC functionality, AG swap in default layout
2016-04-16 18:51:58 -04:00
38a1d830fa
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-04-16 22:56:33 +02:00
5f648b6c40
Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard
2016-04-16 15:47:20 -04:00
86169833c5
updates to preonic default, music mode integrated
2016-04-16 15:47:17 -04:00
9eadeb574b
Merge pull request #257 from VoodaGod/bone2planck
...
Bone2 Layout adptation for Planck
2016-04-16 01:24:03 -04:00
d81ef5b7eb
new defaults for planck and preonic
2016-04-16 01:19:37 -04:00
9d4bfc1bcf
Corrected layer macros
2016-04-15 22:40:07 -05:00
0faa18eab9
audio enable stored in eeprom
2016-04-15 23:38:21 -04:00
549b797ad1
My Attempt at adapting the Bone2 layout with Neo2 navigation cluster & number block to the Planck.
...
Very much a WIP, will most likely start tweaking further once my Planck kit has dropped
2016-04-16 01:36:18 +02:00
2aa51e4416
Tweaking PVC atomic layout
2016-04-15 16:32:44 -05:00
8f85117aa9
Added Audio to my Atomic
2016-04-15 14:42:50 -05:00
39e520c010
Prepping for merge with new_defaults
2016-04-15 13:09:42 -05:00
ee2ee7f4f0
audio note length fixes
2016-04-15 13:44:07 -04:00
bb0836c620
the spacessss
2016-04-15 00:26:22 -04:00
43a4ffc259
bootmagic somehow not getting enabled, so adding eeconfig to backlight src include cond
2016-04-14 23:53:35 -04:00
2597fb7c50
might have broken something
2016-04-14 23:33:46 -04:00
66c1024bd3
fixed merging
2016-04-14 22:33:18 -05:00
d4f90fe882
Merge remote-tracking branch 'remotes/jackhumbert/new_defaults'
2016-04-14 22:29:33 -05:00
3993afbb2e
adding new per-keymap makefile
2016-04-14 22:27:28 -05:00
63656ea34f
The Ordinary Layout is the layout you are looking for. Come and see.
2016-04-14 22:00:15 -05:00
63462bf8c1
changing up the makefile a bit
2016-04-14 20:42:14 -04:00
ddbe430778
new defaults
2016-04-14 19:13:24 -04:00
f051496f13
Checkin
2016-04-14 18:01:29 -05:00
990254edec
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-04-14 21:47:33 +02:00
cf17687f29
Adding personal build file settings
2016-04-14 12:59:16 -05:00
3dd20f2b6c
Rename pc.c to pvc_planck.c
2016-04-14 11:35:49 -05:00
3d601c1bce
Rename pc.c to pvc_planck.c
2016-04-14 08:56:27 -05:00
19061f2ff1
Update and rename pc_atomic.c to pvc_atomic.c
2016-04-14 08:54:22 -05:00
4b4d3069b4
Update and rename pc_atomic.c to pvc_atomic.c
...
Also removed unused FNs
2016-04-14 08:50:01 -05:00
59e041672c
Remapped magic bootloader key to B.
2016-04-14 08:20:55 -05:00
44e4320b2e
Nightly
2016-04-14 06:34:56 -05:00
95a44cdf01
Disabled print.
2016-04-13 22:00:36 -05:00
aa9eaa9773
Corrected spacing.
2016-04-13 21:56:27 -05:00
9ff9317720
Corrected spacing.
2016-04-13 21:55:04 -05:00
3755ef5ddb
Compiler Warnings / Atomic TLC
...
Corrected compiler warnings for a number of issues. Gave Atomic some
TLC.
2016-04-13 20:57:51 -05:00
01f5b35396
Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into pc_planck
2016-04-13 19:14:23 -05:00
390fd3107a
local files
...
local files
2016-04-13 18:48:25 -05:00
caf3e48de8
LOCAL COMMIT
...
LOCAL COMMIT
2016-04-13 17:40:16 -05:00
3a601e76e4
Adding PC Atomic
2016-04-13 14:43:09 -05:00
a71ab3ebb6
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-04-12 15:39:18 +02:00
ff06eaf853
Added del
2016-04-12 08:17:02 -05:00
5ef6978cab
Adding personal files
2016-04-12 06:55:26 -05:00
a0194d7e5f
Merge pull request #249 from nrrkeene/master
...
Version 3, Ordinary Perfected
2016-04-12 09:04:29 +03:00
93de95d0cd
The Ordinary Layout is the layout you are looking for. Come and see.
2016-04-11 23:34:41 -05:00
96f75f39c8
The Ordinary Layout is the layout you are looking for. Come and see.
2016-04-11 23:28:16 -05:00
efffbe35c8
The Ordinary Layout is the layout you are looking for. Come and see.
2016-04-11 22:51:12 -05:00
7635958270
Merge pull request #1 from J3RN/vim-navigation
...
Added Vim-style navigation
2016-04-11 19:22:23 -04:00
9e2c767c45
Added README note about Vim-style navigation
2016-04-11 19:19:20 -04:00
4b03a0f3d5
Stylistic changes
2016-04-11 19:08:24 -04:00
aaa7af752c
Make a also toggle Media layer
2016-04-11 19:01:39 -04:00
511c843829
Merge pull request #246 from romanzolotarev/master
...
Add a new layout with arrows in the home row
2016-04-11 23:02:08 +03:00
c2e1d69f27
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-04-11 21:54:55 +02:00
d342989f25
Merge pull request #244 from nicosuave/add_nico_planck_keymap
...
Add nico keymap
2016-04-11 14:52:10 -04:00
472e920c03
Merge pull request #236 from tak3over/master
...
Minor Doc Changes.
2016-04-11 14:51:37 -04:00
f26985ad16
Add HJKL layout
2016-04-11 21:45:10 +08:00
077aee09a4
Add my keymap
2016-04-09 11:34:01 -07:00
9e153b1a5c
another modification of layers, restored arrow keys and added cut/paste
2016-04-07 10:54:11 -05:00
9cfc74c35b
[Erez & Jack] Makes tri-layer available across Quantum
2016-04-07 15:21:06 +03:00
0befb25739
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-04-06 22:52:49 +02:00
d07a1257b3
Merge pull request #215 from nrrkeene/master
...
Added proper documentation
2016-04-06 22:35:17 +03:00
e89fd63426
switched raise and lower layers
2016-04-06 11:12:58 -05:00
4eadc2a977
updated my keymap
2016-04-05 16:39:45 -05:00
028dd16fe6
Modified keymap
2016-04-05 16:21:45 -05:00
9bd1caed44
Updated hex
2016-04-05 15:51:13 +01:00
50ac511b56
💷 typo
2016-04-05 07:49:35 -07:00
3fd62428a6
💷 typo
2016-04-05 07:48:13 -07:00
1facc53a26
Merge pull request #5 from jackhumbert/master
...
Sync with upstream
2016-04-05 07:44:37 -07:00
931b0a79fc
updates to noise
2016-04-05 09:44:01 -04:00
2a488d1597
Update tak3over.c
2016-04-04 16:51:30 -05:00
75c24499f3
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-04-04 22:35:48 +02:00
2ba0de8fcd
Merge pull request #2 from jackhumbert/master
...
Update from source
2016-04-04 13:41:37 -05:00
9cd0c9d589
Minor documentation error. Raise and Lower.
...
The Raise and Lower keys were transposed in the comment key map for all layers. Assuming _RS and _LW should be mapped to Raise and Lower respectively. Probably is the same in the other custom keymaps that copied from this default.
2016-04-04 13:19:19 -05:00
0cdf5d292c
Merge pull request #235 from mbarkhau/master
...
add indent to generated keymap
2016-04-04 08:04:31 +03:00
dee6a4338a
minor updates - new PNG
2016-04-03 23:48:22 +02:00
a90d68739a
music mode file
2016-04-03 16:00:10 -04:00
22691de580
add indent to generated keymap
2016-04-03 21:46:32 +02:00
Jack Humbert
Stephan Bösebeck
IBNobody
Jason Janse van Rensburg
IBNobody
Nicholas Keene
IBNobody
Erez Zukerman
Jonathan Arnett
Roman Zolotarev
Nico Ritschel
tak3over
Erez Zukerman
Alex Johnstone
Manuel Barkhau