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

580 commits

Author SHA1 Message Date
cbbrowne a732003bfd Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-26 12:13:50 -04:00
Jack Humbert 4321f0af7d Merge pull request #659 from Dbroqua/master 
- Updated dbroqua layout for planck keyboard
 2016-08-25 15:49:50 -04:00
cbbrowne 7c2a24b315 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-24 17:47:09 -04:00
cbbrowne 9778349c4b More notes 2016-08-24 17:47:01 -04:00
dbroqua 235d47e747 - Updated readme by adding link on kle for each layer 2016-08-24 12:57:32 +02:00
IBNobody a902206735 Nightly 
Prep for Vision build
 2016-08-23 23:05:35 -05:00
dbroqua e65252d591 Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	keyboards/planck/keymaps/dbroqua/keymap.c
 2016-08-23 13:39:49 +02:00
dbroqua 92fe78a5ea - Added PrintScreen key on multimedia layer 2016-08-22 21:19:03 +02:00
cbbrowne 90abe70586 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-22 13:16:49 -04:00
dbroqua d7b6d74842 - Inverted key Tab and Esc 
- Reorganised bottom row
 2016-08-21 23:20:24 +02:00
Joe Wasson c20bf83afd Add one-hand key to planck/experimental keymap. 2016-08-20 18:47:06 -07:00
dbroqua b9a284352e - Moved Insert/Del in Esc layer 2016-08-19 21:10:07 +02:00
dbroqua 11aa19a626 - Updated lower and raise layer 2016-08-19 21:00:24 +02:00
dbroqua c6e733afce - Added readme file and layout preview 2016-08-19 14:17:07 +02:00
dbroqua b4f23b146f - Moved Home/End/PgUp/PgDn on arrow keys 2016-08-19 14:01:37 +02:00
dbroqua 31120ed166 - Moved Brite function on esc to avoid conflict with ctrl key. 2016-08-19 09:39:25 +02:00
dbroqua 578b7e969e - Updated dbroqua layout for planck keyboard 2016-08-19 09:19:55 +02:00
Damien a5e6da7aa8 Added dbroqua layout for planck keyboard 2016-08-18 22:25:13 +02:00
Jack Humbert 8f32595820 Merge pull request #650 from Xyverz/master 
Minor changes to keymaps and other files
 2016-08-18 10:31:17 -04:00
Gergely Nagy 0d9d4b8658 planck/circuit: Update after the latest tap-dance change 
Fixes #653.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
 2016-08-18 13:22:16 +02:00
