Merge upstream master to 2022 Q4 breaking change

4 files changed, 0 insertions, 486 deletions

diff --git a/keyboards/satt/comet46/config.h b/keyboards/satt/comet46/config.h
deleted file mode 100644
index f67dcc1761..0000000000
--- a/keyboards/satt/comet46/config.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@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
-
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 10
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-/* number of backlight levels */
-//#define BACKLIGHT_LEVELS 3
-
-#define ONESHOT_TIMEOUT 500
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-
-// Define masks for modifiers
-#define MODS_SHIFT_MASK  (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT))
-#define MODS_CTRL_MASK  (MOD_BIT(KC_LCTL)|MOD_BIT(KC_RCTL))
-#define MODS_ALT_MASK  (MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT))
-#define MODS_GUI_MASK  (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
diff --git a/keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.c b/keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.c
deleted file mode 100644
index 392baa0961..0000000000
--- a/keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.c
+++ /dev/null
@@ -1,143 +0,0 @@
-#include "quantum.h"
-#include "command.h"
-#include "action_pseudo_lut.h"
-
-static uint8_t send_key_shift_bit[SHIFT_BIT_SIZE];
-
-/*
- * Pseudo layout action.
- * This action converts a keycode in order to output the character according to the keymap you specified
- * still your keyboard layout recognized wrongly on your OS.
- * Memo: Using other layer keymap to get keycode
- */
-void action_pseudo_lut(keyrecord_t *record, uint8_t base_keymap_id, const uint16_t (*keymap)[2]) {
-  uint8_t prev_shift;
-  uint16_t keycode;
-  uint16_t pseudo_keycode;
-
-  /* get keycode from keymap you specified */
-  keycode = keymap_key_to_keycode(base_keymap_id, record->event.key);
-
-  prev_shift = keyboard_report->mods & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT));
-
-  if (record->event.pressed) {
-    /* when magic commands entered, keycode does not converted */
-    if (IS_COMMAND()) {
-      if (prev_shift) {
-        add_shift_bit(keycode);
-      }
-      register_code(keycode);
-      return;
-    }
-
-    if (prev_shift) {
-      pseudo_keycode = convert_keycode(keymap, keycode, true);
-      dprintf("pressed: %02X, converted: %04X\n", keycode, pseudo_keycode);
-      add_shift_bit(keycode);
-
-      if (IS_LSFT(pseudo_keycode)) {
-        register_code(QK_LSFT ^ pseudo_keycode);
-      } else {
-        /* delete shift mod temporarily */
-        del_mods(prev_shift);
-        send_keyboard_report();
-        register_code(pseudo_keycode);
-        add_mods(prev_shift);
-        send_keyboard_report();
-      }
-    } else {
-      pseudo_keycode = convert_keycode(keymap, keycode, false);
-      dprintf("pressed: %02X, converted: %04X\n", keycode, pseudo_keycode);
-
-      if (IS_LSFT(pseudo_keycode)) {
-        add_weak_mods(MOD_BIT(KC_LSFT));
-        send_keyboard_report();
-        register_code(QK_LSFT ^ pseudo_keycode);
-        /* on Windows, prevent key repeat to avoid unintended output */
-        unregister_code(QK_LSFT ^ pseudo_keycode);
-        del_weak_mods(MOD_BIT(KC_LSFT));
-        send_keyboard_report();
-      } else {
-        register_code(pseudo_keycode);
-      }
-    }
-  } else {
-    if (get_shift_bit(keycode)) {
-      del_shift_bit(keycode);
-      pseudo_keycode = convert_keycode(keymap, keycode, true);
-    } else {
-      pseudo_keycode = convert_keycode(keymap, keycode, false);
-    }
-    dprintf("released: %02X, converted: %04X\n", keycode, pseudo_keycode);
-
-    if (IS_LSFT(pseudo_keycode)) {
-      unregister_code(QK_LSFT ^ pseudo_keycode);
-    } else {
-      unregister_code(pseudo_keycode);
-    }
-  }
-}
-
-uint16_t convert_keycode(const uint16_t (*keymap)[2], uint16_t keycode, bool shift_modded)
-{
-  uint16_t pseudo_keycode;
-
-  switch (keycode) {
-    case KC_A ... KC_CAPS_LOCK:
-      #if defined(__AVR__) 
-        if (shift_modded) {
-          pseudo_keycode = pgm_read_word(&keymap[keycode][1]);
-        } else {
-          pseudo_keycode = pgm_read_word(&keymap[keycode][0]);
-        }
-      #else
-        if (shift_modded) {
-          pseudo_keycode = keymap[keycode][1];
-        } else {
-          pseudo_keycode = keymap[keycode][0];
-        }
-      #endif
-      /* if undefined, use got keycode as it is */
-      if (pseudo_keycode == 0x00) {
-        if (shift_modded) {
-          pseudo_keycode = S(keycode);
-        } else {
-          pseudo_keycode = keycode;
-        }
-      }
-      break;
-    default:
-      if (shift_modded) {
-        pseudo_keycode = S(keycode);
-      } else {
-        pseudo_keycode = keycode;
-      }
-      break;
-  }
-  return pseudo_keycode;
-}
-
-uint8_t get_shift_bit(uint16_t keycode) {
-  if ((keycode >> 3) < SHIFT_BIT_SIZE) {
-    return send_key_shift_bit[keycode >> 3] & (1 << (keycode & 7));
-  } else {
-    dprintf("get_shift_bit: Can't get shift bit. keycode: %02X\n", keycode);
-    return 0;
-  }
-}
-
-void add_shift_bit(uint16_t keycode) {
-  if ((keycode >> 3) < SHIFT_BIT_SIZE) {
-    send_key_shift_bit[keycode >> 3] |= (1 << (keycode & 7));
-  } else {
-    dprintf("add_shift_bit: Can't add shift bit. keycode: %02X\n", keycode);
-  }
-}
-
-void del_shift_bit(uint16_t keycode) {
-  if ((keycode >> 3) < SHIFT_BIT_SIZE) {
-    send_key_shift_bit[keycode >> 3] &= ~(1 << (keycode & 7));
-  } else {
-    dprintf("del_shift_bit: Can't delete shift bit. keycode: %02X\n", keycode);
-  }
-}
diff --git a/keyboards/satt/comet46/keymaps/satt/keymap.c b/keyboards/satt/comet46/keymaps/satt/keymap.c
deleted file mode 100644
index f57e97724c..0000000000
--- a/keyboards/satt/comet46/keymaps/satt/keymap.c
+++ /dev/null
@@ -1,257 +0,0 @@
-// this is the style you want to emulate.
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-
-#include QMK_KEYBOARD_H
-#include "keymap_jis2us.h"
-#include "action_pseudo_lut.h"
-#include "keymap_japanese.h"
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum comet46_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _PSEUDO_US,
-  _PSEUDO_US_LOWER,
-  _PSEUDO_US_RAISE,
-  _ADJUST
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  PSEUDO_US,
-  JIS2US,
-};
-
-// JIS keycodes
-#define KC_JZHT JP_ZKHK  // hankaku/zenkaku|kanzi
-#define KC_JCIR JP_CIRC  // ^, ~
-#define KC_JAT  JP_AT    // @, `
-#define KC_JLBR JP_LBRC  // [, {
-#define KC_JCOL JP_COLN  // :, *
-#define KC_JRBR JP_RBRC  // ], }
-#define KC_JBSL JP_BSLS  // \, _
-#define KC_JMHE JP_MHEN  // muhenkan
-#define KC_JHEN JP_HENK  // henkan
-#define KC_JKAN JP_KANA  // katakana/hiragana|ro-mazi
-#define KC_JMKA JP_LANG1 //kana on MacOSX
-#define KC_JMEI KC_LNG2  //eisu on MacOSX
-#define KC_JAMP JP_AMPR  // &
-#define KC_JQUO JP_QUOT  // '
-#define KC_JLPR JP_LPRN  // (
-#define KC_JRPR JP_RPRN  // )
-#define KC_JEQL JP_EQL   // =
-#define KC_JTIL JP_TILD  // ~
-#define KC_JPIP JP_PIPE  // |
-#define KC_JGRV JP_GRV   // `
-#define KC_JLCB JP_LCBR  // {
-#define KC_JPLU JP_PLUS  // +
-#define KC_JAST JP_ASTR  // *
-#define KC_JRCB JP_RCBR  // }
-#define KC_JUND JP_UNDS  // _
-
-// Layer related keycodes
-#define KC_LWR  MO(_LOWER)
-#define KC_RSE  MO(_RAISE)
-#define KC_P_LW MO(_PSEUDO_US_LOWER)
-#define KC_P_RS MO(_PSEUDO_US_RAISE)
-#define KC_QWRT QWERTY
-#define KC_P_US PSEUDO_US
-#define KC_J2US JIS2US
-
-// Special keycodes
-#define KC_SPCT CTL_T(KC_SPC)
-#define KC_ENSF SFT_T(KC_ENT)
-#define KC_CAEC MT(MOD_LCTL | MOD_LALT, KC_ESC)
-#define KC_CSTB C_S_T(KC_TAB)
-#define KC_IMON ALT_T(KC_F13)
-#define KC_IMOF GUI_T(KC_F14)
-#define KC_CAD LCA(KC_DEL)
-#define KC_RST QK_BOOT
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //,----+----+----+----+----+----+               +----+----+----+----+----+----.
-     KC_CAEC, KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                 KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_DEL ,
-  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----|
-     KC_CSTB, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,KC_LPRN,      KC_RPRN, KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_BSPC,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     KC_LSFT, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,KC_LBRC,      KC_RBRC, KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_QUOT,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                         KC_IMOF,KC_LWR ,KC_SPCT,      KC_ENSF,KC_RSE ,KC_IMON
-  //                    +----+----+---/       \---+----+----+
-  ),
-
-  [_LOWER] = LAYOUT(
-  //,----+----+----+----+----+----+               +----+----+----+----+----+----.
-     _______,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC,                KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,_______,
-  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----|
-     _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 ,      KC_GRV ,KC_BSLS,KC_MINS,KC_EQL ,KC_LBRC,KC_RBRC,_______,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     _______, KC_F7 , KC_F8 , KC_F9 , KC_F10, KC_F11, KC_F12,      KC_TILD,KC_PIPE,KC_UNDS,KC_PLUS,KC_LCBR,KC_RCBR,_______,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                         _______,_______,_______,      _______,_______,_______
-  //                    +----+----+---/       \---+----+----+
-  ),
-
-  [_RAISE] = LAYOUT(
-  //,----+----+----+----+----+----+               +----+----+----+----+----+----.
-     _______, KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                 KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,_______,
-  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----|
-     _______,_______,_______,_______,_______,_______,_______,      XXXXXXX,KC_LEFT,KC_DOWN, KC_UP ,KC_RGHT,KC_END ,_______,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     _______,_______,_______,_______,_______,_______,_______,      KC_HOME,XXXXXXX,KC_PGDN,KC_PGUP,XXXXXXX,XXXXXXX,_______,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                         _______,_______,_______,      _______,_______,_______
-  //                    +----+----+---/       \---+----+----+
-  ),
-
-  [_PSEUDO_US] = LAYOUT(
-  //,----+----+----+----+----+----+               +----+----+----+----+----+----.
-     KC_CAEC, KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                 KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_DEL ,
-  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----|
-     KC_CSTB, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,KC_JLPR,      KC_JRPR, KC_H  , KC_J  , KC_K  , KC_L  ,KC_J2US,KC_BSPC,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     KC_LSFT, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,KC_J2US,      KC_J2US, KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_J2US,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                         KC_IMOF,KC_P_LW,KC_SPCT,      KC_ENSF,KC_P_RS,KC_IMON
-  //                    +----+----+---/       \---+----+----+
-  ),
-
-
-  [_PSEUDO_US_LOWER] = LAYOUT(
-  //,----+----+----+----+----+----+               +----+----+----+----+----+----.
-     _______,KC_EXLM,KC_JAT ,KC_HASH,KC_DLR ,KC_PERC,                KC_JCIR,KC_JAMP,KC_JAST,KC_JLPR,KC_JRPR,_______,
-  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----|
-     _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 ,      KC_JGRV,KC_JBSL,KC_MINS,KC_JEQL,KC_JLBR,KC_JRBR,_______,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     _______, KC_F7 , KC_F8 , KC_F9 , KC_F10, KC_F11, KC_F12,      KC_JTIL,KC_JPIP,KC_JUND,KC_JPLU,KC_JLCB,KC_JRCB,_______,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                         _______,_______,_______,      _______,_______,_______
-  //                    +----+----+---/       \---+----+----+
-  ),
-
-  [_PSEUDO_US_RAISE] = LAYOUT(
-  //,----+----+----+----+----+----+               +----+----+----+----+----+----.
-     _______, KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                 KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,_______,
-  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----|
-     _______,_______,_______,_______,_______,_______,KC_JZHT,      XXXXXXX,KC_LEFT,KC_DOWN, KC_UP ,KC_RGHT,KC_END ,_______,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     _______,_______,_______,_______,_______,_______,_______,      KC_HOME,XXXXXXX,KC_PGDN,KC_PGUP,XXXXXXX,XXXXXXX,_______,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                         _______,_______,_______,      _______,_______,_______
-  //                    +----+----+---/       \---+----+----+
-  ),
-
-  [_ADJUST] = LAYOUT(
-  //,----+----+----+----+----+----+               +----+----+----+----+----+----.
-     _______,_______,_______,_______,_______,_______,                _______,_______,_______,_______,_______,_______,
-  //|----+----+----+----+----+----+----+     +----+----+----+----+----+----+----|
-     _______,_______,_______,_______,_______,_______,KC_CAD ,      KC_QWRT,_______,_______,_______,_______,_______,_______,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     _______,_______,_______,_______,_______,_______,KC_RST ,      KC_P_US,_______,_______,_______,_______,_______,_______,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-                         _______,_______,_______,      _______,_______,_______
-  //                    +----+----+---/       \---+----+----+
-  )
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  switch (get_highest_layer(state)) {
-    case _PSEUDO_US_LOWER:
-    case _PSEUDO_US_RAISE:
-      return update_tri_layer_state(state, _PSEUDO_US_RAISE, _PSEUDO_US_LOWER, _ADJUST);
-      break;
-    default:
-      return update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
-      break;
-  }
-}
-
-#ifdef OLED_ENABLE
-
-// You need to add source files to SRC in rules.mk when using OLED display functions
-void set_keylog(uint16_t keycode);
-const char *read_keylog(void);
-const char *read_modifier_state(void);
-const char *read_host_led_state(void);
-
-bool oled_task_user(void) {
-  // Layer state
-  char layer_str[22];
-  oled_write_P(PSTR("Layer: "), false);
-  uint8_t layer = get_highest_layer(layer_state);
-  uint8_t default_layer = get_highest_layer(eeconfig_read_default_layer());
-  switch (layer) {
-    case _QWERTY:
-      switch (default_layer) {
-        case _QWERTY:
-          snprintf(layer_str, sizeof(layer_str), "Qwerty");
-          break;
-        case _PSEUDO_US:
-          snprintf(layer_str, sizeof(layer_str), "Psuedo_US");
-          break;
-        default:
-          snprintf(layer_str, sizeof(layer_str), "Undef-%d", default_layer);
-          break;
-      }
-      break;
-    case _RAISE:
-      snprintf(layer_str, sizeof(layer_str), "Raise");
-      break;
-    case _LOWER:
-      snprintf(layer_str, sizeof(layer_str), "Lower");
-      break;
-      case _PSEUDO_US_RAISE:
-        snprintf(layer_str, sizeof(layer_str), "P_US_Raise");
-        break;
-      case _PSEUDO_US_LOWER:
-        snprintf(layer_str, sizeof(layer_str), "P_US_Lower");
-        break;
-    case _ADJUST:
-      snprintf(layer_str, sizeof(layer_str), "Adjust");
-      break;
-    default:
-      snprintf(layer_str, sizeof(layer_str), "Undef-%d", layer);
-  }
-  oled_write_ln(layer_str, false);
-  // Last entered keycode
-  oled_write_ln(read_keylog(), false);
-  // Modifier state
-  oled_write_ln(read_modifier_state(), false);
-  // Host Keyboard LED Status
-  oled_write(read_host_led_state(), false);
-
-  return false;
-}
-
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  #ifdef OLED_ENABLE
-    if (record->event.pressed) {
-      set_keylog(keycode);
-    }
-  #endif
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      break;
-    case PSEUDO_US:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_PSEUDO_US);
-      }
-      break;
-    case JIS2US:
-      action_pseudo_lut(record, _QWERTY, keymap_jis2us);
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/satt/comet46/keymaps/satt/keymap_jis2us.h b/keyboards/satt/comet46/keymaps/satt/keymap_jis2us.h
deleted file mode 100644
index a99af7770e..0000000000
--- a/keyboards/satt/comet46/keymaps/satt/keymap_jis2us.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef KEYMAP_JIS2US_H
-#define KEYMAP_JIS2US_H
-
-/* keymap for convert from JIS to US */
-const uint16_t PROGMEM keymap_jis2us[][2] = {
-  [KC_A ... KC_CAPS] = { 0x00, 0x00 }, /* default value */
-
-  [KC_1]    = { KC_1,    KC_EXLM    }, /* 1 and ! -> 1 and ! */
-  [KC_2]    = { KC_2,    KC_LBRC    }, /* 2 and " -> 2 and @ */
-  [KC_3]    = { KC_3,    KC_HASH    }, /* 3 and # -> 3 and # */
-  [KC_4]    = { KC_4,    KC_DLR     }, /* 4 and $ -> 4 and $ */
-  [KC_5]    = { KC_5,    KC_PERC    }, /* 5 and % -> 5 and % */
-  [KC_6]    = { KC_6,    KC_EQL     }, /* 6 and & -> 6 and ^ */
-  [KC_7]    = { KC_7,    KC_CIRC    }, /* 7 and ' -> 7 and & */
-  [KC_8]    = { KC_8,    KC_DQT     }, /* 8 and ( -> 8 and * */
-  [KC_9]    = { KC_9,    KC_ASTR    }, /* 9 and ) -> 9 and ( */
-  [KC_0]    = { KC_0,    KC_LPRN    }, /* 0 and (no assign) -> 0 and ) */
-  [KC_MINS] = { KC_MINS, S(KC_INT1) }, /* - and = -> - and _ */
-  [KC_EQL]  = { KC_UNDS, KC_COLN    }, /* ^ and ~ -> = and + */
-  [KC_LBRC] = { KC_RBRC, KC_RCBR    }, /* @ and ` -> [ and { */
-  [KC_RBRC] = { KC_BSLS, KC_PIPE    }, /* [ and { -> ] and } */
-  [KC_BSLS] = { KC_INT3, S(KC_INT3) }, /* ] and } -> / and | */
-  [KC_NUHS] = { KC_NUHS, S(KC_NUHS) }, /* (no assign) */
-  [KC_SCLN] = { KC_SCLN, KC_QUOT    }, /* ; and + -> ; and : */
-  [KC_QUOT] = { KC_AMPR, KC_AT      }, /* : and * -> ' and " */
-  [KC_GRV]  = { KC_LCBR, KC_PLUS    }, /* (no assign) -> ` and ~ */
-  [KC_COMM] = { KC_COMM, KC_LT      }, /* , and < -> , and < */
-  [KC_DOT]  = { KC_DOT,  KC_GT      }, /* . and > -> . and > */
-  [KC_SLSH] = { KC_SLSH, KC_QUES    }, /* / and ? -> / and ? */
-};
-
-#endif