Update Neo2 keymap (#9063)

* fixed typo for clear lcd screen function

brought to attention by #9085

* fixed typo for clear lcd screen function (ja docs)

docs/feature_hd44780.md

@@ -50,7 +50,7 @@ LCD_DISP_ON_CURSOR_BLINK : display on, cursor on flashing
 ````
 This is best done in your keyboards `matrix_init_kb` or your keymaps `matrix_init_user`.  
 It is advised to clear the display before use.  
-To do so call `lcd_clrsrc()`.
+To do so call `lcd_clrscr()`.
 
 To now print something to your Display you first call `lcd_gotoxy(column, line)`. To go to the start of the first line you would call `lcd_gotoxy(0, 0)` and then print a string with `lcd_puts("example string")`.
 

docs/ja/feature_hd44780.md

@@ -55,7 +55,7 @@ LCD_DISP_ON_CURSOR_BLINK : ディスプレイオン、点滅カーソル
 ````
 これはキーボードの `matrix_init_kb` またはキーマップの `matrix_init_user` で行うのが最適です。
 使用前にディスプレイをクリアすることをお勧めします。
-そのためには、`lcd_clrsrc()` を呼びます。
+そのためには、`lcd_clrscr()` を呼びます。
 
 ディスプレイに何かを表示するには、最初に `lcd_gotoxy(column, line)` を呼びます。最初の行の先頭に移動するには、`lcd_gotoxy(0, 0)` を呼び出し、その後 `lcd_puts("example string")` を使って文字列を出力します。
 

drivers/oled/oled_driver.c

@@ -479,7 +479,7 @@ void oled_write_ln_P(const char *data, bool invert) {
 void oled_write_raw_P(const char *data, uint16_t size) {
     if (size > OLED_MATRIX_SIZE) size = OLED_MATRIX_SIZE;
     for (uint16_t i = 0; i < size; i++) {
-        uint8_t c = pgm_read_byte(++data);
+        uint8_t c = pgm_read_byte(data++);
         if (oled_buffer[i] == c) continue;
         oled_buffer[i] = c;
         oled_dirty |= (1 << (i / OLED_BLOCK_SIZE));

keyboards/eniigmakeyboards/ek87/rules.mk

@@ -16,7 +16,7 @@ BOOTLOADER = atmel-dfu
 #
 BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
+EXTRAKEY_ENABLE = yes        # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE

keyboards/keebio/viterbi/keymaps/vosechu/config.h

@@ -0,0 +1,41 @@
+/*
+Copyright 2017 Chuck Lauer Vose <[email protected]>
+
+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
+
+#undef RGBLED_NUM
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 3
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+
+#define RGBLIGHT_SLEEP // Put the keyboard to sleep when USB goes dark
+
+#define LAYOUT_ortho_half_5x7( \
+    L00, L01, L02, L03, L04, L05, L06, \
+    L10, L11, L12, L13, L14, L15, L16, \
+    L20, L21, L22, L23, L24, L25, L26, \
+    L30, L31, L32, L33, L34, L35, L36, \
+    L40, L41, L42, L43, L44, L45, L46 \
+    ) \
+    LAYOUT_ortho_5x14( \
+        L00, L01, L02, L03, L04, L05, L06, KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO, \
+        L10, L11, L12, L13, L14, L15, L16, KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO, \
+        L20, L21, L22, L23, L24, L25, L26, KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO, \
+        L30, L31, L32, L33, L34, L35, L36, KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO, \
+        L40, L41, L42, L43, L44, L45, L46, KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO  \
+    )

keyboards/keebio/viterbi/keymaps/vosechu/keymap.c

@@ -0,0 +1,91 @@
+#include QMK_KEYBOARD_H
+#include "vosechu.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[BASE] = LAYOUT_ortho_half_5x7( // Base layer
+  KC_GRV  , KC_1    , KC_2    , KC_3    , KC_4    , KC_5    , KC_9    ,
+  ALT_TAB , KC_Q    , KC_W    , KC_E    , KC_R    , KC_T    , TT(TT1) ,
+  CTL_ESC , KC_A    , KC_S    , KC_D    , KC_F    , KC_G    , TT(TT2) ,
+  KC_F13  , KC_Z    , KC_X    , KC_C    , KC_V    , KC_B    , TT(TT3) ,
+  KC_MEH  , CTL_GRV , ALT_TAB , KC_LALT , MO(LWR) , LFT_BK  , SFT_SPC
+),
+[LWR] = LAYOUT_ortho_half_5x7( // EVE layer
+  _______   , _______ , _______ , _______ , _______ , _______ , _______ ,
+  A(KC_LEFT), KC_F1   , KC_F2   , KC_F3   , KC_F4   , KC_F5   , KC_F9   ,
+  SFT_SPC   , A(KC_F1), A(KC_F2), A(KC_F3), A(KC_F4), _______ , _______ ,
+  A(KC_RGHT), C(KC_F1), C(KC_F2), C(KC_F3), C(KC_F4), _______ , _______ ,
+  _______   , RESET   , _______ , _______ , _LAYER_ , KC_DEL  , KC_ENT
+),
+[LFT] = LAYOUT_ortho_half_5x7( // Media
+  _______ , KC_F10  , KC_F11  , KC_F12  , KC_PSCR , KC_SLCK , KC_PAUS ,
+  _______ , KC_F7   , KC_F8   , KC_F9   , KC_INS  , KC_HOME , KC_PGUP ,
+  RGB_TOG , KC_F4   , KC_F5   , KC_F6   , KC_DEL  , KC_END  , KC_PGDN ,
+  _______ , KC_F1   , KC_F2   , KC_F3   , KC_VOLU , KC_VOLD , KC_MUTE ,
+  _______ , _______ , _______ , _______ , PSWD    , _LAYER_ , PSWD_ALT
+),
+[TT1] = LAYOUT_ortho_half_5x7( // Override WASD with arrows
+  _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
+  _______ , _______ , KC_UP   , _______ , _______ , _______ , _______ ,
+  _______ , KC_LEFT , KC_DOWN , KC_RGHT , _______ , _______ , _______ ,
+  _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
+  _______ , _______ , _______ , _______ , _______ , _______ , _______
+),
+[TT2] = LAYOUT_ortho_half_5x7( // Browser layer
+  C(KC_W) , C(KC_1) , C(KC_T) , C(KC_9) , _______ , _______ , _______ ,
+  WBWSRBK , WTABLFT , KC_UP   , WTABRGT , WBWSRFW , _______ , _______ ,
+  KC_ESC  , KC_LEFT , KC_DOWN , KC_RGHT , C(KC_R) , _______ , _______ ,
+  _______ , _______ , _______ , _______ , _______ , _______ , TT(T23X),
+  _______ , _______ , _______ , _______ , _______ , _______ , _______
+),
+[TT3] = LAYOUT_ortho_half_5x7( // OS X override layer
+  _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
+  _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
+  _______ , _______ , _______ , _______ , _______ , _______ , TT(T23X),
+  _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
+  _______ , _______ , _______ , KC_LGUI , _______ , _______ , _______
+),
+[T23X] = LAYOUT_ortho_half_5x7( // Browser layer
+  G(KC_W) , G(KC_1) , G(KC_T) , G(KC_9) , _______ , SLACKTB , _______ ,
+  BWSR_BK , TAB_LFT , KC_UP   , TAB_RGT , BWSR_FW , SLACKUP , _______ ,
+  KC_ESC  , KC_LEFT , KC_DOWN , KC_RGHT , G(KC_R) , SLACKDN , _______ ,
+  _______ , _______ , KC_Q    , KC_J    , KC_K    , _______ , _______ ,
+  _______ , _______ , _______ , KC_LGUI , _______ , _______ , _______
+),
+// [_EMPTY] = LAYOUT(
+//   _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
+//   _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
+//   _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
+//   _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
+//   _______ , _______ , _______ , _______ , _______ , _______ , _______
+// ),
+};
+
+void keyboard_post_init_user(void) {
+    // Call the post init code.
+    rgblight_enable_noeeprom(); // enables Rgb, without saving settings
+    rgblight_mode_noeeprom(0);
+    rgblight_sethsv_noeeprom(0, 0, 0);
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+  switch (get_highest_layer(state)) {
+  case TT1:
+    rgblight_sethsv_noeeprom(HSV_BLUE);
+    break;
+  case TT2:
+    rgblight_sethsv_noeeprom(HSV_PURPLE);
+    break;
+  case T23X:
+    rgblight_sethsv_noeeprom(HSV_GOLD);
+    break;
+  case TT3:
+    rgblight_sethsv_noeeprom(HSV_GREEN);
+    break;
+  default: //  for any other layers, or the default layer
+    rgblight_sethsv_noeeprom(0, 0, 0);
+    break;
+  }
+
+  return state;
+}

keyboards/keebio/viterbi/keymaps/vosechu/rules.mk

@@ -0,0 +1 @@
+RGBLIGHT_ENABLE = yes

keyboards/pabile/p18/config.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x6666
+#define PRODUCT_ID      0x6668
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Pabile
+#define PRODUCT         P18 Macro Pad
+#define DESCRIPTION     An 18-key DIY macropad kit
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 5
+
+/* pin-out for PROMICRO */
+#define MATRIX_ROW_PINS { D1, D0, D4, C6 }
+#define MATRIX_COL_PINS { D2, D7, E6, B4, B5 }
+#define UNUSED_PINS
+ 
+/* Encoder position for PROMICRO */
+#define ENCODERS_PAD_A { B6, F6 }
+#define ENCODERS_PAD_B { F4, F5 } 
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW

keyboards/pabile/p18/info.json

@@ -0,0 +1,31 @@
+{
+    "keyboard_name": "Pabile 18", 
+    "url": "https://pabileonline.blogspot.com/", 
+    "maintainer": "Pabile", 
+    "width": 5.25, 
+    "height": 4, 
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+              {"x":1.25, "y":0}, 
+              {"x":2.25, "y":0}, 
+              {"x":3.25, "y":0}, 
+              {"x":4.25, "y":0}, 
+              {"x":1.25, "y":1}, 
+              {"x":2.25, "y":1}, 
+              {"x":3.25, "y":1}, 
+              {"x":4.25, "y":1}, 
+              {"x":0, "y":2}, 
+              {"x":1.25, "y":2}, 
+              {"x":2.25, "y":2}, 
+              {"x":3.25, "y":2}, 
+              {"x":4.25, "y":2}, 
+              {"x":0, "y":3}, 
+              {"x":1.25, "y":3}, 
+              {"x":2.25, "y":3}, 
+              {"x":3.25, "y":3}, 
+              {"x":4.25, "y":3}
+            ]
+        }
+    }
+}

keyboards/pabile/p18/keymaps/default/keymap.c

@@ -0,0 +1,27 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+                 KC_P7,   KC_P8,   KC_P9, KC_PMNS, 
+                 KC_P4,   KC_P5,   KC_P6, KC_PPLS,
+        KC_MUTE, KC_P1,   KC_P2,   KC_P3, KC_TAB,
+        KC_ESC,  KC_DEL, KC_P0, KC_PDOT, KC_PENT
+    )
+        
+};
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+  if (index == 0) { /* First encoder below the controller */
+    if (clockwise) {
+      tap_code(KC_VOLD); /*volume down*/
+    } else {
+      tap_code(KC_VOLU); /*volume up*/
+    }
+  } else if (index == 1) { /* Second encoder */  
+    if (clockwise) {
+      tap_code(KC_WH_U); /*mouse wheel up*/
+    } else {
+      tap_code(KC_WH_D); /*mouse wheel down*/
+    }
+  }
+}

