Initial uk+us DD keymap_extras migration (#19031)
This commit is contained in:
		
							parent
							
								
									6133b08e73
								
							
						
					
					
						commit
						9bc7e9afbd
					
				
					 7 changed files with 690 additions and 125 deletions
				
			
		| 
						 | 
				
			
			@ -1,39 +1,33 @@
 | 
			
		|||
/* Copyright 2015-2016 Jack Humbert
 | 
			
		||||
 *
 | 
			
		||||
 * 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/>.
 | 
			
		||||
 */
 | 
			
		||||
// Copyright 2022 QMK
 | 
			
		||||
// SPDX-License-Identifier: GPL-2.0-or-later
 | 
			
		||||
 | 
			
		||||
/*******************************************************************************
 | 
			
		||||
  88888888888 888      d8b                .d888 d8b 888               d8b
 | 
			
		||||
      888     888      Y8P               d88P"  Y8P 888               Y8P
 | 
			
		||||
      888     888                        888        888
 | 
			
		||||
      888     88888b.  888 .d8888b       888888 888 888  .d88b.       888 .d8888b
 | 
			
		||||
      888     888 "88b 888 88K           888    888 888 d8P  Y8b      888 88K
 | 
			
		||||
      888     888  888 888 "Y8888b.      888    888 888 88888888      888 "Y8888b.
 | 
			
		||||
      888     888  888 888      X88      888    888 888 Y8b.          888      X88
 | 
			
		||||
      888     888  888 888  88888P'      888    888 888  "Y8888       888  88888P'
 | 
			
		||||
                                                        888                 888
 | 
			
		||||
                                                        888                 888
 | 
			
		||||
                                                        888                 888
 | 
			
		||||
     .d88b.   .d88b.  88888b.   .d88b.  888d888 8888b.  888888 .d88b.   .d88888
 | 
			
		||||
    d88P"88b d8P  Y8b 888 "88b d8P  Y8b 888P"      "88b 888   d8P  Y8b d88" 888
 | 
			
		||||
    888  888 88888888 888  888 88888888 888    .d888888 888   88888888 888  888
 | 
			
		||||
    Y88b 888 Y8b.     888  888 Y8b.     888    888  888 Y88b. Y8b.     Y88b 888
 | 
			
		||||
     "Y88888  "Y8888  888  888  "Y8888  888    "Y888888  "Y888 "Y8888   "Y88888
 | 
			
		||||
         888
 | 
			
		||||
    Y8b d88P
 | 
			
		||||
     "Y88P"
 | 
			
		||||
*******************************************************************************/
 | 
			
		||||
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
#include "keymap.h"
 | 
			
		||||
 | 
			
		||||
// clang-format off
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
 | 
			
		||||
 * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │       │
 | 
			
		||||
 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
 | 
			
		||||
 * │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │
 | 
			
		||||
 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
 | 
			
		||||
 * │      │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │
 | 
			
		||||
 * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
 | 
			
		||||
 * │    │ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │          │
 | 
			
		||||
 * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
 | 
			
		||||
 * │    │    │    │                        │    │    │    │    │
 | 
			
		||||
 * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
 | 
			
		||||
 */
 | 
			
		||||
// Row 1
 | 
			
		||||
// Aliases
 | 
			
		||||
#define UK_GRV  KC_GRV  // `
 | 
			
		||||
#define UK_1    KC_1    // 1
 | 
			
		||||
#define UK_2    KC_2    // 2
 | 
			
		||||
| 
						 | 
				
			
			@ -47,7 +41,6 @@
 | 
			
		|||
#define UK_0    KC_0    // 0
 | 
			
		||||
#define UK_MINS KC_MINS // -
 | 
			
		||||
#define UK_EQL  KC_EQL  // =
 | 
			
		||||
// Row 2
 | 
			
		||||
#define UK_Q    KC_Q    // Q
 | 
			
		||||
#define UK_W    KC_W    // W
 | 
			
		||||
#define UK_E    KC_E    // E
 | 
			
		||||
| 
						 | 
				
			
			@ -60,7 +53,6 @@
 | 
			
		|||
#define UK_P    KC_P    // P
 | 
			
		||||
#define UK_LBRC KC_LBRC // [
 | 
			
		||||
#define UK_RBRC KC_RBRC // ]
 | 
			
		||||
// Row 3
 | 
			
		||||
#define UK_A    KC_A    // A
 | 
			
		||||
#define UK_S    KC_S    // S
 | 
			
		||||
#define UK_D    KC_D    // D
 | 
			
		||||
| 
						 | 
				
			
			@ -73,7 +65,6 @@
 | 
			
		|||
#define UK_SCLN KC_SCLN // ;
 | 
			
		||||
#define UK_QUOT KC_QUOT // '
 | 
			
		||||
#define UK_HASH KC_NUHS // #
 | 
			
		||||
// Row 4
 | 
			
		||||
#define UK_BSLS KC_NUBS // (backslash)
 | 
			
		||||
#define UK_Z    KC_Z    // Z
 | 
			
		||||
#define UK_X    KC_X    // X
 | 
			
		||||
| 
						 | 
				
			
			@ -85,21 +76,6 @@
 | 
			
		|||
#define UK_COMM KC_COMM // ,
 | 
			
		||||
#define UK_DOT  KC_DOT  // .
 | 
			
		||||
#define UK_SLSH KC_SLSH // /
 | 
			
		||||
 | 
			
		||||
/* Shifted symbols
 | 
			
		||||
 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
 | 
			
		||||
 * │ ¬ │ ! │ " │ £ │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       │
 | 
			
		||||
 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
 | 
			
		||||
 * │     │   │   │   │   │   │   │   │   │   │   │ { │ } │     │
 | 
			
		||||
 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
 | 
			
		||||
 * │      │   │   │   │   │   │   │   │   │   │ : │ @ │ ~ │    │
 | 
			
		||||
 * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
 | 
			
		||||
 * │    │ | │   │   │   │   │   │   │   │ < │ > │ ? │          │
 | 
			
		||||
 * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
 | 
			
		||||
 * │    │    │    │                        │    │    │    │    │
 | 
			
		||||
 * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
 | 
			
		||||
 */
 | 
			
		||||
// Row 1
 | 
			
		||||
#define UK_NOT  S(UK_GRV)  // ¬
 | 
			
		||||
#define UK_EXLM S(UK_1)    // !
 | 
			
		||||
#define UK_DQUO S(UK_2)    // "
 | 
			
		||||
| 
						 | 
				
			
			@ -113,39 +89,21 @@
 | 
			
		|||
#define UK_RPRN S(UK_0)    // )
 | 
			
		||||
#define UK_UNDS S(UK_MINS) // _
 | 
			
		||||
#define UK_PLUS S(UK_EQL)  // +
 | 
			
		||||
// Row 2
 | 
			
		||||
#define UK_LCBR S(UK_LBRC) // {
 | 
			
		||||
#define UK_RCBR S(UK_RBRC) // }
 | 
			
		||||
// Row 3
 | 
			
		||||
#define UK_COLN S(UK_SCLN) // :
 | 
			
		||||
#define UK_AT   S(UK_QUOT) // @
 | 
			
		||||
#define UK_TILD S(UK_HASH) // ~
 | 
			
		||||
// Row 4
 | 
			
		||||
#define UK_PIPE S(UK_BSLS) // |
 | 
			
		||||
#define UK_LABK S(UK_COMM) // <
 | 
			
		||||
#define UK_RABK S(UK_DOT)  // >
 | 
			
		||||
#define UK_QUES S(UK_SLSH) // ?
 | 
			
		||||
 | 
			
		||||
/* AltGr symbols
 | 
			
		||||
 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
 | 
			
		||||
 * │ ¦ │   │   │   │ € │   │   │   │   │   │   │   │   │       │
 | 
			
		||||
 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
 | 
			
		||||
 * │     │   │   │ É │   │   │   │ Ú │ Í │ Ó │   │   │   │     │
 | 
			
		||||
 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
 | 
			
		||||
 * │      │ Á │   │   │   │   │   │   │   │   │   │   │   │    │
 | 
			
		||||
 * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
 | 
			
		||||
 * │    │   │   │   │   │   │   │   │   │   │   │   │          │
 | 
			
		||||
 * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
 | 
			
		||||
 * │    │    │    │                        │    │    │    │    │
 | 
			
		||||
 * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
 | 
			
		||||
 */
 | 
			
		||||
// Row 1
 | 
			
		||||
#define UK_BRKP ALGR(UK_GRV)  // ¦
 | 
			
		||||
#define UK_EURO ALGR(UK_4)    // €
 | 
			
		||||
// Row 2
 | 
			
		||||
#define UK_EACU ALGR(KC_E)    // É
 | 
			
		||||
#define UK_UACU ALGR(KC_U)    // Ú
 | 
			
		||||
#define UK_IACU ALGR(KC_I)    // Í
 | 
			
		||||
#define UK_OACU ALGR(KC_O)    // Ó
 | 
			
		||||
// Row 3
 | 
			
		||||
#define UK_AACU ALGR(KC_A)    // Á
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,52 +1,55 @@
 | 
			
		|||
// Copyright 2022 QMK
 | 
			
		||||
// SPDX-License-Identifier: GPL-2.0-or-later
 | 
			
		||||
 | 
			
		||||
/*******************************************************************************
 | 
			
		||||
  88888888888 888      d8b                .d888 d8b 888               d8b
 | 
			
		||||
      888     888      Y8P               d88P"  Y8P 888               Y8P
 | 
			
		||||
      888     888                        888        888
 | 
			
		||||
      888     88888b.  888 .d8888b       888888 888 888  .d88b.       888 .d8888b
 | 
			
		||||
      888     888 "88b 888 88K           888    888 888 d8P  Y8b      888 88K
 | 
			
		||||
      888     888  888 888 "Y8888b.      888    888 888 88888888      888 "Y8888b.
 | 
			
		||||
      888     888  888 888      X88      888    888 888 Y8b.          888      X88
 | 
			
		||||
      888     888  888 888  88888P'      888    888 888  "Y8888       888  88888P'
 | 
			
		||||
                                                        888                 888
 | 
			
		||||
                                                        888                 888
 | 
			
		||||
                                                        888                 888
 | 
			
		||||
     .d88b.   .d88b.  88888b.   .d88b.  888d888 8888b.  888888 .d88b.   .d88888
 | 
			
		||||
    d88P"88b d8P  Y8b 888 "88b d8P  Y8b 888P"      "88b 888   d8P  Y8b d88" 888
 | 
			
		||||
    888  888 88888888 888  888 88888888 888    .d888888 888   88888888 888  888
 | 
			
		||||
    Y88b 888 Y8b.     888  888 Y8b.     888    888  888 Y88b. Y8b.     Y88b 888
 | 
			
		||||
     "Y88888  "Y8888  888  888  "Y8888  888    "Y888888  "Y888 "Y8888   "Y88888
 | 
			
		||||
         888
 | 
			
		||||
    Y8b d88P
 | 
			
		||||
     "Y88P"
 | 
			
		||||
*******************************************************************************/
 | 
			
		||||
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
#include "keymap.h"
 | 
			
		||||
 | 
			
		||||
// clang-format off
 | 
			
		||||
 | 
			
		||||
/* Shifted symbols
 | 
			
		||||
 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
 | 
			
		||||
 * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       │
 | 
			
		||||
 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
 | 
			
		||||
 * │     │   │   │   │   │   │   │   │   │   │   │ { │ } │  |  │
 | 
			
		||||
 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
 | 
			
		||||
 * │      │   │   │   │   │   │   │   │   │   │ : │ " │        │
 | 
			
		||||
 * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
 | 
			
		||||
 * │        │   │   │   │   │   │   │   │ < │ > │ ? │          │
 | 
			
		||||
 * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
 | 
			
		||||
 * │    │    │    │                        │    │    │    │    │
 | 
			
		||||
 * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
 | 
			
		||||
 */
 | 
			
		||||
// Row 1
 | 
			
		||||
// Aliases
 | 
			
		||||
#define KC_TILD S(KC_GRAVE) // ~
 | 
			
		||||
#define KC_EXLM S(KC_1)     // !
 | 
			
		||||
#define KC_AT   S(KC_2)     // @
 | 
			
		||||
#define KC_HASH S(KC_3)     // #
 | 
			
		||||
#define KC_DLR  S(KC_4)     // $
 | 
			
		||||
#define KC_PERC S(KC_5)     // %
 | 
			
		||||
#define KC_CIRC S(KC_6)     // ^
 | 
			
		||||
#define KC_AMPR S(KC_7)     // &
 | 
			
		||||
#define KC_ASTR S(KC_8)     // *
 | 
			
		||||
#define KC_LPRN S(KC_9)     // (
 | 
			
		||||
#define KC_RPRN S(KC_0)     // )
 | 
			
		||||
#define KC_EXLM S(KC_1)    // !
 | 
			
		||||
#define KC_AT   S(KC_2)    // @
 | 
			
		||||
#define KC_HASH S(KC_3)    // #
 | 
			
		||||
#define KC_DLR  S(KC_4)    // $
 | 
			
		||||
#define KC_PERC S(KC_5)    // %
 | 
			
		||||
#define KC_CIRC S(KC_6)    // ^
 | 
			
		||||
#define KC_AMPR S(KC_7)    // &
 | 
			
		||||
#define KC_ASTR S(KC_8)    // *
 | 
			
		||||
#define KC_LPRN S(KC_9)    // (
 | 
			
		||||
#define KC_RPRN S(KC_0)    // )
 | 
			
		||||
#define KC_UNDS S(KC_MINUS) // _
 | 
			
		||||
#define KC_PLUS S(KC_EQUAL) // +
 | 
			
		||||
// Row 2
 | 
			
		||||
#define KC_LCBR S(KC_LEFT_BRACKET)  // {
 | 
			
		||||
#define KC_LCBR S(KC_LEFT_BRACKET) // {
 | 
			
		||||
#define KC_RCBR S(KC_RIGHT_BRACKET) // }
 | 
			
		||||
#define KC_PIPE S(KC_BACKSLASH)     // |
 | 
			
		||||
// Row 3
 | 
			
		||||
#define KC_PIPE S(KC_BACKSLASH) // |
 | 
			
		||||
#define KC_COLN S(KC_SEMICOLON) // :
 | 
			
		||||
#define KC_DQUO S(KC_QUOTE)     // "
 | 
			
		||||
// Row 4
 | 
			
		||||
#define KC_DQUO S(KC_QUOTE) // "
 | 
			
		||||
#define KC_LABK S(KC_COMMA) // <
 | 
			
		||||
#define KC_RABK S(KC_DOT)   // >
 | 
			
		||||
#define KC_RABK S(KC_DOT)  // >
 | 
			
		||||
#define KC_QUES S(KC_SLASH) // ?
 | 
			
		||||
 | 
			
		||||
// alias stuff
 | 
			
		||||
#define KC_TILDE KC_TILD
 | 
			
		||||
#define KC_EXCLAIM KC_EXLM
 | 
			
		||||
#define KC_DOLLAR KC_DLR
 | 
			
		||||
| 
						 | 
				
			
			@ -57,16 +60,14 @@
 | 
			
		|||
#define KC_LEFT_PAREN KC_LPRN
 | 
			
		||||
#define KC_RIGHT_PAREN KC_RPRN
 | 
			
		||||
#define KC_UNDERSCORE KC_UNDS
 | 
			
		||||
 | 
			
		||||
#define KC_LEFT_CURLY_BRACE KC_LCBR
 | 
			
		||||
#define KC_RIGHT_CURLY_BRACE KC_RCBR
 | 
			
		||||
 | 
			
		||||
#define KC_COLON KC_COLN
 | 
			
		||||
#define KC_DOUBLE_QUOTE KC_DQUO
 | 
			
		||||
#define KC_DQT KC_DQUO
 | 
			
		||||
 | 
			
		||||
#define KC_LEFT_ANGLE_BRACKET KC_LABK
 | 
			
		||||
#define KC_LT KC_LABK
 | 
			
		||||
#define KC_RIGHT_ANGLE_BRACKET KC_RABK
 | 
			
		||||
#define KC_GT KC_RABK
 | 
			
		||||
#define KC_QUESTION KC_QUES
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue