Merge remote-tracking branch 'upstream/master' into develop
This commit is contained in:
		
						commit
						c38a730805
					
				
					 311 changed files with 4894 additions and 585 deletions
				
			
		
							
								
								
									
										69
									
								
								keyboards/planck/keymaps/jweickm/config.h
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										69
									
								
								keyboards/planck/keymaps/jweickm/config.h
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,69 @@
 | 
			
		|||
/*
 | 
			
		||||
 * Copyright 2018 Jack Humbert <jack.humb@gmail.com>
 | 
			
		||||
 *
 | 
			
		||||
 * This program is free software: you can redistribute it and/or modify
 | 
			
		||||
 * it under the terms of the GNU General Public License as published by
 | 
			
		||||
 * the Free Software Foundation, either version 2 of the License, or
 | 
			
		||||
 * (at your option) any later version.
 | 
			
		||||
 *
 | 
			
		||||
 * This program is distributed in the hope that it will be useful,
 | 
			
		||||
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
			
		||||
 * GNU General Public License for more details.
 | 
			
		||||
 *
 | 
			
		||||
 * You should have received a copy of the GNU General Public License
 | 
			
		||||
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
 */
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
#ifdef AUDIO_ENABLE
 | 
			
		||||
    #define STARTUP_SONG SONG(PLANCK_SOUND)
 | 
			
		||||
    // #define STARTUP_SONG SONG(NO_SOUND)
 | 
			
		||||
 | 
			
		||||
    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
 | 
			
		||||
                                  SONG(COLEMAK_SOUND), \
 | 
			
		||||
                                  SONG(DVORAK_SOUND), \
 | 
			
		||||
                                  SONG(WORKMAN_SOUND), \
 | 
			
		||||
                                  SONG(PLOVER_SOUND), \
 | 
			
		||||
                                  SONG(STARTUP_SOUND), \
 | 
			
		||||
                                  SONG(PREONIC_SOUND), \
 | 
			
		||||
                                  SONG(GOODBYE_SOUND), \
 | 
			
		||||
                                }
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * MIDI options
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
/* enable basic MIDI features:
 | 
			
		||||
   - MIDI notes can be sent when in Music mode is on
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
#define MIDI_BASIC
 | 
			
		||||
 | 
			
		||||
/* enable advanced MIDI features:
 | 
			
		||||
   - MIDI notes can be added to the keymap
 | 
			
		||||
   - Octave shift and transpose
 | 
			
		||||
   - Virtual sustain, portamento, and modulation wheel
 | 
			
		||||
   - etc.
 | 
			
		||||
*/
 | 
			
		||||
//#define MIDI_ADVANCED
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
// Most tactile encoders have detents every 4 stages
 | 
			
		||||
#define ENCODER_RESOLUTION 4
 | 
			
		||||
 | 
			
		||||
// settings for HOME ROW MODS
 | 
			
		||||
#define TAPPING_TERM 160 // 200 ms is the default value
 | 
			
		||||
#define TAPPING_TERM_PER_KEY
 | 
			
		||||
//#define PERMISSIVE_HOLD
 | 
			
		||||
#define IGNORE_MOD_TAP_INTERRUPT
 | 
			
		||||
#define TAPPING_FORCE_HOLD_PER_KEY
 | 
			
		||||
 | 
			
		||||
// settings for LEADER key
 | 
			
		||||
#define LEADER_PER_KEY_TIMING
 | 
			
		||||
#define LEADER_TIMEOUT 250
 | 
			
		||||
#define LEADER_NO_TIMEOUT
 | 
			
		||||
 | 
			
		||||
#define RGBLIGHT_SLEEP // RGB lighting will switch off when the host goes to sleep
 | 
			
		||||
#define RGBLIGHT_LAYERS
 | 
			
		||||
							
								
								
									
										1131
									
								
								keyboards/planck/keymaps/jweickm/keymap.c
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1131
									
								
								keyboards/planck/keymaps/jweickm/keymap.c
									
										
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							
							
								
								
									
										154
									
								
								keyboards/planck/keymaps/jweickm/readme.md
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										154
									
								
								keyboards/planck/keymaps/jweickm/readme.md
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,154 @@
 | 
			
		|||
