megamanmalte/qmk_firmware
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
4169 commits 1 branch 0 tags 275 MiB
Commit graph

4169 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jack Humbert b466628c0b Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-10-18 13:58:20 -04:00
Jack Humbert 18b5c3dccf removes planck/rev3 temporarily 2016-10-18 13:57:56 -04:00
Erez Zukerman 0d8844dcb8 Merge pull request #826 from algernon/ergodox-ez/algernon 
ergodox: Update algernon's keymap to v1.9
 2016-10-17 18:12:31 -04:00
cbbrowne 778dbe46d2 Merge branch 'master' of github.com:cbbrowne/qmk_firmware 2016-10-17 10:54:09 -04:00
cbbrowne 0469bd8ffa Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-10-17 10:53:39 -04:00
Rob Rogers 1dcee07eab Move hand_swap_config to ez.c, removes error for infinity 2016-10-17 08:04:29 -05:00
Chris Browne 62e6789ab2 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-10-16 20:59:52 -04:00
Jack Humbert a889b899e2 working with power limit 2016-10-16 16:03:56 -04:00
Jack Humbert 5f91fb4136 working with power limit 2016-10-16 16:03:33 -04:00
Jack Humbert 80ac73a21c Update Makefile 2016-10-16 15:59:50 -04:00
Jack Humbert 52d7f7d277 Merge pull request #815 from priyadi/unicode_map 
Allow unicode up to 0xFFFFF using separate mapping table
 2016-10-16 15:49:45 -04:00
Jack Humbert 5e2b843538 Merge pull request #825 from replicaJunction/pr-vscode 
Added VS Code dir to .gitignore
 2016-10-16 15:49:33 -04:00
dbroqua 911b52a494 - Added HHKB like layout for KC60 pcb 2016-10-16 15:37:47 +02:00
Gergely Nagy f9d8cf35f6 ergodox: Update algernon's keymap to v1.9 
Overall changes
===============

* `F12` was replaced by an `Fx` key, that activate the **Media** layer
  as a one-shot layer, and also `Alt` as a one-shot modifier.

Base layer changes
==================

* The `Media Stop` key is now a tap-dance key, and resets the device for
  programming on the fourth tap.

Miscellaneous
=============

* `π` can now be entered with UCIS.
* `🐁` can now be entered with UCIS.

Tools
=====

* The `tools/layer-notify` tool was removed, it was an example, which I
  don't use.

`tools/hid-commands`
--------------------

* Now looks at the `DISABLE_APPSEL_START` environment value, and does
  not display an AppSel notification if it is non-empty.
* Will attempt to re-program the keyboard when receiving a `reflash`
  command.
* No longer tries to select Emacs 24 on `APPSEL_EMACS`, rather, it goes
  for any Emacs.
* The `APPSEL_MUSIC` command now includes Kodi in the list too, as the
  last choice.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
 2016-10-16 08:01:50 +02:00
Joshua T 2a918718f1 Added VS Code dir to .gitignore 2016-10-15 18:46:39 -05:00
Joshua T d9dede476f Added VS Code dir to .gitignore 2016-10-15 18:40:26 -05:00
Joshua T 896c1e6f1e Added a bit more detail to header 2016-10-15 18:19:09 -05:00
Joshua T a2adff94bb Reversed tilde and grave 2016-10-15 18:05:22 -05:00
Joshua T 825563f34d Moved Extend tab and ^tab 2016-10-15 17:56:09 -05:00
Joshua T 1455a44a44 Added = to match Atreus 2016-10-15 17:41:36 -05:00
Joshua T 80fe2ea676 Switched Tab and Ctrl back 2016-10-15 17:23:25 -05:00
Joshua T 0714981288 Fixed typo 2016-10-15 17:19:07 -05:00
Joshua T c67f6ee872 Added Menu key (the rclick menu) 2016-10-15 17:03:27 -05:00
Joshua T d9db5395b3 Updated layout to 1.2 - lots of changes 
Rewrote QWERTY to make it a first-class citizen instead of just a glorified game layer.

Added a lot of keys to Extend layer to bring it in line with my Atreus.

Plenty of other changes too.
 2016-10-15 16:51:40 -05:00
Joshua T a9c8f2f5b8 Reduced TAPPING_TERM to 150 
Also removed duplicate definition of PREVENT_STUCK_MODIFIERS
 2016-10-15 16:44:26 -05:00
Joshua T 8ec7341fb2 Added Ctrl+` (ConEmu shortcut) 2016-10-15 15:28:16 -05:00
Joshua T 2e6a1a53d7 Merge remote-tracking branch 'upstream/master' 2016-10-15 15:14:10 -05:00
dbroqua 28ca1f5345 Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware 2016-10-14 21:53:37 +02:00
Damien 2098b363ea Merge pull request #9 from jackhumbert/master 
Merge from jackhumbert
 2016-10-13 21:51:35 +02:00
cbbrowne f74c560be8 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-10-13 13:05:33 -04:00
Daniel Svensson b73adf0dea
Support the Pegasus Hoof controller. 
Replacement controller for Filco Majestouch TKL keyboards.

matrix.c ported from:
https://github.com/BathroomEpiphanies/epiphanies_tmk_keyboard

More details:
http://bathroomepiphanies.com/controllers/
 2016-10-13 12:50:54 +02:00
Erez Zukerman 0a9ad8f335 Merge pull request #818 from pvinis/pvinis-keymap 
pvinis keymap
 2016-10-13 06:41:51 -04:00
Erez Zukerman 16e362cfc4 Merge pull request #822 from jackhumbert/hotfix/simplify_to 
[Jack & Erez] Simplifies and documents TO
 2016-10-13 06:41:07 -04:00
Jack & Erez e27a754b70 [Jack & Erez] Simplifies and documents TO 2016-10-12 22:18:27 -04:00
cbbrowne 99ca59baf8 I keep mis-using UPPER|LOWER/SLASH, and getting RESET. 
With RESET shifted to the UPPER+LOWER layer, it is now time to change that key to Alt-Slash, which, in Emacs, does automatic word completion
 2016-10-12 12:03:54 -04:00
cbbrowne dbb8cbac18 Merge branch 'master' of github.com:cbbrowne/qmk_firmware 2016-10-12 11:57:46 -04:00
Pavlos Vinieratos 0853227ede add readme 2016-10-11 11:25:54 +02:00
Pavlos Vinieratos 538cdda78e use wait_ms instead of _delay_ms 2016-10-11 10:34:47 +02:00
Pavlos Vinieratos bcc0fa5c81 add messenger 2016-10-11 10:34:47 +02:00
Pavlos Vinieratos 2855de5f0f init keymap 2016-10-11 10:34:47 +02:00
Erez Zukerman 698d02122b Merge pull request #803 from coderkun/coderkun_neo2 
Merge Unicode fixes for keymap “coderkun_neo2”
 2016-10-10 19:59:28 -04:00
Erez Zukerman be60c057dc Merge pull request #809 from nathanejohnson/osx_whiskey_tango_foxtrot_capslock 
Adding whiskey_tango_foxtrot_capslock ergodox keymap
 2016-10-10 19:58:59 -04:00
Chris Browne 92ca95641f Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-10-10 17:19:47 -04:00
Chris Browne 4b682ea63e Merge branch 'master' of github.com:cbbrowne/qmk_firmware 2016-10-10 17:18:15 -04:00
Jack Humbert aa8aa6af75 Merge pull request #808 from npoirey/master 
Altgr quick combination and updated readme
 2016-10-10 00:22:12 -04:00
Jack Humbert 49fe93fbb3 Merge pull request #811 from Vifon/planck_keymap_vifon 
New Planck keymap: vifon
 2016-10-10 00:21:01 -04:00
Jack Humbert 0f119e09a5 Merge pull request #810 from Vifon/dynamic_macros 
Reduce the default dynamic macro buffer
 2016-10-10 00:20:46 -04:00
Jack Humbert 03b6fcdaf0 Merge pull request #814 from fredizzimo/rgb_tuning 
Improve the RGB led effects
 2016-10-10 00:20:24 -04:00
Jack Humbert 4859be084d Merge pull request #813 from fredizzimo/add_cluecard_rgb_effects 
Add a Cluecard keymap for testing the RGB effects
 2016-10-10 00:19:34 -04:00
Priyadi Iman Nurcahyo 932705706e Add example keymap 2016-10-10 01:35:41 +07:00