Xyverz 47beb763e8 Returned RAISE and LOWER buttons to their original functions - too many inopportune ENTER inputs. :-( 2016-08-18 00:05:24 -07:00
Xyverz 385b827c85 Merge remote-tracking branch 'upstream/master' 
this merge is necessary,
 2016-08-17 23:53:56 -07:00
Jack Humbert f59b61332f Merge pull request #638 from premek/master 
Split layout for planck
 2016-08-17 21:11:02 -04:00
Přemek Vyhnal 2ebfdcac40 Update readme.md 2016-08-16 01:07:34 +02:00
premek a75d4bd593 premek split layout 2016-08-16 00:50:35 +02:00
premek 5abb05ca40 premek split layout 2016-08-16 00:44:58 +02:00
Matt f5ed3e5155 Added my custom Planck layout called Circuit. 
* Layout has image and readme, as well as documentation in the code.
 2016-08-15 17:26:01 -05:00
Xyverz 5c5c3e626b Adding KC_BSPC to the LT() macro for LOWER resulted in a backspace stroke being sent if the LOWER key was used too quickly. 
Switching back to original LOWER macro, but keeping the new RAISE macro.
 2016-08-15 06:57:24 -07:00
Xyverz 8e2d69d5a2 Adding u/treasuredfrog's hack to use LT() with the RAISE and LOWER macros. 2016-08-15 06:28:39 -07:00
Callum Oakley 993d72b11f added a lock screen key 2016-08-12 21:05:52 +01:00
cbbrowne 83913f9197 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-10 11:36:37 -04:00
Callum Oakley 2a160bbbe3 Update keymap. (#616) 
* changed order of bottom row of symbol layer to ease acess to brackets

* updated readme.md to reflect keymap changes
 2016-08-09 12:33:07 -04:00
Xyverz ca3278cc35 adds Xyverz's keymaps (#615) 
* Adding my own keymaps to the following keyboards:

Planck, Preonic, Atreus, Ergodox

* Delete dvorak.png

Not reflective of my layout.

* Delete readme.md

file cleanup, removing file that doesn't apply to my layout.

* Delete old_keymap.c

file cleanup

* Delete README.md

file clean up.

* Delete README.md

file cleanup

* Delete keymap.c

file cleanup

* Changed behavior of _DVORAK layout's KC_RSFT to SFT_T(KC_ENT) for flexibility's sake.
Updated the rest of the keymap to reflect the current (as of 19:37 on 08 Aug 2018) default
layout and default makefile.
 2016-08-09 12:31:56 -04:00
Callum Oakley 49fbcb3e7c Merge remote-tracking branch 'upstream/master' 2016-08-09 12:39:59 +01:00
Callum Oakley 725dd7328f updated readme.md to reflect keymap changes 2016-08-09 11:09:52 +01:00
Callum Oakley 5f37b11f2c changed order of bottom row of symbol layer to ease acess to brackets 2016-08-09 11:03:12 +01:00
cbbrowne 6ce0195e24 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-08 13:50:01 -04:00
JeeBak Kim ef83f1d04f Tap for ;, hold for GUI, tap for ", hold for Alt 2016-08-07 12:44:45 -07:00
JeeBak Kim 3d86e5b7a7 Tap for Tab, hold for Hyper 2016-08-07 11:05:10 -07:00
JeeBak Kim 68e287013b Add Tab Close, New, Reopen macros to TouchCursor layer 2016-08-06 13:36:46 -07:00
JeeBak Kim bda4d15ffa Add Virtual Desktop Switching macros to TouchCursor layer 2016-08-06 12:00:37 -07:00
JeeBak Kim 57218827cb Move KC_ACL1 button 2016-08-06 00:08:59 -07:00
JeeBak Kim 96ed96f924 Fix KC_ALT_TAB/KC_CMD_TAB logic 2016-08-06 00:01:12 -07:00
JeeBak Kim 6483a2a04b Mouse layer updates 
- Rename to MOUSECURSOR
- Use "d" key, since middle finger is stronger than pinky
- Shuffle some mouse buttons around
 2016-08-05 23:32:00 -07:00
JeeBak Kim 36abd4463f Revert swapp of AltTab/CmdTab in readme. Layout did not change 2016-08-04 14:26:03 -07:00
cbbrowne 64e051652b Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-04 11:10:41 -04:00
JeeBak Kim 7db1d7902b Workaround for KC_COPY, etc. based on current AG_NORM/AG_SWAP setting 2016-08-03 21:21:28 -07:00
JeeBak Kim 9a4e72fa71 Add CmdSlash to TouchCursor Layer 2016-08-03 19:19:18 -07:00
JeeBak Kim 16f4a31784 Number layer tweaks 2016-08-03 19:19:18 -07:00
JeeBak Kim fdd89e7f0d Add Alt-Tab, Cmd-Tab, and Ctl-Tab Macros to TouchCursor layer, swap LGUI and LSFT 2016-08-03 19:19:18 -07:00
JeeBak Kim abc3cd4d72 Update readme.md 2016-08-03 19:19:18 -07:00
Stephen Christie bf2b260429 Merge branch 'master' of http://github.com/jackhumbert/qmk_firmware 2016-08-02 22:51:30 -04:00
Stephen Christie 0acb394ac4 Moved Insert, PrtSc, Pause to Adjust; Corner enter 2016-08-02 22:32:27 -04:00
Stephen Christie 76ef37e72d Corrected Qwerty/Fn Mismatch. 2016-08-01 18:54:25 -04:00
Jack Humbert d5baa4773d Merge pull request #596 from fredizzimo/rid_of_quick 
Fix the makefile dependencies and remove quick targets
 2016-08-01 02:24:53 -04:00
Stephen Christie 4b74c90cdb Added quote key. 2016-07-31 22:39:25 -04:00
Fred Sundvik 97817a773e Generate version information to version.h 
So that only the files that really needs a version are recompiled.
 2016-07-31 13:42:05 +03:00
JeeBak Kim 230d313dbd Update readme.md 2016-07-30 17:30:10 -07:00
JeeBak Kim a2ed7ce795 Add additional shortcut keymaps to TOUCHCURSOR layer 2016-07-30 12:52:51 -07:00
JeeBak Kim db8ad8204e Add additional maps for [, and ], to LOWER 2016-07-30 12:52:51 -07:00
JeeBak Kim b54a58859f Make RAISE layer an all numbers/arithmatic layer 2016-07-30 12:52:51 -07:00
JeeBak Kim 216efe6c99 Move reset to a less accessible location 2016-07-30 12:52:51 -07:00
JeeBak Kim e0dd9d6af0 Add -, +, and . to RAISE 2016-07-30 12:52:51 -07:00
JeeBak Kim 6a2c681ae9 Change calls from persistant_default_layer_set() to default_layer_set() 2016-07-30 12:52:51 -07:00
JeeBak Kim eb9416a67d PrintScreen and RGUI replace BACKLIT and Ctrl. Move BACKLIT to LOWER/RAISE layers 2016-07-30 12:52:46 -07:00
JeeBak Kim 984fc2b630 Media keys for all the "regular" layers 2016-07-30 10:13:50 -07:00
JeeBak Kim 7209310d1b Add mouse layer, and remove default arrow keys (touchcursor only, now) 2016-07-30 10:13:50 -07:00
JeeBak Kim a6bae9fb07 Add numbers to _RAISE 2016-07-30 10:13:49 -07:00
JeeBak Kim 6baf77d8fb Move _RAISE symbols to _LOWER 2016-07-30 10:13:49 -07:00
JeeBak Kim ad7e4af45c Tap for Enter, hold for Shift 2016-07-30 10:13:49 -07:00
JeeBak Kim b5d77440b6 Add personalized TouchCursor layer 2016-07-30 10:13:49 -07:00
JeeBak Kim eb1a06d3ae Tap for Esc, hold for Control 2016-07-30 10:13:44 -07:00
JeeBak Kim f78a994355 Add "jeebak" keymap folder as a copy of the "default" folder 2016-07-30 00:16:04 -07:00
Stephen Christie 5f2d3f27de Moved CapsLk, ScrollLk, and NumLk to Adjust layer 2016-07-30 00:56:43 -04:00
Stephen Christie c018743729 Connected all layers through Adjust layer 2016-07-29 00:08:48 -04:00
Jack Humbert 9b5edbdce9 Merge pull request #577 from hot-leaf-juice/master 
Pull request to include my keymap if you want it!
 2016-07-28 16:34:16 -04:00
Stephen Christie 6567fa1ebe Fixed Function keys (Impossible layout) 2016-07-28 14:57:45 -04:00
Stephen Christie a4e5a4d566 Modified Qwerty, created Qwerty with numbers 2016-07-28 13:49:25 -04:00
Christopher Browne 2d59c97ec1 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-07-28 12:42:21 -04:00
Callum Oakley 1eeceee355 Added readme.md for custom layout. 2016-07-28 12:15:55 +01:00
Callum Oakley 9822b9f743 Added custom keymap. 
Added custom keymap.
 2016-07-27 21:18:19 +01:00
Seth Chandler 180a3da44d remove unnecessary includes 2016-07-27 02:32:15 -04:00
Seth Chandler 95ef3f864e fix numerous errors in bone2planck keymap 2016-07-27 02:30:17 -04:00
Stephen Christie 57952949fe General table cleanup. 2016-07-26 23:33:21 -04:00
Stephen Christie ff8136b883 Modified Plover layer for Impossible's home position. 2016-07-26 17:39:21 -04:00
Stephen Christie 465cf08c63 Removed unused layers (keeping QWERTY for later/reference) 2016-07-26 17:37:56 -04:00
Stephen Christie fb2a7d787a Removed unused layers (left QWERTY for later use/reference) 2016-07-26 17:29:19 -04:00
Christopher Browne 2a349e96bb Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-07-26 16:35:44 -04:00
Jack Humbert b66131eeb5 disable midi by default 2016-07-26 15:59:26 -04:00
Jason Janse van Rensburg a41a7a9100 include base config.h instead of copying it 2016-07-26 16:19:34 +02:00
Jason Janse van Rensburg 8244fa40cc added config.h, and missing Ins of filpped navigation layer 2016-07-26 14:58:17 +02:00
Jason Janse van Rensburg 27d27b179b Merged branch master into bone2planck 2016-07-25 22:55:28 +02:00
Jason Janse van Rensburg 3e462fac31 added missing F keys in flipped layer 2016-07-25 20:21:32 +02:00
Christopher Browne 17a7570e08 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-07-25 12:55:46 -04:00
Jack Humbert 8b94e26d7c Fixes midi functionality 2016-07-24 22:07:43 -04:00
Jason Janse van Rensburg 4e0bf283f6 added readme 2016-07-24 05:11:07 +02:00
Jason Janse van Rensburg 1bfd57e234 moved insert 2016-07-24 05:02:06 +02:00
Jason Janse van Rensburg 58f092cf87 moved ctrl 2016-07-24 04:52:35 +02:00
Jason Janse van Rensburg 34bce6f206 fixed stupid errors 2016-07-24 04:08:40 +02:00
Stephen Christie 723857bf8a Table for Fn 
layer.
 2016-07-22 18:19:07 -04:00
Stephen Christie a39eaa7fb5 Switched to natural arrows, put ENTER on middle Fn, swapped Shift and CTRL. 2016-07-22 17:46:23 -04:00
Stephen Christie eeb100f87d First draft of the 'impossible' layout. 2016-07-21 18:19:08 -04:00
Jason Janse van Rensburg b0e9dbecee fixed include paths 2016-07-20 17:05:23 +02:00
Jason Janse van Rensburg 32f5b34ad2 reformat 2016-07-20 16:58:10 +02:00
Jason Janse van Rensburg 3d7244e604 updated bone2planck 2016-07-20 16:42:09 +02:00
Christopher Browne 82f768e6c0 Notes about changes 2016-07-18 16:07:00 -04:00
Christopher Browne f4fbfe6e54 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-07-12 11:57:15 -04:00
Christopher Browne 477ed703c8 I did not like Space Cadet paren; it jumps in in way too many extra cases 2016-07-12 11:57:05 -04:00
TerryMathews e2ec45a755 Fix cluepad and planck 2016-07-07 23:57:11 -04:00
TerryMathews 50c686587e Create keycodes for RGB control functions 
Moves RGB controls out of the macro function and assigns them their own
keycodes:
RGB_TOG (toggle on/off)
RGB_MOD (mode step)
RGB_HUI (increase hue)
RGB_HUD (decrease hue)
RGB_SAI (increase saturation)
RGB_SAD (decrease saturation)
RGB_VAI (increase brightness)
RGB_VAD (decrease brightness)
 2016-07-07 23:34:33 -04:00
Jack Humbert 57e08eb8ba updates rgblight implementation, makes non-timer stuff compatible with audio 2016-07-07 11:33:34 -04:00
Christopher Browne 97dfbd1afc Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-07-07 11:13:22 -04:00
Jack Humbert 94d3159d9d correct break/return order for planck and preonic defaults 2016-07-04 22:06:22 -04:00
Christopher Browne 44a5f7630f Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-30 12:38:48 -04:00
Jack Humbert 7db2ec1509 updates planck experimental, width of color output 2016-06-29 18:47:53 -04:00
Jack Humbert 197f152dee adds random base64 character generator 2016-06-29 18:29:20 -04:00
Jack Humbert 215c2119af Implements subprojects and updates projects for this (#459) 
* non-working commit

* working

* subprojects implemented for planck

* pass a subproject variable through to c

* consolidates clueboard revisions

* thanks for letting me know about conflicts..

* turn off audio for yang's

* corrects starting paths for subprojects

* messing around with travis

* semicolon

* travis script

* travis script

* script for travis

* correct directory (probably), amend files to commit

* remove origin before adding

* git pull, correct syntax

* git checkout

* git pull origin branch

* where are we?

* where are we?

* merging

* force things to happen

* adds commit message, adds add

* rebase, no commit message

* rebase branch

* idk!

* try just pull

* fetch - merge

* specify repo branch

* checkout

* goddammit

* merge? idk

* pls

* after all

* don't split up keyboards

* syntax

* adds quick for all-keyboards

* trying out new script

* script update

* lowercase

* all keyboards

* stop replacing compiled.hex automatically

* adds if statement

* skip automated build branches

* forces push to automated build branch

* throw an add in there

* upstream?

* adds AUTOGEN

* ignore all .hex files again

* testing out new repo

* global ident

* generate script, keyboard_keymap.hex

* skip generation for now, print pandoc info, submodule update

* try trusty

* and sudo

* try generate

* updates subprojects to keyboards

* no idea

* updates to keyboards

* cleans up clueboard stuff

* setup to use local readme

* updates cluepad, planck experimental

* remove extra led.c [ci skip]

* disable power up for now

* config files updates

* makefile updates

* .h file updates, config tuning

* disable audio for yang
 2016-06-29 16:21:41 -04:00
Christopher Browne c9f509f016 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-28 14:46:50 -04:00
Anand Babu (AB) Periasamy 57066b1246 zoom and undo keys for ab's planck keymap (#446) 2016-06-27 09:51:12 -04:00
Jack Humbert 0058c33815 updates preonic default layout 2016-06-26 14:20:57 -04:00
Jack Humbert 00dcac7270 updates planck macros to keycodes, prototype fn_actions 2016-06-26 14:08:11 -04:00
Anand Babu (AB) Periasamy 0314620d26 Swap up and down on ab's layout to match default (#441) 2016-06-24 13:43:12 -04:00
Christopher Browne 4d79e22438 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-24 12:19:34 -04:00
Jack Humbert 13bb6b4b7f Backlight abstraction and other changes (#439) 
* redoes matrix pins, abstracts backlight code for B5,6,7

* slimming down keyboard stuff, backlight breathing implemented

* don't call backlight init when no pin

* cleans up user/kb/quantum calls, keyboard files

* fix pvc atomic

* replaces CHANNEL with correct var in breathing

* removes .hexs, updates readmes, updates template

* cleans-up clueboards, readmes to lowercase

* updates readme
 2016-06-23 22:18:20 -04:00
Peter ba116ceb49 Add OS specific layers that can be switched with macros (#436) 2016-06-23 20:06:13 -04:00
Christopher Browne a4bdb0ac0e Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-23 11:34:50 -04:00
Anand Babu (AB) Periasamy bab6a8fde5 AB's practical planck keymap (#435) 2016-06-22 23:36:30 -04:00
Christopher Browne 0cd017d485 Use Space Cadet parens on LSFT 2016-06-22 16:51:25 -04:00
Christopher Browne b0caf32741 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-22 11:26:26 -04:00
Jack Humbert 649b33d778 Renames keyboard folder to keyboards, adds couple of tmk's fixes (#432) 
* fixes from tmk's repo

* rename keyboard to keyboards
 2016-06-21 22:39:54 -04:00