# Semi-wide German/English MIT Planck Layout
 | 
			
		||||
Added keymap for my planck MIT.
 | 
			
		||||
It has a German and an English switching mode, so that it works the exact same with both OS languages.
 | 
			
		||||
It is a semi-wide layout, with the left hand all the way to the edge, and with one extra column in the middle used for media controls.
 | 
			
		||||
Home row mods implemented in the top row with individual tapping_terms for different fingers.
 | 
			
		||||
Mouse layer accessible through the pinkies.
 | 
			
		||||
Navigation layer on space.
 | 
			
		||||
 | 
			
		||||
```
 | 
			
		||||
/* _HRWIDECOLEMAK
 | 
			
		||||
* ,-----------------------------------------------------------------------------------.
 | 
			
		||||
* |  G-Q |  A-W |  S-F |  C-P |_Num-B|Vol/B+|_Num-J|  C-L |  S-U |  A-Y |  G-/ |   ü  |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |   A  |   R  |   S  |   T  |   G  | TAB  |   M  |   N  |   E  |   I  |   O  |   '  |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |_Mo-Z |   X  |   C  |   D  |   V  |Vol/B-|   K  |   H  |   ,  |   .  |_Mo-/ |   \  |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |C-CAPS| LEAD |MN-ESC|_L-BSP| LSFT |  _Nav-SPC   |_R-ENT|S-DEL | RALT |_Mo <-|_Mo ->|
 | 
			
		||||
* `-----------------------------------------------------------------------------------'
 | 
			
		||||
*/
 | 
			
		||||
/* _HRWIDECOLEMAK_DE
 | 
			
		||||
* same as above, when the PC is set to German layout
 | 
			
		||||
* ,-----------------------------------------------------------------------------------.
 | 
			
		||||
* |  G-Q |  A-W |  S-F |  C-P |_Num-B|Vol/B+|_Num-J|  C-L |  S-U |  A-Y |  G-/ |   ü  |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |   A  |   R  |   S  |   T  |   G  | TAB  |   M  |   N  |   E  |   I  |   O  |   '  |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |_Mo-Z |   X  |   C  |   D  |   V  |Vol/B-|   K  |   H  |   ,  |   .  |_Mo-/ |   \  |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |C-CAPS| LEAD |MN-ESC|_L-BSP| LSFT |  _Nav-SPC   |_R-ENT|S-DEL | RALT |_Mo <-|_Mo ->|
 | 
			
		||||
* `-----------------------------------------------------------------------------------'
 | 
			
		||||
*/
 | 
			
		||||
/* _GAMING
 | 
			
		||||
* ,-----------------------------------------------------------------------------------.
 | 
			
		||||
* | ESC  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |  F5  |  F8  |  F9  |Vol/B+|
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* | TAB  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |Vol/B-|
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* | LSFT |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   Z  |   M  |   ;  |_CM-EN|
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* | LCTL |   C  |   B  |   X  | LALT |    SPACE    | ENT  | RALT | ____ | ____ | !GAME|
 | 
			
		||||
* `-----------------------------------------------------------------------------------'
 | 
			
		||||
*/
 | 
			
		||||
/* WIDECOLEMAK
 | 
			
		||||
* no mod taps
 | 
			
		||||
* ,-----------------------------------------------------------------------------------.
 | 
			
		||||
* |   Q  |   W  |   F  |   P  |   B  |Vol/B+|   J  |   L  |   U  |   Y  |   /  |   Ü  |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |   A  |   R  |   S  |   T  |   G  | TAB  |   M  |   N  |   E  |   I  |   O  |   '  |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |   Z  |   X  |   C  |   D  |   V  |Vol/B-|   K  |   H  |   ,  |   .  |   /  |!CM-EN|
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |C-CAPS|G-TAB |MN-ESC|_L-BSP| LSFT |  _NAV-SPC   |_R-ENT|S-DEL |C-TAB |_Mo <-|_Mo ->|
 | 
			
		||||
* `-----------------------------------------------------------------------------------'
 | 
			
		||||
*/
 | 
			
		||||