keyboards/pabile/p18/p18.c

@@ -0,0 +1 @@
+#include "p18.h"

keyboards/pabile/p18/p18.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+         k01, k02, k03, k04, \
+         k11, k12, k13, k14, \
+    k20, k21, k22, k23, k24, \
+    k30, k31, k32, k33, k34 \
+) \
+{ \
+    {KC_NO, k04, k03, k02, k01}, \
+    {KC_NO, k14, k13, k12, k11}, \
+    {k20,   k24, k23, k22, k21}, \
+    {k30,   k34, k33, k32, k31} \
+} 

keyboards/pabile/p18/readme.md

@@ -0,0 +1,15 @@
+# P18 
+
+![render](https://i.imgur.com/CPtGiSL.png)
+
+A 18-key DIY Hotswap Macropad that accepts both Pro Micro and Adafruit Feather 32u4 Bluefruit LE.
+
+* Keyboard Maintainer: [pabile](https://github.com/pabile)
+* Hardware Supported: Pabile P18 PCB with Pro Micro or Adafruit Feather 32u4 Bluefruit LE
+* Hardware Availability: [Info at pabileonline.blogspot.com](https://pabileonline.blogspot.com/search/label/pabile18)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make pabile/p18:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/pabile/p18/rules.mk

@@ -0,0 +1,35 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+MIDI_ENABLE = no            # MIDI support
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+AUDIO_ENABLE = no           # Audio output on port C6
+FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
+HD44780_ENABLE = no         # Enable support for HD44780 based LCDs
+UNICODE_ENABLE = yes        # Unicode
+IOS_DEVICE_ENABLE = no      # connect to IOS Device
+ENCODER_ENABLE = yes

keyboards/pabile/p20/config.h

@@ -0,0 +1,26 @@
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x6666
+#define PRODUCT_ID      0x6667
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Pabile
+#define PRODUCT         P20
+#define DESCRIPTION     5x4 Macropad
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 4
+
+/* pin-out */
+#define MATRIX_ROW_PINS { B3, B4, B5, D7, E6 }
+#define MATRIX_COL_PINS { D0, B2, D4, B6 }
+#define UNUSED_PINS
+ 
+#define ENCODERS_PAD_A { F5, F7 }
+#define ENCODERS_PAD_B { F6, B1 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW

keyboards/pabile/p20/keymaps/default/keymap.c

@@ -0,0 +1,38 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_5x4(
+        KC_PSLS, KC_PMNS, KC_PAST, KC_MPLY, 
+        KC_P7,   KC_P8,   KC_P9,   KC_PMNS, 
+        KC_P4,   KC_P5,   KC_P6,   KC_PPLS, 
+        KC_P1,   KC_P2,   KC_P3,   KC_TAB, 
+        LT(2,KC_P0), KC_PCMM, KC_PDOT, LT(1,KC_PENT)),
+    [1] = LAYOUT_ortho_5x4(
+        KC_NLCK, KC_UNDS, KC_NO,   KC_NO, 
+        KC_AMPR, KC_ASTR, KC_LPRN, KC_EQL, 
+        KC_DLR,  KC_PERC, KC_CIRC, KC_NO, 
+        KC_EXLM, KC_AT,   KC_HASH, KC_NO, 
+        KC_RPRN, KC_NO,   KC_PSLS, KC_NO),
+    [2] = LAYOUT_ortho_5x4(
+        KC_NLCK, KC_NO,   KC_NO,   KC_NO, 
+        KC_BTN1, KC_MS_U, KC_BTN2, KC_NO, 
+        KC_MS_L, KC_MS_D, KC_MS_R, KC_TAB, 
+        KC_WH_U, KC_NO,   KC_WH_D, KC_NO, 
+        KC_NO,   KC_NO,   KC_DEL,  KC_ESC)
+};
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+  if (index == 0) { /* First encoder */
+    if (clockwise) {
+      tap_code(KC_WH_U); /*mouse wheel up*/
+    } else {
+      tap_code(KC_WH_D); /*mouse wheel down */
+    }
+  } else if (index == 1) { /* Second encoder */  
+    if (clockwise) {
+      tap_code(KC_VOLD); /*volume down*/
+    } else {
+      tap_code(KC_VOLU); /*volume up*/
+    }
+  }
+}

keyboards/pabile/p20/p20.c

@@ -0,0 +1 @@
+#include "p20.h"

keyboards/pabile/p20/p20.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_ortho_5x4( \
+    k00, k01, k02, k03, \
+    k10, k11, k12, k13, \
+    k20, k21, k22, k23, \
+    k30, k31, k32, k33, \
+    k40, k41, k42, k43 \
+) \
+{ \
+    {k00, k01, k02, k03}, \
+    {k10, k11, k12, k13}, \
+    {k20, k21, k22, k23}, \
+    {k30, k31, k32, k33}, \
+    {k40, k41, k42, k43} \
+} 

keyboards/pabile/p20/readme.md

@@ -0,0 +1,16 @@
+# P20
+
+![Linear grid](https://github.com/pabile/Pabile20/blob/master/_bak/layout-grid.jpg)
+![Numeric pad](https://github.com/pabile/Pabile20/blob/master/_bak/layout-numpad.jpg)
+
+A 5x4 grid keyboard with 2 rotary encoders. 
+
+* Keyboard Maintainer: [pabile](https://github.com/pabile)
+* Hardware Supported: Pabile P20 PCB, Pro Micro
+* Hardware Availability: [Info at pabileonline.blogspot.com](https://pabileonline.blogspot.com/search/label/pabile20)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make pabile/p20:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/pabile/p20/rules.mk

@@ -0,0 +1,37 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+MIDI_ENABLE = no            # MIDI support
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+AUDIO_ENABLE = no           # Audio output on port C6
+FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
+HD44780_ENABLE = no         # Enable support for HD44780 based LCDs
+UNICODE_ENABLE = yes        # Unicode
+IOS_DEVICE_ENABLE = no      # connect to IOS Device
+ENCODER_ENABLE = yes
+
+LAYOUTS = ortho_5x4

keyboards/pabile/p40/config.h

@@ -0,0 +1,29 @@
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x6666
+#define PRODUCT_ID      0x6666
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Pabile
+#define PRODUCT         P40 Keyboard
+#define DESCRIPTION     4x10 staggered keyboard
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 10
+
+/* pin-out
+for PCB ver0.01 452019 */
+#define MATRIX_ROW_PINS { F6, B3, B2, B6 }
+#define MATRIX_COL_PINS { F4, F5, B5, B4, E6, D7, C6, D4, D0, D1 }
+/*
+for pro micro facing back of pcb
+#define MATRIX_ROW_PINS { D4, E6, B4, B5 }
+#define MATRIX_COL_PINS { D1, D0, B6, B2, B3, B1, F7, F6, F5, F4 }
+*/
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW

keyboards/pabile/p40/info.json

@@ -0,0 +1,52 @@
+{
+    "keyboard_name": "Pabile 40", 
+    "url": "https://pabileonline.blogspot.com/", 
+    "maintainer": "Pabile", 
+    "width": 10.75, 
+    "height": 4, 
+    "layouts": {
+        "LAYOUT_ortho_4x10": {
+            "layout": [
+				{"x":0, "y":0},
+				{"x":1, "y":0}, 
+				{"x":2, "y":0}, 
+				{"x":3, "y":0}, 
+				{"x":4, "y":0}, 
+				{"x":5, "y":0}, 
+				{"x":6, "y":0}, 
+				{"x":7, "y":0}, 
+				{"x":8, "y":0}, 
+				{"x":9, "y":0}, 
+				{"x":0.25, "y":1}, 
+				{"x":1.25, "y":1}, 
+				{"x":2.25, "y":1}, 
+				{"x":3.25, "y":1}, 
+				{"x":4.25, "y":1}, 
+				{"x":5.25, "y":1}, 
+				{"x":6.25, "y":1}, 
+				{"x":7.25, "y":1}, 
+				{"x":8.25, "y":1}, 
+				{"x":9.25, "y":1}, 
+				{"x":0.5, "y":2}, 
+				{"x":1.5, "y":2}, 
+				{"x":2.5, "y":2}, 
+				{"x":3.5, "y":2}, 
+				{"x":4.5, "y":2}, 
+				{"x":5.5, "y":2}, 
+				{"x":6.5, "y":2}, 
+				{"x":7.5, "y":2}, 
+				{"x":8.5, "y":2}, 
+				{"x":9.5, "y":2}, 
+				{"x":0.75, "y":3}, 
+				{"x":1.75, "y":3}, 
+				{"x":2.75, "y":3}, 
+				{"x":3.75, "y":3}, 
+				{"x":4.75, "y":3}, 
+				{"x":5.75, "y":3}, 
+				{"x":6.75, "y":3}, 
+				{"x":7.75, "y":3}, 
+				{"x":8.75, "y":3}, 
+				{"x":9.75, "y":3}]
+        }
+    }
+}

keyboards/pabile/p40/keymaps/default/keymap.c

@@ -0,0 +1,29 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_ortho_4x10(
+    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,          KC_Y,         KC_U,   KC_I,    KC_O,   KC_P,
+    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,          KC_H,         KC_J,   KC_K,    KC_L,   LT(3,KC_MINS),
+    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,          KC_N,         KC_M,   KC_COMM, KC_DOT, LT(4,KC_SLSH),
+    KC_LCTL, KC_LGUI, KC_LALT, KC_LSFT, LT(2,KC_BSPC), LT(1,KC_SPC), KC_ENT, KC_APP,  KC_DEL, KC_ESC),
+  [1] = LAYOUT_ortho_4x10(
+    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+    KC_TAB,  KC_NO,   KC_NO,   KC_GRV,  KC_LBRC, KC_RBRC, KC_BSLS, KC_SCLN, KC_QUOT, KC_MINS,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_EQL,  KC_MINS, KC_NO,   KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+  [2] = LAYOUT_ortho_4x10(
+    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_F6,   KC_F7, KC_F8,   KC_F9,   KC_F10,
+    KC_TAB,  KC_F11,  KC_F12,  KC_NO,   KC_NO, KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO,
+    KC_CAPS, KC_PSCR, KC_SLCK, KC_PAUS, KC_NO, KC_NLCK, KC_NO, KC_VOLD, KC_VOLU, KC_MUTE,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO),
+  [3] = LAYOUT_ortho_4x10(
+    KC_ESC,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_INS,  KC_PGUP, KC_UP,   KC_PGDN, KC_DEL,
+    KC_TAB,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_END,  KC_NO,   KC_NO,   KC_NO,   KC_NO,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO),
+  [4] = LAYOUT_ortho_4x10(
+    KC_ESC,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_BTN1, KC_MS_U, KC_BTN2, KC_DEL,
+    KC_TAB,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_WH_U, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_WH_D, KC_NO,   KC_NO,   KC_NO,   KC_NO,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO)
+};

keyboards/pabile/p40/p40.c

@@ -0,0 +1 @@
+#include "p40.h"

keyboards/pabile/p40/p40.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_ortho_4x10( \
+      k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
+      k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
+      k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
+      k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 \
+) \
+{ \
+      {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09}, \
+      {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19}, \
+      {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29}, \
+      {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39} \
+}

keyboards/pabile/p40/readme.md

@@ -0,0 +1,15 @@
+# P40 
+
+![prototype photo1](https://github.com/pabile/Pabile40/blob/master/_bak/web-DSCN9033.jpg)
+
+A compact 4x10 (40%) staggered DIY keyboard kit.
+
+* Keyboard Maintainer: [pabile](https://github.com/pabile)
+* Hardware Supported: Pabile P40 PCB, Pro Micro
+* Hardware Availability: [Info at pabileonline.blogspot.com](https://pabileonline.blogspot.com/search/label/pabile40)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make pabile/p40:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/pabile/p40/rules.mk

@@ -0,0 +1,36 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+MIDI_ENABLE = no            # MIDI controls
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+AUDIO_ENABLE = no           # Audio output on port C6
+FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
+HD44780_ENABLE = no         # Enable support for HD44780 based LCDs
+UNICODE_ENABLE = yes        # Unicode
+IOS_DEVICE_ENABLE = no      # connect to IOS Device
+
+LAYOUTS = ortho_4x10

layouts/community/ortho_4x12/xyverz/keymap.c

@@ -2,13 +2,15 @@
 
 enum layer_names { _QWERTY, _COLEMAK, _DVORAK, _LOWER, _RAISE, _ADJUST };
 
-enum custom_keycodes { QWERTY = SAFE_RANGE, COLEMAK, DVORAK, LOWER, RAISE, ADJUST };
+enum custom_keycodes { QWERTY = SAFE_RANGE, COLEMAK, DVORAK, ADJUST };
 
 // Aliases to keep the keymap tidy
 #define GUIBSPC GUI_T(KC_BSPC)  // GUI when held, BSPC when tapped.
 #define RGB_SWR RGB_M_SW        // Swirl Animation alias
 #define RGB_SNK RGB_M_SN        // Snake Animation alias
 #define MACLOCK LGUI(LCTL(KC_Q)) // Lock my MacBook!
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
 
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

quantum/keymap_extras/keymap_canadian_multilingual.h

@@ -1,4 +1,4 @@
-/* Copyright 2016 Didier Loiseau
+/* Copyright 2020
  *
  * 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
@@ -13,247 +13,421 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef KEYMAP_CANADIAN_MULTILINGUAL_H
+
-#define KEYMAP_CANADIAN_MULTILINGUAL_H
+#pragma once
 
 #include "keymap.h"
 
-#ifndef GR2A
+// clang-format off
-#    define GR2A(kc) RCTL(kc)
-#endif
 
-// Normal characters
+/*
-// First row
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
-#define CSA_SLASH KC_GRV  // /
+ * │ / │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │       │
-#define CSA_SLSH CSA_SLASH
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │     │ 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
+#define CA_SLSH KC_GRV  // /
+#define CA_1    KC_1    // 1
+#define CA_2    KC_2    // 2
+#define CA_3    KC_3    // 3
+#define CA_4    KC_4    // 4
+#define CA_5    KC_5    // 5
+#define CA_6    KC_6    // 6
+#define CA_7    KC_7    // 7
+#define CA_8    KC_8    // 8
+#define CA_9    KC_9    // 9
+#define CA_0    KC_0    // 0
+#define CA_MINS KC_MINS // -
+#define CA_EQL  KC_EQL  // =
+// Row 2
+#define CA_Q    KC_Q    // Q
+#define CA_W    KC_W    // W
+#define CA_E    KC_E    // E
+#define CA_R    KC_R    // R
+#define CA_T    KC_T    // T
+#define CA_Y    KC_Y    // Y
+#define CA_U    KC_U    // U
+#define CA_I    KC_I    // I
+#define CA_O    KC_O    // O
+#define CA_P    KC_P    // P
+#define CA_CIRC KC_LBRC // ^ (dead)
+#define CA_CCED KC_RBRC // Ç
+// Row 3
+#define CA_A    KC_A    // A
+#define CA_S    KC_S    // S
+#define CA_D    KC_D    // D
+#define CA_F    KC_F    // F
+#define CA_G    KC_G    // G
+#define CA_H    KC_H    // H
+#define CA_J    KC_J    // J
+#define CA_K    KC_K    // K
+#define CA_L    KC_L    // L
+#define CA_SCLN KC_SCLN // ;
+#define CA_EGRV KC_QUOT // É
+#define CA_AGRV KC_NUHS // À
+// Row 4
+#define CA_UGRV KC_NUBS // Ù
+#define CA_Z    KC_Z    // Z
+#define CA_X    KC_X    // X
+#define CA_C    KC_C    // C
+#define CA_V    KC_V    // V
+#define CA_B    KC_B    // B
+#define CA_N    KC_N    // N
+#define CA_M    KC_M    // M
+#define CA_COMM KC_COMM // ,
+#define CA_DOT  KC_DOT  // .
+#define CA_EACU KC_SLSH // É
 
-// Second row
+/* Shifted symbols
-#define CSA_DEAD_CIRCUMFLEX KC_LBRACKET  // dead ^
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
-#define CSA_DCRC CSA_DEAD_CIRCUMFLEX
+ * │ \ │ ! │ @ │ # │ $ │ % │ ? │ & │ * │ ( │ ) │ _ │ + │       │
-#define CSA_C_CEDILLA KC_RBRACKET  // Ç
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
-#define CSA_CCED CSA_C_CEDILLA
+ * │     │   │   │   │   │   │   │   │   │   │   │ ¨ │   │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
+ * │      │   │   │   │   │   │   │   │   │   │ : │   │   │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+ * │    │   │   │   │   │   │   │   │   │ ' │ " │   │          │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │    │    │    │                        │    │    │    │    │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+// Row 1
+#define CA_BSLS S(CA_SLSH) // (backslash)
+#define CA_EXLM S(CA_1)    // !
+#define CA_AT   S(CA_2)    // @
+#define CA_HASH S(CA_3)    // #
+#define CA_DLR  S(CA_4)    // $
+#define CA_PERC S(CA_5)    // %
+#define CA_QUES S(CA_6)    // ?
+#define CA_AMPR S(CA_7)    // &
+#define CA_ASTR S(CA_8)    // *
+#define CA_LPRN S(CA_9)    // (
+#define CA_RPRN S(CA_0)    // )
+#define CA_UNDS S(CA_MINS) // _
+#define CA_PLUS S(CA_EQL)  // +
+// Row 2
+#define CA_DIAE S(CA_CIRC) // ¨ (dead)
+// Row 3
+#define CA_COLN S(CA_SCLN) // :
+// Row 4
+#define CA_QUOT S(CA_COMM) // '
+#define CA_DQUO S(CA_DOT)  // "
 
-// Third row
+/* AltGr symbols
-#define CSA_E_GRAVE KC_QUOT  // è
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
-#define CSA_EGRV CSA_E_GRAVE
+ * │ | │   │   │   │ ¤ │   │   │ { │ } │ [ │ ] │   │ ¬ │       │
-#define CSA_A_GRAVE KC_BSLASH  // à
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
-#define CSA_AGRV CSA_A_GRAVE
+ * │     │   │   │ € │   │   │   │   │   │   │   │ ` │ ~ │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
+ * │      │   │   │   │   │   │   │   │   │   │ ° │   │   │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+ * │    │   │ « │ » │   │   │   │   │   │ < │ > │   │          │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │    │    │    │                        │    │    │    │    │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+// Row 1
+#define CA_PIPE ALGR(CA_SLSH) // |
+#define CA_CURR ALGR(CA_4)    // ¤
+#define CA_LCBR ALGR(CA_7)    // {
+#define CA_RCBR ALGR(CA_8)    // }
+#define CA_LBRC ALGR(CA_9)    // [
+#define CA_RBRC ALGR(CA_0)    // ]
+#define CA_NOT  ALGR(CA_EQL)  // ¬
+// Row 2
+#define CA_EURO ALGR(CA_E)    // €
+#define CA_GRV  ALGR(CA_CIRC) // ` (dead)
+#define CA_DTIL ALGR(CA_CCED) // ~ (dead)
+// Row 3
+#define CA_DEG  ALGR(CA_SCLN) // °
+// Row 4
+#define CA_LDAQ ALGR(CA_X)    // «
+#define CA_RDAQ ALGR(CA_C)    // »
+#define CA_LABK ALGR(CA_DOT)  // <
+#define CA_RABK ALGR(CA_COMM) // >
 
-// Fourth row
+/* Right Ctrl symbols
-#define CSA_U_GRAVE KC_NONUS_BSLASH  // ù
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
-#define CSA_UGRV CSA_U_GRAVE
+ * │   │ ¹ │ ² │ ³ │ ¼ │ ½ │ ¾ │   │   │   │   │   │ ¸ │       │
-#define CSA_E_ACUTE KC_SLSH  // é
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
-#define CSA_ECUT CSA_E_ACUTE
+ * │     │ Ω │ Ł │ Œ │ ¶ │ Ŧ │ ← │ ↓ │ → │ Ø │ Þ │   │ ~ │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
+ * │      │ Æ │ ß │ Ð │   │ Ŋ │ Ħ │ IJ │ ĸ │ Ŀ │ ´ │   │   │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+ * │    │   │   │   │ ¢ │ “ │ ” │ ʼn │ μ │ ― │ ˙ │   │          │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │    │    │    │                        │    │    │    │    │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+// Row 1
+#define CA_SUP1 RCTL(CA_1)    // ¹
+#define CA_SUP2 RCTL(CA_2)    // ²
+#define CA_SUP3 RCTL(CA_3)    // ³
+#define CA_QRTR RCTL(CA_4)    // ¼
+#define CA_HALF RCTL(CA_5)    // ½
+#define CA_TQTR RCTL(CA_6)    // ¾
+#define CA_CEDL RCTL(CA_EQL)  // ¸ (dead)
+// Row 2
+#define CA_OMEG RCTL(CA_Q)    // Ω
+#define CA_LSTR RCTL(CA_W)    // Ł
+#define CA_OE   RCTL(CA_E)    // Œ
+#define CA_PARA RCTL(CA_R)    // ¶
+#define CA_TSTR RCTL(CA_T)    // Ŧ
+#define CA_LARR RCTL(CA_Y)    // ←
+#define CA_DARR RCTL(CA_U)    // ↓
+#define CA_RARR RCTL(CA_I)    // →
+#define CA_OSTR RCTL(CA_O)    // Ø
+#define CA_THRN RCTL(CA_P)    // Þ
+#define CA_TILD RCTL(CA_CCED) // ~
+// Row 3
+#define CA_AE   RCTL(CA_A)    // Æ
+#define CA_SS   RCTL(CA_S)    // ß
+#define CA_ETH  RCTL(CA_D)    // Ð
+#define CA_ENG  RCTL(CA_G)    // Ŋ
+#define CA_HSTR RCTL(CA_H)    // Ħ
+#define CA_IJ   RCTL(CA_J)    // IJ
+#define CA_KRA  RCTL(CA_K)    // ĸ
+#define CA_LMDT RCTL(CA_L)    // Ŀ
+#define CA_ACUT RCTL(CA_SCLN) // ´ (dead)
+// Row 4
+#define CA_CENT RCTL(CA_C)    // ¢
+#define CA_LDQU RCTL(CA_V)    // “
+#define CA_RDQU RCTL(CA_B)    // ”
+#define CA_APSN RCTL(CA_N)    // ʼn
+#define CA_MICR RCTL(CA_M)    // μ
+#define CA_HRZB RCTL(CA_COMM) // ―
+#define CA_DOTA ALGR(CA_DOT)  // ˙ (dead)
 
-// Shifted characters
+/* Shift+Right Ctrl symbols
-// First row
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
-#define CSA_BACKSLASH LSFT(CSA_SLASH) /* \ */
+ * │ - │ ¡ │   │ £ │   │ ⅜ │ ⅝ │ ⅞ │ ™ │ ± │   │ ¿ │ ˛ │       │
-#define CSA_BSLS CSA_BACKSLASH
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
-#define CSA_QUESTION LSFT(KC_6)  // ?
+ * │     │   │   │   │ ® │   │ ¥ │ ↑ │ ı │   │   │ ° │ ¯ │     │
-#define CSA_QEST CSA_QUESTION
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
+ * │      │   │ § │   │ ª │   │   │   │   │   │ ˝ │ ˇ │ ˘ │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+ * │    │ ¦ │   │   │ © │ ‘ │ ’ │ ♪ │ º │ × │ ÷ │   │          │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │    │    │    │                        │    │    │    │    │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+// Row 1
+#define CA_SHYP RCTL(S(CA_SLSH)) // (soft hyphen)
+#define CA_IEXL RCTL(S(CA_1))    // ¡
+#define CA_PND  RCTL(S(CA_3))    // £
+#define CA_TEIG RCTL(S(CA_5))    // ⅜
+#define CA_FEIG RCTL(S(CA_6))    // ⅝
+#define CA_SEIG RCTL(S(CA_7))    // ⅞
+#define CA_TM   RCTL(S(CA_8))    // ™
+#define CA_PLMN RCTL(S(CA_9))    // ±
+#define CA_IQUE RCTL(S(CA_MINS)) // ¿
+#define CA_OGON RCTL(S(CA_EQL))  // ˛ (dead)
+// Row 2
+#define CA_REGD RCTL(S(CA_R))    // ®
+#define CA_YEN  RCTL(S(CA_Y))    // ¥
+#define CA_UARR RCTL(S(CA_U))    // ↑
+#define CA_DLSI RCTL(S(CA_I))    // ı
+#define CA_RNGA RCTL(S(CA_CIRC)) // ° (dead)
+#define CA_MACR RCTL(S(CA_CCED)) // ¯ (dead)
+// Row 3
+#define CA_SECT RCTL(S(CA_S))    // §
+#define CA_FORD RCTL(S(CA_F))    // ª
+#define CA_DACU RCTL(S(CA_SCLN)) // ˝ (dead)
+#define CA_CARN RCTL(S(CA_EGRV)) // ˇ (dead)
+#define CA_BREV RCTL(S(CA_AGRV)) // ˘ (dead)
+// Row 4
+#define CA_BRKP RCTL(S(CA_UGRV)) // ¦
+#define CA_COPY RCTL(S(CA_C))    // ©
+#define CA_LSQU RCTL(S(CA_V))    // ‘
+#define CA_RSQU RCTL(S(CA_B))    // ’
+#define CA_ENOT RCTL(S(CA_N))    // ♪
+#define CA_MORD RCTL(S(CA_M))    // º
+#define CA_MUL  RCTL(S(CA_COMM)) // ×
+#define CA_DIV  RCTL(S(CA_DOT))  // ÷
 
-// Second row
+// DEPRECATED
-#define CSA_DEAD_TREMA LSFT(CSA_DEAD_CIRCUMFLEX)  // dead trema/umlaut/diaresis for ä ë ï ö ü
+#define GR2A(kc) RCTL(kc)
-#define CSA_DTRM CSA_DEAD_TREMA
+#define CSA_SLASH CA_SLSH
-
+#define CSA_SLSH CA_SLSH
-// Third row
+#define CSA_DEAD_CIRCUMFLEX CA_CIRC
-// all same as US-QWERTY, or capitalised character of the non-shifted key
+#define CSA_DCRC CA_CIRC
-
+#define CSA_C_CEDILLA CA_CCED
-// Fourth row
+#define CSA_CCED CA_CCED
-#define CSA_APOSTROPHE LSFT(KC_COMMA)  // '
+#define CSA_E_GRAVE CA_EGRV
-#define CSA_APOS CSA_APOSTROPHE
+#define CSA_EGRV CA_EGRV
-#define CSA_DOUBLE_QUOTE LSFT(KC_DOT)  // "
+#define CSA_A_GRAVE CA_AGRV
-#define CSA_DQOT CSA_DOUBLE_QUOTE
+#define CSA_AGRV CA_AGRV
-
+#define CSA_U_GRAVE CA_UGRV
-// Alt Gr-ed characters
+#define CSA_UGRV CA_UGRV
-// First row
+#define CSA_E_ACUTE CA_EACU
-#define CSA_PIPE ALGR(CSA_SLASH)  // |
+#define CSA_ECUT CA_EACU
-#define CSA_CURRENCY ALGR(KC_4)   // ¤
+#define CSA_BACKSLASH CA_BSLS
-#define CSA_CURR CSA_CURRENCY
+#define CSA_BSLS CA_BSLS
-#define CSA_LEFT_CURLY_BRACE ALGR(KC_7)  // {
+#define CSA_QUESTION CA_QUES
-#define CSA_LCBR CSA_LEFT_CURLY_BRACE
+#define CSA_QEST CA_QUES
-#define CSA_RIGHT_CURLY_BRACE ALGR(KC_8)  // }
+#define CSA_DEAD_TREMA CA_DIAE
-#define CSA_RCBR CSA_RIGHT_CURLY_BRACE
+#define CSA_DTRM CA_DIAE
-#define CSA_LBRACKET ALGR(KC_9)  // [
+#define CSA_APOSTROPHE CA_QUOT
-#define CSA_LBRC CSA_LBRACKET
+#define CSA_APOS CA_QUOT
-#define CSA_RBRACKET ALGR(KC_0)  // ]
+#define CSA_DOUBLE_QUOTE CA_DQUO
-#define CSA_RBRC CSA_RBRACKET
+#define CSA_DQOT CA_DQUO
-#define CSA_NEGATION ALGR(KC_EQUAL)  // ¬
+#define CSA_PIPE CA_PIPE
-#define CSA_NEGT CSA_NEGATION
+#define CSA_CURRENCY CA_CURR
-
+#define CSA_CURR CA_CURR
-// Second row
+#define CSA_LEFT_CURLY_BRACE CA_LCBR
-// euro symbol not available on Linux? (X.org)
+#define CSA_LCBR CA_LCBR
-#define CSA_EURO ALGR(KC_E)  // €
+#define CSA_RIGHT_CURLY_BRACE CA_RCBR
-#define CSA_DEAD_GRAVE ALGR(CSA_DEAD_CIRCUMFLEX)
+#define CSA_RCBR CA_RCBR
-#define CSA_DGRV CSA_DEAD_GRAVE             // dead `
+#define CSA_LBRACKET CA_LBRC
-#define CSA_DEAD_TILDE ALGR(CSA_C_CEDILLA)  // ~
+#define CSA_LBRC CA_LBRC
-#define CSA_DTLD CSA_DEAD_TILDE
+#define CSA_RBRACKET CA_RBRC
-
+#define CSA_RBRC CA_RBRC
-// Third row
+#define CSA_NEGATION CA_NOT
-#define CSA_DEGREE ALGR(KC_SCOLON)  // °
+#define CSA_NEGT CA_NOT
-#define CSA_DEGR CSA_DEGREE
+#define CSA_EURO CA_EURO
-
+#define CSA_DEAD_GRAVE CA_GRV
-// Fourth row
+#define CSA_DGRV CA_GRV
-#define CSA_LEFT_GUILLEMET ALGR(KC_Z)  // «
+#define CSA_DEAD_TILDE CA_DTIL
-#define CSA_LGIL CSA_LEFT_GUILLEMET
+#define CSA_DTLD CA_DTIL
-#define CSA_RIGHT_GUILLEMET ALGR(KC_X)  // »
+#define CSA_DEGREE CA_DEG
-#define CSA_RGIL CSA_RIGHT_GUILLEMET
+#define CSA_DEGR CA_DEG
-#define CSA_LESS ALGR(KC_COMMA)   // <
+#define CSA_LEFT_GUILLEMET CA_LDAQ
-#define CSA_GREATER ALGR(KC_DOT)  // >
+#define CSA_LGIL CA_LDAQ
-#define CSA_GRTR CSA_GREATER
+#define CSA_RIGHT_GUILLEMET CA_RDAQ
-
+#define CSA_RGIL CA_RDAQ
-// Space bar
+#define CSA_LESS CA_LABK
-#define CSA_NON_BREAKING_SPACE ALGR(KC_SPACE)
+#define CSA_GREATER CA_RABK
-#define CSA_NBSP CSA_NON_BREAKING_SPACE
+#define CSA_GRTR CA_RABK
-
+#define CSA_NON_BREAKING_SPACE ALGR(KC_SPC)
-// GR2A-ed characters
+#define CSA_NBSP ALGR(KC_SPC)
-// First row
+#define CSA_SUPERSCRIPT_ONE CA_SUP1
-#define CSA_SUPERSCRIPT_ONE GR2A(KC_1)  // ¹
+#define CSA_SUP1 CA_SUP1
-#define CSA_SUP1 CSA_SUPERSCRIPT_ONE
+#define CSA_SUPERSCRIPT_TWO CA_SUP2
-#define CSA_SUPERSCRIPT_TWO GR2A(KC_2)  // ²
+#define CSA_SUP2 CA_SUP2
-#define CSA_SUP2 CSA_SUPERSCRIPT_TWO
+#define CSA_SUPERSCRIPT_THREE CA_SUP3
-#define CSA_SUPERSCRIPT_THREE GR2A(KC_3)  // ³
+#define CSA_SUP3 CA_SUP3
-#define CSA_SUP3 CSA_SUPERSCRIPT_THREE
+#define CSA_ONE_QUARTER CA_QRTR
-#define CSA_ONE_QUARTER GR2A(KC_4)  // ¼
+#define CSA_1QRT CA_QRTR
-#define CSA_1QRT CSA_ONE_QUARTER
+#define CSA_ONE_HALF CA_HALF
-#define CSA_ONE_HALF GR2A(KC_5)  // ½
+#define CSA_1HLF CA_HALF
-#define CSA_1HLF CSA_ONE_HALF
+#define CSA_THREE_QUARTERS CA_TQTR
-#define CSA_THREE_QUARTERS GR2A(KC_6)  // ¾
+#define CSA_3QRT CA_TQTR
-#define CSA_3QRT CSA_THREE_QUARTERS
+#define CSA_DEAD_CEDILLA CA_CEDL
-// nothing on 7-0 and -
+#define CSA_DCED CA_CEDL
-#define CSA_DEAD_CEDILLA GR2A(KC_EQUAL)  // dead ¸
+#define CSA_OMEGA CA_OMEG
-#define CSA_DCED CSA_DEAD_CEDILLA
+#define CSA_OMEG CA_OMEG
-
+#define CSA_L_STROKE CA_LSTR
-// Second row
+#define CSA_LSTK CA_LSTR
-#define CSA_OMEGA GR2A(KC_Q)  // ω
+#define CSA_OE_LIGATURE CA_OE
-#define CSA_OMEG CSA_OMEGA
+#define CSA_OE CA_OE
-#define CSA_L_STROKE GR2A(KC_W)  // ł
+#define CSA_PARAGRAPH CA_PARA
-#define CSA_LSTK CSA_L_STROKE
+#define CSA_PARG CA_PARA
-#define CSA_OE_LIGATURE GR2A(KC_E)  // œ
+#define CSA_T_STROKE CA_TSTR
-#define CSA_OE CSA_OE_LIGATURE
+#define CSA_LEFT_ARROW CA_LARR
-#define CSA_PARAGRAPH GR2A(KC_R)  // ¶
+#define CSA_LARW CA_LARR
-#define CSA_PARG CSA_PARAGRAPH
+#define CSA_DOWN_ARROW CA_DARR
-#define CSA_T_STROKE GR2A(KC_T)    // ŧ
+#define CSA_DARW CA_DARR
-#define CSA_LEFT_ARROW GR2A(KC_Y)  // ←
+#define CSA_RIGHT_ARROW CA_RARR
-#define CSA_LARW CSA_LEFT_ARROW
+#define CSA_RARW CA_RARR
-#define CSA_DOWN_ARROW GR2A(KC_U)  // ↓
+#define CSA_O_STROKE CA_OSTR
-#define CSA_DARW CSA_DOWN_ARROW
+#define CSA_OSTK CA_OSTR
-#define CSA_RIGHT_ARROW GR2A(KC_I)  // →
+#define CSA_THORN CA_THRN
-#define CSA_RARW CSA_RIGHT_ARROW
+#define CSA_THRN CA_THRN
-#define CSA_O_STROKE GR2A(KC_O)  // ø
+#define CSA_TILDE CA_TILD
-#define CSA_OSTK CSA_O_STROKE
+#define CSA_TILD CA_TILD
-#define CSA_THORN GR2A(KC_P)  // þ
+#define CSA_AE_LIGATURE CA_AE
-#define CSA_THRN CSA_THORN
+#define CSA_AE CA_AE
-// nothing on ^
+#define CSA_SHARP_S CA_SS
-#define CSA_TILDE GR2A(CSA_C_CEDILLA)  // dead ~
+#define CSA_SRPS CA_SS
-#define CSA_TILD CSA_TILDE
+#define CSA_ETH CA_ETH
-
+#define CSA_ENG CA_ENG
-// Third row
+#define CSA_H_SRTOKE CA_HSTR
-#define CSA_AE_LIGATURE GR2A(KC_A)  // æ
+#define CSA_HSTK CA_HSTR
-#define CSA_AE CSA_AE_LIGATURE
+#define CSA_IJ_LIGATURE CA_IJ
-#define CSA_SHARP_S GR2A(KC_S)  // ß
+#define CSA_IJ CA_IJ
-#define CSA_SRPS CSA_SHARP_S
+#define CSA_KRA CA_KRA
-#define CSA_ETH GR2A(KC_D)  // ð
+#define CSA_L_FLOWN_DOT CA_LMDT
-// nothing on F
+#define CSA_LFLD CA_LMDT
-#define CSA_ENG GR2A(KC_G)       // ŋ
+#define CSA_DEAD_ACUTE CA_ACUT
-#define CSA_H_SRTOKE GR2A(KC_H)  // ħ
+#define CSA_DACT CA_ACUT
-#define CSA_HSTK CSA_H_SRTOKE
+#define CSA_CENT CA_CENT
-#define CSA_IJ_LIGATURE GR2A(KC_J)  // ij
+#define CSA_LEFT_DOUBLE_QUOTE CA_LDQU
-#define CSA_IJ CSA_IJ_LIGATURE
+#define CSA_LDQT CA_LDQU
-#define CSA_KRA GR2A(KC_K)          // ĸ
+#define CSA_RIGHT_DOUBLE_QUOTE CA_RDQU
-#define CSA_L_FLOWN_DOT GR2A(KC_L)  // ŀ
+#define CSA_RDQT CA_RDQU
-#define CSA_LFLD CSA_L_FLOWN_DOT
+#define CSA_N_APOSTROPHE CA_APSN
-#define CSA_DEAD_ACUTE GR2A(KC_SCLN)  // dead acute accent
+#define CSA_NAPO CA_APSN
-#define CSA_DACT CSA_DEAD_ACUTE
+#define CSA_MU CA_MICR
-// nothing on È & À
+#define CSA_HORIZONTAL_BAR CA_HRZB
-
+#define CSA_HZBR CA_HRZB
-// Fourth row
+#define CSA_DEAD_DOT_ABOVE CA_DOTA
-#define CSA_CENT GR2A(KC_C)               // ¢
+#define CSA_DDTA CA_DOTA
-#define CSA_LEFT_DOUBLE_QUOTE GR2A(KC_V)  // “
+#define CSA_SOFT_HYPHEN CA_SHYP
-#define CSA_LDQT CSA_LEFT_DOUBLE_QUOTE
+#define CSA_SHYP CA_SHYP
-#define CSA_RIGHT_DOUBLE_QUOTE GR2A(KC_B)  // ”
+#define CSA_INVERTED_EXCLAIM CA_IEXL
-#define CSA_RDQT CSA_RIGHT_DOUBLE_QUOTE
+#define CSA_IXLM CA_IEXL
-#define CSA_N_APOSTROPHE GR2A(KC_N)  // ʼn (deprecated unicode codepoint)
+#define CSA_POUND CA_PND
-#define CSA_NAPO CSA_N_APOSTROPHE
+#define CSA_GBP CA_PND
-#define CSA_MU GR2A(KC_M)                  // μ
+#define CSA_EURO_BIS CA_EURO
-#define CSA_HORIZONTAL_BAR GR2A(KC_COMMA)  // ―
+#define CSA_EURB CA_EURO
-#define CSA_HZBR CSA_HORIZONTAL_BAR
+#define CSA_THREE_EIGHTHS CA_TEIG
-#define CSA_DEAD_DOT_ABOVE GR2A(KC_DOT)  // dead ˙
+#define CSA_3ON8 CA_TEIG
-#define CSA_DDTA CSA_DEAD_DOT_ABOVE
+#define CSA_FIVE_EIGHTHS CA_FEIG
-
+#define CSA_5ON8 CA_FEIG
-// GR2A-shifted characters (different from capitalised GR2A-ed characters)
+#define CSA_SEVEN_EIGHTHS CA_SEIG
-// First row
+#define CSA_7ON8 CA_SEIG
-#define CSA_SOFT_HYPHEN GR2A(LSFT(CSA_SLASH))  // soft-hyphen, appears as a hyphen in wrapped word
+#define CSA_TRADEMARK CA_TM
-#define CSA_SHYP CSA_SOFT_HYPHEN
+#define CSA_TM CA_TM
-#define CSA_INVERTED_EXCLAIM GR2A(KC_EXCLAIM)  // ¡
+#define CSA_PLUS_MINUS CA_PLMN
-#define CSA_IXLM CSA_INVERTED_EXCLAIM
+#define CSA_PSMS CA_PLMN
-// nothing on 2
+#define CSA_INVERTED_QUESTION CA_IQUE
-#define CSA_POUND GR2A(LSFT(KC_3))  // £
+#define CSA_IQST CA_IQUE
-#define CSA_GBP CSA_POUND_SIGN
+#define CSA_DEAD_OGONEK CA_OGON
-// already on ALGR(KC_E)
+#define CSA_DOGO CA_OGON
-#define CSA_EURO_BIS GR2A(LSFT(KC_4))  // €
+#define CSA_REGISTERED_TRADEMARK CA_REGD
-#define CSA_EURB CSA_EURO_BIS
+#define CSA_RTM CA_REGD
-#define CSA_THREE_EIGHTHS GR2A(LSFT(KC_5))  // ⅜
+#define CSA_YEN CA_YEN
-#define CSA_3ON8 CSA_THREE_EIGHTHS
+#define CSA_YUAN CA_YEN
-#define CSA_FIVE_EIGHTHS GR2A(LSFT(KC_6))  // ⅝
+#define CSA_UP_ARROW CA_UARR
-#define CSA_5ON8 CSA_FIVE_EIGHTHS
+#define CSA_DOTLESS_I CA_DLSI
-#define CSA_SEVEN_EIGHTHS GR2A(LSFT(KC_7))  // ⅞
+#define CSA_DLSI CA_DLSI
-#define CSA_7ON8 CSA_SEVEN_EIGHTHS
+#define CSA_DEAD_RING CA_RNGA
-#define CSA_TRADEMARK GR2A(LSFT(KC_8))  // ™
+#define CSA_DRNG CA_RNGA
-#define CSA_TM CSA_TRADEMARK
+#define CSA_DEAD_MACRON CA_MACR
-#define CSA_PLUS_MINUS GR2A(LSFT(KC_9))  // ±
+#define CSA_DMCR CA_MACR
-#define CSA_PSMS CSA_PLUS_MINUS
+#define CSA_SECTION CA_SECT
-// nothing on 0
+#define CSA_SECT CA_SECT
-#define CSA_INVERTED_QUESTION GR2A(LSFT(KC_MINUS))  // ¿
+#define CSA_ORDINAL_INDICATOR_A CA_FORD
-#define CSA_IQST CSA_INVERTED_QUESTION
+#define CSA_ORDA CA_FORD
-#define CSA_DEAD_OGONEK GR2A(LSFT(KC_EQUAL))  // dead ˛
+#define CSA_DEAD_DOUBLE_ACUTE CA_DACU
-#define CSA_DOGO CSA_DEAD_OGONEK
+#define CSA_DDCT CA_DACU
-
+#define CSA_DEAD_CARON CA_CARN
-// Second row
+#define CSA_DCAR CA_CARN
-#define CSA_REGISTERED_TRADEMARK GR2A(LSFT(KC_R))  // ®
+#define CSA_DEAD_BREVE CA_BREV
-#define CSA_RTM CSA_REGISTERED_TRADEMARK
+#define CSA_DBRV CA_BREV
-#define CSA_YEN GR2A(LSFT(KC_Y))  // ¥
+#define CSA_BROKEN_PIPE CA_BRKP
-#define CSA_YUAN CSA_YEN
+#define CSA_BPIP CA_BRKP
-#define CSA_UP_ARROW LSFT(CSA_DOWN_ARROW)  // ↑
+#define CSA_COPYRIGHT CA_COPY
-#define CSA_DOTLESS_I GR2A(LSFT(KC_I))     // ı
+#define CSA_CPRT CA_COPY
-#define CSA_DLSI CSA_DOTLESS_I
+#define CSA_LEFT_QUOTE CA_LSQU
-#define CSA_DEAD_RING GR2A(LSFT(CSA_DCRC))  // dead °
+#define CSA_LQOT CA_LSQU
-#define CSA_DRNG CSA_DEAD_RING
+#define CSA_RIGHT_QUOTE CA_RSQU
-#define CSA_DEAD_MACRON GR2A(LSFT(CSA_C_CEDILLA))  // dead ¯
+#define CSA_RQOT CA_RSQU
-#define CSA_DMCR CSA_DEAD_MACRON
+#define CSA_EIGHTH_NOTE CA_ENOT
-
+#define CSA_8NOT CA_ENOT
-// Third row
+#define CSA_ORDINAL_INDICATOR_O CA_MORD
-#define CSA_SECTION GR2A(LSFT(KC_S))  // §
+#define CSA_ORDO CA_MORD
-#define CSA_SECT CSA_SECTION
+#define CSA_TIMES CA_MUL
-#define CSA_ORDINAL_INDICATOR_A GR2A(LSFT(KC_F))  // ª
+#define CSA_TIMS CA_MUL
-#define CSA_ORDA CSA_ORDINAL_INDICATOR_A
+#define CSA_OBELUS CA_DIV
-#define CSA_DEAD_DOUBLE_ACUTE LSFT(CSA_DEAD_ACUTE)  // ˝
+#define CSA_OBEL CA_DIV
-#define CSA_DDCT CSA_DEAD_DOUBLE_ACUTE
+#define CSA_DIVISION_SIGN CA_DIV
-#define CSA_DEAD_CARON GR2A(LSFT(CSA_E_GRAVE))  // dead ˇ
+#define CSA_DVSN CA_DIV
-#define CSA_DCAR CSA_DEAD_CARON
-#define CSA_DEAD_BREVE GR2A(LSFT(CSA_A_GRAVE))  // dead ˘
-#define CSA_DBRV CSA_DEAD_BREVE
-
-// Fourth row
-#define CSA_BROKEN_PIPE GR2A(LSFT(CSA_U_GRAVE))  // ¦
-#define CSA_BPIP CSA_BROKEN_PIPE
-#define CSA_COPYRIGHT GR2A(LSFT(KC_C))  // ©
-#define CSA_CPRT CSA_COPYRIGHT
-#define CSA_LEFT_QUOTE GR2A(LSFT(KC_V))  // ‘
-#define CSA_LQOT CSA_LEFT_QUOTE
-#define CSA_RIGHT_QUOTE GR2A(LSFT(KC_B))  // ’
-#define CSA_RQOT CSA_RIGHT_QUOTE
-#define CSA_EIGHTH_NOTE GR2A(LSFT(KC_N))  // ♪
-#define CSA_8NOT CSA_EIGHTH_NOTE
-#define CSA_ORDINAL_INDICATOR_O GR2A(LSFT(KC_M))  // º
-#define CSA_ORDO CSA_ORDINAL_INDICATOR_O
-#define CSA_TIMES GR2A(LSFT(KC_COMMA))  // ×
-#define CSA_TIMS CSA_TIMES
-#define CSA_OBELUS GR2A(LSFT(KC_DOT))  // ÷
-#define CSA_OBEL CSA_OBELUS
-// more conventional name of the symbol
-#define CSA_DIVISION_SIGN CSA_OBELUS
-#define CSA_DVSN CSA_DIVISION_SIGN
-// TODO GR2A(LSFT(CSA_E_ACUTE))
-
-#endif

quantum/keymap_extras/keymap_neo2.h

@@ -13,66 +13,130 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef KEYMAP_NEO2
+
-#define KEYMAP_NEO2
+#pragma once
 
 #include "keymap.h"
-#include "keymap_german.h"
 
-#define NEO_A KC_D
+// clang-format off
-#define NEO_B KC_N
-#define NEO_C KC_R
-#define NEO_D DE_OE
-#define NEO_E KC_F
-#define NEO_F KC_O
-#define NEO_G KC_I
-#define NEO_H KC_U
-#define NEO_I KC_S
-#define NEO_J DE_MINS
-#define NEO_K DE_Z
-#define NEO_L KC_E
-#define NEO_M KC_M
-#define NEO_N KC_J
-#define NEO_O KC_G
-#define NEO_P KC_V
-#define NEO_Q KC_P
-#define NEO_R KC_K
-#define NEO_S KC_H
-#define NEO_T KC_L
-#define NEO_U KC_A
-#define NEO_V KC_W
-#define NEO_W KC_T
-#define NEO_X KC_Q
-#define NEO_Y DE_AE
-#define NEO_Z KC_B
-#define NEO_AE KC_C
-#define NEO_OE KC_X
-#define NEO_UE DE_Y
-#define NEO_SS DE_UE
 
-#define NEO_DOT DE_DOT
+/*
-#define NEO_COMM DE_COMM
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │ ^ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ ` │       │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │     │ X │ V │ L │ C │ W │ K │ H │ G │ F │ Q │ ß │ ´ │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
+ * │  L3  │ U │ I │ A │ E │ O │ S │ N │ R │ T │ D │ Y │ L3│    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+ * │    │L4 │ Ü │ Ö │ Ä │ P │ Z │ B │ M │ , │ . │ J │          │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │    │    │    │                        │    │ L4 │    │    │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+// Row 1
+#define NE_CIRC KC_GRV  // ^ (dead)
+#define NE_1    KC_1    // 1
+#define NE_2    KC_2    // 2
+#define NE_3    KC_3    // 3
+#define NE_4    KC_4    // 4
+#define NE_5    KC_5    // 5
+#define NE_6    KC_6    // 6
+#define NE_7    KC_7    // 7
+#define NE_8    KC_8    // 8
+#define NE_9    KC_9    // 9
+#define NE_0    KC_0    // 0
+#define NE_MINS KC_MINS // -
+#define NE_GRV  KC_EQL  // ` (dead)
+// Row 2
+#define NE_X    KC_Q    // X
+#define NE_V    KC_W    // V
+#define NE_L    KC_E    // L
+#define NE_C    KC_R    // C
+#define NE_W    KC_T    // W
+#define NE_K    KC_Y    // K
+#define NE_H    KC_U    // H
+#define NE_H    KC_I    // G
+#define NE_F    KC_O    // F
+#define NE_Q    KC_P    // Q
+#define NE_SS   KC_LBRC // ß
+#define NE_ACUT KC_RBRC // ´ (dead)
+// Row 3
+#define NE_L3L  KC_CAPS // (layer 3)
+#define NE_U    KC_A    // U
+#define NE_I    KC_S    // I
+#define NE_A    KC_D    // A
+#define NE_E    KC_F    // E
+#define NE_O    KC_G    // O
+#define NE_S    KC_H    // S
+#define NE_N    KC_J    // N
+#define NE_R    KC_K    // R
+#define NE_T    KC_L    // T
+#define NE_D    KC_SCLN // D
+#define NE_Y    KC_QUOT // Y
+#define NE_L3R  KC_NUHS // (layer 3)
+// Row 4
+#define NE_L4L  KC_NUBS // (layer 4)
+#define NE_UDIA KC_Z    // Ü
+#define NE_ODIA KC_X    // Ö
+#define NE_ADIA KC_C    // Ä
+#define NE_P    KC_V    // P
+#define NE_Z    KC_B    // Z
+#define NE_B    KC_N    // B
+#define NE_M    KC_M    // M
+#define NE_COMM KC_COMM // ,
+#define NE_DOT  KC_DOT  // .
+#define NE_J    KC_SLSH // J
+// Row 5
+#define NE_L4R  KC_ALGR // (layer 4)
 
-#define NEO_1 DE_1
+// DEPRECATED
-#define NEO_2 DE_2
+#define NEO_A NE_A
-#define NEO_3 DE_3
+#define NEO_B NE_B
-#define NEO_4 DE_4
+#define NEO_C NE_C
-#define NEO_5 DE_5
+#define NEO_D NE_D
-#define NEO_6 DE_6
+#define NEO_E NE_E
-#define NEO_7 DE_7
+#define NEO_F NE_F
-#define NEO_8 DE_8
+#define NEO_G NE_G
-#define NEO_9 DE_9
+#define NEO_H NE_H
-#define NEO_0 DE_0
+#define NEO_I NE_I
-#define NEO_MINS DE_SS
+#define NEO_J NE_J
-
+#define NEO_K NE_K
-#define NEO_ACUT DE_PLUS
+#define NEO_L NE_L
-#define NEO_GRV DE_ACUT
+#define NEO_M NE_M
-#define NEO_CIRC DE_CIRC
+#define NEO_N NE_N
-
+#define NEO_O NE_O
-#define NEO_L1_L KC_CAPS
+#define NEO_P NE_P
-#define NEO_L1_R DE_HASH
+#define NEO_Q NE_Q
-
+#define NEO_R NE_R
-#define NEO_L2_L DE_LESS
+#define NEO_S NE_S
-#define NEO_L2_R KC_ALGR
+#define NEO_T NE_T
-
+#define NEO_U NE_U
-#endif
+#define NEO_V NE_V
+#define NEO_W NE_W
+#define NEO_X NE_X
+#define NEO_Y NE_Y
+#define NEO_Z NE_Z
+#define NEO_AE NE_ADIA
+#define NEO_OE NE_ODIA
+#define NEO_UE NE_UDIA
+#define NEO_SS NE_SS
+#define NEO_DOT NE_DOT
+#define NEO_COMM NE_COMM
+#define NEO_1 NE_1
+#define NEO_2 NE_2
+#define NEO_3 NE_3
+#define NEO_4 NE_4
+#define NEO_5 NE_5
+#define NEO_6 NE_6
+#define NEO_7 NE_7
+#define NEO_8 NE_8
+#define NEO_9 NE_9
+#define NEO_0 NE_0
+#define NEO_MINS NE_MINS
+#define NEO_ACUT NE_ACUT
+#define NEO_GRV NE_GRV
+#define NEO_CIRC NE_CIRC
+#define NEO_L1_L NE_L3L
+#define NEO_L1_R NE_L3R
+#define NEO_L2_L NE_L4L
+#define NEO_L2_R NE_L4R

quantum/keymap_extras/sendstring_canadian_multilingual.h

@@ -0,0 +1,100 @@
+/* Copyright 2020
+ *
+ * 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/>.
+ */
+
+// Sendstring lookup tables for Canadian Multilingual layouts
+
+#pragma once
+
+#include "keymap_canadian_multilingual.h"
+#include "quantum.h"
+
+// clang-format off
+
+const uint8_t ascii_to_shift_lut[16] PROGMEM = {
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+
+    KCLUT_ENTRY(0, 1, 1, 1, 1, 1, 1, 1),
+    KCLUT_ENTRY(1, 1, 1, 1, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 1, 0, 0, 0, 0, 1),
+    KCLUT_ENTRY(1, 1, 1, 1, 1, 1, 1, 1),
+    KCLUT_ENTRY(1, 1, 1, 1, 1, 1, 1, 1),
+    KCLUT_ENTRY(1, 1, 1, 1, 1, 1, 1, 1),
+    KCLUT_ENTRY(1, 1, 1, 0, 1, 0, 0, 1),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0)
+};
+
+const uint8_t ascii_to_altgr_lut[16] PROGMEM = {
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 1, 0, 1, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 1, 0, 1, 0, 0),
+    KCLUT_ENTRY(1, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 0, 0, 0, 0, 0),
+    KCLUT_ENTRY(0, 0, 0, 1, 1, 1, 1, 0)
+};
+
+const uint8_t ascii_to_keycode_lut[128] PROGMEM = {
+    // NUL   SOH      STX      ETX      EOT      ENQ      ACK      BEL
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    // BS    TAB      LF       VT       FF       CR       SO       SI
+    KC_BSPC, KC_TAB,  KC_ENT,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    // DLE   DC1      DC2      DC3      DC4      NAK      SYN      ETB
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    // CAN   EM       SUB      ESC      FS       GS       RS       US
+    XXXXXXX, XXXXXXX, XXXXXXX, KC_ESC,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+
+    //       !        "        #        $        %        &        '
+    KC_SPC,  CA_1,    CA_DOT,  CA_3,    CA_4,    CA_5,    CA_7,    CA_COMM,
+    // (     )        *        +        ,        -        .        /
+    CA_9,    CA_0,    CA_8,    CA_EQL,  CA_COMM, CA_MINS, CA_DOT,  CA_SLSH,
+    // 0     1        2        3        4        5        6        7
+    CA_0,    CA_1,    CA_2,    CA_3,    CA_4,    CA_5,    CA_6,    CA_7,
+    // 8     9        :        ;        <        =        >        ?
+    CA_8,    CA_9,    CA_SCLN, CA_SCLN, CA_DOT,  CA_EQL,  CA_COMM, CA_6,
+    // @     A        B        C        D        E        F        G
+    CA_2,    CA_A,    CA_B,    CA_C,    CA_D,    CA_E,    CA_F,    CA_G,
+    // H     I        J        K        L        M        N        O
+    CA_H,    CA_I,    CA_J,    CA_K,    CA_L,    CA_M,    CA_N,    CA_O,
+    // P     Q        R        S        T        U        V        W
+    CA_P,    CA_Q,    CA_R,    CA_S,    CA_T,    CA_U,    CA_V,    CA_W,
+    // X     Y        Z        [        \        ]        ^        _
+    CA_X,    CA_Y,    CA_Z,    CA_9,    CA_SLSH, CA_0,    CA_CIRC, CA_MINS,
+    // `     a        b        c        d        e        f        g
+    CA_CIRC, CA_A,    CA_B,    CA_C,    CA_D,    CA_E,    CA_F,    CA_G,
+    // h     i        j        k        l        m        n        o
+    CA_H,    CA_I,    CA_J,    CA_K,    CA_L,    CA_M,    CA_N,    CA_O,
+    // p     q        r        s        t        u        v        w
+    CA_P,    CA_Q,    CA_R,    CA_S,    CA_T,    CA_U,    CA_V,    CA_W,
+    // x     y        z        {        |        }        ~        DEL
+    CA_X,    CA_Y,    CA_Z,    CA_7,    CA_SLSH, CA_8,    CA_CCED, KC_DEL
+};

tmk_core/common/action_layer.c

@@ -257,7 +257,7 @@ uint8_t layer_switch_get_layer(keypos_t key) {
 
     layer_state_t layers = layer_state | default_layer_state;
     /* check top layer first */
-    for (int8_t i = sizeof(layer_state_t) * 8 - 1; i >= 0; i--) {
+    for (int8_t i = MAX_LAYER - 1; i >= 0; i--) {
         if (layers & (1UL << i)) {
             action = action_for_key(i, key);
             if (action.code != ACTION_TRANSPARENT) {

tmk_core/common/action_layer.h

@@ -23,12 +23,24 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #if defined(LAYER_STATE_8BIT)
 typedef uint8_t layer_state_t;
+#    define MAX_LAYER_BITS 3
+#    ifndef MAX_LAYER
+#        define MAX_LAYER 8
+#    endif
 #    define get_highest_layer(state) biton(state)
 #elif defined(LAYER_STATE_16BIT)
 typedef uint16_t layer_state_t;
+#    define MAX_LAYER_BITS 4
+#    ifndef MAX_LAYER
+#        define MAX_LAYER 16
+#    endif
 #    define get_highest_layer(state) biton16(state)
 #else
 typedef uint32_t layer_state_t;
+#    define MAX_LAYER_BITS 5
+#    ifndef MAX_LAYER
+#        define MAX_LAYER 32
+#    endif
 #    define get_highest_layer(state) biton32(state)
 #endif
 
@@ -96,8 +108,7 @@ layer_state_t layer_state_set_kb(layer_state_t state);
 
 /* pressed actions cache */
 #if !defined(NO_ACTION_LAYER) && !defined(STRICT_LAYER_RELEASE)
-/* The number of bits needed to represent the layer number: log2(32). */
+
-#    define MAX_LAYER_BITS 5
 void    update_source_layers_cache(keypos_t key, uint8_t layer);
 uint8_t read_source_layers_cache(keypos_t key);
 #endif

users/vosechu/vosechu.h

@@ -10,8 +10,13 @@ enum userspace_custom_layers {
   RSE,
   LWR,
   LFT,
-  MOUSE
+  MOUSE,
+  TT1,
+  TT2,
+  TT3,
+  T23X
 };
+#define BASE DV
 
 enum userspace_custom_keycodes {
   PAWFIVE = SAFE_RANGE,
@@ -34,9 +39,14 @@ enum userspace_custom_keycodes {
 // == Macro keys for commonly used apps
 // -- Slack
 // Move one conversation up/down
+#define SLACKTB LGUI(LSFT(KC_T))
 #define SLACKUP LALT(LSFT(KC_UP))
 #define SLACKDN LALT(LSFT(KC_DOWN))
 
+// -- 1password
+#define PSWD LCTL(KC_BSLS)
+#define PSWD_ALT LCTL(LALT(KC_BSLS))
+
 // -- Browser and OS X
 // Activate one tab left/right
 #define TAB_LFT LGUI(LSFT(KC_LBRC))
@@ -52,6 +62,14 @@ enum userspace_custom_keycodes {
 // Make window fill the whole monitor
 #define SCR_FUL HYPR(KC_F)
 
+// -- Windows variants of browser commanads
+// Activate one tab left/right
+#define WTABLFT LCTL(LSFT(KC_TAB))
+#define WTABRGT LCTL(KC_TAB)
+// Go back/forward in history
+#define WBWSRBK LALT(KC_LEFT)
+#define WBWSRFW LALT(KC_RGHT)
+
 // == Extended alpha layer toggles
 // -- Dvorak
 // Pressing U opens up the LWR layer (numpad)