/* _LOWER
 | 
			
		||||
* ,-----------------------------------------------------------------------------------.
 | 
			
		||||
* |   !  |   @  |   #  |   $  |   %  |   ~  |   ^  |   &  |   *  |   (  |   )  |   Ö  |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   ß  |   _  |   +  |   {  |   }  |   Ä  |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | MPLY |   /  |   \  |   |  |   €  |   è  |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |!MOUSE| ____ | ____ | ____ | ____ |     ____    | ____ | Vol- | Vol+ |   ↓  |   ↑  |
 | 
			
		||||
* `-----------------------------------------------------------------------------------'
 | 
			
		||||
*/
 | 
			
		||||
/* _LOWER_DE
 | 
			
		||||
* ,-----------------------------------------------------------------------------------.
 | 
			
		||||
* |   !  |   @  |   #  |   $  |   %  |   ~  |   ^  |   &  |   *  |   (  |   )  |   Ö  |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   ß  |   _  |   +  |   {  |   }  |   Ä  |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | MPLY |   /  |   \  |   |  |   €  |   `  |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |!MOUSE| ____ | ____ | ____ | ____ |     ____    | ____ | Vol- | Vol+ |   ↓  |   ↑  |
 | 
			
		||||
* `-----------------------------------------------------------------------------------'
 | 
			
		||||
*/
 | 
			
		||||
/* _RAISE
 | 
			
		||||
* ,-----------------------------------------------------------------------------------.
 | 
			
		||||
* |   1  |   2  |   3  |   4  |   5  |   `  |   6  |   7  |   8  |   9  |   0  |   ö  |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   ß  |   -  |   =  |   [  |   ]  |   ä  |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | MPLY |   \  |   ,  |   .  |   /  |   é  |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |!MOUSE| ____ | ____ | BSPC | ____ |     ____    | ____ |  |<< | >>|  |   ↓  |   ↑  |
 | 
			
		||||
* `-----------------------------------------------------------------------------------'
 | 
			
		||||
*/
 | 
			
		||||
/* _RAISE_DE
 | 
			
		||||
* ,-----------------------------------------------------------------------------------.
 | 
			
		||||
* |   1  |   2  |   3  |   4  |   5  |   `  |   6  |   7  |   8  |   9  |   0  |   ö  |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   ß  |   -  |   =  |   [  |   ]  |   ä  |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 | MPLY |   \  |   ,  |   .  |   /  |   ´  |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |!MOUSE| ____ | ____ | BSPC | ____ |     ____    | ____ |  |<< | >>|  |   ↓  |   ↑  |
 | 
			
		||||
* `-----------------------------------------------------------------------------------'
 | 
			
		||||
*/
 | 
			
		||||
/* _ADJUST
 | 
			
		||||
* ,-----------------------------------------------------------------------------------.
 | 
			
		||||
* | A-SFT| RESET| DEBUG|RGBTOG|RGBMOD|RGBHUI|RGBHUD|RGBSAI|RGBSAD|RGBVAI|RGBVAD| DE_SW|
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* | A-GRV|EEPRST|MU_MOD| AU_ON|AU_OFF|AGNORM|AGSWAP|!HRWCM| !WCM | A-GRV| !LANG| !GAME|
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* | ____ |MUV_DE|MUV_IN| MU_ON|MU_OFF| MI_ON|MI_OFF| Vol- | MPLY | Vol+ | ____ | ____ |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* | ____ | ____ | ____ | ____ | ____ |     ____    | ____ | ____ | ____ | ____ |EEPRST|
 | 
			
		||||
* `-----------------------------------------------------------------------------------'
 | 
			
		||||
*/
 | 
			
		||||
/* _NAV
 | 
			
		||||
* ,-----------------------------------------------------------------------------------.
 | 
			
		||||
* |A(TAB)| C(->)| !LANG|A(GRV)| C(<-)| >>|  | HOME |  ->  | PGUP | COPY | PASTE| DE_SW|
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |C(TAB)|  TAB |  ESC |  ENT |VIM_GG| MPLY |  <-  |   ↓  |   ↑  |  ->  |  END | VIM_O|  
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* | LSFT | XXXX |S(DEL)| CAPS | VIM_V| MUTE | HOME | PGDN | LSFT | RFST | C(F) | C(F) |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* | XXXX | XXXX | ____ | BSPC | ____ |     ____    |  ENT |  DEL | ____ | ____ | DE_SW|
 | 
			
		||||
* `-----------------------------------------------------------------------------------'
 | 
			
		||||
*/
 | 
			
		||||
/* _VIM
 | 
			
		||||
* ,-----------------------------------------------------------------------------------.
 | 
			
		||||
* |A(TAB)| C(->)| !LANG|A(GRV)| C(<-)| >>|  | HOME |  ->  | PGUP | COPY | PASTE| DE_SW|
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |C(TAB)|  TAB |  ESC |  ENT |VIM_GG| MPLY |  <-  |   ↓  |   ↑  |  ->  |  END | VIM_O|  
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* | LSFT | XXXX |S(DEL)| CAPS | VIM_V| MUTE | HOME | PGDN | LSFT | RFST | C(F) | C(F) |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* | XXXX | XXXX | !VIM | BSPC | ____ |     ____    |  ENT |  DEL | ____ |   ↓  |   ↑  |
 | 
			
		||||
* `-----------------------------------------------------------------------------------'
 | 
			
		||||
*/
 | 
			
		||||
/* _NUM
 | 
			
		||||
* ,-----------------------------------------------------------------------------------.
 | 
			
		||||
* |  F1  |  F2  |  F3  |  F4  |  |<< |NUMLCK| >>|  |   7  |   8  |   9  |   -  | ____ |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |  F5  |  F6  |  F7  |  F8  | Vol+ | MPLY |   *  |   4  |   5  |   6  |   +  |   .  |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |  F9  |  F10 |  F11 |  F12 | Vol- | MUTE |   =  |   1  |   2  |   3  |   /  |   ,  |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* | ____ | ____ | ____ | ____ | ____ |     ____    |   0  |   .  |   ,  |   =  | ____ |
 | 
			
		||||
* `-----------------------------------------------------------------------------------'
 | 
			
		||||
*/
 | 
			
		||||
/* _MOUSE
 | 
			
		||||
* ,-----------------------------------------------------------------------------------.
 | 
			
		||||
* | XXXX | XXXX | MBTN4| MBTN5| XXXX | Bri+ | XXXX | MWHL↑|MAUS↑ | MWHL↑| XXXX | XXXX |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* | XXXX | MBTN3| MBTN2| MBTN1| XXXX | MPLY | XXXX |MAUS<-|MAUS↓ |MAUS->| XXXX | XXXX |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |  F9  | XXXX | XXXX | XXXX | XXXX | Bri- | XXXX | MWHL↓| XXXX | XXXX | ____ | XXXX |
 | 
			
		||||
* |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
* |!MOUSE| XXXX | XXXX | ____ | XXXX | MAUS_ACCEL2 | ____ | XXXX | XXXX |   ↓  |   ↑  |
 | 
			
		||||
* `-----------------------------------------------------------------------------------'
 | 
			
		||||
 */
 | 
			
		||||
							
								
								
									
										5
									
								
								keyboards/planck/keymaps/jweickm/rules.mk
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								keyboards/planck/keymaps/jweickm/rules.mk
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,5 @@
 | 
			
		|||
CONSOLE_ENABLE = no         # Console for debug
 | 
			
		||||
LEADER_ENABLE = yes
 | 
			
		||||
TAP_DANCE_ENABLE = yes			# enable tap dance functionality
 | 
			
		||||
 | 
			
		||||
SRC += muse.c
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue