diff options
398 files changed, 4302 insertions, 5949 deletions
| diff --git a/.github/labeler.yml b/.github/labeler.yml index 53921f7f95..41b2475f67 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -22,7 +22,6 @@ keymap:  via:    - keyboards/**/keymaps/via/*  cli: -  - bin/qmk    - requirements.txt    - lib/python/**/*  python: diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml index 7a8dc8540f..3bf9741ac7 100644 --- a/.github/workflows/cli.yml +++ b/.github/workflows/cli.yml @@ -8,7 +8,6 @@ on:    pull_request:      paths:      - 'lib/python/**' -    - 'bin/qmk'      - 'requirements.txt'      - '.github/workflows/cli.yml' @@ -30,11 +30,7 @@ endif  endif  # Determine which qmk cli to use -ifeq (,$(shell which qmk)) -    QMK_BIN = bin/qmk -else -    QMK_BIN = qmk -endif +QMK_BIN := qmk  # avoid 'Entering|Leaving directory' messages  MAKEFLAGS += --no-print-directory diff --git a/bin/qmk b/bin/qmk deleted file mode 100755 index 617f992826..0000000000 --- a/bin/qmk +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/env python3 -"""CLI wrapper for running QMK commands. -""" -import os -import sys -from pathlib import Path - -# Add the QMK python libs to our path -script_dir = Path(os.path.realpath(__file__)).parent -qmk_dir = script_dir.parent -python_lib_dir = Path(qmk_dir / 'lib' / 'python').resolve() -sys.path.append(str(python_lib_dir)) - -# Setup the CLI -import milc  # noqa - -milc.EMOJI_LOGLEVELS['INFO'] = '{fg_blue}Ψ{style_reset_all}' - - [email protected]('QMK Helper Script') -def qmk_main(cli): -    """The function that gets run when no subcommand is provided. -    """ -    cli.print_help() - - -def main(): -    """Setup our environment and then call the CLI entrypoint. -    """ -    # Change to the root of our checkout -    os.environ['ORIG_CWD'] = os.getcwd() -    os.environ['DEPRECATED_BIN_QMK'] = '1' -    os.chdir(qmk_dir) - -    print('Warning: The bin/qmk script is being deprecated. Please install the QMK CLI: python3 -m pip install qmk', file=sys.stderr) - -    # Import the subcommands -    import milc.subcommand.config  # noqa -    import qmk.cli  # noqa - -    # Execute -    return_code = milc.cli() - -    if return_code is False: -        exit(1) - -    elif return_code is not True and isinstance(return_code, int): -        if return_code < 0 or return_code > 255: -            milc.cli.log.error('Invalid return_code: %d', return_code) -            exit(255) - -        exit(return_code) - -    exit(0) - - -if __name__ == '__main__': -    main() diff --git a/build_keyboard.mk b/build_keyboard.mk index 37fa6852f8..420643c3e7 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk @@ -115,6 +115,7 @@ include $(INFO_RULES_MK)  # Check for keymap.json first, so we can regenerate keymap.c  include build_json.mk +# Pull in keymap level rules.mk  ifeq ("$(wildcard $(KEYMAP_PATH))", "")      # Look through the possible keymap folders until we find a matching keymap.c      ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_5)/keymap.c)","") @@ -345,6 +346,7 @@ ifeq ("$(USER_NAME)","")  endif  USER_PATH := users/$(USER_NAME) +# Pull in user level rules.mk  -include $(USER_PATH)/rules.mk  ifneq ("$(wildcard $(USER_PATH)/config.h)","")      CONFIG_H += $(USER_PATH)/config.h @@ -356,6 +358,23 @@ endif  # Disable features that a keyboard doesn't support  -include disable_features.mk +# Pull in post_rules.mk files from all our subfolders +ifneq ("$(wildcard $(KEYBOARD_PATH_1)/post_rules.mk)","") +    include $(KEYBOARD_PATH_1)/post_rules.mk +endif +ifneq ("$(wildcard $(KEYBOARD_PATH_2)/post_rules.mk)","") +    include $(KEYBOARD_PATH_2)/post_rules.mk +endif +ifneq ("$(wildcard $(KEYBOARD_PATH_3)/post_rules.mk)","") +    include $(KEYBOARD_PATH_3)/post_rules.mk +endif +ifneq ("$(wildcard $(KEYBOARD_PATH_4)/post_rules.mk)","") +    include $(KEYBOARD_PATH_4)/post_rules.mk +endif +ifneq ("$(wildcard $(KEYBOARD_PATH_5)/post_rules.mk)","") +    include $(KEYBOARD_PATH_5)/post_rules.mk +endif +  ifneq ("$(wildcard $(KEYMAP_PATH)/config.h)","")      CONFIG_H += $(KEYMAP_PATH)/config.h  endif diff --git a/docs/cli_commands.md b/docs/cli_commands.md index 8fa7ad41dc..06568afb46 100644 --- a/docs/cli_commands.md +++ b/docs/cli_commands.md @@ -118,54 +118,6 @@ This command lets you configure the behavior of QMK. For the full `qmk config` d  qmk config [-ro] [config_token1] [config_token2] [...] [config_tokenN]  ``` -## `qmk console` - -This command lets you connect to keyboard consoles to get debugging messages. It only works if your keyboard firmware has been compiled with `CONSOLE_ENABLE=yes`. - -**Usage**: - -``` -qmk console [-d <pid>:<vid>[:<index>]] [-l] [-n] [-t] [-w <seconds>] -``` - -**Examples**: - -Connect to all available keyboards and show their console messages: - -``` -qmk console -``` - -List all devices: - -``` -qmk console -l -``` - -Show only messages from clueboard/66/rev3 keyboards: - -``` -qmk console -d C1ED:2370 -``` - -Show only messages from the second clueboard/66/rev3: - -``` -qmk console -d C1ED:2370:2 -``` - -Show timestamps and VID:PID instead of names: - -``` -qmk console -n -t -``` - -Disable bootloader messages: - -``` -qmk console --no-bootloaders -``` -  ## `qmk doctor`  This command examines your environment and alerts you to potential build or flash problems. It can fix many of them if you want it to. diff --git a/docs/contributing.md b/docs/contributing.md index 1d68d22d9f..eb033d167f 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -105,7 +105,7 @@ enum my_keycodes {  Before opening a pull request, you can preview your changes if you have set up the development environment by running this command from the `qmk_firmware/` folder: -    ./bin/qmk docs +    qmk docs  or if you only have Python 3 installed: diff --git a/docs/de/cli.md b/docs/de/cli.md index 7dc02d505b..259aeecf75 100644 --- a/docs/de/cli.md +++ b/docs/de/cli.md @@ -51,25 +51,6 @@ Wir suchen nach Freiwilligen, die ein `qmk`-Package für weitere Betriebssysteme  * Installiere mit einem [virtualenv](https://virtualenv.pypa.io/en/latest/).  * Weise den User an, die Umgebungs-Variable `QMK_HOME` zu setzen, um die Firmware-Quelle anders einzustellen als `~/qmk_firmware`. -# Lokale CLI - -Wenn Du die globale CLI nicht verwenden möchtest, beinhaltet `qmk_firmware` auch eine lokale CLI. Du kannst sie hier finden: `qmk_firmware/bin/qmk`. Du kannst den `qmk`-Befehl aus irgendeinem Datei-Verzeichnis ausführen und es wird immer auf dieser Kopie von `qmk_firmware` arbeiten. - -**Beispiel**: - -``` -$ ~/qmk_firmware/bin/qmk hello -Ψ Hello, World! -``` - -## Einschränkungen der lokalen CLI - -Hier ein Vergleich mit der globalen CLI: - -* Die lokale CLI unterstützt kein `qmk setup` oder `qmk clone`. -* Die lokale CLI arbeitet immer innerhalb der selben `qmk_firmware`-Verzeichnisstruktur, auch wenn Du mehrere Repositories geklont hast. -* Die lokale CLI läuft nicht in einer virtualenv. Daher ist es möglich, dass Abhängigkeiten (dependencies) miteinander in Konflikt kommen/stehen. -  # CLI-Befehle  ## `qmk compile` diff --git a/docs/fr-fr/cli.md b/docs/fr-fr/cli.md index bfa060f2ad..917a9315bc 100644 --- a/docs/fr-fr/cli.md +++ b/docs/fr-fr/cli.md @@ -48,25 +48,6 @@ Nous recherchons des gens pour créer et maintenir un paquet `qmk` pour plus de  * Installez en utilisant un virtualenv  * Expliquez à l'utilisateur de définir la variable d'environnement `QMK_Home` pour "check out" les sources du firmware à un autre endroit que `~/qmk_firmware`. -# CLI locale - -Si vous ne voulez pas utiliser la CLI globale, il y a une CLI locale empaquetée avec `qmk_firmware`. Vous pouvez le trouver dans `qmk_firmware/bin/qmk`. Vous pouvez lancer la commande `qmk` depuis n'importe quel répertoire et elle fonctionnera toujours sur cette copie de `qmk_firmware`. - -**Exemple**: - -``` -$ ~/qmk_firmware/bin/qmk hello -Ψ Hello, World! -``` - -## Limitations de la CLI locale - -Il y a quelques limitations à la CLI locale comparé à la globale: - -* La CLI locale ne supporte pas `qmk setup` ou `qmk clone` -* La CLI locale n'opère pas sur le même arbre `qmk_firmware`, même si vous avez plusieurs dépôts clonés. -* La CLI locale ne s'exécute pas dans un virtualenv, donc il y a des risques que des dépendances seront en conflit -  # Les commandes CLI  ## `qmk compile` diff --git a/docs/hardware_keyboard_guidelines.md b/docs/hardware_keyboard_guidelines.md index 7630b44e0c..17be7ee6aa 100644 --- a/docs/hardware_keyboard_guidelines.md +++ b/docs/hardware_keyboard_guidelines.md @@ -144,10 +144,38 @@ The `rules.mk` file can also be placed in a sub-folder, and its reading order is          * `keyboards/top_folder/sub_1/sub_2/sub_3/sub_4/rules.mk`            * `keyboards/top_folder/keymaps/a_keymap/rules.mk`            * `users/a_user_folder/rules.mk` +        * `keyboards/top_folder/sub_1/sub_2/sub_3/sub_4/post_rules.mk` +      * `keyboards/top_folder/sub_1/sub_2/sub_3/post_rules.mk` +    * `keyboards/top_folder/sub_1/sub_2/post_rules.mk` +  * `keyboards/top_folder/sub_1/post_rules.mk` +* `keyboards/top_folder/post_rules.mk`  * `common_features.mk`  Many of the settings written in the `rules.mk` file are interpreted by `common_features.mk`, which sets the necessary source files and compiler options. +The `post_rules.mk` file can interpret `features` of a keyboard-level before `common_features.mk`.  For example, when your designed keyboard has the option to implement backlighting or underglow using rgblight.c, writing the following in the `post_rules.mk` makes it easier for the user to configure the `rules.mk`. + +* `keyboards/top_folder/keymaps/a_keymap/rules.mk` +  ```makefile +  # Please set the following according to the selection of the hardware implementation option. +  RGBLED_OPTION_TYPE = backlight   ## none, backlight or underglow +  ``` +* `keyboards/top_folder/post_rules.mk` +  ```makefile +  ifeq ($(filter $(strip $(RGBLED_OPTION_TYPE))x, nonex backlightx underglowx x),) +     $(error unknown RGBLED_OPTION_TYPE value "$(RGBLED_OPTION_TYPE)") +  endif + +  ifeq ($(strip $(RGBLED_OPTION_TYPE)),backlight) +    RGBLIGHT_ENABLE = yes +    OPT_DEFS += -DRGBLED_NUM=30 +  endif +  ifeq ($(strip $(RGBLED_OPTION_TYPE)),underglow) +    RGBLIGHT_ENABLE = yes +    OPT_DEFS += -DRGBLED_NUM=6 +  endif +  ``` +  ?> See `build_keyboard.mk` and `common_features.mk` for more details.  ### `<keyboard_name.c>` diff --git a/keyboards/40percentclub/ut47/post_rules.mk b/keyboards/40percentclub/ut47/post_rules.mk new file mode 100644 index 0000000000..7051ee413d --- /dev/null +++ b/keyboards/40percentclub/ut47/post_rules.mk @@ -0,0 +1,4 @@ +ifeq ($(strip $(LED_ENABLE)), yes) +  OPT_DEFS += -DLED_ENABLE +  SRC += led.c +endif diff --git a/keyboards/40percentclub/ut47/rules.mk b/keyboards/40percentclub/ut47/rules.mk index 4f0d0bdb2f..9c0e3a206c 100644 --- a/keyboards/40percentclub/ut47/rules.mk +++ b/keyboards/40percentclub/ut47/rules.mk @@ -24,8 +24,3 @@ AUDIO_ENABLE = no           # Audio output on port C6  # custom matrix setup  CUSTOM_MATRIX = yes  SRC += matrix.c protocol/serial_uart.c - -ifeq ($(strip $(LED_ENABLE)), yes) -  OPT_DEFS += -DLED_ENABLE -  SRC += led.c -endif diff --git a/keyboards/6ball/6ball.h b/keyboards/6ball/6ball.h index 234235341d..ef73a72053 100644 --- a/keyboards/6ball/6ball.h +++ b/keyboards/6ball/6ball.h @@ -1,14 +1,10 @@ -#ifndef SIXBALL_H -#define SIXBALL_H +#pragma once  #include "quantum.h"  #define LAYOUT( \ -      k01, k02, k03, \ -      k04, k05, k06 \ -) \ -{ \ -    { k02, k03, k06, k05, k04, k01 } \ -}  - -#endif +    k05, k00, k01, \ +    k04, k03, k02 \ +) { \ +    { k00, k01, k02, k03, k04, k05 } \ +} diff --git a/keyboards/6ball/config.h b/keyboards/6ball/config.h index c7d4d3354a..cc496d675a 100644 --- a/keyboards/6ball/config.h +++ b/keyboards/6ball/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -46,5 +45,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define DIODE_DIRECTION COL2ROW  #define TAPPING_TERM 200 - -#endif diff --git a/keyboards/9key/9key.h b/keyboards/9key/9key.h index b60dc53c00..ad809da4b8 100644 --- a/keyboards/9key/9key.h +++ b/keyboards/9key/9key.h @@ -1,17 +1,13 @@ -#ifndef NINEKEY_H -#define NINEKEY_H +#pragma once  #include "quantum.h"  #define LAYOUT( \ -      k00, k01, k02, \ -      k10, k11, k12, \ -      k20, k21, k22  \ -) \ -{ \ +    k00, k01, k02, \ +    k10, k11, k12, \ +    k20, k21, k22 \ +) { \      { k00, k01, k02 }, \      { k10, k11, k12 }, \      { k20, k21, k22 } \ -}  - -#endif +} diff --git a/keyboards/9key/config.h b/keyboards/9key/config.h index 3c7b4e0ad6..b0462eb50f 100644 --- a/keyboards/9key/config.h +++ b/keyboards/9key/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -45,5 +44,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define DIODE_DIRECTION COL2ROW  #define TAPPING_TERM 200 - -#endif diff --git a/keyboards/ai03/orbit/orbit.h b/keyboards/ai03/orbit/orbit.h index 2ada881f3f..39f1ebb0e3 100644 --- a/keyboards/ai03/orbit/orbit.h +++ b/keyboards/ai03/orbit/orbit.h @@ -13,8 +13,8 @@   * 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 ORBIT_H -#define ORBIT_H + +#pragma once  #include "quantum.h" @@ -35,29 +35,27 @@  #endif  #endif +#define XXX KC_NO  #define LAYOUT( \      L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ -	L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ -	L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ -	L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ +    L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ +    L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ +    L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \           L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45 \ -) \ -{ \ -	{ 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 }, \ -	{ KC_NO, L41,   L42,   L43,   L44,   L45,   L46 }, \ -	{ R00,   R01,   R02,   R03,   R04,   R05,   R06 }, \ -	{ R10,   R11,   R12,   R13,   R14,   R15,   R16 }, \ -	{ R20,   R21,   R22,   R23,   R24,   R25,   R26 }, \ -	{ R30,   R31,   R32,   R33,   R34,   R35,   R36 }, \ -	{ R40,   R41,   R42,   R43,   R44,   R45, KC_NO }  \ +) { \ +    { 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 }, \ +    { XXX, L41, L42, L43, L44, L45, L46 }, \ +    { R00, R01, R02, R03, R04, R05, R06 }, \ +    { R10, R11, R12, R13, R14, R15, R16 }, \ +    { R20, R21, R22, R23, R24, R25, R26 }, \ +    { R30, R31, R32, R33, R34, R35, R36 }, \ +    { R40, R41, R42, R43, R44, R45, XXX } \  }  extern void led_toggle(int id, bool on);  void set_all_leds(bool leds[6]);  extern void set_layer_indicators(uint8_t layer); - -#endif diff --git a/keyboards/alf/dc60/dc60.h b/keyboards/alf/dc60/dc60.h index db5154a28c..710ae703ed 100644 --- a/keyboards/alf/dc60/dc60.h +++ b/keyboards/alf/dc60/dc60.h @@ -13,11 +13,13 @@   * 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 DC60_H -#define DC60_H + +#pragma once  #include "quantum.h" +#define XXX KC_NO +  // This a shortcut to help you visually see your layout.  // The following is an example using the Planck MIT layout  // The first section contains all of the arguments representing the physical @@ -25,18 +27,15 @@  // The second converts the arguments into a two-dimensional array which  // represents the switch matrix.  #define LAYOUT_all( \ -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KOD, KOE, \ -    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ -    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      \ -    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ -    K40,      K42, K43,      K45,      K47, K48,      K4A, K4B, K4C, K4D, K4E  \ -) \ -{ \ -    { K00, K01,   K02, K03, K04,   K05, K06,   K07, K08, K09,   K0A, K0B, K0C, KOD, KOE },   \ -    { K10, KC_NO, K12, K13, K14,   K15, K16,   K17, K18, K19,   K1A, K1B, K1C, K1D, K1E },   \ -    { K20, KC_NO, K22, K23, K24,   K25, K26,   K27, K28, K29,   K2A, K2B, K2C, K2D, KC_NO }, \ -    { K30, K31,   K32, K33, K34,   K35, K36,   K37, K38, K39,   K3A, K3B, K3C, K3D, K3E },   \ -    { K40, KC_NO, K42, K43, KC_NO, K45, KC_NO, K47, K48, KC_NO, K4A, K4B, K4C, K4D, K4E },   \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ +    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \ +    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ +    k40,      k42, k43,      k45,      k47, k48,      k4A, k4B, k4C, k4D, k4E \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ +    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ +    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \ +    { k40, XXX, k42, k43, XXX, k45, XXX, k47, k48, XXX, k4A, k4B, k4C, k4D, k4E } \  } - -#endif diff --git a/keyboards/alf/x2/config.h b/keyboards/alf/x2/config.h index 6c9a139c3a..c2c3abdcf5 100644 --- a/keyboards/alf/x2/config.h +++ b/keyboards/alf/x2/config.h @@ -1,5 +1,4 @@ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -45,5 +44,3 @@  #define RGBLIGHT_SAT_STEP 8  #define RGBLIGHT_VAL_STEP 8  #endif - -#endif diff --git a/keyboards/alf/x2/x2.h b/keyboards/alf/x2/x2.h index c6c587aea9..9262c44ac2 100644 --- a/keyboards/alf/x2/x2.h +++ b/keyboards/alf/x2/x2.h @@ -1,98 +1,97 @@ -#ifndef X2_H -#define X2_H +#pragma once  #include "quantum.h" -// K404 and K408 are the microswitches at the top of the PCB +#define XXX KC_NO + +// k44 and k48 are the microswitches at the top of the PCB  #define LAYOUT( \ -	                        K404,                   K408,                                     \ -	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ -	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ -	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       \ -	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \ -	K400, K401,       K403,             K406,                   K410, K411, K412, K413, K414  \ +                        k44,                k48, \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ +    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \ +    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ +    k40, k41,      k43,           k46,                k4A, k4B, k4C, k4D, k4E \  ) { \ -	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 },  \ -	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 },  \ -	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO }, \ -	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 },  \ -	{ K400,  K401,  KC_NO, K403,  K404,  KC_NO, K406,  KC_NO, K408,  KC_NO, K410,  K411,  K412,  K413,  K414 }   \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ +    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ +    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \ +    { k40, k41, XXX, k43, k44, XXX, k46, XXX, k48, XXX, k4A, k4B, k4C, k4D, k4E } \  }  #define LAYOUT_std_ansi( \ -							K404,                   K408,                                     \ -	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K014, \ -	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ -	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       \ -	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,       \ -	K400, K401,       K403,             K406,                   K410, K411,       K413, K414  \ +                        k44,                k48, \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E, \ +    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \ +    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ +    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, \ +    k40, k41,      k43,           k46,                k4A, k4B,      k4D, k4E \  ) { \ -	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  KC_NO, K014 },  \ -	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 },  \ -	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO }, \ -	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  KC_NO }, \ -	{ K400,  K401,  KC_NO, K403,  K404,  KC_NO, K406,  KC_NO, K408,  KC_NO, K410,  K411,  KC_NO, K413,  K414 }   \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E }, \ +    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ +    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX }, \ +    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX }, \ +    { k40, k41, XXX, k43, k44, XXX, k46, XXX, k48, XXX, k4A, k4B, XXX, k4D, k4E } \  }  #define LAYOUT_std_splits( \ -							K404,					K408,								      \ -	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ -	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ -	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       \ -	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \ -	K400, K401,       K403,             K406,                   K410, K411,       K413, K414  \ +                        k44,                k48, \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ +    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \ +    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E, \ +    k40, k41,      k43,           k46,                k4A, k4B,      k4D, k4E \  ) { \ -	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 },  \ -	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 },  \ -	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO }, \ -	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314 },  \ -	{ K400,  K401,  KC_NO, K403,  K404,  KC_NO, K406,  KC_NO, K408,  KC_NO, K410,  K411,  KC_NO, K413,  K414 }   \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ +    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ +    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \ +    { k40, k41, XXX, k43, k44, XXX, k46, XXX, k48, XXX, k4A, k4B, XXX, k4D, k4E } \  }  #define LAYOUT_hhkb( \ -							K404,					K408,								      \ -	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ -	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ -	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       \ -	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \ -	      K401,       K403,             K406,                   K410, K411                    \ +                        k44,                k48, \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ +    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \ +    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ +    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E, \ +         k41,      k43,           k46,                k4A, k4B \  ) { \ -	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 },  \ -	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 },  \ -	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO }, \ -	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314 },  \ -	{ KC_NO, K401,  KC_NO, K403,  K404,  KC_NO, K406,  KC_NO, K408,  KC_NO, K410,  K411,  KC_NO, KC_NO, KC_NO }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ +    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ +    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX }, \ +    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \ +    { XXX, k41, XXX, k43, k44, XXX, k46, XXX, k48, XXX, k4A, k4B, XXX, XXX, XXX } \  }  #define LAYOUT_2u_split_arrows( \ -							K404,					K408,								      \ -	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ -	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ -	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       \ -	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \ -	K400, K401,       K403,             K406,                   K410, K411, K412, K413, K414  \ +                        k44,                k48, \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ +    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \ +    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ +    k40, k41,      k43,           k46,                k4A, k4B, k4C, k4D, k4E \  ) { \ -	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012, K013,  K014 },  \ -	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112, K113,  K114 },  \ -	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212, K213,  KC_NO }, \ -	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312, K313,  K314 },  \ -	{ K400,  K401,  KC_NO, K403,  K404,  KC_NO, K406,  KC_NO, K408,  KC_NO, K410,  K411,  K412, K413,  K414 }   \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ +    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ +    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \ +    { k40, k41, XXX, k43, k44, XXX, k46, XXX, k48, XXX, k4A, k4B, k4C, k4D, k4E } \  }  #define LAYOUT_split_arrows( \ -							K404,					K408,									  \ -	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ -	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ -	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       \ -	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \ -	K400, K401,       K403,             K406,                   K410, K411, K412, K413, K414  \ +                        k44,                k48, \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ +    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \ +    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E, \ +    k40, k41,      k43,           k46,                k4A, k4B, k4C, k4D, k4E \  ) { \ -	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 },  \ -	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 },  \ -	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO }, \ -	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314 },  \ -	{ K400,  K401,  KC_NO, K403,  K404,  KC_NO, K406,  KC_NO, K408,  KC_NO, K410,  K411,  K412,  K413,  K414 }   \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ +    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ +    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \ +    { k40, k41, XXX, k43, k44, XXX, k46, XXX, k48, XXX, k4A, k4B, k4C, k4D, k4E } \  } - -#endif diff --git a/keyboards/alpha/alpha.h b/keyboards/alpha/alpha.h index 025a3ac5fb..204e03822b 100755 --- a/keyboards/alpha/alpha.h +++ b/keyboards/alpha/alpha.h @@ -1,16 +1,15 @@ -#ifndef KB_H -#define KB_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  #define LAYOUT( \ -	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, \ -	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, \ -	K200, K201, K202, K203,       K205,       K207, K208, K209  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \ +    k20, k21, k22, k23,      k25,      k27, k28, k29 \  ) { \ -	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009 }, \ -	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109 }, \ -	{ K200,  K201,  K202,  K203,  KC_NO, K205,  KC_NO, K207,  K208,  K209 }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \ +    { k20, k21, k22, k23, XXX, k25, XXX, k27, k28, k29 } \  } - -#endif diff --git a/keyboards/alpha/config.h b/keyboards/alpha/config.h index 8c7edd5798..ae1c69656b 100755 --- a/keyboards/alpha/config.h +++ b/keyboards/alpha/config.h @@ -1,5 +1,4 @@ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -45,5 +44,3 @@  #define RGBLIGHT_SAT_STEP 8  #define RGBLIGHT_VAL_STEP 8  #endif - -#endif diff --git a/keyboards/amj96/amj96.h b/keyboards/amj96/amj96.h index e8a83af0cb..81abd6bf94 100644 --- a/keyboards/amj96/amj96.h +++ b/keyboards/amj96/amj96.h @@ -13,8 +13,8 @@   * 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 AMJ96_H -#define AMJ96_H + +#pragma once  #include "quantum.h" @@ -26,21 +26,18 @@  // The first section contains all of the arguments  // The second converts the arguments into a two-dimensional array  #define LAYOUT( \ -    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,   K1F, K09, K0A, K0C, \ -    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,   K2F, K0B, K0F, K6F, \ -    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,        K3E, K3F, K0D, K6D, \ -    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,             K4D, K4E, K4F, K6E, \ -    K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D,        K5E, K5F, K0E, K07, \ -    K60, K61, K62,                K63,                     K64, K65, K66, K68,   K69, K6A, K6B, K6C  \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F, k09, k0A, k0C, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E,   k2F, k0B, k0F, k6F, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D,        k3E, k3F, k0D, k6D, \ +    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C,             k4D, k4E, k4F, k6E, \ +    k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D,        k5E, k5F, k0E, k07, \ +    k60, k61, k62,                k63,                     k64, k65, k66, k68,   k69, k6A, k6B, k6C \  ) { \ -    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, K07, XXX, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ -    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ -    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ -    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ -    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \ -    { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, \ -    { K60, K61, K62, K63, K64, K65, K66, XXX, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F }  \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, k07, XXX, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \ +    { k60, k61, k62, k63, k64, k65, k66, XXX, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F } \  } - - -#endif diff --git a/keyboards/amj96/config.h b/keyboards/amj96/config.h index eaa33f6281..4a0eef0d99 100644 --- a/keyboards/amj96/config.h +++ b/keyboards/amj96/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -154,5 +153,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define RGBLIGHT_ANIMATIONS  #define RGBLED_NUM 16  #define RGB_DI_PIN D3 - -#endif diff --git a/keyboards/amjpad/amjpad.h b/keyboards/amjpad/amjpad.h index d9a0516215..976a7ab041 100644 --- a/keyboards/amjpad/amjpad.h +++ b/keyboards/amjpad/amjpad.h @@ -1,5 +1,4 @@ -#ifndef AMJPAD_H -#define ADMJPAD_H +#pragma once  #include "quantum.h" @@ -24,40 +23,36 @@  // The first section contains all of the arguments  // The second converts the arguments into a two-dimensional array  #define LAYOUT_numpad_6x4( \ -  k00, k01, k02, k03, \ -  k10, k11, k12, k13, \ -  k20, k21, k22,      \ -  k30, k31, k32, k23, \ -  k40, k41, k42,      \ -     k50,   k52, k43  \ -) \ -{ \ -  {k00, k01, k02, k03}, \ -  {k10, k11, k12, k13}, \ -  {k20, k21, k22, k23}, \ -  {k30, k31, k32, XXX}, \ -  {k40, k41, k42, k43}, \ -  {k50, XXX, k52, XXX} \ +    k00, k01, k02, k03, \ +    k10, k11, k12, k13, \ +    k20, k21, k22, \ +    k30, k31, k32, k23, \ +    k40, k41, k42, \ +       k50,   k52, k43  \ +) { \ +    { k00, k01, k02, k03 }, \ +    { k10, k11, k12, k13 }, \ +    { k20, k21, k22, k23 }, \ +    { k30, k31, k32, XXX }, \ +    { k40, k41, k42, k43 }, \ +    { k50, XXX, k52, XXX } \  }  #define LAYOUT_ortho_6x4( \ -  k00, k01, k02, k03, \ -  k10, k11, k12, k13, \ -  k20, k21, k22, k23, \ -  k30, k31, k32, k33, \ -  k40, k41, k42, k43, \ -  k50, k51, k52, k53  \ -) \ -{ \ -  {k00, k01, k02, k03}, \ -  {k10, k11, k12, k13}, \ -  {k20, k21, k22, k23}, \ -  {k30, k31, k32, k33}, \ -  {k40, k41, k42, k43}, \ -  {k50, k51, k52, k53} \ +    k00, k01, k02, k03, \ +    k10, k11, k12, k13, \ +    k20, k21, k22, k23, \ +    k30, k31, k32, k33, \ +    k40, k41, k42, k43, \ +    k50, k51, k52, k53 \ +) { \ +    { k00, k01, k02, k03 }, \ +    { k10, k11, k12, k13 }, \ +    { k20, k21, k22, k23 }, \ +    { k30, k31, k32, k33 }, \ +    { k40, k41, k42, k43 }, \ +    { k50, k51, k52, k53 } \  }  void matrix_init_user(void);  void matrix_scan_user(void); - -#endif diff --git a/keyboards/amjpad/config.h b/keyboards/amjpad/config.h index 6bac897e73..f1d57592b5 100644 --- a/keyboards/amjpad/config.h +++ b/keyboards/amjpad/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -87,5 +86,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/atreus62/config.h b/keyboards/atreus62/config.h index 2d4ab99c62..31baef145f 100644 --- a/keyboards/atreus62/config.h +++ b/keyboards/atreus62/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -71,5 +70,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/baguette/baguette.h b/keyboards/baguette/baguette.h index e3945bea7e..70440f7627 100644 --- a/keyboards/baguette/baguette.h +++ b/keyboards/baguette/baguette.h @@ -13,11 +13,13 @@   * 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 BAGUETTE_H -#define BAGUETTE_H + +#pragma once  #include "quantum.h" +#define XXX KC_NO +  /* This a shortcut to help you visually see your layout.   *   * The first section contains all of the arguments representing the physical @@ -27,33 +29,29 @@   * represents the switch matrix.   */  #define LAYOUT_ansi( \ -        K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F, \ -        K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,          K1F, \ -        K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,          K2D,               \ -        K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,        \ -                      K42,   K43,                        K47,                        K4B,   K4C,   K4D,   K4E,   K4F  \ -) \ -{ \ -    {   K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F }, \ -    {   K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D, KC_NO,   K1F }, \ -    {   K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B, KC_NO,   K2D, KC_NO, KC_NO }, \ -    {   K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E, KC_NO }, \ -    { KC_NO, KC_NO,   K42,   K43, KC_NO, KC_NO, KC_NO,   K47, KC_NO, KC_NO, KC_NO,   K4B,   K4C,   K4D,   K4E,   K4F }  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1F, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ +              k42, k43,                k47,                k4B, k4C, k4D, k4E, k4F \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, XXX }, \ +    { XXX, XXX, k42, k43, XXX, XXX, XXX, k47, XXX, XXX, XXX, k4B, k4C, k4D, k4E, k4F } \  }  #define LAYOUT_iso( \ -        K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F, \ -        K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,                 K1F, \ -        K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K1D,   K2D,               \ -        K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,        \ -                      K42,   K43,                        K47,                        K4B,   K4C,   K4D,   K4E,   K4F  \ -) \ -{ \ -    {   K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F }, \ -    {   K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C, KC_NO, KC_NO,   K1F }, \ -    {   K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K1D,   K2D, KC_NO, KC_NO }, \ -    {   K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E, KC_NO }, \ -    { KC_NO, KC_NO,   K42,   K43, KC_NO, KC_NO, KC_NO,   K47, KC_NO, KC_NO, KC_NO,   K4B,   K4C,   K4D,   K4E,   K4F }  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,           k1F, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k1D, k2D, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ +              k42, k43,                k47,                k4B, k4C, k4D, k4E, k4F \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, XXX, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k1D, k2D, XXX, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, XXX }, \ +    { XXX, XXX, k42, k43, XXX, XXX, XXX, k47, XXX, XXX, XXX, k4B, k4C, k4D, k4E, k4F } \  } - -#endif diff --git a/keyboards/bantam44/bantam44.h b/keyboards/bantam44/bantam44.h index 38afbbdde7..f680f9eac2 100644 --- a/keyboards/bantam44/bantam44.h +++ b/keyboards/bantam44/bantam44.h @@ -1,23 +1,21 @@ -#ifndef BANTAM44_H -#define BANTAM44_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  // This a shortcut to help you visually see your layout.  // The following is an example using the Planck MIT layout  // The first section contains all of the arguements  // The second converts the arguments into a two-dimensional array  #define LAYOUT( \ -  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ -  K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19,    K1A, \ -  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ -  K30,   K31,   K32,   K33,     K34,    K35,   K36, K37, K38  \ -) \ -{ \ -  { K00, K01, K02, K03,   K04, K05,   K06, K07,   K08, K09, K0A,   K0B }, \ -  { K10, K11, K12, K13,   K14, K15,   K16, K17,   K18, K19, KC_NO, K2A }, \ -  { K20, K21, K22, K23,   K24, K25,   K26, K27,   K28, K29, K2A,   K2B }, \ -  { K30, K31, K32, KC_NO, K33, KC_NO, K34, KC_NO, K35, K36, K37,   K38 }  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ +    k10,   k11, k12, k13, k14, k15, k16, k17, k18, k19,    k1B, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \ +    k30,   k31,   k32,   k34,     k36,    k38,   k39, k3A, k3B \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, XXX, k1B }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \ +    { k30, k31, k32, XXX, k34, XXX, k36, XXX, k38, k39, k3A, k3B } \  } - -#endif diff --git a/keyboards/bantam44/config.h b/keyboards/bantam44/config.h index b468b28ccb..6cff8b2899 100644 --- a/keyboards/bantam44/config.h +++ b/keyboards/bantam44/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -72,5 +71,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/bfake/bfake.h b/keyboards/bfake/bfake.h index 599ea0f870..59a40de2f8 100644 --- a/keyboards/bfake/bfake.h +++ b/keyboards/bfake/bfake.h @@ -15,43 +15,42 @@ 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 BFAKE_H -#define BFAKE_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  #define LAYOUT_all( \ -  K61, K71, K72, K73, K74, K64, K65, K75, K76, K77, K78, K68, K66, K10, K60,\ -   K11, K01, K02, K03, K04, K14, K15, K05, K06, K07, K08, K18, K16,  K20,   \ -    K12, K21, K22, K23, K24, K34, K35, K25, K26, K27, K28, K38,   K40,      \ -  K19, K13, K41, K42, K43, K44, K54, K55, K45, K46, K47, K58,   K49,    K50,\ -  K09,   K00,   K39,           K30,                 K59,   K69,   K57,   K29\ -){ \ -  { KC_NO, K01,   K02,   K03,   K04, K05, K06,   K07,   K08,   K09,   K00},   \ -  { KC_NO, K11,   K12,   K13,   K14, K15, K16,   KC_NO, K18,   K19,   K10},   \ -  { KC_NO, K21,   K22,   K23,   K24, K25, K26,   K27,   K28,   K29,   K20},   \ -  { KC_NO, KC_NO, KC_NO, KC_NO, K34, K35, KC_NO, KC_NO, K38,   K39,   K30},   \ -  { KC_NO, K41,   K42,   K43,   K44, K45, K46,   K47,   KC_NO, K49,   K40},   \ -  { KC_NO, KC_NO, KC_NO, KC_NO, K54, K55, KC_NO, K57,   K58,   K59,   K50},   \ -  { KC_NO, K61,   KC_NO, KC_NO, K64, K65, K66,   KC_NO, K68,   K69,   K60},   \ -  { KC_NO, K71,   K72,   K73,   K74, K75, K76,   K77,   K78,   KC_NO, KC_NO}, \ +    k61, k71, k72, k73, k74, k64, k65, k75, k76, k77, k78, k68, k66, k1A, k6A,\ +     k11, k01, k02, k03, k04, k14, k15, k05, k06, k07, k08, k18, k16,  k2A, \ +      k12, k21, k22, k23, k24, k34, k35, k25, k26, k27, k28, k38,   k4A, \ +    k19, k13, k41, k42, k43, k44, k54, k55, k45, k46, k47, k58,   k49,    k5A, \ +    k09,   k0A,   k39,           k3A,                 k59,   k69,   k57,   k29 \ +) { \ +    { XXX, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \ +    { XXX, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1A }, \ +    { XXX, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \ +    { XXX, XXX, XXX, XXX, k34, k35, XXX, XXX, k38, k39, k3A }, \ +    { XXX, k41, k42, k43, k44, k45, k46, k47, XXX, k49, k4A }, \ +    { XXX, XXX, XXX, XXX, k54, k55, XXX, k57, k58, k59, k5A }, \ +    { XXX, k61, XXX, XXX, k64, k65, k66, XXX, k68, k69, k6A }, \ +    { XXX, k71, k72, k73, k74, k75, k76, k77, k78, XXX, XXX } \  }  #define LAYOUT_60_ansi( \ -  K61, K71, K72, K73, K74, K64, K65, K75, K76, K77, K78, K68, K66,      K60,\ -   K11, K01, K02, K03, K04, K14, K15, K05, K06, K07, K08, K18, K16,  K20,   \ -    K12, K21, K22, K23, K24, K34, K35, K25, K26, K27, K28, K38,   K40,      \ -  K19,      K41, K42, K43, K44, K54, K55, K45, K46, K47, K58,   K49,        \ -  K09,   K00,   K39,           K30,                 K59,   K69,   K57,   K29\ -){ \ -  { KC_NO, K01,   K02,   K03,   K04, K05, K06,   K07,   K08,   K09,   K00},   \ -  { KC_NO, K11,   K12,   KC_NO, K14, K15, K16,   KC_NO, K18,   K19,   KC_NO}, \ -  { KC_NO, K21,   K22,   K23,   K24, K25, K26,   K27,   K28,   K29,   K20},   \ -  { KC_NO, KC_NO, KC_NO, KC_NO, K34, K35, KC_NO, KC_NO, K38,   K39,   K30},   \ -  { KC_NO, K41,   K42,   K43,   K44, K45, K46,   K47,   KC_NO, K49,   K40},   \ -  { KC_NO, KC_NO, KC_NO, KC_NO, K54, K55, KC_NO, K57,   K58,   K59,   KC_NO}, \ -  { KC_NO, K61,   KC_NO, KC_NO, K64, K65, K66,   KC_NO, K68,   K69,   K60},   \ -  { KC_NO, K71,   K72,   K73,   K74, K75, K76,   K77,   K78,   KC_NO, KC_NO}, \ +    k61, k71, k72, k73, k74, k64, k65, k75, k76, k77, k78, k68, k66,      k6A, \ +     k11, k01, k02, k03, k04, k14, k15, k05, k06, k07, k08, k18, k16,  k2A, \ +      k12, k21, k22, k23, k24, k34, k35, k25, k26, k27, k28, k38,   k4A, \ +    k19,      k41, k42, k43, k44, k54, k55, k45, k46, k47, k58,   k49, \ +    k09,   k0A,   k39,           k3A,                 k59,   k69,   k57,   k29 \ +) { \ +    { XXX, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \ +    { XXX, k11, k12, XXX, k14, k15, k16, XXX, k18, k19, XXX }, \ +    { XXX, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \ +    { XXX, XXX, XXX, XXX, k34, k35, XXX, XXX, k38, k39, k3A }, \ +    { XXX, k41, k42, k43, k44, k45, k46, k47, XXX, k49, k4A }, \ +    { XXX, XXX, XXX, XXX, k54, k55, XXX, k57, k58, k59, XXX }, \ +    { XXX, k61, XXX, XXX, k64, k65, k66, XXX, k68, k69, k6A }, \ +    { XXX, k71, k72, k73, k74, k75, k76, k77, k78, XXX, XXX } \  } - -#endif diff --git a/keyboards/bigseries/1key/1key.h b/keyboards/bigseries/1key/1key.h index 3441407798..6e5ddcc760 100755 --- a/keyboards/bigseries/1key/1key.h +++ b/keyboards/bigseries/1key/1key.h @@ -14,15 +14,13 @@ 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/>.  */ -#ifndef BIGSWITCH_H -#define BIGSWITCH_H + +#pragma once  #include "quantum.h"  #define LAYOUT( \ -  K00  \ +    k00 \  ) { \ -  { K00 }  \ +    { k00 } \  } - -#endif diff --git a/keyboards/bigseries/1key/config.h b/keyboards/bigseries/1key/config.h index f26b242128..f31a7fc057 100755 --- a/keyboards/bigseries/1key/config.h +++ b/keyboards/bigseries/1key/config.h @@ -14,8 +14,8 @@ 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/>.  */ -#ifndef CONFIG_H -#define CONFIG_H + +#pragma once  #include "config_common.h" @@ -55,5 +55,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #endif  #define RGBLIGHT_LIMIT_VAL 128  #endif - -#endif diff --git a/keyboards/bigseries/2key/2key.h b/keyboards/bigseries/2key/2key.h index dcbf2f764c..eff82fef93 100755 --- a/keyboards/bigseries/2key/2key.h +++ b/keyboards/bigseries/2key/2key.h @@ -14,15 +14,13 @@ 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/>.  */ -#ifndef BIGSWITCH_H -#define BIGSWITCH_H + +#pragma once  #include "quantum.h"  #define LAYOUT( \ -  K00, K01  \ +    k00, k01 \  ) { \ -  { K00, K01 }  \ +    { k00, k01 } \  } - -#endif diff --git a/keyboards/bigseries/2key/config.h b/keyboards/bigseries/2key/config.h index 4f75e28470..53866a15d1 100755 --- a/keyboards/bigseries/2key/config.h +++ b/keyboards/bigseries/2key/config.h @@ -14,8 +14,8 @@ 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/>.  */ -#ifndef CONFIG_H -#define CONFIG_H + +#pragma once  #include "config_common.h" @@ -55,5 +55,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #endif  #define RGBLIGHT_LIMIT_VAL 128  #endif - -#endif diff --git a/keyboards/bigseries/3key/3key.h b/keyboards/bigseries/3key/3key.h index 6aa843c263..caee1e4551 100755 --- a/keyboards/bigseries/3key/3key.h +++ b/keyboards/bigseries/3key/3key.h @@ -14,15 +14,13 @@ 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/>.  */ -#ifndef BIGSWITCH_H -#define BIGSWITCH_H + +#pragma once  #include "quantum.h"  #define LAYOUT( \ -  K00, K01, K02  \ +    k00, k01, k02 \  ) { \ -  { K00, K01, K02 }  \ +    { k00, k01, k02 } \  } - -#endif diff --git a/keyboards/bigseries/3key/config.h b/keyboards/bigseries/3key/config.h index a4a3694542..4a474cc3d1 100755 --- a/keyboards/bigseries/3key/config.h +++ b/keyboards/bigseries/3key/config.h @@ -14,8 +14,8 @@ 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/>.  */ -#ifndef CONFIG_H -#define CONFIG_H + +#pragma once  #include "config_common.h" @@ -55,5 +55,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #endif  #define RGBLIGHT_LIMIT_VAL 128  #endif - -#endif diff --git a/keyboards/bigseries/4key/4key.h b/keyboards/bigseries/4key/4key.h index 21373fdeda..7e9ff7a793 100755 --- a/keyboards/bigseries/4key/4key.h +++ b/keyboards/bigseries/4key/4key.h @@ -14,17 +14,15 @@ 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/>.  */ -#ifndef BIGSWITCH_H -#define BIGSWITCH_H + +#pragma once  #include "quantum.h"  #define LAYOUT( \ -  K00, K01, \ -  K10, K11 \ +    k00, k01, \ +    k10, k11 \  ) { \ -  { K00, K01 },  \ -  { K10, K11 }  \ +    { k00, k01 }, \ +    { k10, k11 } \  } - -#endif diff --git a/keyboards/bigseries/4key/config.h b/keyboards/bigseries/4key/config.h index 3e96535799..c1635022de 100755 --- a/keyboards/bigseries/4key/config.h +++ b/keyboards/bigseries/4key/config.h @@ -14,8 +14,8 @@ 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/>.  */ -#ifndef CONFIG_H -#define CONFIG_H + +#pragma once  #include "config_common.h" @@ -55,5 +55,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #endif  #define RGBLIGHT_LIMIT_VAL 128  #endif - -#endif diff --git a/keyboards/blockey/blockey.h b/keyboards/blockey/blockey.h index fa7624be76..7b007a2e97 100644 --- a/keyboards/blockey/blockey.h +++ b/keyboards/blockey/blockey.h @@ -13,8 +13,8 @@   * 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 BLOCKEY_H -#define BLOCKEY_H + +#pragma once  #include "quantum.h" @@ -26,23 +26,20 @@  // The first section contains all of the arguments  // The second converts the arguments into a two-dimensional array  #define LAYOUT( \ -    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, k40,      k41, \ -    k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52,      k53, k54, \ -    k55, k56, k57, k58,                k59,                k60, k61, k62  \ -) \ -{ \ -    { k01, k02, k03, k04, k05, k06, k07 }, \ -    { k15, k16, k17, k18, k19, k20, k21 }, \ -    { k29, k30, k31, k32, k33, k34, k35 }, \ -    { k42, k43, k44, k45, k46, k47, k48 }, \ -    { k55, k56, k57, k58, XXX, XXX, k59 }, \ -    { k08, k09, k10, k11, k12, k13, k14 }, \ -    { k22, k23, k24, k25, k26, k27, k28 }, \ -    { k36, k37, k38, k39, k40, k41, XXX }, \ -    { k49, k50, k51, k52, k53, k54, XXX }, \ -    { XXX, XXX, XXX, k60, k61, k62, XXX }, \ +    k00, k01, k02, k03, k04, k05, k06, k50, k51, k52, k53, k54, k55, k56, \ +    k10, k11, k12, k13, k14, k15, k16, k60, k61, k62, k63, k64, k65, k66, \ +    k20, k21, k22, k23, k24, k25, k26, k70, k71, k72, k73, k74,      k75, \ +    k30, k31, k32, k33, k34, k35, k36, k80, k81, k82, k83,      k84, k85, \ +    k40, k41, k42, k43,                k46,                k93, k94, k95 \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06 }, \ +    { k10, k11, k12, k13, k14, k15, k16 }, \ +    { k20, k21, k22, k23, k24, k25, k26 }, \ +    { k30, k31, k32, k33, k34, k35, k36 }, \ +    { k40, k41, k42, k43, XXX, XXX, k46 }, \ +    { k50, k51, k52, k53, k54, k55, k56 }, \ +    { k60, k61, k62, k63, k64, k65, k66 }, \ +    { k70, k71, k72, k73, k74, k75, XXX }, \ +    { k80, k81, k82, k83, k84, k85, XXX }, \ +    { XXX, XXX, XXX, k93, k94, k95, XXX } \  } - -#endif diff --git a/keyboards/blockey/config.h b/keyboards/blockey/config.h index c79c583982..4493dd0df7 100644 --- a/keyboards/blockey/config.h +++ b/keyboards/blockey/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -161,5 +160,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/bpiphany/frosty_flake/config.h b/keyboards/bpiphany/frosty_flake/config.h index ae19184a6a..ef3a71b8c3 100644 --- a/keyboards/bpiphany/frosty_flake/config.h +++ b/keyboards/bpiphany/frosty_flake/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -142,5 +141,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/bpiphany/kitten_paw/config.h b/keyboards/bpiphany/kitten_paw/config.h index 5e1429c8d5..7972721ed2 100644 --- a/keyboards/bpiphany/kitten_paw/config.h +++ b/keyboards/bpiphany/kitten_paw/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -156,5 +155,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/bpiphany/kitten_paw/kitten_paw.h b/keyboards/bpiphany/kitten_paw/kitten_paw.h index 38b2a94334..d4a9a16656 100644 --- a/keyboards/bpiphany/kitten_paw/kitten_paw.h +++ b/keyboards/bpiphany/kitten_paw/kitten_paw.h @@ -1,8 +1,9 @@ -#ifndef KITTEN_PAW_H -#define KITTEN_PAW_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  // This a shortcut to help you visually see your layout.  // The first section contains all of the arguements  // The second converts the arguments into a two-dimensional array @@ -26,41 +27,37 @@  */  #define LAYOUT( \ -  KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5,                       \ -  KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \ -  KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \ -  KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                    KK2, KL2, KQ2,      \ -  KN2, KI6, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \ -  KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6       \ -) \ -{ \ -    {KC_NO,  KB0,  KC0,  KD0,KC_NO,  KF0,  KG0,KC_NO,KC_NO,KC_NO,  KK0,  KL0,KC_NO,KC_NO,  KO0,KC_NO,  KQ0,  KR0}, \ -    {  KA1,  KB1,KC_NO,  KD1,  KE1,  KF1,  KG1,  KH1,  KI1,  KJ1,  KK1,  KL1,KC_NO,KC_NO,KC_NO,KC_NO,  KQ1,KC_NO}, \ -    {KC_NO,  KB2,KC_NO,  KD2,  KE2,  KF2,  KG2,  KH2,  KI2,  KJ2,  KK2,  KL2,KC_NO,  KN2,KC_NO,  KP2,  KQ2,  KR2}, \ -    {KC_NO,  KB3,KC_NO,  KD3,  KE3,  KF3,  KG3,  KH3,  KI3,  KJ3,  KK3,  KL3,  KM3,  KN3,  KO3,KC_NO,  KQ3,  KR3}, \ -    {  KA4,  KB4,KC_NO,  KD4,  KE4,  KF4,  KG4,  KH4,  KI4,  KJ4,  KK4,  KL4,KC_NO,KC_NO,  KO4,KC_NO,  KQ4,  KR4}, \ -    {  KA5,KC_NO,  KC5,  KD5,  KE5,  KF5,  KG5,  KH5,  KI5,  KJ5,  KK5,  KL5,KC_NO,KC_NO,  KO5,KC_NO,  KQ5,  KR5}, \ -    {KC_NO,  KB6,  KC6,KC_NO,  KE6,  KF6,  KG6,  KH6,  KI6,  KJ6,  KK6,  KL6,KC_NO,KC_NO,  KO6,KC_NO,  KQ6,  KR6}, \ -    {  KA7,  KB7,  KC7,  KD7,  KE7,  KF7,  KG7,  KH7,  KI7,  KJ7,KC_NO,KC_NO,KC_NO,KC_NO,  KO7,KC_NO,  KQ7,  KR7} \ +    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5, \ +    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \ +    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \ +    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                    KK2, KL2, KQ2, \ +    KN2, KI6, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \ +    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6 \ +) { \ +    { XXX, KB0, KC0, KD0, XXX, KF0, KG0, XXX, XXX, XXX, KK0, KL0, XXX, XXX, KO0, XXX, KQ0, KR0 }, \ +    { KA1, KB1, XXX, KD1, KE1, KF1, KG1, KH1, KI1, KJ1, KK1, KL1, XXX, XXX, XXX, XXX, KQ1, XXX }, \ +    { XXX, KB2, XXX, KD2, KE2, KF2, KG2, KH2, KI2, KJ2, KK2, KL2, XXX, KN2, XXX, KP2, KQ2, KR2 }, \ +    { XXX, KB3, XXX, KD3, KE3, KF3, KG3, KH3, KI3, KJ3, KK3, KL3, KM3, KN3, KO3, XXX, KQ3, KR3 }, \ +    { KA4, KB4, XXX, KD4, KE4, KF4, KG4, KH4, KI4, KJ4, KK4, KL4, XXX, XXX, KO4, XXX, KQ4, KR4 }, \ +    { KA5, XXX, KC5, KD5, KE5, KF5, KG5, KH5, KI5, KJ5, KK5, KL5, XXX, XXX, KO5, XXX, KQ5, KR5 }, \ +    { XXX, KB6, KC6, XXX, KE6, KF6, KG6, KH6, KI6, KJ6, KK6, KL6, XXX, XXX, KO6, XXX, KQ6, KR6 }, \ +    { KA7, KB7, KC7, KD7, KE7, KF7, KG7, KH7, KI7, KJ7, XXX, XXX, XXX, XXX, KO7, XXX, KQ7, KR7 } \  }  #define LAYOUT_fullsize_ansi( \ -  KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5,                       \ -  KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \ -  KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \ -  KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                    KK2, KL2, KQ2,      \ -  KN2,      KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \ -  KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6       \ -) \ -{ \ -    {KC_NO,  KB0,  KC0,  KD0,KC_NO,  KF0,  KG0,KC_NO,KC_NO,KC_NO,  KK0,  KL0,KC_NO,KC_NO,  KO0,KC_NO,  KQ0,  KR0}, \ -    {  KA1,  KB1,KC_NO,  KD1,  KE1,  KF1,  KG1,  KH1,  KI1,  KJ1,  KK1,  KL1,KC_NO,KC_NO,KC_NO,KC_NO,  KQ1,KC_NO}, \ -    {KC_NO,  KB2,KC_NO,  KD2,  KE2,  KF2,  KG2,  KH2,  KI2,  KJ2,  KK2,  KL2,KC_NO,  KN2,KC_NO,  KP2,  KQ2,  KR2}, \ -    {KC_NO,  KB3,KC_NO,  KD3,  KE3,  KF3,  KG3,  KH3,  KI3,  KJ3,  KK3,  KL3,  KM3,  KN3,  KO3,KC_NO,  KQ3,  KR3}, \ -    {  KA4,  KB4,KC_NO,  KD4,  KE4,  KF4,  KG4,  KH4,  KI4,  KJ4,  KK4,  KL4,KC_NO,KC_NO,  KO4,KC_NO,  KQ4,  KR4}, \ -    {  KA5,KC_NO,  KC5,  KD5,  KE5,  KF5,  KG5,  KH5,  KI5,  KJ5,  KK5,  KL5,KC_NO,KC_NO,  KO5,KC_NO,  KQ5,  KR5}, \ -    {KC_NO,  KB6,  KC6,KC_NO,  KE6,  KF6,  KG6,  KH6,  KC_NO,KJ6,  KK6,  KL6,KC_NO,KC_NO,  KO6,KC_NO,  KQ6,  KR6}, \ -    {  KA7,  KB7,  KC7,  KD7,  KE7,  KF7,  KG7,  KH7,  KI7,  KJ7,KC_NO,KC_NO,KC_NO,KC_NO,  KO7,KC_NO,  KQ7,  KR7} \ +    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5, \ +    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \ +    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \ +    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                    KK2, KL2, KQ2, \ +    KN2,      KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \ +    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6 \ +) { \ +    { XXX, KB0, KC0, KD0, XXX, KF0, KG0, XXX, XXX, XXX, KK0, KL0, XXX, XXX, KO0, XXX, KQ0, KR0 }, \ +    { KA1, KB1, XXX, KD1, KE1, KF1, KG1, KH1, KI1, KJ1, KK1, KL1, XXX, XXX, XXX, XXX, KQ1, XXX }, \ +    { XXX, KB2, XXX, KD2, KE2, KF2, KG2, KH2, KI2, KJ2, KK2, KL2, XXX, KN2, XXX, KP2, KQ2, KR2 }, \ +    { XXX, KB3, XXX, KD3, KE3, KF3, KG3, KH3, KI3, KJ3, KK3, KL3, KM3, KN3, KO3, XXX, KQ3, KR3 }, \ +    { KA4, KB4, XXX, KD4, KE4, KF4, KG4, KH4, KI4, KJ4, KK4, KL4, XXX, XXX, KO4, XXX, KQ4, KR4 }, \ +    { KA5, XXX, KC5, KD5, KE5, KF5, KG5, KH5, KI5, KJ5, KK5, KL5, XXX, XXX, KO5, XXX, KQ5, KR5 }, \ +    { XXX, KB6, KC6, XXX, KE6, KF6, KG6, KH6, XXX, KJ6, KK6, KL6, XXX, XXX, KO6, XXX, KQ6, KR6 }, \ +    { KA7, KB7, KC7, KD7, KE7, KF7, KG7, KH7, KI7, KJ7, XXX, XXX, XXX, XXX, KO7, XXX, KQ7, KR7 } \  } - -#endif diff --git a/keyboards/bpiphany/sixshooter/sixshooter.h b/keyboards/bpiphany/sixshooter/sixshooter.h index e8fc68f5c9..33ac9335e6 100644 --- a/keyboards/bpiphany/sixshooter/sixshooter.h +++ b/keyboards/bpiphany/sixshooter/sixshooter.h @@ -1,15 +1,13 @@ -#ifndef SIXSHOOTER_H -#define SIXSHOOTER_H +#pragma once  #include "quantum.h"  #define LAYOUT( \ -    K00, K01, K02, \ -    K03, K04, K05 \ -) \ -{ \ -    { K00, K01, K02 }, \ -    { K03, K04, K05 } \ +    k00, k01, k02, \ +    k10, k11, k12 \ +) { \ +    { k00, k01, k02 }, \ +    { k10, k11, k12 } \  }  inline void sixshooter_led_0_on(void)    { DDRB |=  (1<<6); PORTB |=  (1<<6); } @@ -42,5 +40,3 @@ inline void sixshooter_led_all_off(void) {    sixshooter_led_4_off();    sixshooter_led_5_off();  } - -#endif diff --git a/keyboards/bpiphany/tiger_lily/config.h b/keyboards/bpiphany/tiger_lily/config.h index d3e2464bee..d3ee78d382 100644 --- a/keyboards/bpiphany/tiger_lily/config.h +++ b/keyboards/bpiphany/tiger_lily/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -147,5 +146,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/bpiphany/tiger_lily/tiger_lily.h b/keyboards/bpiphany/tiger_lily/tiger_lily.h index 65e4d91564..b1a872e215 100644 --- a/keyboards/bpiphany/tiger_lily/tiger_lily.h +++ b/keyboards/bpiphany/tiger_lily/tiger_lily.h @@ -1,8 +1,9 @@ -#ifndef TIGER_LILY_H -#define TIGER_LILY_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  // This a shortcut to help you visually see your layout.  // The following is an example using the Planck MIT layout  // The first section contains all of the arguements @@ -27,45 +28,37 @@    `-------------------------------------------------------------------------' `--------------' `-------------------'  */  #define LAYOUT( \ -  KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5,                       \ -  KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \ -  KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \ -  KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                    KK2, KL2, KQ2,      \ -  KN2, KI6, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \ -  KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6       \ -) \ -{ \ -/* Columns and rows need to be swapped in the below definition */ \ -/*          A       B       C       D       E       F       G       H       I       J       K       L       M       N       O       P       Q       R       */ \ -/* 0 */ {   KC_NO,  KB0,    KC0,    KD0,    KC_NO,  KF0,    KG0,    KC_NO,  KC_NO,  KC_NO,  KK0,    KL0,    KC_NO,  KC_NO,  KO0,    KC_NO,  KQ0,    KR0     }, \ -/* 1 */ {   KA1,    KB1,    KC_NO,  KD1,    KE1,    KF1,    KG1,    KH1,    KI1,    KJ1,    KK1,    KL1,    KC_NO,  KC_NO,  KC_NO,  KC_NO,  KQ1,    KC_NO   }, \ -/* 2 */ {   KC_NO,  KB2,    KC_NO,  KD2,    KE2,    KF2,    KG2,    KH2,    KI2,    KJ2,    KK2,    KL2,    KC_NO,  KN2,    KC_NO,  KP2,    KQ2,    KR2     }, \ -/* 3 */ {   KC_NO,  KB3,    KC_NO,  KD3,    KE3,    KF3,    KG3,    KH3,    KI3,    KJ3,    KK3,    KL3,    KM3,    KN3,    KO3,    KC_NO,  KQ3,    KR3     }, \ -/* 4 */ {   KA4,    KB4,    KC_NO,  KD4,    KE4,    KF4,    KG4,    KH4,    KI4,    KJ4,    KK4,    KL4,    KC_NO,  KC_NO,  KO4,    KC_NO,  KQ4,    KR4     }, \ -/* 5 */ {   KA5,    KC_NO,  KC5,    KD5,    KE5,    KF5,    KG5,    KH5,    KI5,    KJ5,    KK5,    KL5,    KC_NO,  KC_NO,  KO5,    KC_NO,  KQ5,    KR5     }, \ -/* 6 */ {   KC_NO,  KB6,    KC6,    KC_NO,  KE6,    KF6,    KG6,    KH6,    KI6,    KJ6,    KK6,    KL6,    KC_NO,  KC_NO,  KO6,    KC_NO,  KQ6,    KR6     }, \ -/* 7 */ {   KA7,    KB7,    KC7,    KD7,    KE7,    KF7,    KG7,    KH7,    KI7,    KJ7,    KC_NO,  KC_NO,  KC_NO,  KC_NO,  KO7,    KC_NO,  KQ7,    KR7     }  \ +    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5, \ +    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \ +    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \ +    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                    KK2, KL2, KQ2, \ +    KN2, KI6, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \ +    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6 \ +) { \ +    { XXX, KB0, KC0, KD0, XXX, KF0, KG0, XXX, XXX, XXX, KK0, KL0, XXX, XXX, KO0, XXX, KQ0, KR0 }, \ +    { KA1, KB1, XXX, KD1, KE1, KF1, KG1, KH1, KI1, KJ1, KK1, KL1, XXX, XXX, XXX, XXX, KQ1, XXX }, \ +    { XXX, KB2, XXX, KD2, KE2, KF2, KG2, KH2, KI2, KJ2, KK2, KL2, XXX, KN2, XXX, KP2, KQ2, KR2 }, \ +    { XXX, KB3, XXX, KD3, KE3, KF3, KG3, KH3, KI3, KJ3, KK3, KL3, KM3, KN3, KO3, XXX, KQ3, KR3 }, \ +    { KA4, KB4, XXX, KD4, KE4, KF4, KG4, KH4, KI4, KJ4, KK4, KL4, XXX, XXX, KO4, XXX, KQ4, KR4 }, \ +    { KA5, XXX, KC5, KD5, KE5, KF5, KG5, KH5, KI5, KJ5, KK5, KL5, XXX, XXX, KO5, XXX, KQ5, KR5 }, \ +    { XXX, KB6, KC6, XXX, KE6, KF6, KG6, KH6, KI6, KJ6, KK6, KL6, XXX, XXX, KO6, XXX, KQ6, KR6 }, \ +    { KA7, KB7, KC7, KD7, KE7, KF7, KG7, KH7, KI7, KJ7, XXX, XXX, XXX, XXX, KO7, XXX, KQ7, KR7 } \  }  #define LAYOUT_fullsize_ansi( \ -  KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5,                       \ -  KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \ -  KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \ -  KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                    KK2, KL2, KQ2,      \ -  KN2,      KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \ -  KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6       \ -) \ -{ \ -/* Columns and rows need to be swapped in the below definition */ \ -/*          A       B       C       D       E       F       G       H       I       J       K       L       M       N       O       P       Q       R       */ \ -/* 0 */ {   KC_NO,  KB0,    KC0,    KD0,    KC_NO,  KF0,    KG0,    KC_NO,  KC_NO,  KC_NO,  KK0,    KL0,    KC_NO,  KC_NO,  KO0,    KC_NO,  KQ0,    KR0     }, \ -/* 1 */ {   KA1,    KB1,    KC_NO,  KD1,    KE1,    KF1,    KG1,    KH1,    KI1,    KJ1,    KK1,    KL1,    KC_NO,  KC_NO,  KC_NO,  KC_NO,  KQ1,    KC_NO   }, \ -/* 2 */ {   KC_NO,  KB2,    KC_NO,  KD2,    KE2,    KF2,    KG2,    KH2,    KI2,    KJ2,    KK2,    KL2,    KC_NO,  KN2,    KC_NO,  KP2,    KQ2,    KR2     }, \ -/* 3 */ {   KC_NO,  KB3,    KC_NO,  KD3,    KE3,    KF3,    KG3,    KH3,    KI3,    KJ3,    KK3,    KL3,    KM3,    KN3,    KO3,    KC_NO,  KQ3,    KR3     }, \ -/* 4 */ {   KA4,    KB4,    KC_NO,  KD4,    KE4,    KF4,    KG4,    KH4,    KI4,    KJ4,    KK4,    KL4,    KC_NO,  KC_NO,  KO4,    KC_NO,  KQ4,    KR4     }, \ -/* 5 */ {   KA5,    KC_NO,  KC5,    KD5,    KE5,    KF5,    KG5,    KH5,    KI5,    KJ5,    KK5,    KL5,    KC_NO,  KC_NO,  KO5,    KC_NO,  KQ5,    KR5     }, \ -/* 6 */ {   KC_NO,  KB6,    KC6,    KC_NO,  KE6,    KF6,    KG6,    KH6,    KC_NO,  KJ6,    KK6,    KL6,    KC_NO,  KC_NO,  KO6,    KC_NO,  KQ6,    KR6     }, \ -/* 7 */ {   KA7,    KB7,    KC7,    KD7,    KE7,    KF7,    KG7,    KH7,    KI7,    KJ7,    KC_NO,  KC_NO,  KC_NO,  KC_NO,  KO7,    KC_NO,  KQ7,    KR7     }  \ +    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5, \ +    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \ +    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \ +    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                    KK2, KL2, KQ2, \ +    KN2,      KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \ +    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6 \ +) { \ +    { XXX, KB0, KC0, KD0, XXX, KF0, KG0, XXX, XXX, XXX, KK0, KL0, XXX, XXX, KO0, XXX, KQ0, KR0 }, \ +    { KA1, KB1, XXX, KD1, KE1, KF1, KG1, KH1, KI1, KJ1, KK1, KL1, XXX, XXX, XXX, XXX, KQ1, XXX }, \ +    { XXX, KB2, XXX, KD2, KE2, KF2, KG2, KH2, KI2, KJ2, KK2, KL2, XXX, KN2, XXX, KP2, KQ2, KR2 }, \ +    { XXX, KB3, XXX, KD3, KE3, KF3, KG3, KH3, KI3, KJ3, KK3, KL3, KM3, KN3, KO3, XXX, KQ3, KR3 }, \ +    { KA4, KB4, XXX, KD4, KE4, KF4, KG4, KH4, KI4, KJ4, KK4, KL4, XXX, XXX, KO4, XXX, KQ4, KR4 }, \ +    { KA5, XXX, KC5, KD5, KE5, KF5, KG5, KH5, KI5, KJ5, KK5, KL5, XXX, XXX, KO5, XXX, KQ5, KR5 }, \ +    { XXX, KB6, KC6, XXX, KE6, KF6, KG6, KH6, XXX, KJ6, KK6, KL6, XXX, XXX, KO6, XXX, KQ6, KR6 }, \ +    { KA7, KB7, KC7, KD7, KE7, KF7, KG7, KH7, KI7, KJ7, XXX, XXX, XXX, XXX, KO7, XXX, KQ7, KR7 } \  } - -#endif diff --git a/keyboards/bpiphany/unloved_bastard/config.h b/keyboards/bpiphany/unloved_bastard/config.h index 61a86d723e..ed6ce8c2fb 100644 --- a/keyboards/bpiphany/unloved_bastard/config.h +++ b/keyboards/bpiphany/unloved_bastard/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -140,5 +139,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/bpiphany/unloved_bastard/unloved_bastard.h b/keyboards/bpiphany/unloved_bastard/unloved_bastard.h index d444fd0d8a..26fce8749a 100644 --- a/keyboards/bpiphany/unloved_bastard/unloved_bastard.h +++ b/keyboards/bpiphany/unloved_bastard/unloved_bastard.h @@ -13,74 +13,65 @@   * 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 UNLOVED_BASTARD_H -#define UNLOVED_BASTARD_H + +#pragma once  #include "quantum.h" +#define XXX KC_NO +  #define LAYOUT_all( \ -  KG6,      KH4, KI4, KI2, KI6, KP5, KL6, KM2, KM4, KO4, KO5, KO6, KO0,   KN5, KN7, KP7, \ -  KG4, KG5, KH5, KI5, KJ5, KJ4, KK4, KK5, KL5, KM5, KF5, KF4, KL4, KO2,   KR4, KC4, KE4, \ -  KG2, KG7, KH7, KI7, KJ7, KJ2, KK2, KK7, KL7, KM7, KF7, KF2, KL2, KO3,   KQ4, KC5, KE5, \ -  KH2, KG3, KH3, KI3, KJ3, KJ6, KK6, KK3, KL3, KM3, KF3, KF6,      KO1,                  \ -  KB2, KH6, KG1, KH1, KI1, KJ1, KJ0, KK0, KK1, KL1, KM1, KF0,      KB3,        KC6,      \ -  KP4, KN2, KN6,                KQ6,                KN0, KN3, KM0, KP1,   KC0, KQ0, KR0  \ -) \ -{ \ -/* Columns and rows need to be swapped in the below definition */ \ -/*          A       B       C       D       E       F       G       H       I       J       K       L       M       N       O       P       Q       R       */ \ -/* 0 */ {   KC_NO,  KC_NO,  KC0,    KC_NO,  KC_NO,  KF0,    KC_NO,  KC_NO,  KC_NO,  KJ0,  KK0,  KC_NO, KM0,  KN0,    KO0,    KC_NO,  KQ0,    KR0     }, \ -/* 1 */ {   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KG1,    KH1,    KI1,    KJ1,    KK1,  KL1,   KM1,  KC_NO,  KO1,    KP1,    KC_NO,  KC_NO   }, \ -/* 2 */ {   KC_NO,  KB2,    KC_NO,  KC_NO,  KC_NO,  KF2,    KG2,    KH2,    KI2,    KJ2,    KK2,  KL2,   KM2,  KN2,    KO2,    KC_NO,  KC_NO,  KC_NO   }, \ -/* 3 */ {   KC_NO,  KB3,    KC_NO,  KC_NO,  KC_NO,  KF3,    KG3,    KH3,    KI3,    KJ3,    KK3,  KL3,   KM3,  KN3,    KO3,    KC_NO,  KC_NO,  KC_NO   }, \ -/* 4 */ {   KC_NO,  KC_NO,  KC4,    KC_NO,  KE4,    KF4,    KG4,    KH4,    KI4,    KJ4,    KK4,  KL4,   KM4,  KC_NO,  KO4,    KP4,    KQ4,    KR4     }, \ -/* 5 */ {   KC_NO,  KC_NO,  KC5,    KC_NO,  KE5,    KF5,    KG5,    KH5,    KI5,    KJ5,    KK5,  KL5,   KM5,  KN5,    KO5,    KP5,    KC_NO,  KC_NO   }, \ -/* 6 */ {   KC_NO,  KC_NO,  KC6,    KC_NO,  KC_NO,  KF6,    KG6,    KH6,    KI6,    KJ6,    KK6,  KL6,   KC_NO,KN6,    KO6,    KC_NO,  KQ6,    KC_NO   }, \ -/* 7 */ {   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KF7,    KG7,    KH7,    KI7,    KJ7,    KK7,  KL7,   KM7,  KN7,    KC_NO,  KP7,    KC_NO,  KC_NO   }  \ +    KG6,      KH4, KI4, KI2, KI6, KP5, KL6, KM2, KM4, KO4, KO5, KO6, KO0,   KN5, KN7, KP7, \ +    KG4, KG5, KH5, KI5, KJ5, KJ4, KK4, KK5, KL5, KM5, KF5, KF4, KL4, KO2,   KR4, KC4, KE4, \ +    KG2, KG7, KH7, KI7, KJ7, KJ2, KK2, KK7, KL7, KM7, KF7, KF2, KL2, KO3,   KQ4, KC5, KE5, \ +    KH2, KG3, KH3, KI3, KJ3, KJ6, KK6, KK3, KL3, KM3, KF3, KF6,      KO1, \ +    KB2, KH6, KG1, KH1, KI1, KJ1, KJ0, KK0, KK1, KL1, KM1, KF0,      KB3,        KC6, \ +    KP4, KN2, KN6,                KQ6,                KN0, KN3, KM0, KP1,   KC0, KQ0, KR0 \ +) { \ +    { XXX, XXX, KC0, XXX, XXX, KF0, XXX, XXX, XXX, KJ0, KK0, XXX, KM0, KN0, KO0, XXX, KQ0, KR0 }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, KG1, KH1, KI1, KJ1, KK1, KL1, KM1, XXX, KO1, KP1, XXX, XXX }, \ +    { XXX, KB2, XXX, XXX, XXX, KF2, KG2, KH2, KI2, KJ2, KK2, KL2, KM2, KN2, KO2, XXX, XXX, XXX }, \ +    { XXX, KB3, XXX, XXX, XXX, KF3, KG3, KH3, KI3, KJ3, KK3, KL3, KM3, KN3, KO3, XXX, XXX, XXX }, \ +    { XXX, XXX, KC4, XXX, KE4, KF4, KG4, KH4, KI4, KJ4, KK4, KL4, KM4, XXX, KO4, KP4, KQ4, KR4 }, \ +    { XXX, XXX, KC5, XXX, KE5, KF5, KG5, KH5, KI5, KJ5, KK5, KL5, KM5, KN5, KO5, KP5, XXX, XXX }, \ +    { XXX, XXX, KC6, XXX, XXX, KF6, KG6, KH6, KI6, KJ6, KK6, KL6, XXX, KN6, KO6, XXX, KQ6, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, KF7, KG7, KH7, KI7, KJ7, KK7, KL7, KM7, KN7, XXX, KP7, XXX, XXX } \  }  #define LAYOUT_tkl_ansi( \ -  KG6,      KH4, KI4, KI2, KI6, KP5, KL6, KM2, KM4, KO4, KO5, KO6, KO0,   KN5, KN7, KP7, \ -  KG4, KG5, KH5, KI5, KJ5, KJ4, KK4, KK5, KL5, KM5, KF5, KF4, KL4, KO2,   KR4, KC4, KE4, \ -  KG2, KG7, KH7, KI7, KJ7, KJ2, KK2, KK7, KL7, KM7, KF7, KF2, KL2, KO3,   KQ4, KC5, KE5, \ -  KH2, KG3, KH3, KI3, KJ3, KJ6, KK6, KK3, KL3, KM3, KF3, KF6,      KO1,                  \ -  KB2,      KG1, KH1, KI1, KJ1, KJ0, KK0, KK1, KL1, KM1, KF0,      KB3,        KC6,      \ -  KP4, KN2, KN6,                KQ6,                KN0, KN3, KM0, KP1,   KC0, KQ0, KR0  \ -) \ -{ \ -/* Columns and rows need to be swapped in the below definition */ \ -/*          A       B       C       D       E       F       G       H       I       J       K       L       M       N       O       P       Q       R       */ \ -/* 0 */ {   KC_NO,  KC_NO,  KC0,    KC_NO,  KC_NO,  KF0,    KC_NO,  KC_NO,  KC_NO,  KJ0,  KK0,  KC_NO, KM0,  KN0,    KO0,    KC_NO,  KQ0,    KR0     }, \ -/* 1 */ {   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KG1,    KH1,    KI1,    KJ1,    KK1,  KL1,   KM1,  KC_NO,  KO1,    KP1,    KC_NO,  KC_NO   }, \ -/* 2 */ {   KC_NO,  KB2,    KC_NO,  KC_NO,  KC_NO,  KF2,    KG2,    KH2,    KI2,    KJ2,    KK2,  KL2,   KM2,  KN2,    KO2,    KC_NO,  KC_NO,  KC_NO   }, \ -/* 3 */ {   KC_NO,  KB3,    KC_NO,  KC_NO,  KC_NO,  KF3,    KG3,    KH3,    KI3,    KJ3,    KK3,  KL3,   KM3,  KN3,    KO3,    KC_NO,  KC_NO,  KC_NO   }, \ -/* 4 */ {   KC_NO,  KC_NO,  KC4,    KC_NO,  KE4,    KF4,    KG4,    KH4,    KI4,    KJ4,    KK4,  KL4,   KM4,  KC_NO,  KO4,    KP4,    KQ4,    KR4     }, \ -/* 5 */ {   KC_NO,  KC_NO,  KC5,    KC_NO,  KE5,    KF5,    KG5,    KH5,    KI5,    KJ5,    KK5,  KL5,   KM5,  KN5,    KO5,    KP5,    KC_NO,  KC_NO   }, \ -/* 6 */ {   KC_NO,  KC_NO,  KC6,    KC_NO,  KC_NO,  KF6,    KG6,    KC_NO,  KI6,    KJ6,    KK6,  KL6,   KC_NO,KN6,    KO6,    KC_NO,  KQ6,    KC_NO   }, \ -/* 7 */ {   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KF7,    KG7,    KH7,    KI7,    KJ7,    KK7,  KL7,   KM7,  KN7,    KC_NO,  KP7,    KC_NO,  KC_NO   }  \ +    KG6,      KH4, KI4, KI2, KI6, KP5, KL6, KM2, KM4, KO4, KO5, KO6, KO0,   KN5, KN7, KP7, \ +    KG4, KG5, KH5, KI5, KJ5, KJ4, KK4, KK5, KL5, KM5, KF5, KF4, KL4, KO2,   KR4, KC4, KE4, \ +    KG2, KG7, KH7, KI7, KJ7, KJ2, KK2, KK7, KL7, KM7, KF7, KF2, KL2, KO3,   KQ4, KC5, KE5, \ +    KH2, KG3, KH3, KI3, KJ3, KJ6, KK6, KK3, KL3, KM3, KF3, KF6,      KO1, \ +    KB2,      KG1, KH1, KI1, KJ1, KJ0, KK0, KK1, KL1, KM1, KF0,      KB3,        KC6, \ +    KP4, KN2, KN6,                KQ6,                KN0, KN3, KM0, KP1,   KC0, KQ0, KR0 \ +) { \ +    { XXX, XXX, KC0, XXX, XXX, KF0, XXX, XXX, XXX, KJ0, KK0, XXX, KM0, KN0, KO0, XXX, KQ0, KR0 }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, KG1, KH1, KI1, KJ1, KK1, KL1, KM1, XXX, KO1, KP1, XXX, XXX }, \ +    { XXX, KB2, XXX, XXX, XXX, KF2, KG2, KH2, KI2, KJ2, KK2, KL2, KM2, KN2, KO2, XXX, XXX, XXX }, \ +    { XXX, KB3, XXX, XXX, XXX, KF3, KG3, KH3, KI3, KJ3, KK3, KL3, KM3, KN3, KO3, XXX, XXX, XXX }, \ +    { XXX, XXX, KC4, XXX, KE4, KF4, KG4, KH4, KI4, KJ4, KK4, KL4, KM4, XXX, KO4, KP4, KQ4, KR4 }, \ +    { XXX, XXX, KC5, XXX, KE5, KF5, KG5, KH5, KI5, KJ5, KK5, KL5, KM5, KN5, KO5, KP5, XXX, XXX }, \ +    { XXX, XXX, KC6, XXX, XXX, KF6, KG6, XXX, KI6, KJ6, KK6, KL6, XXX, KN6, KO6, XXX, KQ6, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, KF7, KG7, KH7, KI7, KJ7, KK7, KL7, KM7, KN7, XXX, KP7, XXX, XXX } \  }  #define LAYOUT_tkl_iso( \ -  KG6,      KH4, KI4, KI2, KI6, KP5, KL6, KM2, KM4, KO4, KO5, KO6, KO0,   KN5, KN7, KP7, \ -  KG4, KG5, KH5, KI5, KJ5, KJ4, KK4, KK5, KL5, KM5, KF5, KF4, KL4, KO2,   KR4, KC4, KE4, \ -  KG2, KG7, KH7, KI7, KJ7, KJ2, KK2, KK7, KL7, KM7, KF7, KF2, KL2,        KQ4, KC5, KE5, \ -  KH2, KG3, KH3, KI3, KJ3, KJ6, KK6, KK3, KL3, KM3, KF3, KF6, KO3, KO1,                  \ -  KB2, KH6, KG1, KH1, KI1, KJ1, KJ0, KK0, KK1, KL1, KM1, KF0,      KB3,        KC6,      \ -  KP4, KN2, KN6,                KQ6,                KN0, KN3, KM0, KP1,   KC0, KQ0, KR0  \ -) \ -{ \ -/* Columns and rows need to be swapped in the below definition */ \ -/*          A       B       C       D       E       F       G       H       I       J       K       L       M       N       O       P       Q       R       */ \ -/* 0 */ {   KC_NO,  KC_NO,  KC0,    KC_NO,  KC_NO,  KF0,    KC_NO,  KC_NO,  KC_NO,  KJ0,  KK0,  KC_NO, KM0,  KN0,    KO0,    KC_NO,  KQ0,    KR0     }, \ -/* 1 */ {   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KG1,    KH1,    KI1,    KJ1,    KK1,  KL1,   KM1,  KC_NO,  KO1,    KP1,    KC_NO,  KC_NO   }, \ -/* 2 */ {   KC_NO,  KB2,    KC_NO,  KC_NO,  KC_NO,  KF2,    KG2,    KH2,    KI2,    KJ2,    KK2,  KL2,   KM2,  KN2,    KO2,    KC_NO,  KC_NO,  KC_NO   }, \ -/* 3 */ {   KC_NO,  KB3,    KC_NO,  KC_NO,  KC_NO,  KF3,    KG3,    KH3,    KI3,    KJ3,    KK3,  KL3,   KM3,  KN3,    KO3,    KC_NO,  KC_NO,  KC_NO   }, \ -/* 4 */ {   KC_NO,  KC_NO,  KC4,    KC_NO,  KE4,    KF4,    KG4,    KH4,    KI4,    KJ4,    KK4,  KL4,   KM4,  KC_NO,  KO4,    KP4,    KQ4,    KR4     }, \ -/* 5 */ {   KC_NO,  KC_NO,  KC5,    KC_NO,  KE5,    KF5,    KG5,    KH5,    KI5,    KJ5,    KK5,  KL5,   KM5,  KN5,    KO5,    KP5,    KC_NO,  KC_NO   }, \ -/* 6 */ {   KC_NO,  KC_NO,  KC6,    KC_NO,  KC_NO,  KF6,    KG6,    KH6,    KI6,    KJ6,    KK6,  KL6,   KC_NO,KN6,    KO6,    KC_NO,  KQ6,    KC_NO   }, \ -/* 7 */ {   KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KF7,    KG7,    KH7,    KI7,    KJ7,    KK7,  KL7,   KM7,  KN7,    KC_NO,  KP7,    KC_NO,  KC_NO   }  \ +    KG6,      KH4, KI4, KI2, KI6, KP5, KL6, KM2, KM4, KO4, KO5, KO6, KO0,   KN5, KN7, KP7, \ +    KG4, KG5, KH5, KI5, KJ5, KJ4, KK4, KK5, KL5, KM5, KF5, KF4, KL4, KO2,   KR4, KC4, KE4, \ +    KG2, KG7, KH7, KI7, KJ7, KJ2, KK2, KK7, KL7, KM7, KF7, KF2, KL2,        KQ4, KC5, KE5, \ +    KH2, KG3, KH3, KI3, KJ3, KJ6, KK6, KK3, KL3, KM3, KF3, KF6, KO3, KO1, \ +    KB2, KH6, KG1, KH1, KI1, KJ1, KJ0, KK0, KK1, KL1, KM1, KF0,      KB3,        KC6, \ +    KP4, KN2, KN6,                KQ6,                KN0, KN3, KM0, KP1,   KC0, KQ0, KR0 \ +) { \ +    { XXX, XXX, KC0, XXX, XXX, KF0, XXX, XXX, XXX, KJ0, KK0, XXX, KM0, KN0, KO0, XXX, KQ0, KR0 }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, KG1, KH1, KI1, KJ1, KK1, KL1, KM1, XXX, KO1, KP1, XXX, XXX }, \ +    { XXX, KB2, XXX, XXX, XXX, KF2, KG2, KH2, KI2, KJ2, KK2, KL2, KM2, KN2, KO2, XXX, XXX, XXX }, \ +    { XXX, KB3, XXX, XXX, XXX, KF3, KG3, KH3, KI3, KJ3, KK3, KL3, KM3, KN3, KO3, XXX, XXX, XXX }, \ +    { XXX, XXX, KC4, XXX, KE4, KF4, KG4, KH4, KI4, KJ4, KK4, KL4, KM4, XXX, KO4, KP4, KQ4, KR4 }, \ +    { XXX, XXX, KC5, XXX, KE5, KF5, KG5, KH5, KI5, KJ5, KK5, KL5, KM5, KN5, KO5, KP5, XXX, XXX }, \ +    { XXX, XXX, KC6, XXX, XXX, KF6, KG6, KH6, KI6, KJ6, KK6, KL6, XXX, KN6, KO6, XXX, KQ6, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, KF7, KG7, KH7, KI7, KJ7, KK7, KL7, KM7, KN7, XXX, KP7, XXX, XXX } \  }  #define LAYOUT LAYOUT_all - -#endif diff --git a/keyboards/bthlabs/geekpad/geekpad.h b/keyboards/bthlabs/geekpad/geekpad.h index c9f1ac9d4f..4dc6800fe5 100644 --- a/keyboards/bthlabs/geekpad/geekpad.h +++ b/keyboards/bthlabs/geekpad/geekpad.h @@ -13,8 +13,8 @@   * 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 GEEKPAD_H -#define GEEKPAD_H + +#pragma once  #include "quantum.h" @@ -27,14 +27,11 @@   * represents the switch matrix.   */  #define LAYOUT( \ -    K00, K01, K02, \ -    K10, K11, K12, \ -    K20, K21, K22  \ -) \ -{ \ -    { K00,   K01,   K02 }, \ -    { K10,   K11,   K12 }, \ -    { K20,   K21,   K22 }  \ +    k00, k01, k02, \ +    k10, k11, k12, \ +    k20, k21, k22  \ +) { \ +    { k00, k01, k02 }, \ +    { k10, k11, k12 }, \ +    { k20, k21, k22 } \  } - -#endif diff --git a/keyboards/chimera_ergo/chimera_ergo.h b/keyboards/chimera_ergo/chimera_ergo.h index 32d02886c4..b8897ac14e 100644 --- a/keyboards/chimera_ergo/chimera_ergo.h +++ b/keyboards/chimera_ergo/chimera_ergo.h @@ -1,5 +1,4 @@ -#ifndef CHIMERA_ERGO_H -#define CHIMERA_ERGO_H +#pragma once  #include "quantum.h" @@ -43,22 +42,21 @@  #define set_led_white   PORTF |= (1<<LED_B) | (1<<LED_R) | (1<<LED_G)  */ +#define XXX KC_NO +  // This a shortcut to help you visually see your layout.  // The first section contains all of the arguements  // The second converts the arguments into a two-dimensional array  #define LAYOUT( \ -  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, k40, k41,      k42, k43, k44, k45, k46, k47, \ -                      k48, k49,      k50, k51 \ -) \ -{ \ -	{ KC_NO, KC_NO, k26, k15, k28, k01,      k42, k31, k20, k33, KC_NO, KC_NO  }, \ -	{ k00,   KC_NO, k14, k27, k16, k36,      k47, k19, k32, k21, KC_NO, k11    }, \ -	{ k12,   k25,   k02, k39, k17, k49,      k50, k18, k44, k09, k34,   k23    }, \ -	{ k24,   k13,   k38, k04, k05, k48,      k51, k06, k07, k45, k22,   k35    },  \ -	{ k29,   k41,   k03, k40, k37, KC_NO,    k30, k43, k08, k10, k46,   KC_NO  }, \ +    k10, k05, k22, k42, k33, k34,      k37, k38, k48, k29, k49, k1B, \ +    k20, k31, k12, k03, k14, k24,      k27, k17, k08, k19, k3A, k2B, \ +    k30, k21, k02, k13, k04, k40,      k46, k07, k18, k09, k2A, k3B, \ +    k15, k44, k32, k23, k43, k41,      k06, k47, k28, k39, k4A, k16, \ +                        k35, k25,      k26, k36 \ +) { \ +    { XXX, XXX, k02, k03, k04, k05, k06, k07, k08, k09, XXX, XXX }, \ +    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, XXX, k1B }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \ +    { k40, k41, k42, k43, k44, XXX, k46, k47, k48, k49, k4A, XXX } \  } - -#endif diff --git a/keyboards/chimera_ergo/config.h b/keyboards/chimera_ergo/config.h index 4021cdcd50..0767a218b5 100644 --- a/keyboards/chimera_ergo/config.h +++ b/keyboards/chimera_ergo/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -66,5 +65,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.      UCSR1B = _BV(TXEN1) | _BV(RXEN1); \      /* 8-bit data */                  \      UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); - -#endif diff --git a/keyboards/chimera_ls/chimera_ls.h b/keyboards/chimera_ls/chimera_ls.h index 45c91acc3d..7d67d573db 100644 --- a/keyboards/chimera_ls/chimera_ls.h +++ b/keyboards/chimera_ls/chimera_ls.h @@ -1,5 +1,4 @@ -#ifndef CHIMERA_LETS_SPLIT_H -#define CHIMERA_LETS_SPLIT_H +#pragma once  #include "quantum.h" @@ -43,22 +42,21 @@  #define set_led_white   PORTF |= (1<<LED_B) | (1<<LED_R) | (1<<LED_G)  */ +#define XXX KC_NO +  // This a shortcut to help you visually see your layout.  // The first section contains all of the arguements  // The second converts the arguments into a two-dimensional array  #define LAYOUT_ortho_4x12( \ -    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, k40, k41,           k42, k43, k44, k45, k46, k47  \ -  ) { \ -    { k43, k45, k34, k11, k23,   k40, k38, k25, k00, k12   }, \ -    { k31, k44, k46, k35, k22,   k28, k39, k37, k24, k13   }, \ -    { k30, k32, k33, k47, k09,   k29, k27, k26, k36, k02   }, \ -    { k19, k20, k21, k42, k18,   k16, k15, k14, k41, k17   }, \ -    { k06, k07, k08, k10, KC_NO, k05, k04, k03, k01, KC_NO }  \ +    k08, k48, k29, k47, k46, k45,     k40, k41, k42, k24, k43, k03, \ +    k09, k19, k37, k36, k35, k39,     k34, k30, k31, k32, k14, k04, \ +    k18, k07, k27, k26, k15, k25,     k20, k10, k21, k22, k02, k13, \ +    k28, k17, k06, k16, k05, k38,     k33, k00, k11, k01, k12, k23 \ +) { \ +    { 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 }, \ +    { k40, k41, k42, k43, XXX, k45, k46, k47, k48, XXX } \  } - - -#endif diff --git a/keyboards/chimera_ls/config.h b/keyboards/chimera_ls/config.h index d9c14a3fce..2eb028471d 100644 --- a/keyboards/chimera_ls/config.h +++ b/keyboards/chimera_ls/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -66,5 +65,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.      UCSR1B = _BV(TXEN1) | _BV(RXEN1); \      /* 8-bit data */                  \      UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); - -#endif diff --git a/keyboards/chimera_ortho/chimera_ortho.h b/keyboards/chimera_ortho/chimera_ortho.h index ec893990a3..03384c9b28 100644 --- a/keyboards/chimera_ortho/chimera_ortho.h +++ b/keyboards/chimera_ortho/chimera_ortho.h @@ -1,5 +1,4 @@ -#ifndef CHIMERA_ORTHO_H -#define CHIMERA_ORTHO_H +#pragma once  #include "quantum.h" @@ -43,21 +42,20 @@  #define set_led_white   PORTF |= (1<<LED_B) | (1<<LED_R) | (1<<LED_G)  */ +#define XXX KC_NO +  // This a shortcut to help you visually see your layout.  // The first section contains all of the arguements  // The second converts the arguments into a two-dimensional array  #define LAYOUT( \ -  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, k31, k32, k33, k34, k35,      k36, k37, k38, k41, k42, k43, k44, \ -                      k45, k46,                k47, k48      \ -) \ -{ \ -  { k01,   k02, k03, k04, k05,      k08, k09, k10, k11, k12   }, \ -  { k15,   k16, k17, k18, k19,      k22, k23, k24, k25, k26   }, \ -  { k29,   k31, k32, k33, k34,      k37, k38, k41, k42, k43   }, \ -  { KC_NO, k06, k20, k35, k46,      k47, k36, k21, k07, KC_NO }, \ -  { KC_NO, k28, k14, k00, k45,      k48, k13, k27, k44, KC_NO }  \ +    k43, k00, k01, k02, k03, k04, k31,      k38, k05, k06, k07, k08, k09, k46, \ +    k42, k10, k11, k12, k13, k14, k32,      k37, k15, k16, k17, k18, k19, k47, \ +    k41, k20, k21, k22, k23, k24, k33,      k36, k25, k26, k27, k28, k29, k48, \ +                        k44, k34,                k35, k45 \ +) { \ +    { 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 }, \ +    { XXX, k31, k32, k33, k34, k35, k36, k37, k38, XXX }, \ +    { XXX, k41, k42, k43, k44, k45, k46, k47, k48, XXX } \  } - -#endif diff --git a/keyboards/chimera_ortho/config.h b/keyboards/chimera_ortho/config.h index b103589879..974502525c 100644 --- a/keyboards/chimera_ortho/config.h +++ b/keyboards/chimera_ortho/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -66,5 +65,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.      UCSR1B = _BV(TXEN1) | _BV(RXEN1); \      /* 8-bit data */                  \      UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); - -#endif diff --git a/keyboards/christmas_tree/V2017/V2017.h b/keyboards/christmas_tree/V2017/V2017.h index a82a1e82f4..f779c0ed47 100644 --- a/keyboards/christmas_tree/V2017/V2017.h +++ b/keyboards/christmas_tree/V2017/V2017.h @@ -1,6 +1,3 @@ -#ifndef V2017_H -#define V2017_H +#pragma once  #include "christmas_tree.h" - -#endif
\ No newline at end of file diff --git a/keyboards/christmas_tree/V2017/config.h b/keyboards/christmas_tree/V2017/config.h index ebe3d3bf1e..abc94749a8 100644 --- a/keyboards/christmas_tree/V2017/config.h +++ b/keyboards/christmas_tree/V2017/config.h @@ -1,8 +1,5 @@ -#ifndef V2017_CONFIG_H -#define V2017_CONFIG_H +#pragma once  #include "config_common.h"  #define DEVICE_VER 0x2017 - -#endif
\ No newline at end of file diff --git a/keyboards/christmas_tree/christmas_tree.h b/keyboards/christmas_tree/christmas_tree.h index 11063c9152..68eefca6a8 100644 --- a/keyboards/christmas_tree/christmas_tree.h +++ b/keyboards/christmas_tree/christmas_tree.h @@ -1,20 +1,14 @@ -#ifndef CHRISTMAS_TREE_H -#define CHRISTMAS_TREE_H -#include "quantum.h" +#pragma once +#include "quantum.h"  #define LAYOUT( \ -	k00, k01, k02, k03, k04, k05 \ -) \ -{ \ -	{ k00 }, \ -	{ k01 }, \ -	{ k02 }, \ -	{ k03 }, \ -	{ k04 }, \ -	{ k05 } \ +    k00, k10, k20, k30, k40, k50 \ +) { \ +    { k00 }, \ +    { k10 }, \ +    { k20 }, \ +    { k30 }, \ +    { k40 }, \ +    { k50 } \  } - - - -#endif diff --git a/keyboards/christmas_tree/config.h b/keyboards/christmas_tree/config.h index 05e5bdb2b4..531c5996d2 100644 --- a/keyboards/christmas_tree/config.h +++ b/keyboards/christmas_tree/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -53,5 +52,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define LOCKING_SUPPORT_ENABLE  /* Locking resynchronize hack */  #define LOCKING_RESYNC_ENABLE - -#endif diff --git a/keyboards/ckeys/nakey/config.h b/keyboards/ckeys/nakey/config.h index 54775de72f..be0b12dcc2 100644 --- a/keyboards/ckeys/nakey/config.h +++ b/keyboards/ckeys/nakey/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -156,5 +155,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/ckeys/nakey/nakey.h b/keyboards/ckeys/nakey/nakey.h index bbf531fb68..bdb26afa26 100644 --- a/keyboards/ckeys/nakey/nakey.h +++ b/keyboards/ckeys/nakey/nakey.h @@ -13,27 +13,27 @@   * 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 NAKEY_H -#define NAKEY_H + +#pragma once  #include "quantum.h" +#define XXX KC_NO +  // This a shortcut to help you visually see your layout.  // The following is an example using the Planck MIT layout  // The first section contains all of the arguments  // The second converts the arguments into a two-dimensional array  #define LAYOUT_numpad_5x4( \      k00, k01, k02, k03, \ -    k10, k11, k12,      \ +    k10, k11, k12, \      k20, k21, k22, k13, \ -    k30, k31, k32,      \ -    k40,      k41, k33  \ +    k30, k31, k32, \ +    k40,      k41, k33 \  ) { \ -    { k00, k01,   k02, k03   }, \ -    { k10, k11,   k12, k13   }, \ -    { k20, k21,   k22, KC_NO }, \ -    { k30, k31,   k32, k33   }, \ -    { k40, KC_NO, k41, KC_NO }, \ +    { k00, k01, k02, k03 }, \ +    { k10, k11, k12, k13 }, \ +    { k20, k21, k22, XXX }, \ +    { k30, k31, k32, k33 }, \ +    { k40, XXX, k41, XXX } \  } - -#endif diff --git a/keyboards/ckeys/obelus/config.h b/keyboards/ckeys/obelus/config.h index 25bc1db03c..6b00b010f2 100644 --- a/keyboards/ckeys/obelus/config.h +++ b/keyboards/ckeys/obelus/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -157,5 +156,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.    #define AUDIO_PIN C6    #define STARTUP_SONG SONG(STARTUP_SOUND)  #endif - -#endif diff --git a/keyboards/ckeys/obelus/obelus.h b/keyboards/ckeys/obelus/obelus.h index 371b79df20..76ff4f1a9f 100644 --- a/keyboards/ckeys/obelus/obelus.h +++ b/keyboards/ckeys/obelus/obelus.h @@ -1,5 +1,4 @@ -#ifndef OBELUS_H -#define OBELUS_H +#pragma once  #include "quantum.h" @@ -12,12 +11,9 @@      k10, k11, k12, k13, \      k20, k21, k22, k23, \      k30, k31, k32, k33 \ -) \ -{ \ +) { \      { k00, k01, k02, k03 }, \      { k10, k11, k12, k13 }, \      { k20, k21, k22, k23 }, \      { k30, k31, k32, k33 } \  } - -#endif diff --git a/keyboards/clueboard/17/17.h b/keyboards/clueboard/17/17.h index ebf2083862..ef5b3f3e04 100644 --- a/keyboards/clueboard/17/17.h +++ b/keyboards/clueboard/17/17.h @@ -1,6 +1,3 @@ -#ifndef CLUEPAD_H -#define CLUEPAD_H +#pragma once  #include "quantum.h" - -#endif diff --git a/keyboards/clueboard/17/config.h b/keyboards/clueboard/17/config.h index 877f478690..e2d0d1a23e 100644 --- a/keyboards/clueboard/17/config.h +++ b/keyboards/clueboard/17/config.h @@ -15,12 +15,9 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h"  /* Number of backlighting levels */  #define BACKLIGHT_LEVELS 3 - -#endif diff --git a/keyboards/clueboard/2x1800/2018/2018.h b/keyboards/clueboard/2x1800/2018/2018.h index c6e152ad44..6e2d3b3831 100644 --- a/keyboards/clueboard/2x1800/2018/2018.h +++ b/keyboards/clueboard/2x1800/2018/2018.h @@ -13,9 +13,7 @@   * 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 TWOX1800_H -#define TWOX1800_H -#include "quantum.h" +#pragma once -#endif +#include "quantum.h" diff --git a/keyboards/clueboard/60/60.h b/keyboards/clueboard/60/60.h index 0345f419fa..9a019ccf6d 100644 --- a/keyboards/clueboard/60/60.h +++ b/keyboards/clueboard/60/60.h @@ -13,9 +13,7 @@   * 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 CLUEBOARD60_H -#define CLUEBOARD60_H -#include "quantum.h" +#pragma once -#endif +#include "quantum.h" diff --git a/keyboards/coarse/vinta/vinta.h b/keyboards/coarse/vinta/vinta.h index 03a815c065..18f51cd434 100644 --- a/keyboards/coarse/vinta/vinta.h +++ b/keyboards/coarse/vinta/vinta.h @@ -1,55 +1,49 @@ -#ifndef VINTA_H -#define VINTA_H - -#define XXX KC_NO +#pragma once  #include "quantum.h" +#define XXX KC_NO +  // This a shortcut to help you visually see your layout.  #define LAYOUT_69_ansi( \ -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ -    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \ -    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,           K2E, K2F, \ -    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3C,      K3E, K3F, \ -    K40, K41, K42,           K45,                K49, K4A,      K4C, K4D, K4E, K4F  \ -) \ -{ \ -    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ -    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E, K1F }, \ -    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, XXX, K2E, K2F }, \ -    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, XXX, K3C, XXX, K3E, K3F }, \ -    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, XXX, K4C, K4D, K4E, K4F }  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1E, k1F, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2E, k2F, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A,      k3C,      k3E, k3F, \ +    k40, k41, k42,           k45,                k49, k4A,      k4C, k4D, k4E, k4F \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, XXX, k2E, k2F }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, XXX, k3C, XXX, k3E, k3F }, \ +    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4A, XXX, k4C, k4D, k4E, k4F } \  }  #define LAYOUT_68_tada( \ -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \ -    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \ -    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,           K2E, K2F, \ -    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3C,      K3E, K3F, \ -    K40, K41, K42,           K45,                K49, K4A,      K4C, K4D, K4E, K4F  \ -) \ -{ \ -    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \ -    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E, K1F }, \ -    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, XXX, K2E, K2F }, \ -    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, XXX, K3C, XXX, K3E, K3F }, \ -    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, XXX, XXX, K4D, K4E, K4F }  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0F, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1E, k1F, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2E, k2F, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A,      k3C,      k3E, k3F, \ +    k40, k41, k42,           k45,                k49, k4A,      k4C, k4D, k4E, k4F \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, XXX, k2E, k2F }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, XXX, k3C, XXX, k3E, k3F }, \ +    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4A, XXX, XXX, k4D, k4E, k4F } \  }  #define LAYOUT_65_ansi_blocker( \ -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \ -    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \ -    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,           K2E, K2F, \ -    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3C,      K3E, K3F, \ -    K40, K41, K42,           K45,                K49, K4A,           K4D, K4E, K4F  \ -) \ -{ \ -    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \ -    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E, K1F }, \ -    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, XXX, K2E, K2F }, \ -    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, XXX, K3C, XXX, K3E, K3F }, \ -    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, XXX, XXX, K4D, K4E, K4F }  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0F, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1E, k1F, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2E, k2F, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A,      k3C,      k3E, k3F, \ +    k40, k41, k42,           k45,                k49, k4A,           k4D, k4E, k4F \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, XXX, k2E, k2F }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, XXX, k3C, XXX, k3E, k3F }, \ +    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4A, XXX, XXX, k4D, k4E, k4F } \  } - -#endif diff --git a/keyboards/comet46/comet46.h b/keyboards/comet46/comet46.h index c108d4193b..094d960e20 100644 --- a/keyboards/comet46/comet46.h +++ b/keyboards/comet46/comet46.h @@ -1,22 +1,21 @@ -#ifndef COMET46_H -#define COMET46_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  // This a shortcut to help you visually see your layout.  // The first section contains all of the arguements  // The second converts the arguments into a two-dimensional array  #define LAYOUT( \ -  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, k31, k32, k33,      k34, k35, k36, k37, k38, k41, k42,\ -                      k43, k44, k45,      k46, k47, k48     \ -) \ -{ \ -	{ k13,   k01, k26, k12, k00,      k11, k25, k42, k10, k24}, \ -	{ k03,   k28, k14, k02, k27,      k41, k09, k23, k38, k08}, \ -	{ k31,   k16, k04, k29, k15,      k22, k37, k07, k21, k36}, \ -	{ KC_NO, k32, k17, k05, k43,      k48, k06, k20, k35, KC_NO },  \ -	{ KC_NO, k45, k33, k18, k44,      k47, k19, k34, k46, KC_NO }, \ +    k04, k01, k13, k10, k22, k33,                k36, k27, k19, k16, k08, k05, \ +    k03, k00, k12, k24, k21, k32, k43,      k46, k37, k28, k25, k17, k09, k06, \ +    k02, k14, k11, k23, k20, k31, k42,      k47, k38, k29, k26, k18, k15, k07, \ +                        k34, k44, k41,      k48, k45, k35 \ +) { \ +    { 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 }, \ +    { XXX, k31, k32, k33, k34, k35, k36, k37, k38, XXX }, \ +    { XXX, k41, k42, k43, k44, k45, k46, k47, k48, XXX } \  } -#endif diff --git a/keyboards/comet46/config.h b/keyboards/comet46/config.h index 5ae026f923..067dabb103 100644 --- a/keyboards/comet46/config.h +++ b/keyboards/comet46/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -72,5 +71,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.      UCSR1B = _BV(TXEN1) | _BV(RXEN1); \      /* 8-bit data */                  \      UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); - -#endif diff --git a/keyboards/comet46/i2c.h b/keyboards/comet46/i2c.h index 47cf6bd1b2..710662c7ab 100644 --- a/keyboards/comet46/i2c.h +++ b/keyboards/comet46/i2c.h @@ -1,5 +1,4 @@ -#ifndef I2C_H -#define I2C_H +#pragma once  #include <stdint.h> @@ -45,5 +44,3 @@ extern unsigned char i2c_readNak(void);  extern unsigned char i2c_read(unsigned char ack);  #define i2c_read(ack)  (ack) ? i2c_readAck() : i2c_readNak(); - -#endif diff --git a/keyboards/contra/config.h b/keyboards/contra/config.h index 8dc565546b..499517f984 100755 --- a/keyboards/contra/config.h +++ b/keyboards/contra/config.h @@ -1,5 +1,4 @@ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -44,5 +43,3 @@  #define RGBLIGHT_SAT_STEP 8  #define RGBLIGHT_VAL_STEP 8  #endif - -#endif diff --git a/keyboards/contra/contra.h b/keyboards/contra/contra.h index 74aad77d0b..27a8dd2956 100755 --- a/keyboards/contra/contra.h +++ b/keyboards/contra/contra.h @@ -1,30 +1,27 @@ -#ifndef KB_H -#define KB_H +#pragma once  #include "quantum.h"  #define LAYOUT_ortho_4x12( \ -  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ -  K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ -  K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ -  K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B \  ) { \ -  { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \ -  { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \ -  { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \ -  { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311 }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B } \  }  #define LAYOUT_planck_mit( \ -  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ -  K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ -  K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ -  K300, K301, K302, K303, K304,    K305,    K307, K308, K309, K310, K311  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \ +    k30, k31, k32, k33, k34,   k35,    k37, k38, k39, k3A, k3B \  ) { \ -  { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \ -  { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \ -  { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \ -  { K300,  K301,  K302,  K303,  K304,  K305,  K305,  K307,  K308,  K309,  K310,  K311 }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \ +    { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3A, k3B } \  } - -#endif diff --git a/keyboards/converter/adb_usb/adb_usb.h b/keyboards/converter/adb_usb/adb_usb.h index 3db303b039..ddbbd71564 100644 --- a/keyboards/converter/adb_usb/adb_usb.h +++ b/keyboards/converter/adb_usb/adb_usb.h @@ -17,11 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  Ported to QMK by Peter Roe <[email protected]>  */ -#ifndef ADB_USB_H -#define ADB_USB_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  /* M0115/M3501 Apple Extended Keyboard ANSI   * ,---.   ,---------------. ,---------------. ,---------------. ,-----------.             ,---.   * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|             |Pwr| @@ -39,29 +40,29 @@ Ported to QMK by Peter Roe <[email protected]>   * `-----------------------------------------------------------' `-----------' `---------------'   */  #define LAYOUT_ext_ansi( \ -    K35,    K7A,K78,K63,K76,K60,K61,K62,K64,K65,K6D,K67,K6F, K69,K6B,K71,              K7F, \ -    K32,K12,K13,K14,K15,K17,K16,K1A,K1C,K19,K1D,K1B,K18,K33, K72,K73,K74,  K47,K51,K4B,K43, \ -    K30,K0C,K0D,K0E,K0F,K11,K10,K20,K22,K1F,K23,K21,K1E,K2A, K75,K77,K79,  K59,K5B,K5C,K4E, \ -    K39,K00,K01,K02,K03,K05,K04,K26,K28,K25,K29,K27,    K24,               K56,K57,K58,K45, \ -    K38,K06,K07,K08,K09,K0B,K2D,K2E,K2B,K2F,K2C,        K7B,     K3E,      K53,K54,K55,     \ -    K36,K3A,K37,        K31,                        K7C,K7D, K3B,K3D,K3C,  K52,    K41,K4C  \ +    k35,      k7A, k78, k63, k76, k60, k61, k62, k64, k65, k6D, k67, k6F,  k69, k6B, k71,                 k7F, \ +    k32, k12, k13, k14, k15, k17, k16, k1A, k1C, k19, k1D, k1B, k18, k33,  k72, k73, k74,  k47, k51, k4B, k43, \ +    k30, k0C, k0D, k0E, k0F, k11, k10, k20, k22, k1F, k23, k21, k1E, k2A,  k75, k77, k79,  k59, k5B, k5C, k4E, \ +    k39, k00, k01, k02, k03, k05, k04, k26, k28, k25, k29, k27,      k24,                  k56, k57, k58, k45, \ +    k38, k06, k07, k08, k09, k0B, k2D, k2E, k2B, k2F, k2C,           k7B,       k3E,       k53, k54, k55,\ +    k36, k3A, k37,           k31,                               k7C, k7D,  k3B, k3D, k3C,  k52,      k41, k4C \  ) { \ -    { K00,   K01,   K02,   K03, K04,   K05,   K06,   K07    }, \ -    { K08,   K09,   KC_NO, K0B, K0C,   K0D,   K0E,   K0F    }, \ -    { K10,   K11,   K12,   K13, K14,   K15,   K16,   K17    }, \ -    { K18,   K19,   K1A,   K1B, K1C,   K1D,   K1E,   K1F    }, \ -    { K20,   K21,   K22,   K23, K24,   K25,   K26,   K27    }, \ -    { K28,   K29,   K2A,   K2B, K2C,   K2D,   K2E,   K2F    }, \ -    { K30,   K31,   K32,   K33, KC_NO, K35,   K36,   K37    }, \ -    { K38,   K39,   K3A,   K3B, K3C,   K3D,   K3E,   KC_NO, }, \ -    { KC_NO, K41,   KC_NO, K43, KC_NO, K45,   KC_NO, K47    }, \ -    { KC_NO, KC_NO, KC_NO, K4B, K4C,   KC_NO, K4E,   KC_NO, }, \ -    { KC_NO, K51,   K52,   K53, K54,   K55,   K56,   K57    }, \ -    { K58,   K59,   KC_NO, K5B, K5C,   KC_NO, KC_NO, KC_NO, }, \ -    { K60,   K61,   K62,   K63, K64,   K65,   KC_NO, K67    }, \ -    { KC_NO, K69,   KC_NO, K6B, KC_NO, K6D,   KC_NO, K6F    }, \ -    { KC_NO, K71,   K72,   K73, K74,   K75,   K76,   K77    }, \ -    { K78,   K79,   K7A,   K7B, K7C,   K7D,   KC_NO, K7F    }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07 }, \ +    { k08, k09, XXX, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17 }, \ +    { k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27 }, \ +    { k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ +    { k30, k31, k32, k33, XXX, k35, k36, k37 }, \ +    { k38, k39, k3A, k3B, k3C, k3D, k3E, XXX }, \ +    { XXX, k41, XXX, k43, XXX, k45, XXX, k47 }, \ +    { XXX, XXX, XXX, k4B, k4C, XXX, k4E, XXX }, \ +    { XXX, k51, k52, k53, k54, k55, k56, k57 }, \ +    { k58, k59, XXX, k5B, k5C, XXX, XXX, XXX }, \ +    { k60, k61, k62, k63, k64, k65, XXX, k67 }, \ +    { XXX, k69, XXX, k6B, XXX, k6D, XXX, k6F }, \ +    { XXX, k71, k72, k73, k74, k75, k76, k77 }, \ +    { k78, k79, k7A, k7B, k7C, k7D, XXX, k7F } \  }  /* M0116 Apple Standard Keyboard ANSI @@ -81,29 +82,27 @@ Ported to QMK by Peter Roe <[email protected]>   * +---------------------------------------------------------+ +-------+---+---+   */  #define LAYOUT_m0116_ansi( \ -                           K7F,                                              \ -   K35,K12,K13,K14,K15,K17,K16,K1A,K1C,K19,K1D,K1B,K18,K33, K47,K51,K4B,K43, \ -   K30,K0C,K0D,K0E,K0F,K11,K10,K20,K22,K1F,K23,K21,K1E,     K59,K5B,K5C,K45, \ -   K36,K00,K01,K02,K03,K05,K04,K26,K28,K25,K29,K27,    K24, K56,K57,K58,K4E, \ -   K38,K06,K07,K08,K09,K0B,K2D,K2E,K2B,K2F,K2C,        K7B, K53,K54,K55,     \ -   K39,K3A,K37,K32,        K31,        K2A,K3B,K3C,K3D,K3E, K52,    K41,K4C  \ +                                  k7F, \ +    k35, k12, k13, k14, k15, k17, k16, k1A, k1C, k19, k1D, k1B, k18, k33,  k47, k51, k4B, k43, \ +    k30, k0C, k0D, k0E, k0F, k11, k10, k20, k22, k1F, k23, k21, k1E,       k59, k5B, k5C, k45, \ +    k36, k00, k01, k02, k03, k05, k04, k26, k28, k25, k29, k27,      k24,  k56, k57, k58, k4E, \ +    k38, k06, k07, k08, k09, k0B, k2D, k2E, k2B, k2F, k2C,           k7B,  k53, k54, k55, \ +    k39, k3A, k37, k32,           k31,           k2A, k3B, k3C, k3D, k3E,  k52,      k41, k4C \  ) { \ -  { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07   }, \ -  { K08,   K09,   KC_NO, K0B,   K0C,   K0D,   K0E,   K0F   }, \ -  { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17   }, \ -  { K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F   }, \ -  { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27   }, \ -  { K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F   }, \ -  { K30,   K31,   K32,   K33,   KC_NO, K35,   K36,   K37   }, \ -  { K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,   KC_NO }, \ -  { KC_NO, K41,   KC_NO, K43,   KC_NO, K45,   KC_NO, K47   }, \ -  { KC_NO, KC_NO, KC_NO, K4B,   K4C,   KC_NO, K4E,   KC_NO }, \ -  { KC_NO, K51,   K52,   K53,   K54,   K55,   K56,   K57   }, \ -  { K58,   K59,   KC_NO, K5B,   K5C,   KC_NO, KC_NO, KC_NO }, \ -  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ -  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ -  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ -  { KC_NO, KC_NO, KC_NO, K7B,   KC_NO, KC_NO, KC_NO, K7F   }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07 }, \ +    { k08, k09, XXX, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17 }, \ +    { k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27 }, \ +    { k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ +    { k30, k31, k32, k33, XXX, k35, k36, k37 }, \ +    { k38, k39, k3A, k3B, k3C, k3D, k3E, XXX }, \ +    { XXX, k41, XXX, k43, XXX, k45, XXX, k47 }, \ +    { XXX, XXX, XXX, k4B, k4C, XXX, k4E, XXX }, \ +    { XXX, k51, k52, k53, k54, k55, k56, k57 }, \ +    { k58, k59, XXX, k5B, k5C, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, k7B, XXX, XXX, XXX, k7F } \  } - -#endif diff --git a/keyboards/converter/ibm_terminal/config.h b/keyboards/converter/ibm_terminal/config.h index 5d8e5f8135..6895f08e7a 100644 --- a/keyboards/converter/ibm_terminal/config.h +++ b/keyboards/converter/ibm_terminal/config.h @@ -16,9 +16,7 @@ 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 CONFIG_H -#define CONFIG_H - +#pragma once  #define VENDOR_ID       0xFEED  #define PRODUCT_ID      0x6535 @@ -133,5 +131,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define PS2_DATA_DDR    DDRD  #define PS2_DATA_BIT    0  #endif - -#endif diff --git a/keyboards/converter/ibm_terminal/ibm_terminal.h b/keyboards/converter/ibm_terminal/ibm_terminal.h index adf048206e..ce50e5f437 100644 --- a/keyboards/converter/ibm_terminal/ibm_terminal.h +++ b/keyboards/converter/ibm_terminal/ibm_terminal.h @@ -1,8 +1,9 @@ -#ifndef IBM_TERMINAL_H -#define IBM_TERMINAL_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  void matrix_init_user(void);  /* @@ -20,63 +21,61 @@ void matrix_init_user(void);   *   +---------+   */  #define LAYOUT( \ -                  K08,K10,K18,K20,K28,K30,K38,K40,K48,K50,K57,K5F,                                         \ -                  K07,K0F,K17,K1F,K27,K2F,K37,K3F,K47,K4F,K56,K5E,                                         \ -                                                                                                           \ -    K05,K06,  K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K5D,K66,  K67,K6E,K6F,  K76,K77,K7E,K84, \ -    K04,K0C,  K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,    K5C,  K64,K65,K6D,  K6C,K75,K7D,K7C, \ -    K03,K0B,  K14,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52,    K53,K5A,      K63,      K6B,K73,K74,K7B, \ -    K83,K0A,  K12,K13,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A,    K51,K59,  K61,K62,K6A,  K69,K72,K7A,K79, \ -    K01,K09,  K11,    K19,            K29,                    K39,    K58,      K60,      K68,K70,K71,K78  \ +                    k08, k10, k18, k20, k28, k30, k38, k40, k48, k50, k57, k5F, \ +                    k07, k0F, k17, k1F, k27, k2F, k37, k3F, k47, k4F, k56, k5E, \ +\ +    k05, k06,  k0E, k16, k1E, k26, k25, k2E, k36, k3D, k3E, k46, k45, k4E, k55, k5D, k66,  k67, k6E, k6F,  k76, k77, k7E, k84, \ +    k04, k0C,  k0D, k15, k1D, k24, k2D, k2C, k35, k3C, k43, k44, k4D, k54, k5B,      k5C,  k64, k65, k6D,  k6C, k75, k7D, k7C, \ +    k03, k0B,  k14, k1C, k1B, k23, k2B, k34, k33, k3B, k42, k4B, k4C, k52,      k53, k5A,       k63,       k6B, k73, k74, k7B, \ +    k83, k0A,  k12, k13, k1A, k22, k21, k2A, k32, k31, k3A, k41, k49, k4A,      k51, k59,  k61, k62, k6A,  k69, k72, k7A, k79, \ +    k01, k09,  k11,      k19,                k29,                          k39,      k58,       k60,       k68, k70, k71, k78 \  ) { \ -    { KC_NO, K01,   KC_NO, K03,   K04,   K05,   K06,   K07   }, \ -    { K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F   }, \ -    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17   }, \ -    { K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F   }, \ -    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27   }, \ -    { K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F   }, \ -    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37   }, \ -    { K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,   K3F   }, \ -    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47   }, \ -    { K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E,   K4F   }, \ -    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57   }, \ -    { K58,   K59,   K5A,   K5B,   K5C,   K5D,   K5E,   K5F   }, \ -    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67   }, \ -    { K68,   K69,   K6A,   K6B,   K6C,   K6D,   K6E,   K6F   }, \ -    { K70,   K71,   K72,   K73,   K74,   K75,   K76,   K77   }, \ -    { K78,   K79,   K7A,   K7B,   K7C,   K7D,   K7E,   KC_NO }, \ -    { KC_NO, KC_NO, KC_NO, K83,   K84,   KC_NO, KC_NO, KC_NO }  \ +    { XXX, k01, XXX, k03, k04, k05, k06, k07 }, \ +    { k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17 }, \ +    { k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27 }, \ +    { k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37 }, \ +    { k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47 }, \ +    { k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57 }, \ +    { k58, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \ +    { k60, k61, k62, k63, k64, k65, k66, k67 }, \ +    { k68, k69, k6A, k6B, k6C, k6D, k6E, k6F }, \ +    { k70, k71, k72, k73, k74, k75, k76, k77 }, \ +    { k78, k79, k7A, k7B, k7C, k7D, k7E, XXX }, \ +    { XXX, XXX, XXX, k83, k84, XXX, XXX, XXX } \  }  /*   * IBM Terminal keyboard 1399625, 101-key   */  #define LAYOUT_101( \ -    K08,    K07,K0F,K17,K1F,K27,K2F,K37,K3F,K47,K4F,K56,K5E,  K57,K5F,K62,                   \ -                                                                                             \ -    K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66,  K67,K6E,K6F,  K76,K77,K7E,K84, \ -    K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,K5C,  K64,K65,K6D,  K6C,K75,K7D,     \ -    K14,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52,    K5A,                K6B,K73,K74,K7C, \ -    K12,    K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A,    K59,      K63,      K69,K72,K7A,     \ -    K11,    K19,            K29,                K39,    K58,  K61,K60,K6A,  K70,    K71,K79  \ +    k08,      k07, k0F, k17, k1F, k27, k2F, k37, k3F, k47, k4F, k56, k5E,  k57, k5F, k62, \ +\ +    k0E, k16, k1E, k26, k25, k2E, k36, k3D, k3E, k46, k45, k4E, k55, k66,  k67, k6E, k6F,  k76, k77, k7E, k84, \ +    k0D, k15, k1D, k24, k2D, k2C, k35, k3C, k43, k44, k4D, k54, k5B, k5C,  k64, k65, k6D,  k6C, k75, k7D, \ +    k14, k1C, k1B, k23, k2B, k34, k33, k3B, k42, k4B, k4C, k52,      k5A,                  k6B, k73, k74, k7C, \ +    k12,      k1A, k22, k21, k2A, k32, k31, k3A, k41, k49, k4A,      k59,       k63,       k69, k72, k7A, \ +    k11,      k19,                k29,                     k39,      k58,  k61, k60, k6A,  k70,      k71, k79 \  ) { \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K07   }, \ -    { K08,   KC_NO, KC_NO, KC_NO, KC_NO, K0D,   K0E,   K0F   }, \ -    { KC_NO, K11,   K12,   KC_NO, K14,   K15,   K16,   K17   }, \ -    { KC_NO, K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F   }, \ -    { KC_NO, K21,   K22,   K23,   K24,   K25,   K26,   K27   }, \ -    { KC_NO, K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F   }, \ -    { KC_NO, K31,   K32,   K33,   K34,   K35,   K36,   K37   }, \ -    { KC_NO, K39,   K3A,   K3B,   K3C,   K3D,   K3E,   K3F   }, \ -    { KC_NO, K41,   K42,   K43,   K44,   K45,   K46,   K47   }, \ -    { KC_NO, K49,   K4A,   K4B,   K4C,   K4D,   K4E,   K4F   }, \ -    { KC_NO, KC_NO, K52,   KC_NO, K54,   K55,   K56,   K57   }, \ -    { K58,   K59,   K5A,   K5B,   K5C,   KC_NO, K5E,   K5F   }, \ -    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67   }, \ -    { KC_NO, K69,   K6A,   K6B,   K6C,   K6D,   K6E,   K6F   }, \ -    { K70,   K71,   K72,   K73,   K74,   K75,   K76,   K77   }, \ -    { KC_NO, K79,   K7A,   KC_NO, K7C,   K7D,   K7E,   KC_NO }, \ -    { KC_NO, KC_NO, KC_NO, KC_NO, K84,   KC_NO, KC_NO, KC_NO }  \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, k07 }, \ +    { k08, XXX, XXX, XXX, XXX, k0D, k0E, k0F }, \ +    { XXX, k11, k12, XXX, k14, k15, k16, k17 }, \ +    { XXX, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { XXX, k21, k22, k23, k24, k25, k26, k27 }, \ +    { XXX, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ +    { XXX, k31, k32, k33, k34, k35, k36, k37 }, \ +    { XXX, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ +    { XXX, k41, k42, k43, k44, k45, k46, k47 }, \ +    { XXX, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \ +    { XXX, XXX, k52, XXX, k54, k55, k56, k57 }, \ +    { k58, k59, k5A, k5B, k5C, XXX, k5E, k5F }, \ +    { k60, k61, k62, k63, k64, k65, k66, k67 }, \ +    { XXX, k69, k6A, k6B, k6C, k6D, k6E, k6F }, \ +    { k70, k71, k72, k73, k74, k75, k76, k77 }, \ +    { XXX, k79, k7A, XXX, k7C, k7D, k7E, XXX }, \ +    { XXX, XXX, XXX, XXX, k84, XXX, XXX, XXX } \  } - -#endif diff --git a/keyboards/converter/m0110_usb/m0110_usb.h b/keyboards/converter/m0110_usb/m0110_usb.h index 88e74024fc..944296afdc 100644 --- a/keyboards/converter/m0110_usb/m0110_usb.h +++ b/keyboards/converter/m0110_usb/m0110_usb.h @@ -16,12 +16,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  Ported to QMK by Techsock <[email protected]>  */ -#ifndef M0110_USB_H -#define M0110_USB_H -#endif +#pragma once  #include "quantum.h" +#define XXX KC_NO +  /* Common layout for M0110 and M0110A   * This keymap works with both keyboards. As you can see, the M0110A is    * a superset of M0110 keyboard, only one exception is 'Enter'(34) of M0110 @@ -67,26 +67,26 @@ Ported to QMK by Techsock <[email protected]>   * Two right and left keys of 38 and 3A are identical, you cannot discriminate those two.   */  #define LAYOUT_ansi( \ -    K32,K12,K13,K14,K15,K17,K16,K1A,K1C,K19,K1D,K1B,K18,K33,  K47,K68,K6D,K62, \ -    K30,K0C,K0D,K0E,K0F,K11,K10,K20,K22,K1F,K23,K21,K1E,      K59,K5B,K5C,K4E, \ -    K39,K00,K01,K02,K03,K05,K04,K26,K28,K25,K29,K27,    K24,  K56,K57,K58,K66, \ -    K38,K06,K07,K08,K09,K0B,K2D,K2E,K2B,K2F,K2C,        K4D,  K53,K54,K55,K4C, \ -    K3A,K37,            K31,            K34,K2A,K46,K42,K48,  K52,    K41      \ +    K32, K12, K13, K14, K15, K17, K16, K1A, K1C, K19, K1D, K1B, K18, K33,  K47, K68, K6D, K62, \ +    K30, K0C, K0D, K0E, K0F, K11, K10, K20, K22, K1F, K23, K21, K1E,       K59, K5B, K5C, K4E, \ +    K39, K00, K01, K02, K03, K05, K04, K26, K28, K25, K29, K27,      K24,  K56, K57, K58, K66, \ +    K38, K06, K07, K08, K09, K0B, K2D, K2E, K2B, K2F, K2C,           K4D,  K53, K54, K55, K4C, \ +    K3A, K37,                K31,                K34, K2A, K46, K42, K48,  K52,      K41 \  ) { \ -    { K00,    K01,    K02,    K03,    K04,    K05,    K06,    K07   }, \ -    { K08,    K09,    KC_NO,  K0B,    K0C,    K0D,    K0E,    K0F   }, \ -    { K10,    K11,    K12,    K13,    K14,    K15,    K16,    K17   }, \ -    { K18,    K19,    K1A,    K1B,    K1C,    K1D,    K1E,    K1F   }, \ -    { K20,    K21,    K22,    K23,    K24,    K25,    K26,    K27   }, \ -    { K28,    K29,    K2A,    K2B,    K2C,    K2D,    K2E,    K2F   }, \ -    { K30,    K31,    K32,    K33,    K34,    KC_NO,  KC_NO,  K37   }, \ -    { K38,    K39,    K3A,    KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO }, \ -    { KC_NO,  K41,    K42,    KC_NO,  KC_NO,  KC_NO,  K46,    K47   }, \ -    { K48,    KC_NO,  KC_NO,  KC_NO,  K4C,    K4D,    K4E,    KC_NO }, \ -    { KC_NO,  KC_NO,  K52,    K53,    K54,    K55,    K56,    K57   }, \ -    { K58,    K59,    KC_NO,  K5B,    K5C,    KC_NO,  KC_NO,  KC_NO }, \ -    { KC_NO,  KC_NO,  K62,    KC_NO,  KC_NO,  KC_NO,  K66,    KC_NO }, \ -    { K68,    KC_NO,  KC_NO,  KC_NO,  KC_NO,  K6D,    KC_NO,  KC_NO }, \ +    { K00, K01, K02, K03, K04, K05, K06, K07 }, \ +    { K08, K09, XXX, K0B, K0C, K0D, K0E, K0F }, \ +    { K10, K11, K12, K13, K14, K15, K16, K17 }, \ +    { K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ +    { K20, K21, K22, K23, K24, K25, K26, K27 }, \ +    { K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ +    { K30, K31, K32, K33, K34, XXX, XXX, K37 }, \ +    { K38, K39, K3A, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, K41, K42, XXX, XXX, XXX, K46, K47 }, \ +    { K48, XXX, XXX, XXX, K4C, K4D, K4E, XXX }, \ +    { XXX, XXX, K52, K53, K54, K55, K56, K57 }, \ +    { K58, K59, XXX, K5B, K5C, XXX, XXX, XXX }, \ +    { XXX, XXX, K62, XXX, XXX, XXX, K66, XXX }, \ +    { K68, XXX, XXX, XXX, XXX, K6D, XXX, XXX } \  }  /* International keyboard layout for M0110 + M0120 @@ -108,24 +108,24 @@ Ported to QMK by Techsock <[email protected]>   * Two right and left keys of 38 and 3A are identical, you cannot discriminate those two.   */  #define LAYOUT_iso( \ -    K32,K12,K13,K14,K15,K17,K16,K1A,K1C,K19,K1D,K1B,K18,K33,  K47,K68,K6D,K62, \ -    K30,K0C,K0D,K0E,K0F,K11,K10,K20,K22,K1F,K23,K21,K1E,K2A,  K59,K5B,K5C,K4E, \ -    K39,K00,K01,K02,K03,K05,K04,K26,K28,K25,K29,K27,K24,      K56,K57,K58,K66, \ -    K38,K06,K07,K08,K09,K0B,K2D,K2E,K2B,K2F,K2C,K0A,          K53,K54,K55,K4C, \ -        K3A,K37,            K34,                K31,          K52,    K41      \ +    K32, K12, K13, K14, K15, K17, K16, K1A, K1C, K19, K1D, K1B, K18, K33,  K47, K68, K6D, K62, \ +    K30, K0C, K0D, K0E, K0F, K11, K10, K20, K22, K1F, K23, K21, K1E, K2A,  K59, K5B, K5C, K4E, \ +    K39, K00, K01, K02, K03, K05, K04, K26, K28, K25, K29, K27, K24,       K56, K57, K58, K66, \ +    K38, K06, K07, K08, K09, K0B, K2D, K2E, K2B, K2F, K2C, K0A,            K53, K54, K55, K4C, \ +         K3A, K37,                K34,                     K31,            K52,      K41 \  ) { \ -    { K00,    K01,    K02,    K03,    K04,    K05,    K06,    K07   }, \ -    { K08,    K09,    K0A,    K0B,    K0C,    K0D,    K0E,    K0F   }, \ -    { K10,    K11,    K12,    K13,    K14,    K15,    K16,    K17   }, \ -    { K18,    K19,    K1A,    K1B,    K1C,    K1D,    K1E,    K1F   }, \ -    { K20,    K21,    K22,    K23,    K24,    K25,    K26,    K27   }, \ -    { K28,    K29,    K2A,    K2B,    K2C,    K2D,    K2E,    K2F   }, \ -    { K30,    K31,    K32,    K33,    K34,    KC_NO,  KC_NO,  K37   }, \ -    { K38,    K39,    K3A,    KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO }, \ -    { KC_NO,  K41,    KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  K47   }, \ -    { KC_NO,  KC_NO,  KC_NO,  KC_NO,  K4C,    KC_NO,  K4E,    KC_NO }, \ -    { KC_NO,  KC_NO,  K52,    K53,    K54,    K55,    K56,    K57   }, \ -    { K58,    K59,    KC_NO,  K5B,    K5C,    KC_NO,  KC_NO,  KC_NO }, \ -    { KC_NO,  KC_NO,  K62,    KC_NO,  KC_NO,  KC_NO,  K66,    KC_NO }, \ -    { K68,    KC_NO,  KC_NO,  KC_NO,  KC_NO,  K6D,    KC_NO,  KC_NO }, \ +    { K00, K01, K02, K03, K04, K05, K06, K07 }, \ +    { K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ +    { K10, K11, K12, K13, K14, K15, K16, K17 }, \ +    { K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ +    { K20, K21, K22, K23, K24, K25, K26, K27 }, \ +    { K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ +    { K30, K31, K32, K33, K34, XXX, XXX, K37 }, \ +    { K38, K39, K3A, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, K41, XXX, XXX, XXX, XXX, XXX, K47 }, \ +    { XXX, XXX, XXX, XXX, K4C, XXX, K4E, XXX }, \ +    { XXX, XXX, K52, K53, K54, K55, K56, K57 }, \ +    { K58, K59, XXX, K5B, K5C, XXX, XXX, XXX }, \ +    { XXX, XXX, K62, XXX, XXX, XXX, K66, XXX }, \ +    { K68, XXX, XXX, XXX, XXX, K6D, XXX, XXX } \  } diff --git a/keyboards/converter/palm_usb/post_rules.mk b/keyboards/converter/palm_usb/post_rules.mk new file mode 100644 index 0000000000..9c11076701 --- /dev/null +++ b/keyboards/converter/palm_usb/post_rules.mk @@ -0,0 +1,7 @@ +ifdef HARDWARE_SERIAL +  # Untested with palm_usb +  SRC += protocol/serial_uart.c +  OPT_DEFS += -DHARDWARE_SERIAL +else +  SRC += protocol/serial_soft.c +endif diff --git a/keyboards/converter/palm_usb/rules.mk b/keyboards/converter/palm_usb/rules.mk index ff1ddc8f49..dc8cf17400 100644 --- a/keyboards/converter/palm_usb/rules.mk +++ b/keyboards/converter/palm_usb/rules.mk @@ -25,12 +25,5 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend  CUSTOM_MATRIX = yes  SRC += matrix.c -ifdef HARDWARE_SERIAL -  # Untested with palm_usb -  SRC += protocol/serial_uart.c -  OPT_DEFS += -DHARDWARE_SERIAL -else -  SRC += protocol/serial_soft.c -endif  DEFAULT_FOLDER = converter/palm_usb/stowaway diff --git a/keyboards/converter/sun_usb/config.h b/keyboards/converter/sun_usb/config.h index f073e61e44..c67ae5ebae 100644 --- a/keyboards/converter/sun_usb/config.h +++ b/keyboards/converter/sun_usb/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #define VENDOR_ID       0xFEED  #define PRODUCT_ID      0x3333 @@ -81,5 +80,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.      /* idle */ \      SERIAL_SOFT_TXD_ON(); \  } while (0) - -#endif diff --git a/keyboards/converter/sun_usb/post_rules.mk b/keyboards/converter/sun_usb/post_rules.mk new file mode 100644 index 0000000000..2ea1f0a5bf --- /dev/null +++ b/keyboards/converter/sun_usb/post_rules.mk @@ -0,0 +1,6 @@ +ifdef HARDWARE_SERIAL +  SRC += protocol/serial_uart.c +  OPT_DEFS += -DHARDWARE_SERIAL +else +  SRC += protocol/serial_soft.c +endif diff --git a/keyboards/converter/sun_usb/rules.mk b/keyboards/converter/sun_usb/rules.mk index e863d25745..14dd57e1b7 100644 --- a/keyboards/converter/sun_usb/rules.mk +++ b/keyboards/converter/sun_usb/rules.mk @@ -25,11 +25,5 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend  CUSTOM_MATRIX = yes  SRC += matrix.c led.c -ifdef HARDWARE_SERIAL -  SRC += protocol/serial_uart.c -  OPT_DEFS += -DHARDWARE_SERIAL -else -  SRC += protocol/serial_soft.c -endif  DEFAULT_FOLDER = converter/sun_usb/type5 diff --git a/keyboards/converter/sun_usb/type3/type3.h b/keyboards/converter/sun_usb/type3/type3.h index f6f14f4eff..b84a703d6b 100644 --- a/keyboards/converter/sun_usb/type3/type3.h +++ b/keyboards/converter/sun_usb/type3/type3.h @@ -15,11 +15,12 @@ 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 TYPE3_H -#define TYPE3_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  /* Sun type 3 keyboard  ,-------.  ,-----------------------------------------------------------.  ,-----------.  | 01| 03|  | 05| 06|     08|     0A|     0C|     0E|     10| 11| 12| 2B|  | 15| 16| 17| @@ -35,32 +36,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.             | 77 | 78  |               79                  | 7A  |   13 |             `-----------------------------------------------------------'  */ - - -#define LAYOUT(                                                         \ -    K01,K03,  K05,K06,    K08,    K0A,    K0C,    K0E,    K10,K11,K12,K2B,  K15,K16,K17, \ -    K19,K1A,  K1D,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K28,K29,K58,K2A,  K2D,K2E,K2F, \ -    K31,K33,  K35, K36,K37,K38,K39,K3A,K3B,K3C,K3D,K3E,K3F,K40,K41,   K42,  K44,K45,K46, \ -    K48,K49,  K4C,  K4D,K4E,K4F,K50,K51,K52,K53,K54,K55,K56,K57,      K59,  K5B,K5C,K5D, \ -    K5F,K61,  K63,   K64,K65,K66,K67,K68,K69,K6A,K6B,K6C,K6D,     K6E,K6F,  K70,K71,K72, \ -              K77,K78,                    K79,                    K7A,K13                \ +#define LAYOUT( \ +    k01, k03,  k05, k06,      k08,      k0A,      k0C,      k0E,      k10, k11, k12, k2B,  k15, k16, k17, \ +    k19, k1A,  k1D, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k58, k2A,  k2D, k2E, k2F, \ +    k31, k33,  k35,  k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k40, k41,     k42,  k44, k45, k46, \ +    k48, k49,  k4C,   k4D, k4E, k4F, k50, k51, k52, k53, k54, k55, k56, k57,         k59,  k5B, k5C, k5D, \ +    k5F, k61,  k63,    k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D,        k6E, k6F,  k70, k71, k72, \ +               k77, k78,                      k79,                              k7A, k13 \  ) { \ -    { KC_NO,  K01 , KC_NO,  K03 , KC_NO,  K05 ,  K06 , KC_NO }, \ -    {  K08 , KC_NO,  K0A , KC_NO,  K0C , KC_NO,  K0E , KC_NO }, \ -    {  K10 ,  K11 ,  K12 ,  K13 , KC_NO,  K15 ,  K16 ,  K17  }, \ -    { KC_NO,  K19 ,  K1A , KC_NO, KC_NO,  K1D ,  K1E ,  K1F  }, \ -    {  K20 ,  K21 ,  K22 ,  K23 ,  K24 ,  K25 ,  K26 ,  K27  }, \ -    {  K28 ,  K29 ,  K2A ,  K2B , KC_NO,  K2D ,  K2E ,  K2F  }, \ -    { KC_NO,  K31 , KC_NO,  K33 , KC_NO,  K35 ,  K36 ,  K37  }, \ -    {  K38 ,  K39 ,  K3A ,  K3B ,  K3C ,  K3D ,  K3E ,  K3F  }, \ -    {  K40 ,  K41 ,  K42 , KC_NO,  K44 ,  K45 ,  K46 , KC_NO }, \ -    {  K48 ,  K49 , KC_NO, KC_NO,  K4C ,  K4D ,  K4E ,  K4F  }, \ -    {  K50 ,  K51 ,  K52 ,  K53 ,  K54 ,  K55 ,  K56 ,  K57  }, \ -    {  K58 ,  K59 , KC_NO,  K5B ,  K5C ,  K5D , KC_NO,  K5F  }, \ -    { KC_NO,  K61 , KC_NO,  K63 ,  K64 ,  K65 ,  K66 ,  K67  }, \ -    {  K68 ,  K69 ,  K6A ,  K6B ,  K6C ,  K6D ,  K6E ,  K6F  }, \ -    {  K70 ,  K71 ,  K72 , KC_NO, KC_NO, KC_NO, KC_NO,  K77  }, \ -    {  K78 ,  K79 ,  K7A , KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }  \ +    { XXX, k01, XXX, k03, XXX, k05, k06, XXX }, \ +    { k08, XXX, k0A, XXX, k0C, XXX, k0E, XXX }, \ +    { k10, k11, k12, k13, XXX, k15, k16, k17 }, \ +    { XXX, k19, k1A, XXX, XXX, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27 }, \ +    { k28, k29, k2A, k2B, XXX, k2D, k2E, k2F }, \ +    { XXX, k31, XXX, k33, XXX, k35, k36, k37 }, \ +    { k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ +    { k40, k41, k42, XXX, k44, k45, k46, XXX }, \ +    { k48, k49, XXX, XXX, k4C, k4D, k4E, k4F }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57 }, \ +    { k58, k59, XXX, k5B, k5C, k5D, XXX, k5F }, \ +    { XXX, k61, XXX, k63, k64, k65, k66, k67 }, \ +    { k68, k69, k6A, k6B, k6C, k6D, k6E, k6F }, \ +    { k70, k71, k72, XXX, XXX, XXX, XXX, k77 }, \ +    { k78, k79, k7A, XXX, XXX, XXX, XXX, XXX } \  } - -#endif diff --git a/keyboards/converter/sun_usb/type5/type5.h b/keyboards/converter/sun_usb/type5/type5.h index da66d80abc..d4c9cc267c 100644 --- a/keyboards/converter/sun_usb/type5/type5.h +++ b/keyboards/converter/sun_usb/type5/type5.h @@ -15,11 +15,12 @@    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */ -#ifndef TYPE5_H -#define TYPE5_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  /* sun type 5 keyboard, JP Unix-style  ,-------.  ,---,  ,---------------. ,---------------. ,---------------.   ,-----------. ,---------------.  |   76  |  | 0F|  | 05| 06| 08| 0A| | 0C| 0E| 10| 11| | 12| 07| 09| 0B|   | 16| 17| 15| | 2D| 02| 04| 30| @@ -36,30 +37,30 @@  | 5F| 61|  | 77 | 13| 78 |*73 |       79         |*74 |*75| 7A | 43| 0D|  | 18| 1B| 1C| |   5E  | 32|   |  `-------'  `-----------------------------------------------------------'  `-----------' `---------------'  */ -#define LAYOUT_jp_unix(                                                 \ -      K76,    K0F,  K05,K06,K08,K0A,   K0C,K0E,K10,K11,   K12,K07,K09,K0B,  K16,K17,K15,  K2D,K02,K04,K30, \ -    K01,K03,  K1D,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K28,K29,K58,K2A,  K2C,K34,K60,  K62,K2E,K2F,K47, \ -    K19,K1A,  K35, K36,K37,K38,K39,K3A,K3B,K3C,K3D,K3E,K3F,K40,K41,   K2B,  K42,K4A,K7B,  K44,K45,K46,K7D, \ -    K31,K33,  K4C,  K4D,K4E,K4F,K50,K51,K52,K53,K54,K55,K56,K57,      K59,                K5B,K5C,K5D,     \ -    K48,K49,  K63,   K64,K65,K66,K67,K68,K69,K6A,K6B,K6C,K6D,         K6E,      K14,      K70,K71,K72,K5A, \ -    K5F,K61,  K77,K13, K78, K73,        K79,      K74, K75, K7A, K43, K0D,  K18,K1B,K1C,  K5E,    K32      \ +#define LAYOUT_jp_unix( \ +       K76,    K0F,      K05, K06, K08, K0A, K0C, K0E, K10, K11, K12, K07, K09, K0B,       K16, K17, K15,  K2D, K02, K04, K30, \ +    K01, K03,  K1D, K1E, K1F, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K58, K2A,  K2C, K34, K60,  K62, K2E, K2F, K47, \ +    K19, K1A,  K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K40, K41, K2B,       K42, K4A, K7B,  K44, K45, K46, K7D, \ +    K31, K33,  K4C, K4D, K4E, K4F, K50, K51, K52, K53, K54, K55, K56, K57,      K59,                       K5B, K5C, K5D, \ +    K48, K49,  K63,      K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D,      K6E,            K14,       K70, K71, K72, K5A, \ +    K5F, K61,  K77, K13, K78, K73,           K79,           K74, K75, K7A, K43, K0D,       K18, K1B, K1C,     K5E,   K32 \  ) { \ -    { KC_NO,  K01 ,  K02 ,  K03 ,  K04 ,  K05 ,  K06 ,  K07  }, \ -    {  K08 ,  K09 ,  K0A ,  K0B ,  K0C ,  K0D ,  K0E ,  K0F ,}, \ -    {  K10 ,  K11 ,  K12 ,  K13 ,  K14 ,  K15 ,  K16 ,  K17  }, \ -    {  K18 ,  K19 ,  K1A ,  K1B ,  K1C ,  K1D ,  K1E ,  K1F  }, \ -    {  K20 ,  K21 ,  K22 ,  K23 ,  K24 ,  K25 ,  K26 ,  K27  }, \ -    {  K28 ,  K29 ,  K2A ,  K2B ,  K2C ,  K2D ,  K2E ,  K2F  }, \ -    {  K30 ,  K31 ,  K32 ,  K33 ,  K34 ,  K35 ,  K36 ,  K37  }, \ -    {  K38 ,  K39 ,  K3A ,  K3B ,  K3C ,  K3D ,  K3E ,  K3F  }, \ -    {  K40 ,  K41 ,  K42 ,  K43 ,  K44 ,  K45 ,  K46 ,  K47  }, \ -    {  K48 ,  K49 ,  K4A , KC_NO,  K4C ,  K4D ,  K4E ,  K4F  }, \ -    {  K50 ,  K51 ,  K52 ,  K53 ,  K54 ,  K55 ,  K56 ,  K57  }, \ -    {  K58 ,  K59 ,  K5A ,  K5B ,  K5C ,  K5D ,  K5E ,  K5F  }, \ -    {  K60 ,  K61 ,  K62 ,  K63 ,  K64 ,  K65 ,  K66 ,  K67  }, \ -    {  K68 ,  K69 ,  K6A ,  K6B ,  K6C ,  K6D ,  K6E , KC_NO }, \ -    {  K70 ,  K71 ,  K72 ,  K73 ,  K74 ,  K75 ,  K76 ,  K77  }, \ -    {  K78 ,  K79 ,  K7A ,  K7B , KC_NO,  K7D , KC_NO, KC_NO }  \ +    { XXX, K01, K02, K03, K04, K05, K06, K07 }, \ +    { K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ +    { K10, K11, K12, K13, K14, K15, K16, K17 }, \ +    { K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ +    { K20, K21, K22, K23, K24, K25, K26, K27 }, \ +    { K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ +    { K30, K31, K32, K33, K34, K35, K36, K37 }, \ +    { K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ +    { K40, K41, K42, K43, K44, K45, K46, K47 }, \ +    { K48, K49, K4A, XXX, K4C, K4D, K4E, K4F }, \ +    { K50, K51, K52, K53, K54, K55, K56, K57 }, \ +    { K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, \ +    { K60, K61, K62, K63, K64, K65, K66, K67 }, \ +    { K68, K69, K6A, K6B, K6C, K6D, K6E, XXX }, \ +    { K70, K71, K72, K73, K74, K75, K76, K77 }, \ +    { K78, K79, K7A, K7B, XXX, K7D, XXX, XXX } \  }  /* Sun type 5 keyboard, US Unix-style @@ -78,30 +79,30 @@  | 5F| 61|  | 77 | 13| 78 |            79                 |  7A | 43| 0D|  | 18| 1B| 1C| |   5E  | 32|   |  `-------'  `-----------------------------------------------------------'  `-----------' `---------------'  */ -#define LAYOUT_us_unix(                                                 \ -      K76,    K0F,  K05,K06,K08,K0A,   K0C,K0E,K10,K11,   K12,K07,K09,K0B,  K16,K17,K15,  K2D,K02,K04,K30, \ -    K01,K03,  K1D,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K28,K29,K58,K2A,  K2C,K34,K60,  K62,K2E,K2F,K47, \ -    K19,K1A,  K35, K36,K37,K38,K39,K3A,K3B,K3C,K3D,K3E,K3F,K40,K41,   K2B,  K42,K4A,K7B,  K44,K45,K46,K7D, \ -    K31,K33,  K4C,  K4D,K4E,K4F,K50,K51,K52,K53,K54,K55,K56,K57,      K59,                K5B,K5C,K5D,     \ -    K48,K49,  K63,   K64,K65,K66,K67,K68,K69,K6A,K6B,K6C,K6D,         K6E,      K14,      K70,K71,K72,K5A, \ -    K5F,K61,  K77,K13, K78,             K79,                K7A, K43, K0D,  K18,K1B,K1C,  K5E,    K32      \ +#define LAYOUT_us_unix( \ +       K76,    K0F,      K05, K06, K08, K0A, K0C, K0E, K10, K11, K12, K07, K09, K0B,       K16, K17, K15,  K2D, K02, K04, K30, \ +    K01, K03,  K1D, K1E, K1F, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K58, K2A,  K2C, K34, K60,  K62, K2E, K2F, K47, \ +    K19, K1A,  K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K40, K41, K2B,       K42, K4A, K7B,  K44, K45, K46, K7D, \ +    K31, K33,  K4C, K4D, K4E, K4F, K50, K51, K52, K53, K54, K55, K56, K57,      K59,                       K5B, K5C, K5D, \ +    K48, K49,  K63,      K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D,      K6E,            K14,       K70, K71, K72, K5A, \ +    K5F, K61,  K77, K13, K78,                K79,                     K7A, K43, K0D,       K18, K1B, K1C,     K5E,   K32 \  ) { \ -    { KC_NO,  K01 ,  K02 ,  K03 ,  K04 ,  K05 ,  K06 ,  K07  }, \ -    {  K08 ,  K09 ,  K0A ,  K0B ,  K0C ,  K0D ,  K0E ,  K0F ,}, \ -    {  K10 ,  K11 ,  K12 ,  K13 ,  K14 ,  K15 ,  K16 ,  K17  }, \ -    {  K18 ,  K19 ,  K1A ,  K1B ,  K1C ,  K1D ,  K1E ,  K1F  }, \ -    {  K20 ,  K21 ,  K22 ,  K23 ,  K24 ,  K25 ,  K26 ,  K27  }, \ -    {  K28 ,  K29 ,  K2A ,  K2B ,  K2C ,  K2D ,  K2E ,  K2F  }, \ -    {  K30 ,  K31 ,  K32 ,  K33 ,  K34 ,  K35 ,  K36 ,  K37  }, \ -    {  K38 ,  K39 ,  K3A ,  K3B ,  K3C ,  K3D ,  K3E ,  K3F  }, \ -    {  K40 ,  K41 ,  K42 ,  K43 ,  K44 ,  K45 ,  K46 ,  K47  }, \ -    {  K48 ,  K49 ,  K4A , KC_NO,  K4C ,  K4D ,  K4E ,  K4F  }, \ -    {  K50 ,  K51 ,  K52 ,  K53 ,  K54 ,  K55 ,  K56 ,  K57  }, \ -    {  K58 ,  K59 ,  K5A ,  K5B ,  K5C ,  K5D ,  K5E ,  K5F  }, \ -    {  K60 ,  K61 ,  K62 ,  K63 ,  K64 ,  K65 ,  K66 ,  K67  }, \ -    {  K68 ,  K69 ,  K6A ,  K6B ,  K6C ,  K6D ,  K6E , KC_NO }, \ -    {  K70 ,  K71 ,  K72 , KC_NO, KC_NO, KC_NO,  K76 ,  K77  }, \ -    {  K78 ,  K79 ,  K7A ,  K7B , KC_NO,  K7D , KC_NO, KC_NO }  \ +    { XXX, K01, K02, K03, K04, K05, K06, K07 }, \ +    { K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ +    { K10, K11, K12, K13, K14, K15, K16, K17 }, \ +    { K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ +    { K20, K21, K22, K23, K24, K25, K26, K27 }, \ +    { K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ +    { K30, K31, K32, K33, K34, K35, K36, K37 }, \ +    { K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ +    { K40, K41, K42, K43, K44, K45, K46, K47 }, \ +    { K48, K49, K4A, XXX, K4C, K4D, K4E, K4F }, \ +    { K50, K51, K52, K53, K54, K55, K56, K57 }, \ +    { K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, \ +    { K60, K61, K62, K63, K64, K65, K66, K67 }, \ +    { K68, K69, K6A, K6B, K6C, K6D, K6E, XXX }, \ +    { K70, K71, K72, XXX, XXX, XXX, K76, K77 }, \ +    { K78, K79, K7A, K7B, XXX, K7D, XXX, XXX } \  }  /* Sun type 5 keyboard, US ANSI-style @@ -120,29 +121,28 @@     | 5F| 61|  |  4C  | 13| 78 |              79              | 7A | 43| 0D|  | 18| 1B| 1C| |   5E  | 32|   |     `-------'  `-----------------------------------------------------------'  `-----------' `---------------'  */ -#define LAYOUT_ansi(                                                    \ -      K76,    K1D,  K05,K06,K08,K0A,   K0C,K0E,K10,K11,   K12,K07,K09,K0B,  K16,K17,K15,  K2D,K02,K04,K30, \ -    K01,K03,  K2A,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K28,K29,    K2B,  K2C,K34,K60,  K62,K2E,K2F,K47, \ -    K19,K1A,  K35, K36,K37,K38,K39,K3A,K3B,K3C,K3D,K3E,K3F,K40,K41,   K58,  K42,K4A,K7B,  K44,K45,K46,K7D, \ -    K31,K33,  K77,  K4D,K4E,K4F,K50,K51,K52,K53,K54,K55,K56,K57,      K59,                K5B,K5C,K5D,     \ -    K48,K49,  K63,   K64,K65,K66,K67,K68,K69,K6A,K6B,K6C,K6D,         K6E,      K14,      K70,K71,K72,K5A, \ -    K5F,K61,  K4C,K13, K78,              K79,               K7A, K43, K0D,  K18,K1B,K1C,  K5E,    K32      \ +#define LAYOUT_ansi( \ +       K76,    K1D,      K05, K06, K08, K0A, K0C, K0E, K10, K11, K12, K07, K09, K0B,  K16, K17, K15,  K2D, K02, K04, K30, \ +    K01, K03,  K2A, K1E, K1F, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2B,  K2C, K34, K60,  K62, K2E, K2F, K47, \ +    K19, K1A,  K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K40, K41, K58,  K42, K4A, K7B,  K44, K45, K46, K7D, \ +    K31, K33,  K77, K4D, K4E, K4F, K50, K51, K52, K53, K54, K55, K56, K57,      K59,                  K5B, K5C, K5D, \ +    K48, K49,  K63,      K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D,      K6E,       K14,       K70, K71, K72, K5A, \ +    K5F, K61,  K4C, K13, K78,                K79,                     K7A, K43, K0D,  K18, K1B, K1C,     K5E,   K32 \  ) { \ -    { KC_NO,  K01 ,  K02 ,  K03 ,  K04 ,  K05 ,  K06 ,  K07  }, \ -    {  K08 ,  K09 ,  K0A ,  K0B ,  K0C ,  K0D ,  K0E , KC_NO,}, \ -    {  K10 ,  K11 ,  K12 ,  K13 ,  K14 ,  K15 ,  K16 ,  K17  }, \ -    {  K18 ,  K19 ,  K1A ,  K1B ,  K1C ,  K1D ,  K1E ,  K1F  }, \ -    {  K20 ,  K21 ,  K22 ,  K23 ,  K24 ,  K25 ,  K26 ,  K27  }, \ -    {  K28 ,  K29 ,  K2A ,  K2B ,  K2C ,  K2D ,  K2E ,  K2F  }, \ -    {  K30 ,  K31 ,  K32 ,  K33 ,  K34 ,  K35 ,  K36 ,  K37  }, \ -    {  K38 ,  K39 ,  K3A ,  K3B ,  K3C ,  K3D ,  K3E ,  K3F  }, \ -    {  K40 ,  K41 ,  K42 ,  K43 ,  K44 ,  K45 ,  K46 ,  K47  }, \ -    {  K48 ,  K49 ,  K4A , KC_NO,  K4C ,  K4D ,  K4E ,  K4F  }, \ -    {  K50 ,  K51 ,  K52 ,  K53 ,  K54 ,  K55 ,  K56 ,  K57  }, \ -    {  K58 ,  K59 ,  K5A ,  K5B ,  K5C ,  K5D ,  K5E ,  K5F  }, \ -    {  K60 ,  K61 ,  K62 ,  K63 ,  K64 ,  K65 ,  K66 ,  K67  }, \ -    {  K68 ,  K69 ,  K6A ,  K6B ,  K6C ,  K6D ,  K6E , KC_NO }, \ -    {  K70 ,  K71 ,  K72 , KC_NO, KC_NO, KC_NO,  K76 ,  K77  }, \ -    {  K78 ,  K79 ,  K7A ,  K7B , KC_NO,  K7D , KC_NO, KC_NO }  \ +    { XXX, K01, K02, K03, K04, K05, K06, K07 }, \ +    { K08, K09, K0A, K0B, K0C, K0D, K0E, XXX }, \ +    { K10, K11, K12, K13, K14, K15, K16, K17 }, \ +    { K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ +    { K20, K21, K22, K23, K24, K25, K26, K27 }, \ +    { K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ +    { K30, K31, K32, K33, K34, K35, K36, K37 }, \ +    { K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ +    { K40, K41, K42, K43, K44, K45, K46, K47 }, \ +    { K48, K49, K4A, XXX, K4C, K4D, K4E, K4F }, \ +    { K50, K51, K52, K53, K54, K55, K56, K57 }, \ +    { K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, \ +    { K60, K61, K62, K63, K64, K65, K66, K67 }, \ +    { K68, K69, K6A, K6B, K6C, K6D, K6E, XXX }, \ +    { K70, K71, K72, XXX, XXX, XXX, K76, K77 }, \ +    { K78, K79, K7A, K7B, XXX, K7D, XXX, XXX } \  } -#endif diff --git a/keyboards/converter/usb_usb/ble/ble.h b/keyboards/converter/usb_usb/ble/ble.h index d28629643a..3dccc23a41 100644 --- a/keyboards/converter/usb_usb/ble/ble.h +++ b/keyboards/converter/usb_usb/ble/ble.h @@ -1,6 +1,3 @@ -#ifndef BLE_H -#define BLE_H +#pragma once  #include QMK_KEYBOARD_H - -#endif diff --git a/keyboards/converter/usb_usb/config.h b/keyboards/converter/usb_usb/config.h index 7ff8ceeebd..d2488336a5 100644 --- a/keyboards/converter/usb_usb/config.h +++ b/keyboards/converter/usb_usb/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  /* USB Device descriptor parameter */  #define VENDOR_ID       0xFEED @@ -46,5 +45,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/converter/usb_usb/hasu/hasu.h b/keyboards/converter/usb_usb/hasu/hasu.h index d5e7855860..3dccc23a41 100644 --- a/keyboards/converter/usb_usb/hasu/hasu.h +++ b/keyboards/converter/usb_usb/hasu/hasu.h @@ -1,6 +1,3 @@ -#ifndef HASU_H -#define HASU_H +#pragma once  #include QMK_KEYBOARD_H - -#endif diff --git a/keyboards/converter/usb_usb/pro_micro/pro_micro.h b/keyboards/converter/usb_usb/pro_micro/pro_micro.h index 566df9f20f..3dccc23a41 100644 --- a/keyboards/converter/usb_usb/pro_micro/pro_micro.h +++ b/keyboards/converter/usb_usb/pro_micro/pro_micro.h @@ -1,6 +1,3 @@ -#ifndef PRO_MICRO_H -#define PRO_MICRO_H +#pragma once  #include QMK_KEYBOARD_H - -#endif diff --git a/keyboards/converter/usb_usb/usb_usb.h b/keyboards/converter/usb_usb/usb_usb.h index 1d1b6770d1..3acd67634a 100644 --- a/keyboards/converter/usb_usb/usb_usb.h +++ b/keyboards/converter/usb_usb/usb_usb.h @@ -15,11 +15,12 @@ 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 USB_USB_H -#define USB_USB_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  #define ______ KC_TRNS  /*         ,---------------. ,---------------. ,---------------. @@ -63,46 +64,31 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.   * TODO: use same keycode to pass through instead of KC_NO?   */  #define LAYOUT_all( \ -            K68,K69,K6A,K6B,K6C,K6D,K6E,K6F,K70,K71,K72,K73,                                              \ -    K29,    K3A,K3B,K3C,K3D,K3E,K3F,K40,K41,K42,K43,K44,K45,      K46,K47,K48,  K81,K80,K7F,K66, K75,     \ -    K35,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K2D,K2E,K89,K2A,  K49,K4A,K4B,  K53,K54,K55,K56, K78,K79, \ -    K2B,K14,K1A,K08,K15,K17,K1C,K18,K0C,K12,K13,K2F,K30,    K31,  K4C,K4D,K4E,  K5F,K60,K61,K57, K76,K7A, \ -    K39,K04,K16,K07,K09,K0A,K0B,K0D,K0E,K0F,K33,K34,    K32,K28,                K5C,K5D,K5E,K85, K77,K7C, \ -    KE1,K64,K1D,K1B,K06,K19,K05,K11,K10,K36,K37,K38,    K87,KE5,      K52,      K59,K5A,K5B,K67, K74,K7D, \ -    KE0,KE3,KE2,K8B,K91,    K2C,    K90,K8A,K88,KE6,KE7,K65,KE4,  K50,K51,K4F,  K62,    K63,K58, K7E,K7B  \ +              k68, k69, k6A, k6B, k6C, k6D, k6E, k6F, k70, k71, k72, k73, \ +    k29,      k3A, k3B, k3C, k3D, k3E, k3F, k40, k41, k42, k43, k44, k45,       k46, k47, k48,  k81, k80, k7F, k66,  k75, \ +\ +    k35, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k2D, k2E, k89, k2A,  k49, k4A, k4B,  k53, k54, k55, k56,  k78, k79, \ +    k2B, k14, k1A, k08, k15, k17, k1C, k18, k0C, k12, k13, k2F, k30, k31,       k4C, k4D, k4E,  k5F, k60, k61, k57,  k76, k7A, \ +    k39, k04, k16, k07, k09, k0A, k0B, k0D, k0E, k0F, k33, k34, k32, k28,                       k5C, k5D, k5E, k85,  k77, k7C, \ +    kE1, k64, k1D, k1B, k06, k19, k05, k11, k10, k36, k37, k38, k87, kE5,            k52,       k59, k5A, k5B, k67,  k74, k7D, \ +    kE0, kE3, kE2, k8B, k91,      k2C, k90, k8A, k88, kE6, kE7, k65, kE4,       k50, k51, k4F,  k62,      k63, k58,  k7E, k7B \  ) { \ -    { KC_NO, KC_NO, KC_NO, KC_NO, K04,   K05,   K06,   K07,      /* 00-07 */ \ -      K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F    }, /* 08-0F */ \ -    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,      /* 10-17 */ \ -      K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F    }, /* 18-1F */ \ -    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,      /* 20-27 */ \ -      K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F    }, /* 28-2F */ \ -    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,      /* 30-37 */ \ -      K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,   K3F    }, /* 38-3F */ \ -    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,      /* 40-47 */ \ -      K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E,   K4F    }, /* 48-4F */ \ -    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,      /* 50-57 */ \ -      K58,   K59,   K5A,   K5B,   K5C,   K5D,   K5E,   K5F    }, /* 58-5F */ \ -    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67,      /* 60-67 */ \ -      K68,   K69,   K6A,   K6B,   K6C,   K6D,   K6E,   K6F    }, /* 68-6F */ \ -    { K70,   K71,   K72,   K73,   K74,   K75,   K76,   K77,      /* 70-77 */ \ -      K78,   K79,   K7A,   K7B,   K7C,   K7D,   K7E,   K7F    }, /* 78-7F */ \ -    { K80,   K81,   KC_NO, KC_NO, KC_NO, K85,   KC_NO, K87,      /* 80-87 */ \ -      K88,   K89,   K8A,   K8B,   KC_NO, KC_NO, KC_NO, KC_NO  }, /* 88-8F */ \ -    { K90,   K91,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* 90-97 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* 98-9F */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* A0-A7 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* A8-AF */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* B0-B7 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* B8-BF */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* C0-C7 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* C8-CF */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* D0-D7 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* D8-DF */ \ -    { KE0,   KE1,   KE2,   KE3,   KE4,   KE5,   KE6,   KE7,      /* E0-E7 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* E8-EF */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* F0-F7 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* F8-FF */ \ +    { XXX, XXX, XXX, XXX, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \ +    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F }, \ +    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A, k7B, k7C, k7D, k7E, k7F }, \ +    { k80, k81, XXX, XXX, XXX, k85, XXX, k87, k88, k89, k8A, k8B, XXX, XXX, XXX, XXX }, \ +    { k90, k91, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { kE0, kE1, kE2, kE3, kE4, kE5, kE6, kE7, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \  }  /* ,---.   ,---------------. ,---------------. ,---------------. ,-----------. @@ -121,45 +107,30 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.   * `-----------------------------------------------------------' `-----------' `---------------'   */  #define LAYOUT_ansi( \ -    K29,K3A,K3B,K3C,K3D,K3E,K3F,K40,K41,K42,K43,K44,K45,      K46,K47,K48,                   \ -    K35,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K2D,K2E,K2A,  K49,K4A,K4B,  K53,K54,K55,K56, \ -    K2B,K14,K1A,K08,K15,K17,K1C,K18,K0C,K12,K13,K2F,K30,K31,  K4C,K4D,K4E,  K5F,K60,K61,     \ -    K39,K04,K16,K07,K09,K0A,K0B,K0D,K0E,K0F,K33,K34,    K28,                K5C,K5D,K5E,K57, \ -    KE1,K1D,K1B,K06,K19,K05,K11,K10,K36,K37,K38,        KE5,      K52,      K59,K5A,K5B,     \ -    KE0,KE3,KE2,        K2C,                KE6,KE7,K65,KE4,  K50,K51,K4F,  K62,    K63,K58  \ +    k29,      k3A, k3B, k3C, k3D, k3E, k3F, k40, k41, k42, k43, k44, k45,  k46, k47, k48, \ +\ +    k35, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k2D, k2E, k2A,  k49, k4A, k4B,  k53, k54, k55, k56, \ +    k2B, k14, k1A, k08, k15, k17, k1C, k18, k0C, k12, k13, k2F, k30, k31,  k4C, k4D, k4E,  k5F, k60, k61, \ +    k39, k04, k16, k07, k09, k0A, k0B, k0D, k0E, k0F, k33, k34,      k28,                  k5C, k5D, k5E, k57, \ +    kE1,      k1D, k1B, k06, k19, k05, k11, k10, k36, k37, k38,      kE5,       k52,       k59, k5A, k5B, \ +    kE0, kE3, kE2,                k2C,                kE6, kE7, k65, kE4,  k50, k51, k4F,  k62,      k63, k58 \  ) { \ -    { KC_NO, KC_NO, KC_NO, KC_NO, K04,   K05,   K06,   K07,      /* 00-07 */ \ -      K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F    }, /* 08-0F */ \ -    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,      /* 10-17 */ \ -      K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F    }, /* 18-1F */ \ -    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,      /* 20-27 */ \ -      K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F    }, /* 28-2F */ \ -    { K30,   K31,   KC_NO, K33,   K34,   K35,   K36,   K37,      /* 30-37 */ \ -      K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,   K3F    }, /* 38-3F */ \ -    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,      /* 40-47 */ \ -      K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E,   K4F    }, /* 48-4F */ \ -    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,      /* 50-57 */ \ -      K58,   K59,   K5A,   K5B,   K5C,   K5D,   K5E,   K5F    }, /* 58-5F */ \ -    { K60,   K61,   K62,   K63,   KC_NO, K65,   KC_NO, KC_NO,    /* 60-67 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, }, /* 68-6F */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* 70-77 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, }, /* 78-7F */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* 80-87 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* 88-8F */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* 90-97 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* 98-9F */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* A0-A7 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* A8-AF */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* B0-B7 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* B8-BF */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* C0-C7 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* C8-CF */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* D0-D7 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* D8-DF */ \ -    { KE0,   KE1,   KE2,   KE3,   KE4,   KE5,   KE6,   KE7,      /* E0-E7 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* E8-EF */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* F0-F7 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* F8-FF */ \ +    { XXX, XXX, XXX, XXX, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ +    { k30, k31, XXX, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \ +    { k60, k61, k62, k63, XXX, k65, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX,}, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX,}, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { kE0, kE1, kE2, kE3, kE4, kE5, kE6, kE7, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \  }  /* ,---.   ,---------------. ,---------------. ,---------------. ,-----------. @@ -178,45 +149,30 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.   * `-----------------------------------------------------------' `-----------' `---------------'   */  #define LAYOUT_iso( \ -    K29,    K3A,K3B,K3C,K3D,K3E,K3F,K40,K41,K42,K43,K44,K45,  K46,K47,K48,                   \ -    K35,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K2D,K2E,K2A,  K49,K4A,K4B,  K53,K54,K55,K56, \ -    K2B,K14,K1A,K08,K15,K17,K1C,K18,K0C,K12,K13,K2F,K30,K28,  K4C,K4D,K4E,  K5F,K60,K61,K57, \ -    K39,K04,K16,K07,K09,K0A,K0B,K0D,K0E,K0F,K33,K34,K32,                    K5C,K5D,K5E,     \ -    KE1,K64,K1D,K1B,K06,K19,K05,K11,K10,K36,K37,K38,    KE5,      K52,      K59,K5A,K5B,K58, \ -    KE0,KE3,KE2,        K2C,                KE6,KE7,K65,KE4,  K50,K51,K4F,  K62,    K63      \ +    k29,      k3A, k3B, k3C, k3D, k3E, k3F, k40, k41, k42, k43, k44, k45,  k46, k47, k48, \ +\ +    k35, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k2D, k2E, k2A,  k49, k4A, k4B,  k53, k54, k55, k56, \ +    k2B, k14, k1A, k08, k15, k17, k1C, k18, k0C, k12, k13, k2F, k30, k28,  k4C, k4D, k4E,  k5F, k60, k61, k57, \ +    k39, k04, k16, k07, k09, k0A, k0B, k0D, k0E, k0F, k33, k34, k32,                       k5C, k5D, k5E, \ +    kE1, k64, k1D, k1B, k06, k19, k05, k11, k10, k36, k37, k38,      kE5,       k52,       k59, k5A, k5B, k58, \ +    kE0, kE3, kE2,           k2C,                     kE6, kE7, k65, kE4,  k50, k51, k4F,  k62,      k63 \  ) { \ -    { KC_NO, KC_NO, KC_NO, KC_NO, K04,   K05,   K06,   K07,      /* 00-07 */ \ -      K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F    }, /* 08-0F */ \ -    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,      /* 10-17 */ \ -      K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F    }, /* 18-1F */ \ -    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,      /* 20-27 */ \ -      K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F    }, /* 28-2F */ \ -    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,      /* 30-37 */ \ -      K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,   K3F    }, /* 38-3F */ \ -    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,      /* 40-47 */ \ -      K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E,   K4F    }, /* 48-4F */ \ -    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,      /* 50-57 */ \ -      K58,   K59,   K5A,   K5B,   K5C,   K5D,   K5E,   K5F    }, /* 58-5F */ \ -    { K60,   K61,   K62,   K63,   K64,   K65,   KC_NO, KC_NO,    /* 60-67 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, }, /* 68-6F */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* 70-77 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, }, /* 78-7F */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* 80-87 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* 88-8F */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* 90-97 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* 98-9F */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* A0-A7 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* A8-AF */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* B0-B7 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* B8-BF */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* C0-C7 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* C8-CF */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* D0-D7 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* D8-DF */ \ -    { KE0,   KE1,   KE2,   KE3,   KE4,   KE5,   KE6,   KE7,      /* E0-E7 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* E8-EF */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* F0-F7 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* F8-FF */ \ +    { XXX, XXX, XXX, XXX, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \ +    { k60, k61, k62, k63, k64, k65, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX,}, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX,}, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { kE0, kE1, kE2, kE3, kE4, kE5, kE6, kE7, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \  }  /* ,---.   ,---------------. ,---------------. ,---------------. ,-----------. @@ -235,44 +191,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.   * `-----------------------------------------------------------' `-----------' `---------------'   */  #define LAYOUT_jis( \ -    K29,    K3A,K3B,K3C,K3D,K3E,K3F,K40,K41,K42,K43,K44,K45,      K46,K47,K48,                   \ -    K35,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K2D,K2E,K89,K2A,  K49,K4A,K4B,  K53,K54,K55,K56, \ -    K2B,K14,K1A,K08,K15,K17,K1C,K18,K0C,K12,K13,K2F,K30,    K28,  K4C,K4D,K4E,  K5F,K60,K61,K57, \ -    K39,K04,K16,K07,K09,K0A,K0B,K0D,K0E,K0F,K33,K34,K32,                        K5C,K5D,K5E,     \ -    KE1,K1D,K1B,K06,K19,K05,K11,K10,K36,K37,K38,        K87,KE5,      K52,      K59,K5A,K5B,K58, \ -    KE0,KE3,KE2,K8B,    K2C,        K8A,K88,KE6,KE7,K65,KE4,      K50,K51,K4F,  K62,    K63      \ +    k29,      k3A, k3B, k3C, k3D, k3E, k3F, k40, k41, k42, k43, k44, k45,       k46, k47, k48, \ +\ +    k35, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k2D, k2E, k89, k2A,  k49, k4A, k4B,  k53, k54, k55, k56, \ +    k2B, k14, k1A, k08, k15, k17, k1C, k18, k0C, k12, k13, k2F, k30, k28,       k4C, k4D, k4E,  k5F, k60, k61, k57, \ +    k39, k04, k16, k07, k09, k0A, k0B, k0D, k0E, k0F, k33, k34, k32,                            k5C, k5D, k5E, \ +    kE1,      k1D, k1B, k06, k19, k05, k11, k10, k36, k37, k38, k87, kE5,            k52,       k59, k5A, k5B, k58, \ +    kE0, kE3, kE2, k8B,      k2C,           k8A, k88, kE6, kE7, k65, kE4,       k50, k51, k4F,  k62,      k63 \  ) { \ -    { KC_NO, KC_NO, KC_NO, KC_NO, K04,   K05,   K06,   K07,      /* 00-07 */ \ -      K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F    }, /* 08-0F */ \ -    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,      /* 10-17 */ \ -      K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F    }, /* 18-1F */ \ -    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,      /* 20-27 */ \ -      K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F    }, /* 28-2F */ \ -    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,      /* 30-37 */ \ -      K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,   K3F    }, /* 38-3F */ \ -    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,      /* 40-47 */ \ -      K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E,   K4F    }, /* 48-4F */ \ -    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,      /* 50-57 */ \ -      K58,   K59,   K5A,   K5B,   K5C,   K5D,   K5E,   K5F    }, /* 58-5F */ \ -    { K60,   K61,   K62,   K63,   K64,   K65,   KC_NO, KC_NO,    /* 60-67 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, }, /* 68-6F */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* 70-77 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, }, /* 78-7F */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K87,      /* 80-87 */ \ -      K88,   K89,   K8A,   K8B,   KC_NO, KC_NO, KC_NO, KC_NO  }, /* 88-8F */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* 90-97 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* 98-9F */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* A0-A7 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* A8-AF */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* B0-B7 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* B8-BF */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* C0-C7 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* C8-CF */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* D0-D7 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* D8-DF */ \ -    { KE0,   KE1,   KE2,   KE3,   KE4,   KE5,   KE6,   KE7,      /* E0-E7 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* E8-EF */ \ -    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,    /* F0-F7 */ \ -      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO  }, /* F8-FF */ \ +    { XXX, XXX, XXX, XXX, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \ +    { k60, k61, k62, k63, k64, k65, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX,}, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX,}, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, k87, k88, k89, k8A, k8B, XXX, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { kE0, kE1, kE2, kE3, kE4, kE5, kE6, kE7, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \  } -#endif diff --git a/keyboards/cu24/config.h b/keyboards/cu24/config.h index 7d1bae6041..524d3f3702 100644 --- a/keyboards/cu24/config.h +++ b/keyboards/cu24/config.h @@ -14,8 +14,7 @@   * along with this program.  If not, see <http://www.gnu.org/licenses/>.   */ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -159,5 +158,3 @@  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/cu24/cu24.h b/keyboards/cu24/cu24.h index d329182d23..8e3daa4758 100644 --- a/keyboards/cu24/cu24.h +++ b/keyboards/cu24/cu24.h @@ -13,11 +13,13 @@   * 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 CU24_H -#define CU24_H + +#pragma once  #include "quantum.h" +#define XXX KC_NO +  // This a shortcut to help you visually see your layout.  // The following is an example using the Planck MIT layout  // The first section contains all of the arguments @@ -28,34 +30,28 @@      k20, k21, k22, k23, \      k30, k31, k32, k33, \      k40, k41, k42, k43, \ -    k50, k51, k52, k53  \ -) \ -{ \ +    k50, k51, k52, k53 \ +) { \      { k00, k01, k02, k03 }, \      { k10, k11, k12, k13 }, \      { k20, k21, k22, k23 }, \      { k30, k31, k32, k33 }, \      { k40, k41, k42, k43 }, \ -    { k50, k51, k52, k53 }  \ +    { k50, k51, k52, k53 } \  }  #define LAYOUT_numpad( \      k00, k01, k02, k03, \      k10, k11, k12, k13, \      k20, k21, k22, k23, \ -    k30, k31, k32,      \ +    k30, k31, k32, \      k40, k41, k42, k43, \ -         k51, k52       \ -) \ -{ \ -    { k00,   k01,   k02, k03 }, \ -    { k10,   k11,   k12, k13 }, \ -    { k20,   k21,   k22, k23 }, \ -    { k30,   k31,   k32, KC_NO }, \ -    { k40,   k41,   k42, k43 }, \ -    { KC_NO, k51,   k52, KC_NO }  \ +         k51, k52 \ +) { \ +    { k00, k01, k02, k03 }, \ +    { k10, k11, k12, k13 }, \ +    { k20, k21, k22, k23 }, \ +    { k30, k31, k32, XXX }, \ +    { k40, k41, k42, k43 }, \ +    { XXX, k51, k52, XXX } \  } - - - -#endif diff --git a/keyboards/cu75/config.h b/keyboards/cu75/config.h index 232a3a8ebb..124aa5bba2 100644 --- a/keyboards/cu75/config.h +++ b/keyboards/cu75/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -141,5 +140,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/cu75/cu75.h b/keyboards/cu75/cu75.h index 7774187b4f..444c8daaec 100644 --- a/keyboards/cu75/cu75.h +++ b/keyboards/cu75/cu75.h @@ -1,5 +1,4 @@ -#ifndef CU75_H -#define CU75_H +#pragma once  #include "quantum.h"  #include "matrix.h" @@ -40,71 +39,71 @@ enum action_functions {  void reset_keyboard_kb(void);  void click(uint16_t freq, uint16_t duration); +#define XXX KC_NO +  /* Vanilla Keymap */  // This a shortcut to help you visually see your layout.  /*  * ,-------------------------------------------------------------------------------. -* | 01 | 02 | 03 | 04 | 05 | 06 | 07 | 08 | 09 | 0A | 0B | 0C | 0D | 0E | 0F | 0G | +* | 00 | 01 | 02 | 03 | 04 | 05 | 06 | 07 | 08 | 09 | 0A | 0B | 0C | 0D | 0E | 0F |  * |-------------------------------------------------------------------------------| -* | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A | 1B | 1C | 1D |   1E    | 1G | +* | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A | 1B | 1C |   1D    | 1F |  * |-------------------------------------------------------------------------------| -* | 21   | 22 |23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A | 2B | 2C | 2D |   2E   | 2F | +* | 20   | 21 |22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A | 2B | 2C |   2D   | 2E |  * |-------------------------------------------------------------------------------| -* | 31    | 32 |33 | 34 | 35 | 36 | 37 | 38 | 39 | 3A | 3B | 3C |      3D    | 3F | +* | 30    | 31 |32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | 3A | 3B |      3C    | 3E |  * |-------------------------------------------------------------------------------| -* | 41      | 42 |43 | 45 | 46 | 47 | 48 | 49 | 4A | 4B | 4C |    4D    | 4E | 4F | +* | 40      | 42 |43 | 44 | 45 | 46 | 47 | 48 | 49 | 4A | 4B |    4C    | 4D | 4E |  * |-------------------------------------------------------------------------------| -* | 51  |  52  | 53  | 54 |         57        | 59 | 5A | 5B | 5C |  5D | 5E | 5F | +* | 50  |  51  | 52  | 53 |         56        | 58 | 59 | 5A | 5B |  5C | 5D | 5E |  * `-------------------------------------------------------------------------------'  */  // The first section contains all of the arguements  // The second converts the arguments into a two-dimensional array  #define LAYOUT( \ -    k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, \ -    k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,      k1G, \ -    k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, \ -    k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D,      k3F, \ -    k41,      k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, \ -    k51, k52, k53, k54,           k57,      k59, k5A, k5B, k5C, k5D, k5E, k5F \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1F, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,      k3E, \ +    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, \ +    k50, k51, k52, k53,           k56,      k58, k59, k5A, k5B, k5C, k5D, k5E \  ) { \ -    {k01, k02,   k03, k04,   k05,   k06,   k07, k08,   k09, k0A, k0B, k0C, k0D, k0E,   k0F,   k0G}, \ -    {k11, k12,   k13, k14,   k15,   k16,   k17, k18,   k19, k1A, k1B, k1C, k1D, k1E,   KC_NO, k1G}, \ -    {k21, k22,   k23, k24,   k25,   k26,   k27, k28,   k29, k2A, k2B, k2C, k2D, k2E,   k2F,   KC_NO}, \ -    {k31, k32,   k33, k34,   k35,   k36,   k37, k38,   k39, k3A, k3B, k3C, k3D, KC_NO, k3F,   KC_NO}, \ -    {k41, KC_NO, k43, k44,   k45,   k46,   k47, k48,   k49, k4A, k4B, k4C, k4D, k4E,   k4F,   KC_NO}, \ -    {k51, k52,   k53, k54, KC_NO, KC_NO,   k57, KC_NO, k59, k5A, k5B, k5C, k5D, k5E,   k5F,   KC_NO}, \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, XXX, k3E, XXX }, \ +    { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, XXX }, \ +    { k50, k51, k52, k53, XXX, XXX, k56, XXX, k58, k59, k5A, k5B, k5C, k5D, k5E, XXX } \  }  #define LAYOUT_all( \ -    k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, \ -    k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, \ -    k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, \ -    k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \ -    k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, \ -    k51, k52, k53, k54,           k57,      k59, k5A, k5B, k5C, k5D, k5E, k5F \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ +    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, \ +    k50, k51, k52, k53,           k56,      k58, k59, k5A, k5B, k5C, k5D, k5E \  ) { \ -    {k01, k02, k03, k04,   k05,   k06, k07, k08,   k09, k0A, k0B, k0C, k0D, k0E, k0F,   k0G}, \ -    {k11, k12, k13, k14,   k15,   k16, k17, k18,   k19, k1A, k1B, k1C, k1D, k1E, k1F,   k1G}, \ -    {k21, k22, k23, k24,   k25,   k26, k27, k28,   k29, k2A, k2B, k2C, k2D, k2E, k2F,   KC_NO}, \ -    {k31, k32, k33, k34,   k35,   k36, k37, k38,   k39, k3A, k3B, k3C, k3D, k3E, k3F,   KC_NO}, \ -    {k41, k42, k43, k44,   k45,   k46, k47, k48,   k49, k4A, k4B, k4C, k4D, k4E, k4F,   KC_NO}, \ -    {k51, k52, k53, k54, KC_NO, KC_NO, k57, KC_NO, k59, k5A, k5B, k5C, k5D, k5E, k5F,   KC_NO}, \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, XXX }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, XXX }, \ +    { k50, k51, k52, k53, XXX, XXX, k56, XXX, k58, k59, k5A, k5B, k5C, k5D, k5E, XXX } \  }  #define LAYOUT_iso( \ -    k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, \ -    k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,      k1G, \ -    k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, \ -    k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D,      k3F, \ -    k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, \ -    k51, k52, k53,       k54,  k57,  k59,        k5A, k5B, k5C, k5D, k5E, k5F \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1F, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,      k3E, \ +    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, \ +    k50, k51, k52,       k53,  k56,  k58,        k59, k5A, k5B, k5C, k5D, k5E \  ) { \ -    {k01, k02,   k03, k04,   k05,   k06,   k07, k08,   k09, k0A, k0B, k0C, k0D, k0E,   k0F,   k0G}, \ -    {k11, k12,   k13, k14,   k15,   k16,   k17, k18,   k19, k1A, k1B, k1C, k1D, k1E,   KC_NO, k1G}, \ -    {k21, k22,   k23, k24,   k25,   k26,   k27, k28,   k29, k2A, k2B, k2C, k2D, k2E,   k2F,   KC_NO}, \ -    {k31, k32,   k33, k34,   k35,   k36,   k37, k38,   k39, k3A, k3B, k3C, k3D, KC_NO, k3F,   KC_NO}, \ -    {k41, k42, k43, k44,   k45,   k46,   k47, k48,   k49, k4A, k4B, k4C, k4D, k4E,     k4F,   KC_NO}, \ -    {k51, k52,   k53, k54, KC_NO, KC_NO,   k57, KC_NO, k59, k5A, k5B, k5C, k5D, k5E,   k5F,   KC_NO}, \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, XXX, k3E, XXX }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, XXX }, \ +    { k50, k51, k52, k53, XXX, XXX, k56, XXX, k58, k59, k5A, k5B, k5C, k5D, k5E, XXX } \  } - -#endif //CU75_H diff --git a/keyboards/dc01/left/i2c.h b/keyboards/dc01/left/i2c.h index 25e876658b..0d93e4ecaa 100644 --- a/keyboards/dc01/left/i2c.h +++ b/keyboards/dc01/left/i2c.h @@ -1,5 +1,4 @@ -#ifndef I2C_H -#define I2C_H +#pragma once  #include <stdint.h> @@ -27,5 +26,3 @@ uint8_t i2c_master_write(uint8_t data);  uint8_t i2c_master_read(int);  void i2c_reset_state(void);  void i2c_slave_init(uint8_t address); - -#endif diff --git a/keyboards/dichotomy/config.h b/keyboards/dichotomy/config.h index 0cdaf776b4..03e19b1388 100644 --- a/keyboards/dichotomy/config.h +++ b/keyboards/dichotomy/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -66,5 +65,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.      UCSR1B = _BV(TXEN1) | _BV(RXEN1); \      /* 8-bit data */                  \      UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); - -#endif diff --git a/keyboards/dichotomy/dichotomy.h b/keyboards/dichotomy/dichotomy.h index 2023259b11..37372d6496 100755 --- a/keyboards/dichotomy/dichotomy.h +++ b/keyboards/dichotomy/dichotomy.h @@ -1,5 +1,4 @@ -#ifndef DICHOTOMY_H -#define DICHOTOMY_H +#pragma once  #include "report.h"  #include "pointing_device.h" @@ -25,22 +24,21 @@  #define set_led_cyan()    red_led_off(); grn_led_on();  blu_led_on()  #define set_led_white()   red_led_on();  grn_led_on();  blu_led_on() +#define XXX KC_NO +  // This a shortcut to help you visually see your layout.  // The first section contains all of the arguements  // The second converts the arguments into a two-dimensional array  #define LAYOUT( \ -  k00, k01, k02, k03, k04, k05,      k06, k07, k08, k09, k0A, k0B, \ -  k10, k11, k12, k13, k14, k15,      k16, k17, k18, k19, k1A, k1B, \ -  k20, k21, k22, k23, k24, k25,      k26, k27, k28, k29, k2A, k2B, \ -                 k33, k34, k35,      k36, k37, k38,      \ -            k42, k43, k44, k45,      k46, k47, k48, k49  \ -) \ -{ \ -	{ k00,   k01,   k02,   k03,   k04,   k05,      k06,   k07,   k08,   k09,   k0A,   k0B   }, \ -	{ k10,   k11,   k12,   k13,   k14,   k15,      k16,   k17,   k18,   k19,   k1A,   k1B   }, \ -	{ k20,   k21,   k22,   k23,   k24,   k25,      k26,   k27,   k28,   k29,   k2A,   k2B   }, \ -	{ KC_NO, KC_NO, KC_NO, k33,   k34,   k35,      k36,   k37,   k38,   KC_NO, KC_NO, KC_NO }, \ -	{ KC_NO, KC_NO, k42,   k43,   k44,   k45,      k46,   k47,   k48,   k49,   KC_NO, KC_NO }  \ +    k00, k01, k02, k03, k04, k05,      k06, k07, k08, k09, k0A, k0B, \ +    k10, k11, k12, k13, k14, k15,      k16, k17, k18, k19, k1A, k1B, \ +    k20, k21, k22, k23, k24, k25,      k26, k27, k28, k29, k2A, k2B, \ +                   k33, k34, k35,      k36, k37, k38, \ +              k42, k43, k44, k45,      k46, k47, k48, k49 \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \ +    { XXX, XXX, XXX, k33, k34, k35, k36, k37, k38, XXX, XXX, XXX }, \ +    { XXX, XXX, k42, k43, k44, k45, k46, k47, k48, k49, XXX, XXX } \  } - -#endif diff --git a/keyboards/diverge3/diverge3.h b/keyboards/diverge3/diverge3.h index 53364213f6..c668bb29ef 100644 --- a/keyboards/diverge3/diverge3.h +++ b/keyboards/diverge3/diverge3.h @@ -13,8 +13,8 @@   * 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 DIVERGE3_H -#define DIVERGE3_H + +#pragma once  #include "quantum.h" @@ -26,24 +26,25 @@  #endif  #endif +#define XXX KC_NO +  // This a shortcut to help you visually see your layout.  // The second converts the arguments into a two-dimensional array  #define LAYOUT( \ -  L00, L01, L02, L03, L04, L05, L06,           R00, R01, R02, R03, R04, R05, R06, \ -  L10, L11, L12, L13, L14, L15, L16,           R10, R11, R12, R13, R14, R15, R16, \ -  L20, L21, L22, L23, L24, L25, L26,           R20, R21, R22, R23, R24, R25, R26, \ -  L30, L31, L32, L33, L34, L35, L36,           R30, R31, R32, R33, R34, R35, R36, \ -  L40, L41, L42, L43, L44, LT0, LT1, LT2, RT2, RT1, RT0, R40, R41, R42, R43, R44  \ +    L00, L01, L02, L03, L04, L05, L06,           R00, R01, R02, R03, R04, R05, R06, \ +    L10, L11, L12, L13, L14, L15, L16,           R10, R11, R12, R13, R14, R15, R16, \ +    L20, L21, L22, L23, L24, L25, L26,           R20, R21, R22, R23, R24, R25, R26, \ +    L30, L31, L32, L33, L34, L35, L36,           R30, R31, R32, R33, R34, R35, R36, \ +    L40, L41, L42, L43, L44, LT0, LT1, LT2, RT2, RT1, RT0, R40, R41, R42, R43, R44 \  ) { \ -    { L00, L01, L02, L03, L04, L05, L06, KC_NO }, \ -    { L10, L11, L12, L13, L14, L15, L16, KC_NO }, \ -    { L20, L21, L22, L23, L24, L25, L26, KC_NO }, \ -    { L30, L31, L32, L33, L34, L35, L36, KC_NO }, \ -    { L40, L41, L42, L43, L44, LT0, LT1, LT2   }, \ -    { R06, R05, R04, R03, R02, R01, R00, KC_NO }, \ -    { R16, R15, R14, R13, R12, R11, R10, KC_NO }, \ -    { R26, R25, R24, R23, R22, R21, R20, KC_NO }, \ -    { R36, R35, R34, R33, R32, R31, R30, KC_NO }, \ -    { R44, R43, R42, R41, R40, RT0, RT1, RT2   } \ +    { L00, L01, L02, L03, L04, L05, L06, XXX }, \ +    { L10, L11, L12, L13, L14, L15, L16, XXX }, \ +    { L20, L21, L22, L23, L24, L25, L26, XXX }, \ +    { L30, L31, L32, L33, L34, L35, L36, XXX }, \ +    { L40, L41, L42, L43, L44, LT0, LT1, LT2 }, \ +    { R06, R05, R04, R03, R02, R01, R00, XXX }, \ +    { R16, R15, R14, R13, R12, R11, R10, XXX }, \ +    { R26, R25, R24, R23, R22, R21, R20, XXX }, \ +    { R36, R35, R34, R33, R32, R31, R30, XXX }, \ +    { R44, R43, R42, R41, R40, RT0, RT1, RT2 } \    } -#endif diff --git a/keyboards/dm9records/ergoinu/post_rules.mk b/keyboards/dm9records/ergoinu/post_rules.mk new file mode 100644 index 0000000000..02aa48104c --- /dev/null +++ b/keyboards/dm9records/ergoinu/post_rules.mk @@ -0,0 +1,9 @@ +ifneq ($(strip $(ERGOINU)),) +  ifeq ($(findstring promicroled, $(ERGOINU)), promicroled) +    DISABLE_PROMICRO_LEDs = no +  endif +endif + +ifeq ($(strip $(DISABLE_PROMICRO_LEDs)), yes) +  OPT_DEFS += -DDISABLE_PROMICRO_LEDs +endif diff --git a/keyboards/dm9records/ergoinu/rules.mk b/keyboards/dm9records/ergoinu/rules.mk index e3362ea313..4d98df442b 100644 --- a/keyboards/dm9records/ergoinu/rules.mk +++ b/keyboards/dm9records/ergoinu/rules.mk @@ -29,13 +29,3 @@ SRC += matrix.c serial.c split_util.c  # ergoinu configs  DISABLE_PROMICRO_LEDs = yes - -ifneq ($(strip $(ERGOINU)),) -  ifeq ($(findstring promicroled, $(ERGOINU)), promicroled) -    DISABLE_PROMICRO_LEDs = no -  endif -endif - -ifeq ($(strip $(DISABLE_PROMICRO_LEDs)), yes) -  OPT_DEFS += -DDISABLE_PROMICRO_LEDs -endif diff --git a/keyboards/do60/config.h b/keyboards/do60/config.h index f3ee1ed045..8a0f324aa2 100644 --- a/keyboards/do60/config.h +++ b/keyboards/do60/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -75,5 +74,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.  #define LOCKING_RESYNC_ENABLE  #define TAPPING_TERM 200 - -#endif diff --git a/keyboards/dztech/dz65rgb/keymaps/jumper149/readme.md b/keyboards/dztech/dz65rgb/keymaps/jumper149/readme.md index d872587317..9de86be2d1 100644 --- a/keyboards/dztech/dz65rgb/keymaps/jumper149/readme.md +++ b/keyboards/dztech/dz65rgb/keymaps/jumper149/readme.md @@ -3,13 +3,13 @@  Run commands in the root directory of this repository.  ``` -./bin/qmk compile && sudo dfu-programmer atmega32u4 erase && sudo dfu-programmer atmega32u4 flash ./dztech_dz65rgb_v2_jumper149.hex && sudo dfu-programmer atmega32u4 reset +qmk compile && sudo dfu-programmer atmega32u4 erase && sudo dfu-programmer atmega32u4 flash ./dztech_dz65rgb_v2_jumper149.hex && sudo dfu-programmer atmega32u4 reset  ```  ## build  ``` -./bin/qmk compile +qmk compile  ```  ## flash diff --git a/keyboards/eco/config.h b/keyboards/eco/config.h index db1c61ab4f..e5258e3a0b 100644 --- a/keyboards/eco/config.h +++ b/keyboards/eco/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -68,5 +67,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #ifdef SUBPROJECT_rev2      #include "rev2/config.h"  #endif - -#endif diff --git a/keyboards/eco/eco.h b/keyboards/eco/eco.h index 211e41fe8f..885bf982d7 100644 --- a/keyboards/eco/eco.h +++ b/keyboards/eco/eco.h @@ -1,13 +1,9 @@ -#ifndef ECO_H -#define ECO_H +#pragma once -#ifdef KEYBOARD_eco_rev1 -    #include "rev1.h" -#endif -#ifdef KEYBOARD_eco_rev2 -    #include "rev2.h" +#if defined(KEYBOARD_eco_rev1) +#    include "rev1.h" +#elif defined(KEYBOARD_eco_rev2) +#    include "rev2.h"  #endif  #include "quantum.h" - -#endif diff --git a/keyboards/eco/rev1/config.h b/keyboards/eco/rev1/config.h index 1e97a703d1..65cb050d6c 100644 --- a/keyboards/eco/rev1/config.h +++ b/keyboards/eco/rev1/config.h @@ -15,8 +15,7 @@ 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 REV1_CONFIG_H -#define REV1_CONFIG_H +#pragma once  #include "../config.h" @@ -26,5 +25,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define MATRIX_ROW_PINS { B1, B6, B2, B3 }  #define MATRIX_COL_PINS { F4, F5, F6, F7, B5, B4, E6, D7, C6, D4, D0, D1, D2, D3 }  #define UNUSED_PINS - -#endif diff --git a/keyboards/eco/rev1/rev1.h b/keyboards/eco/rev1/rev1.h index 132760fbe8..a6ceafb815 100644 --- a/keyboards/eco/rev1/rev1.h +++ b/keyboards/eco/rev1/rev1.h @@ -1,21 +1,17 @@ -#ifndef REV1_H -#define REV1_H +#pragma once  #include "../eco.h"  #include "quantum.h"  #define LAYOUT( \ -    k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014, \ -    k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114, \ -    k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214, \ -    k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314  \ -    ) \ -    { \ -        { k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014 }, \ -        { k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114 }, \ -        { k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214 }, \ -        { k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314 }  \ -    } - -#endif +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D } \ +} diff --git a/keyboards/eco/rev2/config.h b/keyboards/eco/rev2/config.h index 83f2defc9e..bbc0492e06 100644 --- a/keyboards/eco/rev2/config.h +++ b/keyboards/eco/rev2/config.h @@ -15,8 +15,7 @@ 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 REV2_CONFIG_H -#define REV2_CONFIG_H +#pragma once  #include "../config.h" @@ -26,5 +25,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define MATRIX_ROW_PINS { D7, B5, B4, E6 }  #define MATRIX_COL_PINS { D1, D0, D4, C6, B6, B2, B3, B1, F7, F6, F5, F4, D2, D3 }  #define UNUSED_PINS - -#endif diff --git a/keyboards/eco/rev2/rev2.h b/keyboards/eco/rev2/rev2.h index 881bcc77b9..a6ceafb815 100644 --- a/keyboards/eco/rev2/rev2.h +++ b/keyboards/eco/rev2/rev2.h @@ -1,21 +1,17 @@ -#ifndef REV2_H -#define REV2_H +#pragma once  #include "../eco.h"  #include "quantum.h"  #define LAYOUT( \ -    k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014, \ -    k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114, \ -    k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214, \ -    k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314  \ -    ) \ -    { \ -        { k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, k014 }, \ -        { k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114 }, \ -        { k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214 }, \ -        { k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314 }  \ -    } - -#endif +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D } \ +} diff --git a/keyboards/ep/40/40.h b/keyboards/ep/40/40.h index 30f3d15b4f..1ac39a278d 100644 --- a/keyboards/ep/40/40.h +++ b/keyboards/ep/40/40.h @@ -13,11 +13,13 @@   * 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 EP40_H -#define EP40_H + +#pragma once  #include "quantum.h" +#define XXX KC_NO +  /* This a shortcut to help you visually see your layout.   *   * The first section contains all of the arguments representing the physical @@ -26,19 +28,14 @@   * The second converts the arguments into a two-dimensional array which   * represents the switch matrix.   */ -#define xxx KC_NO - -#define LAYOUT(\ -  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b,\ -	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,      k1b,\ -	k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,\ -	k30, k31, k32,      k34,      k36,      k38, k39, k3a, k3b \ -) \ -{ \ -  {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b},\ -	{k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, xxx, k1b},\ -	{k20, xxx, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b},\ -	{k30, k31, k32, xxx, k34, xxx, k36, xxx, k38, k39, k3a, k3b} \ +#define LAYOUT( \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,      k1B, \ +    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \ +    k30, k31, k32,      k34,      k36,      k38, k39, k3A, k3B \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, XXX, k1B }, \ +    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \ +    { k30, k31, k32, XXX, k34, XXX, k36, XXX, k38, k39, k3A, k3B } \  } - -#endif diff --git a/keyboards/ep/96/96.h b/keyboards/ep/96/96.h index 1887eb472c..1117256cdc 100644 --- a/keyboards/ep/96/96.h +++ b/keyboards/ep/96/96.h @@ -13,11 +13,13 @@   * 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 EP96_H -#define EP96_H + +#pragma once  #include "quantum.h" +#define XXX KC_NO +  /* This a shortcut to help you visually see your layout.   *   * The first section contains all of the arguments representing the physical @@ -26,22 +28,19 @@   * The second converts the arguments into a two-dimensional array which   * represents the switch matrix.   */ -#define xxxx KC_NO  #define LAYOUT( \ -    K000, K001, K002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, k017, k018, \ -    K100, K101, K102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,       k114, k115, k116, k117, k118, \ -    K200,       K202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213,       k215, k216, k217,       \ -    K300,       K302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314, k315, k316, k317, k318, \ -    K400, K401, K402, k403, k404, k405, k406, k407, k408, k409, k410, k411,       k413, k414, k415, k416, k417,       \ -    K500, K501, K502,                   k506,                         k511, k512, k513, k514, k515, k516, k517, k518) \ -{ \ -    {K000, K001, K002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016, k017, k018}, \ -    {K100, K101, K102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, xxxx, k114, k115, k116, k117, k118}, \ -    {K200, xxxx, K202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, xxxx, k215, k216, k217, xxxx}, \ -    {K300, xxxx, K302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314, k315, k316, k317, k318}, \ -    {K400, K401, K402, k403, k404, k405, k406, k407, k408, k409, k410, k411, xxxx, k413, k414, k415, k416, k417, xxxx}, \ -    {K500, K501, K502, xxxx, xxxx, xxxx, k506, xxxx, xxxx, xxxx, xxxx, k511, k512, k513, k514, k515, k516, k517, k518}  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0I, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1E, k1F, k1G, k1H, k1I, \ +    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,      k2F, k2G, k2H, \ +    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H, k3I, \ +    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B,      k4D, k4E, k4F, k4G, k4H, \ +    k50, k51, k52,                k56,                     k5B, k5C, k5D, k5E, k5F, k5G, k5H, k5I \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0I }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, k1E, k1F, k1G, k1H, k1I }, \ +    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F, k2G, k2H, XXX }, \ +    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H, k3I }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H, XXX }, \ +    { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, XXX, k5B, k5C, k5D, k5E, k5F, k5G, k5H, k5I } \  } - -#endif diff --git a/keyboards/ergodash/config.h b/keyboards/ergodash/config.h index c910d8f24f..cfb6bf4ffc 100644 --- a/keyboards/ergodash/config.h +++ b/keyboards/ergodash/config.h @@ -16,9 +16,6 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" - -#endif diff --git a/keyboards/ergodash/mini/mini.h b/keyboards/ergodash/mini/mini.h index d565c6168f..4aca15775b 100644 --- a/keyboards/ergodash/mini/mini.h +++ b/keyboards/ergodash/mini/mini.h @@ -1,5 +1,4 @@ -#ifndef MINI_H -#define MINI_H +#pragma once  #include "ergodash.h" @@ -16,41 +15,37 @@  #ifndef FLIP_HALF  // Standard Keymap  // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left) -#define LAYOUT( \ -	L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ -	L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ -	L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ -	L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36  \ -	) \ -	{ \ -		{ 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 }, \ -		{ R06, R05, R04, R03, R02, R01, R00 }, \ -		{ R16, R15, R14, R13, R12, R11, R10 }, \ -		{ R26, R25, R24, R23, R22, R21, R20 }, \ -		{ R36, R35, R34, R33, R32, R31, R30 }, \ -	} +#    define LAYOUT( \ +    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ +    L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ +    L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ +    L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36 \ +) { \ +    { 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 }, \ +    { R06, R05, R04, R03, R02, R01, R00 }, \ +    { R16, R15, R14, R13, R12, R11, R10 }, \ +    { R26, R25, R24, R23, R22, R21, R20 }, \ +    { R36, R35, R34, R33, R32, R31, R30 } \ +}  #else  // Keymap with right side flipped  // (TRRS jack on both halves are to the right) -#define LAYOUT( \ -	L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ -	L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ -	L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ -	L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36  \ -	) \ -	{ \ -		{ 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 }, \ -		{ R00, R01, R02, R03, R04, R05, R06 }, \ -		{ R10, R11, R12, R13, R14, R15, R16 }, \ -		{ R20, R21, R22, R23, R24, R25, R26 }, \ -		{ R30, R31, R32, R33, R34, R35, R36 }, \ -	} -#endif - +#    define LAYOUT( \ +    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ +    L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ +    L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ +    L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36 \ +) { \ +    { 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 }, \ +    { R00, R01, R02, R03, R04, R05, R06 }, \ +    { R10, R11, R12, R13, R14, R15, R16 }, \ +    { R20, R21, R22, R23, R24, R25, R26 }, \ +    { R30, R31, R32, R33, R34, R35, R36 } \ +}  #endif diff --git a/keyboards/ergodash/rev1/rev1.h b/keyboards/ergodash/rev1/rev1.h index eaabf7cc5f..7f094534cc 100644 --- a/keyboards/ergodash/rev1/rev1.h +++ b/keyboards/ergodash/rev1/rev1.h @@ -1,5 +1,4 @@ -#ifndef REV1_H -#define REV1_H +#pragma once  #include "ergodash.h" @@ -13,135 +12,128 @@  #endif  #endif +#define XXX KC_NO +  #ifndef FLIP_HALF  // Standard Keymap  // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left) -#define LAYOUT_4key( \ +#    define LAYOUT_4key( \      L00, L01, L02, L03, L04, L05, L06,           R00, R01, R02, R03, R04, R05, R06, \      L10, L11, L12, L13, L14, L15, L16,           R10, R11, R12, R13, R14, R15, R16, \      L20, L21, L22, L23, L24, L25, L26,           R20, R21, R22, R23, R24, R25, R26, \      L30, L31, L32, L33, L34, L35, L36,           R30, R31, R32, R33, R34, R35, R36, \ -    L40, L41, L42, L43,      L44, L45, L46, R40, R41, R42,      R43, R44, R45, R46  \ -    ) \ -    { \ -        { 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 }, \ -        { R06, R05, R04, R03, R02, R01, R00 }, \ -        { R16, R15, R14, R13, R12, R11, R10 }, \ -        { R26, R25, R24, R23, R22, R21, R20 }, \ -        { R36, R35, R34, R33, R32, R31, R30 }, \ -        { R46, R45, R44, R43, R42, R41, R40 }  \ -    } +    L40, L41, L42, L43,      L44, L45, L46, R40, R41, R42,      R43, R44, R45, R46 \ +) { \ +    { 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 }, \ +    { R06, R05, R04, R03, R02, R01, R00 }, \ +    { R16, R15, R14, R13, R12, R11, R10 }, \ +    { R26, R25, R24, R23, R22, R21, R20 }, \ +    { R36, R35, R34, R33, R32, R31, R30 }, \ +    { R46, R45, R44, R43, R42, R41, R40 } \ +}  // Just defined for configurator support, the matrix is identical to LAYOUT_4key -#define LAYOUT_4key_2u_inner( \ +#    define LAYOUT_4key_2u_inner( \      L00, L01, L02, L03, L04, L05, L06,           R00, R01, R02, R03, R04, R05, R06, \      L10, L11, L12, L13, L14, L15, L16,           R10, R11, R12, R13, R14, R15, R16, \      L20, L21, L22, L23, L24, L25, L26,           R20, R21, R22, R23, R24, R25, R26, \      L30, L31, L32, L33, L34, L35,      L36, R30,      R31, R32, R33, R34, R35, R36, \ -    L40, L41, L42, L43,      L44, L45, L46, R40, R41, R42,      R43, R44, R45, R46  \ -    ) \ -    { \ -        { 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 }, \ -        { R06, R05, R04, R03, R02, R01, R00 }, \ -        { R16, R15, R14, R13, R12, R11, R10 }, \ -        { R26, R25, R24, R23, R22, R21, R20 }, \ -        { R36, R35, R34, R33, R32, R31, R30 }, \ -        { R46, R45, R44, R43, R42, R41, R40 }  \ -    } +    L40, L41, L42, L43,      L44, L45, L46, R40, R41, R42,      R43, R44, R45, R46 \ +) { \ +    { 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 }, \ +    { R06, R05, R04, R03, R02, R01, R00 }, \ +    { R16, R15, R14, R13, R12, R11, R10 }, \ +    { R26, R25, R24, R23, R22, R21, R20 }, \ +    { R36, R35, R34, R33, R32, R31, R30 }, \ +    { R46, R45, R44, R43, R42, R41, R40 } \ +} -#define LAYOUT_3key_2us( \ +#    define LAYOUT_3key_2us( \      L00, L01, L02, L03, L04, L05, L06,           R00, R01, R02, R03, R04, R05, R06, \      L10, L11, L12, L13, L14, L15, L16,           R10, R11, R12, R13, R14, R15, R16, \      L20, L21, L22, L23, L24, L25, L26,           R20, R21, R22, R23, R24, R25, R26, \      L30, L31, L32, L33, L34, L35,                     R31, R32, R33, R34, R35, R36, \ -    L40, L41, L42, L43,      L44, L45, L46, R40, R41, R42,      R43, R44, R45, R46  \ -    ) \ -    { \ -        { 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, KC_NO }, \ -        { L40, L41, L42, L43, L44, L45, L46 }, \ -        { R06, R05, R04, R03, R02, R01, R00 }, \ -        { R16, R15, R14, R13, R12, R11, R10 }, \ -        { R26, R25, R24, R23, R22, R21, R20 }, \ -        { R36, R35, R34, R33, R32, R31, KC_NO }, \ -        { R46, R45, R44, R43, R42, R41, R40 }  \ -    } - +    L40, L41, L42, L43,      L44, L45, L46, R40, R41, R42,      R43, R44, R45, R46 \ +) { \ +    { 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, XXX }, \ +    { L40, L41, L42, L43, L44, L45, L46 }, \ +    { R06, R05, R04, R03, R02, R01, R00 }, \ +    { R16, R15, R14, R13, R12, R11, R10 }, \ +    { R26, R25, R24, R23, R22, R21, R20 }, \ +    { R36, R35, R34, R33, R32, R31, XXX }, \ +    { R46, R45, R44, R43, R42, R41, R40 } \ +} -#define LAYOUT_3key_1us( \ +#    define LAYOUT_3key_1us( \      L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \      L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \      L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \      L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ -    L40, L41, L42, L43,      L44, L45, R41, R42,      R43, R44, R45, R46  \ -    ) \ -    { \ -        { 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, KC_NO }, \ -        { R06, R05, R04, R03, R02, R01, R00 }, \ -        { R16, R15, R14, R13, R12, R11, R10 }, \ -        { R26, R25, R24, R23, R22, R21, R20 }, \ -        { R36, R35, R34, R33, R32, R31, R30 }, \ -        { R46, R45, R44, R43, R42, R41, KC_NO }  \ -    } +    L40, L41, L42, L43,      L44, L45, R41, R42,      R43, R44, R45, R46 \ +) { \ +    { 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, XXX }, \ +    { R06, R05, R04, R03, R02, R01, R00 }, \ +    { R16, R15, R14, R13, R12, R11, R10 }, \ +    { R26, R25, R24, R23, R22, R21, R20 }, \ +    { R36, R35, R34, R33, R32, R31, R30 }, \ +    { R46, R45, R44, R43, R42, R41, XXX } \ +} -#define LAYOUT_2key( \ +#    define LAYOUT_2key( \      L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \      L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \      L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \      L30, L31, L32, L33, L34, L35,           R31, R32, R33, R34, R35, R36, \ -    L40, L41, L42, L43,      L44, L45, R41, R42,      R43, R44, R45, R46  \ -    ) \ -    { \ -        { 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, KC_NO }, \ -        { L40, L41, L42, L43, L44, L45, KC_NO }, \ -        { R06, R05, R04, R03, R02, R01, R00 }, \ -        { R16, R15, R14, R13, R12, R11, R10 }, \ -        { R26, R25, R24, R23, R22, R21, R20 }, \ -        { R36, R35, R34, R33, R32, R31, KC_NO }, \ -        { R46, R45, R44, R43, R42, R41, KC_NO }  \ -    } +    L40, L41, L42, L43,      L44, L45, R41, R42,      R43, R44, R45, R46 \ +) { \ +    { 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, XXX }, \ +    { L40, L41, L42, L43, L44, L45, XXX }, \ +    { R06, R05, R04, R03, R02, R01, R00 }, \ +    { R16, R15, R14, R13, R12, R11, R10 }, \ +    { R26, R25, R24, R23, R22, R21, R20 }, \ +    { R36, R35, R34, R33, R32, R31, XXX }, \ +    { R46, R45, R44, R43, R42, R41, XXX } \ +}  #define LAYOUT LAYOUT_4key  #else  // Keymap with right side flipped  // (TRRS jack on both halves are to the right) -#define LAYOUT( \ +#    define LAYOUT( \      L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \      L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \      L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \      L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ -    L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46  \ -    ) \ -    { \ -        { 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 }, \ -        { R00, R01, R02, R03, R04, R05, R06 }, \ -        { R10, R11, R12, R13, R14, R15, R16 }, \ -        { R20, R21, R22, R23, R24, R25, R26 }, \ -        { R30, R31, R32, R33, R34, R35, R36 }, \ -        { R40, R41, R42, R43, R44, R45, R46 }  \ -    } -#endif - +    L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ +) { \ +    { 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 }, \ +    { R00, R01, R02, R03, R04, R05, R06 }, \ +    { R10, R11, R12, R13, R14, R15, R16 }, \ +    { R20, R21, R22, R23, R24, R25, R26 }, \ +    { R30, R31, R32, R33, R34, R35, R36 }, \ +    { R40, R41, R42, R43, R44, R45, R46 } \ +}  #endif diff --git a/keyboards/ergodox_infinity/config.h b/keyboards/ergodox_infinity/config.h index 4bee8c3d93..fb6f30d459 100644 --- a/keyboards/ergodox_infinity/config.h +++ b/keyboards/ergodox_infinity/config.h @@ -15,9 +15,7 @@ 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 INFINITY_ERGODOX_CONFIG_H -#define INFINITY_ERGODOX_CONFIG_H - +#pragma once  /* USB Device descriptor parameter */  #define VENDOR_ID       0x1c11 @@ -134,5 +132,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/ergodox_infinity/ergodox_infinity.h b/keyboards/ergodox_infinity/ergodox_infinity.h index 81ac1f338a..39a82e46de 100644 --- a/keyboards/ergodox_infinity/ergodox_infinity.h +++ b/keyboards/ergodox_infinity/ergodox_infinity.h @@ -1,5 +1,4 @@ -#ifndef KEYBOARDS_ERGODOX_INFINITY_INFINITY_H_ -#define KEYBOARDS_ERGODOX_INFINITY_INFINITY_H_ +#pragma once  #include "quantum.h" @@ -84,81 +83,73 @@ inline void ergodox_led_all_set(uint8_t n) {  void ergodox_infinity_lcd_color(uint16_t r, uint16_t g, uint16_t b);  #endif -/* - *   LEFT HAND: LINES 88-95 - *  RIGHT HAND: LINES 97-104 - */ +#define XXX KC_NO +  #define LAYOUT_ergodox( \ -    A80, A70, A60, A50, A40, A30, A20,  \ -    A81, A71, A61, A51, A41, A31, A21,  \ -    A82, A72, A62, A52, A42, A32,       \ -    A83, A73, A63, A53, A43, A33, A23,  \ -    A84, A74, A64, A54, A44,            \ +    A80, A70, A60, A50, A40, A30, A20, \ +    A81, A71, A61, A51, A41, A31, A21, \ +    A82, A72, A62, A52, A42, A32, \ +    A83, A73, A63, A53, A43, A33, A23, \ +    A84, A74, A64, A54, A44, \                                    A13, A03, \                                         A04, \                               A34, A24, A14, \ -                                            \ +\           B20, B30, B40, B50, B60, B70, B80, \           B21, B31, B41, B51, B61, B71, B81, \                B32, B42, B52, B62, B72, B82, \           B23, B33, B43, B53, B63, B73, B83, \                     B44, B54, B64, B74, B84, \ -    B03, B13,     \ -    B04,          \ +    B03, B13, \ +    B04, \      B14, B24, B34 \  ) { \ -    { KC_NO, KC_NO, KC_NO, A03,   A04 }, \ -    { KC_NO, KC_NO, KC_NO, A13,   A14 }, \ -    { A20,   A21,   KC_NO, A23,   A24 }, \ -    { A30,   A31,   A32,   A33,   A34 }, \ -    { A40,   A41,   A42,   A43,   A44 }, \ -    { A50,   A51,   A52,   A53,   A54 }, \ -    { A60,   A61,   A62,   A63,   A64 }, \ -    { A70,   A71,   A72,   A73,   A74 }, \ -    { A80,   A81,   A82,   A83,   A84 }, \ -    { KC_NO, KC_NO, KC_NO, B03,   B04 }, \ -    { KC_NO, KC_NO, KC_NO, B13,   B14 }, \ -    { B20,   B21,   KC_NO, B23,   B24 }, \ -    { B30,   B31,   B32,   B33,   B34 }, \ -    { B40,   B41,   B42,   B43,   B44 }, \ -    { B50,   B51,   B52,   B53,   B54 }, \ -    { B60,   B61,   B62,   B63,   B64 }, \ -    { B70,   B71,   B72,   B73,   B74 }, \ -    { B80,   B81,   B82,   B83,   B84 }  \ +    { XXX, XXX, XXX, A03, A04 }, \ +    { XXX, XXX, XXX, A13, A14 }, \ +    { A20, A21, XXX, A23, A24 }, \ +    { A30, A31, A32, A33, A34 }, \ +    { A40, A41, A42, A43, A44 }, \ +    { A50, A51, A52, A53, A54 }, \ +    { A60, A61, A62, A63, A64 }, \ +    { A70, A71, A72, A73, A74 }, \ +    { A80, A81, A82, A83, A84 }, \ +    { XXX, XXX, XXX, B03, B04 }, \ +    { XXX, XXX, XXX, B13, B14 }, \ +    { B20, B21, XXX, B23, B24 }, \ +    { B30, B31, B32, B33, B34 }, \ +    { B40, B41, B42, B43, B44 }, \ +    { B50, B51, B52, B53, B54 }, \ +    { B60, B61, B62, B63, B64 }, \ +    { B70, B71, B72, B73, B74 }, \ +    { B80, B81, B82, B83, B84 } \  } -/*  -------------- LEFT HAND --------------     -------------- RIGHT HAND -------------- */ -#define LAYOUT_ergodox_pretty(                                                              \ -                                                                                            \ -    A80, A70, A60, A50, A40, A30, A20,               B20, B30, B40, B50, B60, B70, B80,     \ -    A81, A71, A61, A51, A41, A31, A21,               B21, B31, B41, B51, B61, B71, B81,     \ -    A82, A72, A62, A52, A42, A32,                         B32, B42, B52, B62, B72, B82,     \ -    A83, A73, A63, A53, A43, A33, A23,               B23, B33, B43, B53, B63, B73, B83,     \ -    A84, A74, A64, A54, A44,                                   B44, B54, B64, B74, B84,     \ -                                  A13, A03,     B03, B13,                                   \ -                                       A04,     B04,                                        \ -                             A34, A24, A14,     B14, B24, B34 )                             \ -                                                                                            \ -   /* matrix positions */                \ - {                                       \ -    { KC_NO, KC_NO, KC_NO, A03,   A04 }, \ -    { KC_NO, KC_NO, KC_NO, A13,   A14 }, \ -    { A20,   A21,   KC_NO, A23,   A24 }, \ -    { A30,   A31,   A32,   A33,   A34 }, \ -    { A40,   A41,   A42,   A43,   A44 }, \ -    { A50,   A51,   A52,   A53,   A54 }, \ -    { A60,   A61,   A62,   A63,   A64 }, \ -    { A70,   A71,   A72,   A73,   A74 }, \ -    { A80,   A81,   A82,   A83,   A84 }, \ -    { KC_NO, KC_NO, KC_NO, B03,   B04 }, \ -    { KC_NO, KC_NO, KC_NO, B13,   B14 }, \ -    { B20,   B21,   KC_NO, B23,   B24 }, \ -    { B30,   B31,   B32,   B33,   B34 }, \ -    { B40,   B41,   B42,   B43,   B44 }, \ -    { B50,   B51,   B52,   B53,   B54 }, \ -    { B60,   B61,   B62,   B63,   B64 }, \ -    { B70,   B71,   B72,   B73,   B74 }, \ -    { B80,   B81,   B82,   B83,   B84 }  \ +#define LAYOUT_ergodox_pretty( \ +    A80, A70, A60, A50, A40, A30, A20,               B20, B30, B40, B50, B60, B70, B80, \ +    A81, A71, A61, A51, A41, A31, A21,               B21, B31, B41, B51, B61, B71, B81, \ +    A82, A72, A62, A52, A42, A32,                         B32, B42, B52, B62, B72, B82, \ +    A83, A73, A63, A53, A43, A33, A23,               B23, B33, B43, B53, B63, B73, B83, \ +    A84, A74, A64, A54, A44,                                   B44, B54, B64, B74, B84, \ +                                  A13, A03,     B03, B13, \ +                                       A04,     B04, \ +                             A34, A24, A14,     B14, B24, B34 \ +) { \ +    { XXX, XXX, XXX, A03, A04 }, \ +    { XXX, XXX, XXX, A13, A14 }, \ +    { A20, A21, XXX, A23, A24 }, \ +    { A30, A31, A32, A33, A34 }, \ +    { A40, A41, A42, A43, A44 }, \ +    { A50, A51, A52, A53, A54 }, \ +    { A60, A61, A62, A63, A64 }, \ +    { A70, A71, A72, A73, A74 }, \ +    { A80, A81, A82, A83, A84 }, \ +    { XXX, XXX, XXX, B03, B04 }, \ +    { XXX, XXX, XXX, B13, B14 }, \ +    { B20, B21, XXX, B23, B24 }, \ +    { B30, B31, B32, B33, B34 }, \ +    { B40, B41, B42, B43, B44 }, \ +    { B50, B51, B52, B53, B54 }, \ +    { B60, B61, B62, B63, B64 }, \ +    { B70, B71, B72, B73, B74 }, \ +    { B80, B81, B82, B83, B84 } \  } - -#endif /* KEYBOARDS_ERGODOX_INFINITY_INFINITY_H_ */ diff --git a/keyboards/ergotaco/post_rules.mk b/keyboards/ergotaco/post_rules.mk new file mode 100644 index 0000000000..0db3171b33 --- /dev/null +++ b/keyboards/ergotaco/post_rules.mk @@ -0,0 +1,8 @@ + +# A bunch of stuff that you shouldn't touch unless you +# know what you're doing. +# +# No touchy, capiche? +ifeq ($(strip $(DEBUG_MATRIX)), yes) +    OPT_DEFS += -DDEBUG_MATRIX +endif diff --git a/keyboards/ergotaco/rules.mk b/keyboards/ergotaco/rules.mk index 9fe0992ffd..db236477b0 100644 --- a/keyboards/ergotaco/rules.mk +++ b/keyboards/ergotaco/rules.mk @@ -14,6 +14,3 @@ COMMAND_ENABLE		= yes  #  # No touchy, capiche?  SRC += matrix.c i2c_master.c -ifeq ($(strip $(DEBUG_MATRIX)), yes) -    OPT_DEFS += -DDEBUG_MATRIX -endif diff --git a/keyboards/ergotravel/rev1/rev1.h b/keyboards/ergotravel/rev1/rev1.h index 5907617ef3..2973f4d9f3 100644 --- a/keyboards/ergotravel/rev1/rev1.h +++ b/keyboards/ergotravel/rev1/rev1.h @@ -1,5 +1,4 @@ -#ifndef REV1_H -#define REV1_H +#pragma once  #include "ergotravel.h" @@ -13,21 +12,20 @@  #endif  #endif +#define XXX KC_NO +  #define LAYOUT( \      L00, L01, L02, L03, L04, L05, L06,       R00, R01, R02, R03, R04, R05, R06, \      L10, L11, L12, L13, L14, L15, L16,       R10, R11, R12, R13, R14, R15, R16, \      L20, L21, L22, L23, L24, L25, L26,       R20, R21, R22, R23, R24, R25, R26, \ -    L30, L31, L32, L33,      L34, L35,       R30, R31,      R32, R33, R34, R35  \ -    ) \ -    { \ -        { 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, KC_NO }, \ -        { R06, R05, R04, R03, R02, R01, R00 }, \ -        { R16, R15, R14, R13, R12, R11, R10 }, \ -        { R26, R25, R24, R23, R22, R21, R20 }, \ -        { R35, R34, R33, R32, R31, R30, KC_NO } \ -    } - -#endif +    L30, L31, L32, L33,      L34, L35,       R30, R31,      R32, R33, R34, R35 \ +) { \ +    { 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, XXX }, \ +    { R06, R05, R04, R03, R02, R01, R00 }, \ +    { R16, R15, R14, R13, R12, R11, R10 }, \ +    { R26, R25, R24, R23, R22, R21, R20 }, \ +    { R35, R34, R33, R32, R31, R30, XXX } \ +} diff --git a/keyboards/evil80/evil80.h b/keyboards/evil80/evil80.h index a880de98f5..90d4f6564b 100644 --- a/keyboards/evil80/evil80.h +++ b/keyboards/evil80/evil80.h @@ -1,23 +1,21 @@ -#ifndef EVIL80_H -#define EVIL80_H +#pragma once  #include "quantum.h" -#define LAYOUT( \ -      K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K013, K014, K015, \ -      K500, K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K113, K114, K115, \ -      K501, K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K213, K214, K215, \ -      K502, K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,                         \ -      K503, K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,             K414,       \ -      K504, K505, K506,                   K507,                   K509, K510, K511, K512,       K513, K514, K515  \ -) \ -{ \ -    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015  }, \ -    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115  }, \ -    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215  }, \ -    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312, KC_NO, KC_NO, KC_NO  }, \ -    { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412, KC_NO,  K414, KC_NO  }, \ -    { K500,  K501,  K502,  K503,  K504,  K505,  K506,  K507, KC_NO,  K509,  K510,  K511,  K512,  K513,  K514,  K515  }  \ -}  +#define XXX KC_NO -#endif +#define LAYOUT( \ +    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,       k0D, k0E, k0F, \ +    k50, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,       k1D, k1E, k1F, \ +    k51, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,       k2D, k2E, k2F, \ +    k52, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, \ +    k53, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C,            k4E, \ +    k54, k55, k56,                k57,                k59, k5A, k5B, k5C,       k5D, k5E, k5F \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, XXX, XXX, XXX }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, XXX, k4E, XXX }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57, XXX, k59, k5A, k5B, k5C, k5D, k5E, k5F } \ +} diff --git a/keyboards/evyd13/atom47/rev3/info.json b/keyboards/evyd13/atom47/rev3/info.json index bd7d6c2aea..28a83c1199 100644 --- a/keyboards/evyd13/atom47/rev3/info.json +++ b/keyboards/evyd13/atom47/rev3/info.json @@ -101,14 +101,15 @@                  {"x":10.75, "y":2, "w":1.25},                  {"x":12, "y":2}, -                {"x":0, "y":3, "w":1.25}, -                {"x":1.25, "y":3, "w":1.25}, -                {"x":2.5, "y":3, "w":1.25}, -                {"x":3.75, "y":3, "w":6.25}, +                {"x":0, "y":3}, +                {"x":1, "y":3}, +                {"x":2, "y":3}, +                {"x":3, "y":3, "w":6}, +                {"x":9, "y":3},                  {"x":10, "y":3},                  {"x":11, "y":3},                  {"x":12, "y":3}              ]          }      } -}
\ No newline at end of file +} diff --git a/keyboards/evyd13/atom47/rev4/info.json b/keyboards/evyd13/atom47/rev4/info.json index a04e4cc180..dead529afb 100644 --- a/keyboards/evyd13/atom47/rev4/info.json +++ b/keyboards/evyd13/atom47/rev4/info.json @@ -101,14 +101,15 @@                  {"x":10.75, "y":2, "w":1.25},                  {"x":12, "y":2}, -                {"x":0, "y":3, "w":1.25}, -                {"x":1.25, "y":3, "w":1.25}, -                {"x":2.5, "y":3, "w":1.25}, -                {"x":3.75, "y":3, "w":6.25}, +                {"x":0, "y":3}, +                {"x":1, "y":3}, +                {"x":2, "y":3}, +                {"x":3, "y":3, "w":6}, +                {"x":9, "y":3},                  {"x":10, "y":3},                  {"x":11, "y":3},                  {"x":12, "y":3}              ]          }      } -}
\ No newline at end of file +} diff --git a/keyboards/exclusive/e6v2/le/config.h b/keyboards/exclusive/e6v2/le/config.h index 8fc91e504c..f9295145ec 100644 --- a/keyboards/exclusive/e6v2/le/config.h +++ b/keyboards/exclusive/e6v2/le/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -57,5 +56,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define DIODE_DIRECTION COL2ROW  #define DEBOUNCE 5 - -#endif diff --git a/keyboards/exclusive/e6v2/le/le.h b/keyboards/exclusive/e6v2/le/le.h index d52560dfbe..41992a185e 100644 --- a/keyboards/exclusive/e6v2/le/le.h +++ b/keyboards/exclusive/e6v2/le/le.h @@ -1,36 +1,35 @@ -#ifndef LE_H -#define LE_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  #define LAYOUT( \ -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0D, \ -    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ -    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      \ -    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ -    K40,      K42, K43, K44,           K47,      K49, K4A, K4B, K4C, K4D, K4E  \ -)\ -{\ -  { K00, K01,   K02, K03, K04, K05,   K06,   K07, K08,   K09, K0A, K0B, K0C, K0D, K0E   }, \ -  { K10, KC_NO, K12, K13, K14, K15,   K16,   K17, K18,   K19, K1A, K1B, K1C, K1D, K1E   }, \ -  { K20, KC_NO, K22, K23, K24, K25,   K26,   K27, K28,   K29, K2A, K2B, K2C, K2D, KC_NO }, \ -  { K30, K31,   K32, K33, K34, K35,   K36,   K37, K38,   K39, K3A, K3B, K3C, K3D, K3E   }, \ -  { K40, KC_NO, K42, K43, K44, KC_NO, KC_NO, K47, KC_NO, K49, K4A, K4B, K4C, K4D, K4E   }, \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0D, \ +    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \ +    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ +    k40,      k42, k43, k44,           k47,      k49, k4A, k4B, k4C, k4D, k4E \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ +    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ +    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \ +    { k40, XXX, k42, k43, k44, XXX, XXX, k47, XXX, k49, k4A, k4B, k4C, k4D, k4E } \  }  #define LAYOUT_60_ansi( \ -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0D, \ -    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ -    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      \ -    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,      \ -    K40,      K42, K43,                K47,           K4A, K4B,      K4D, K4E  \ -)\ -{\ -  { K00, K01,   K02, K03, K04,   K05,   K06,   K07, K08,   K09,   K0A, K0B, K0C,   K0D, KC_NO }, \ -  { K10, KC_NO, K12, K13, K14,   K15,   K16,   K17, K18,   K19,   K1A, K1B, K1C,   K1D, K1E   }, \ -  { K20, KC_NO, K22, K23, K24,   K25,   K26,   K27, K28,   K29,   K2A, K2B, K2C,   K2D, KC_NO }, \ -  { K30, KC_NO, K32, K33, K34,   K35,   K36,   K37, K38,   K39,   K3A, K3B, KC_NO, K3D, KC_NO }, \ -  { K40, KC_NO, K42, K43, KC_NO, KC_NO, KC_NO, K47, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D, K4E   }, \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0D, \ +    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \ +    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ +    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, \ +    k40,      k42, k43,                k47,           k4A, k4B,      k4D, k4E \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX }, \ +    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ +    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX }, \ +    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX }, \ +    { k40, XXX, k42, k43, XXX, XXX, XXX, k47, XXX, XXX, k4A, k4B, XXX, k4D, k4E } \  }  /* LAYOUT_60_hhkb @@ -47,18 +46,15 @@   * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘  */  #define LAYOUT_60_hhkb( \ -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0D, \ -    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ -    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      \ -    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, \ -              K42, K43,                K47,                K4B,      K4D       \ -)\ -{\ -  { K00,   K01,   K02, K03, K04,   K05,   K06,   K07, K08,   K09,   K0A,   K0B, K0C,   K0D,   K0E   }, \ -  { K10,   KC_NO, K12, K13, K14,   K15,   K16,   K17, K18,   K19,   K1A,   K1B, K1C,   K1D,   K1E   }, \ -  { K20,   KC_NO, K22, K23, K24,   K25,   K26,   K27, K28,   K29,   K2A,   K2B, K2C,   K2D,   KC_NO }, \ -  { K30,   KC_NO, K32, K33, K34,   K35,   K36,   K37, K38,   K39,   K3A,   K3B, K3C,   KC_NO, K3E   }, \ -  { KC_NO, KC_NO, K42, K43, KC_NO, KC_NO, KC_NO, K47, KC_NO, KC_NO, KC_NO, K4B, KC_NO, K4D,   KC_NO }, \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0D, \ +    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \ +    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ +    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,      k3E, \ +              k42, k43,                k47,                k4B,      k4D \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ +    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ +    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX }, \ +    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, XXX, k3E }, \ +    { XXX, XXX, k42, k43, XXX, XXX, XXX, k47, XXX, XXX, XXX, k4B, XXX, k4D, XXX } \  } - -#endif diff --git a/keyboards/exclusive/e6v2/oe/config.h b/keyboards/exclusive/e6v2/oe/config.h index 13be6ccad6..d9362cfc03 100644 --- a/keyboards/exclusive/e6v2/oe/config.h +++ b/keyboards/exclusive/e6v2/oe/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -54,5 +53,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define DIODE_DIRECTION COL2ROW  #define DEBOUNCE 5 - -#endif diff --git a/keyboards/exclusive/e6v2/oe/oe.h b/keyboards/exclusive/e6v2/oe/oe.h index 0746039fe7..21daaa2aa9 100644 --- a/keyboards/exclusive/e6v2/oe/oe.h +++ b/keyboards/exclusive/e6v2/oe/oe.h @@ -1,66 +1,61 @@ -#ifndef OE_H -#define OE_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  #define LAYOUT( \ -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ -     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,  K1D,   \ -      K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,  K2C,  K2D, \ -    K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,  K3C,    K3D, \ -    K40,  K41,  K42,                K46,                K4A,  K4B,  K4C,  K4D \ -)\ -{\ -  { K00, K01, K02, K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C, K0D, K0E   }, \ -  { K10, K11, K12, K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C, K1D, KC_NO }, \ -  { K20, K21, K22, K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C, K2D, KC_NO }, \ -  { K30, K31, K32, K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, K3C, K3D, KC_NO }, \ -  { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, KC_NO }, \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ +     k10,  k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,  k1D, \ +      k20,  k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,  k2C,  k2D, \ +    k30,  k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,  k3C,    k3D, \ +    k40,  k41,  k42,                k46,                k4A,  k4B,  k4C,  k4D \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX }, \ +    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, XXX } \  }  #define LAYOUT_60_ansi( \ -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0D, \ -     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,  K1D,   \ -      K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,        K2D, \ -     K30,  K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,         \ -    K40,  K41,  K42,                K46,                K4A,  K4B,  K4C,  K4D \ -)\ -{\ -  { K00, K01,   K02, K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   K0D,   KC_NO }, \ -  { K10, K11,   K12, K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   KC_NO }, \ -  { K20, K21,   K22, K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, KC_NO, K2D,   KC_NO }, \ -  { K30, KC_NO, K32, K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, K3C,   KC_NO, KC_NO }, \ -  { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C,   K4D,   KC_NO }, \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0D, \ +     k10,  k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,  k1D, \ +      k20,  k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,        k2D, \ +     k30,  k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, \ +    k40,  k41,  k42,                k46,                k4A,  k4B,  k4C,  k4D \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX }, \ +    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, XXX, XXX }, \ +    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, XXX } \  }  #define LAYOUT_hhkb( \ -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0D, \ -     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,  K1D,   \ -      K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,       K2D,  \ -        K30,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,   K3C,  K3D,  \ -          K41,  K42,                 K46,                   K4B,  K4C         \ -)\ -{\ -  { K00,   K01,   K02, K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A,   K0B, K0C,   K0D,   KC_NO }, \ -  { K10,   K11,   K12, K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A,   K1B, K1C,   K1D,   KC_NO }, \ -  { K20,   K21,   K22, K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A,   K2B, KC_NO, K2D,   KC_NO }, \ -  { K30,   KC_NO, K32, K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A,   K3B, K3C,   K3D,   KC_NO }, \ -  { KC_NO, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, KC_NO, K4B, K4C,   KC_NO, KC_NO }, \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0D, \ +     k10,  k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,  k1D, \ +      k20,  k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,       k2D, \ +        k30,   k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,   k3C,  k3D, \ +          k41,  k42,                 k46,                   k4B,  k4C \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX }, \ +    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX }, \ +    { XXX, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4B, k4C, XXX, XXX } \  }  #define LAYOUT_hhkb_splits( \ -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,    K0D, K0E,\ -     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,  K1D,     \ -      K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,     \ -     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,   K3C, K3D,     \ -          K41,  K42,                 K46,                   K4B,  K4C           \ -)\ -{\ -  { K00,   K01, K02, K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A,   K0B, K0C,   K0D,   K0E   }, \ -  { K10,   K11, K12, K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A,   K1B, K1C,   K1D,   KC_NO }, \ -  { K20,   K21, K22, K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A,   K2B, KC_NO, K2D,   KC_NO }, \ -  { K30,   K31, K32, K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A,   K3B, K3C,   K3D,   KC_NO }, \ -  { KC_NO, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, KC_NO, K4B, K4C,   KC_NO, KC_NO }, \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,    k0D, k0E, \ +     k10,  k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,  k1D, \ +      k20,  k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, \ +     k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,   k3C, k3D, \ +          k41,  k42,                 k46,                   k4B,  k4C \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX }, \ +    { XXX, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4B, k4C, XXX, XXX } \  } - -#endif diff --git a/keyboards/eyeohdesigns/sprh/info.json b/keyboards/eyeohdesigns/sprh/info.json index f2a3070bc0..3fb761ac80 100644 --- a/keyboards/eyeohdesigns/sprh/info.json +++ b/keyboards/eyeohdesigns/sprh/info.json @@ -1,15 +1,150 @@  { -    "keyboard_name": "sprh",  -    "url": "",  -    "maintainer": "eye oh designs",  -    "width": 17.25,  +    "keyboard_name": "sprh", +    "maintainer": "eye oh designs",      "height": 5, +    "url": "", +    "width": 17.25,      "layouts": { -       "LAYOUT_default": { -            "layout": [{"label":"Encd", "x":0.5, "y":0}, {"label":"Esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Backspace", "x":14.5, "y":0, "w":2}, {"label":"Tab", "x":1, "y":1, "w":1.5}, {"label":"Q", "x":2.5, "y":1}, {"label":"W", "x":3.5, "y":1}, {"label":"E", "x":4.5, "y":1}, {"label":"R", "x":5.5, "y":1}, {"label":"T", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"[", "x":12.5, "y":1}, {"label":"]", "x":13.5, "y":1}, {"label":"\\", "x":14.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"H", "x":7.5, "y":2}, {"label":"J", "x":8.5, "y":2}, {"label":"K", "x":9.5, "y":2}, {"label":"L", "x":10.5, "y":2}, {"label":";", "x":11.5, "y":2}, {"label":"'", "x":12.5, "y":2}, {"label":"Enter", "x":13.5, "y":2, "w":2.25}, {"label":"Shift", "x":0.25, "y":3, "w":2.25}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":",", "x":9.5, "y":3}, {"label":".", "x":10.5, "y":3}, {"label":"/", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":2.75}, {"label":"\u2191", "x":15.25, "y":3}, {"label":"Super", "x":0, "y":4, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.37, "y":4, "w":1.25}, {"x":4.62, "y":4, "w":6.25}, {"label":"Alt", "x":10.87, "y":4, "w":1.25}, {"label":"Function", "x":12.12, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4}, {"label":"\u2193", "x":15.25, "y":4}, {"label":"\u2192", "x":16.25, "y":4}] +        "LAYOUT_default": { +            "layout": [ +                { "label": "Encd", "x": 0.5, "y": 0 }, +                { "label": "Esc", "x": 1.5, "y": 0 }, +                { "label": "1", "x": 2.5, "y": 0 }, +                { "label": "2", "x": 3.5, "y": 0 }, +                { "label": "3", "x": 4.5, "y": 0 }, +                { "label": "4", "x": 5.5, "y": 0 }, +                { "label": "5", "x": 6.5, "y": 0 }, +                { "label": "6", "x": 7.5, "y": 0 }, +                { "label": "7", "x": 8.5, "y": 0 }, +                { "label": "8", "x": 9.5, "y": 0 }, +                { "label": "9", "x": 10.5, "y": 0 }, +                { "label": "0", "x": 11.5, "y": 0 }, +                { "label": "_", "x": 12.5, "y": 0 }, +                { "label": "+", "x": 13.5, "y": 0 }, +                { "label": "Backspace", "w": 2, "x": 14.5, "y": 0 }, +                { "label": "Tab", "w": 1.5, "x": 1, "y": 1 }, +                { "label": "Q", "x": 2.5, "y": 1 }, +                { "label": "W", "x": 3.5, "y": 1 }, +                { "label": "E", "x": 4.5, "y": 1 }, +                { "label": "R", "x": 5.5, "y": 1 }, +                { "label": "T", "x": 6.5, "y": 1 }, +                { "label": "Y", "x": 7.5, "y": 1 }, +                { "label": "U", "x": 8.5, "y": 1 }, +                { "label": "I", "x": 9.5, "y": 1 }, +                { "label": "O", "x": 10.5, "y": 1 }, +                { "label": "P", "x": 11.5, "y": 1 }, +                { "label": "[", "x": 12.5, "y": 1 }, +                { "label": "]", "x": 13.5, "y": 1 }, +                { "label": "\\", "w": 1.5, "x": 14.5, "y": 1 }, +                { "label": "Caps Lock", "w": 1.75, "x": 0.75, "y": 2 }, +                { "label": "A", "x": 2.5, "y": 2 }, +                { "label": "S", "x": 3.5, "y": 2 }, +                { "label": "D", "x": 4.5, "y": 2 }, +                { "label": "F", "x": 5.5, "y": 2 }, +                { "label": "G", "x": 6.5, "y": 2 }, +                { "label": "H", "x": 7.5, "y": 2 }, +                { "label": "J", "x": 8.5, "y": 2 }, +                { "label": "K", "x": 9.5, "y": 2 }, +                { "label": "L", "x": 10.5, "y": 2 }, +                { "label": ";", "x": 11.5, "y": 2 }, +                { "label": "'", "x": 12.5, "y": 2 }, +                { "label": "Enter", "w": 2.25, "x": 13.5, "y": 2 }, +                { "label": "Shift", "w": 2.25, "x": 0.25, "y": 3 }, +                { "label": "Z", "x": 2.5, "y": 3 }, +                { "label": "X", "x": 3.5, "y": 3 }, +                { "label": "C", "x": 4.5, "y": 3 }, +                { "label": "V", "x": 5.5, "y": 3 }, +                { "label": "B", "x": 6.5, "y": 3 }, +                { "label": "N", "x": 7.5, "y": 3 }, +                { "label": "M", "x": 8.5, "y": 3 }, +                { "label": ",", "x": 9.5, "y": 3 }, +                { "label": ".", "x": 10.5, "y": 3 }, +                { "label": "/", "x": 11.5, "y": 3 }, +                { "label": "Shift", "w": 2.75, "x": 12.5, "y": 3 }, +                { "label": "\u2191", "x": 15.25, "y": 3 }, +                { "label": "Super", "w": 1.25, "x": 0, "y": 4 }, +                { "label": "Ctrl", "w": 1.25, "x": 1.25, "y": 4 }, +                { "label": "Alt", "w": 1.25, "x": 3.37, "y": 4 }, +                { "w": 6.25, "x": 4.62, "y": 4 }, +                { "label": "Alt", "w": 1.25, "x": 10.87, "y": 4 }, +                { "label": "Function", "w": 1.25, "x": 12.12, "y": 4 }, +                { "label": "\u2190", "x": 14.25, "y": 4 }, +                { "label": "\u2193", "x": 15.25, "y": 4 }, +                { "label": "\u2192", "x": 16.25, "y": 4 } +            ]          }, -		"LAYOUT_split": { -            "layout": [{"label":"Encd", "x":0.5, "y":0}, {"label":"Esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"\u2190", "x":14.5, "y":0}, {"label":"Del", "x":15.5, "y":0}, {"label":"Tab", "x":1, "y":1, "w":1.5}, {"label":"Q", "x":2.5, "y":1}, {"label":"W", "x":3.5, "y":1}, {"label":"E", "x":4.5, "y":1}, {"label":"R", "x":5.5, "y":1}, {"label":"T", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"[", "x":12.5, "y":1}, {"label":"]", "x":13.5, "y":1}, {"label":"\\", "x":14.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"H", "x":7.5, "y":2}, {"label":"J", "x":8.5, "y":2}, {"label":"K", "x":9.5, "y":2}, {"label":"L", "x":10.5, "y":2}, {"label":";", "x":11.5, "y":2}, {"label":"'", "x":12.5, "y":2}, {"label":"Enter", "x":13.5, "y":2, "w":2.25}, {"label":"Shift", "x":0.25, "y":3, "w":2.25}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":",", "x":9.5, "y":3}, {"label":".", "x":10.5, "y":3}, {"label":"/", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":1.75}, {"label":"Fn", "x":14.25, "y":3}, {"label":"\u2191", "x":15.25, "y":3}, {"label":"Super", "x":0, "y":4, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.37, "y":4, "w":1.25}, {"x":4.62, "y":4, "w":2.75}, {"x":7.37, "y":4, "w":2.25}, {"x":9.62, "y":4, "w":1.25}, {"label":"Alt", "x":10.87, "y":4, "w":1.25}, {"label":"Function", "x":12.12, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4}, {"label":"\u2193", "x":15.25, "y":4}, {"label":"\u2192", "x":16.25, "y":4}] +        "LAYOUT_split": { +            "layout": [ +                { "label": "Encd", "x": 0.5, "y": 0 }, +                { "label": "Esc", "x": 1.5, "y": 0 }, +                { "label": "1", "x": 2.5, "y": 0 }, +                { "label": "2", "x": 3.5, "y": 0 }, +                { "label": "3", "x": 4.5, "y": 0 }, +                { "label": "4", "x": 5.5, "y": 0 }, +                { "label": "5", "x": 6.5, "y": 0 }, +                { "label": "6", "x": 7.5, "y": 0 }, +                { "label": "7", "x": 8.5, "y": 0 }, +                { "label": "8", "x": 9.5, "y": 0 }, +                { "label": "9", "x": 10.5, "y": 0 }, +                { "label": "0", "x": 11.5, "y": 0 }, +                { "label": "_", "x": 12.5, "y": 0 }, +                { "label": "+", "x": 13.5, "y": 0 }, +                { "label": "\u2190", "x": 14.5, "y": 0 }, +                { "label": "Del", "x": 15.5, "y": 0 }, +                { "label": "Tab", "w": 1.5, "x": 1, "y": 1 }, +                { "label": "Q", "x": 2.5, "y": 1 }, +                { "label": "W", "x": 3.5, "y": 1 }, +                { "label": "E", "x": 4.5, "y": 1 }, +                { "label": "R", "x": 5.5, "y": 1 }, +                { "label": "T", "x": 6.5, "y": 1 }, +                { "label": "Y", "x": 7.5, "y": 1 }, +                { "label": "U", "x": 8.5, "y": 1 }, +                { "label": "I", "x": 9.5, "y": 1 }, +                { "label": "O", "x": 10.5, "y": 1 }, +                { "label": "P", "x": 11.5, "y": 1 }, +                { "label": "[", "x": 12.5, "y": 1 }, +                { "label": "]", "x": 13.5, "y": 1 }, +                { "label": "\\", "w": 1.5, "x": 14.5, "y": 1 }, +                { "label": "Caps Lock", "w": 1.75, "x": 0.75, "y": 2 }, +                { "label": "A", "x": 2.5, "y": 2 }, +                { "label": "S", "x": 3.5, "y": 2 }, +                { "label": "D", "x": 4.5, "y": 2 }, +                { "label": "F", "x": 5.5, "y": 2 }, +                { "label": "G", "x": 6.5, "y": 2 }, +                { "label": "H", "x": 7.5, "y": 2 }, +                { "label": "J", "x": 8.5, "y": 2 }, +                { "label": "K", "x": 9.5, "y": 2 }, +                { "label": "L", "x": 10.5, "y": 2 }, +                { "label": ";", "x": 11.5, "y": 2 }, +                { "label": "'", "x": 12.5, "y": 2 }, +                { "label": "Enter", "w": 2.25, "x": 13.5, "y": 2 }, +                { "label": "CapsLock", "x": 0.25, "y": 3 }, +                { "label": "Shift", "w": 1.25, "x": 1.25, "y": 3 }, +                { "label": "Z", "x": 2.5, "y": 3 }, +                { "label": "X", "x": 3.5, "y": 3 }, +                { "label": "C", "x": 4.5, "y": 3 }, +                { "label": "V", "x": 5.5, "y": 3 }, +                { "label": "B", "x": 6.5, "y": 3 }, +                { "label": "N", "x": 7.5, "y": 3 }, +                { "label": "M", "x": 8.5, "y": 3 }, +                { "label": ",", "x": 9.5, "y": 3 }, +                { "label": ".", "x": 10.5, "y": 3 }, +                { "label": "/", "x": 11.5, "y": 3 }, +                { "label": "Shift", "w": 1.75, "x": 12.5, "y": 3 }, +                { "label": "Fn", "x": 14.25, "y": 3 }, +                { "label": "\u2191", "x": 15.25, "y": 3 }, +                { "label": "Super", "w": 1.25, "x": 0, "y": 4 }, +                { "label": "Ctrl", "w": 1.25, "x": 1.25, "y": 4 }, +                { "label": "Alt", "w": 1.25, "x": 3.37, "y": 4 }, +                { "w": 2.75, "x": 4.62, "y": 4 }, +                { "w": 2.25, "x": 7.37, "y": 4 }, +                { "w": 1.25, "x": 9.62, "y": 4 }, +                { "label": "Alt", "w": 1.25, "x": 10.87, "y": 4 }, +                { "label": "Function", "w": 1.25, "x": 12.12, "y": 4 }, +                { "label": "\u2190", "x": 14.25, "y": 4 }, +                { "label": "\u2193", "x": 15.25, "y": 4 }, +                { "label": "\u2192", "x": 16.25, "y": 4 } +            ]          }      } -}
\ No newline at end of file +} diff --git a/keyboards/fc660c/actuation_point.h b/keyboards/fc660c/actuation_point.h index f7066d92c1..e02832186c 100644 --- a/keyboards/fc660c/actuation_point.h +++ b/keyboards/fc660c/actuation_point.h @@ -15,8 +15,7 @@ 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 ACTUATION_POINT_H -#define ACTUATION_POINT_H +#pragma once  #include <stdint.h> @@ -28,5 +27,3 @@ void actuation_point_down(void);  // be careful with this.  void adjust_actuation_point(int offset); - -#endif diff --git a/keyboards/fc660c/config.h b/keyboards/fc660c/config.h index e979daf331..460881cb17 100644 --- a/keyboards/fc660c/config.h +++ b/keyboards/fc660c/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -80,5 +79,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  // test all keys before further adjustment.  // this should probably stay in the range +/-5.  // #define ACTUATION_DEPTH_ADJUSTMENT 0 - -#endif diff --git a/keyboards/fc660c/fc660c.h b/keyboards/fc660c/fc660c.h index e3621570dd..fca02dc0e9 100644 --- a/keyboards/fc660c/fc660c.h +++ b/keyboards/fc660c/fc660c.h @@ -14,38 +14,23 @@ 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/>.  */ -#ifndef FC660C_H -#define FC660C_H + +#pragma once  #include "quantum.h" +#define XXX KC_NO  #define LAYOUT( \ -    K13, K10, K11, K12, K14, K16, K17, K15, K1B, K18, K19, K1A, K1C, K1E,      K1F, \ -    K03, K00, K01, K02, K04, K06, K07, K05, K0B, K08, K09, K0A, K0C, K0E,      K0F, \ -    K43, K40, K41, K42, K44, K46, K47, K45, K4B, K48, K49, K4A,      K4E,           \ -    K33, K31, K32, K34, K36, K37, K35, K3B, K38, K39, K3A,           K3C, K3D,      \ -    K23, K21, K22,                K27,                K28, K2A, K2C, K2E, K2D, K2F  \ +    k13, k10, k11, k12, k14, k16, k17, k15, k1B, k18, k19, k1A, k1C, k1E,      k1F, \ +    k03, k00, k01, k02, k04, k06, k07, k05, k0B, k08, k09, k0A, k0C, k0E,      k0F, \ +    k43, k40, k41, k42, k44, k46, k47, k45, k4B, k48, k49, k4A,      k4E, \ +    k33, k31, k32, k34, k36, k37, k35, k3B, k38, k39, k3A,           k3C, k3D, \ +    k23, k21, k22,                k27,                k28, k2A, k2C, k2E, k2D, k2F  \  ) { \ -    { K00, K01, K02, K03, K04, K05, K06, K07,   \ -      K08, K09, K0A, K0B, K0C, KC_NO,    K0E, K0F }, \ -    { K10, K11, K12, K13, K14, K15, K16, K17,   \ -      K18, K19, K1A, K1B, K1C, KC_NO,    K1E, K1F }, \ -    { KC_NO,    K21, K22, K23, KC_NO,    KC_NO,    KC_NO,    K27,   \ -      K28, KC_NO,    K2A, KC_NO,    K2C, K2D, K2E, K2F }, \ -    { KC_NO,    K31, K32, K33, K34, K35, K36, K37,   \ -      K38, K39, K3A, K3B, K3C, K3D, KC_NO,    KC_NO    }, \ -    { K40, K41, K42, K43, K44, K45, K46, K47,   \ -      K48, K49, K4A, K4B, KC_NO,    KC_NO,    K4E, KC_NO    }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, k1E, k1F }, \ +    { XXX, k21, k22, k23, XXX, XXX, XXX, k27, k28, XXX, k2A, XXX, k2C, k2D, k2E, k2F }, \ +    { XXX, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, XXX }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, XXX, XXX, k4E, XXX } \  } -/* -KEYMAP( -        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______, -        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______, -        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______, -        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______, -        _______,_______,_______,                _______,                _______,_______,_______,     _______,_______,_______ -    ) -*/ - -#endif diff --git a/keyboards/fc660c/i2c.h b/keyboards/fc660c/i2c.h index c15b6bc506..8910e70f10 100644 --- a/keyboards/fc660c/i2c.h +++ b/keyboards/fc660c/i2c.h @@ -1,5 +1,4 @@ -#ifndef I2C_H -#define I2C_H +#pragma once  #include <stdint.h> @@ -45,5 +44,3 @@ extern unsigned char i2c_readNak(void);  extern unsigned char i2c_read(unsigned char ack);  #define i2c_read(ack)  (ack) ? i2c_readAck() : i2c_readNak(); - -#endif diff --git a/keyboards/fc980c/actuation_point.h b/keyboards/fc980c/actuation_point.h index f7066d92c1..e02832186c 100644 --- a/keyboards/fc980c/actuation_point.h +++ b/keyboards/fc980c/actuation_point.h @@ -15,8 +15,7 @@ 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 ACTUATION_POINT_H -#define ACTUATION_POINT_H +#pragma once  #include <stdint.h> @@ -28,5 +27,3 @@ void actuation_point_down(void);  // be careful with this.  void adjust_actuation_point(int offset); - -#endif diff --git a/keyboards/fc980c/config.h b/keyboards/fc980c/config.h index b74ca64a5c..b0bffef760 100644 --- a/keyboards/fc980c/config.h +++ b/keyboards/fc980c/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -87,5 +86,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  // test all keys before further adjustment.  // this should probably stay in the range +/-5.  // #define ACTUATION_DEPTH_ADJUSTMENT 0 - -#endif diff --git a/keyboards/fc980c/i2c.h b/keyboards/fc980c/i2c.h index c15b6bc506..8910e70f10 100644 --- a/keyboards/fc980c/i2c.h +++ b/keyboards/fc980c/i2c.h @@ -1,5 +1,4 @@ -#ifndef I2C_H -#define I2C_H +#pragma once  #include <stdint.h> @@ -45,5 +44,3 @@ extern unsigned char i2c_readNak(void);  extern unsigned char i2c_read(unsigned char ack);  #define i2c_read(ack)  (ack) ? i2c_readAck() : i2c_readNak(); - -#endif diff --git a/keyboards/flehrad/bigswitch/bigswitch.h b/keyboards/flehrad/bigswitch/bigswitch.h index ea3d51a1f3..c6c2f026d5 100644 --- a/keyboards/flehrad/bigswitch/bigswitch.h +++ b/keyboards/flehrad/bigswitch/bigswitch.h @@ -14,15 +14,13 @@ 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/>.  */ -#ifndef BIGSWITCH_H -#define BIGSWITCH_H + +#pragma once  #include "quantum.h"  #define LAYOUT( \ -  K00  \ +    k00 \  ) { \ -  { K00 }  \ +    { k00 } \  } - -#endif diff --git a/keyboards/flehrad/bigswitch/config.h b/keyboards/flehrad/bigswitch/config.h index b6fb15d3b7..c0f73366a7 100644 --- a/keyboards/flehrad/bigswitch/config.h +++ b/keyboards/flehrad/bigswitch/config.h @@ -14,8 +14,8 @@ 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/>.  */ -#ifndef CONFIG_H -#define CONFIG_H + +#pragma once  #include "config_common.h" @@ -52,5 +52,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define RGBLIGHT_ANIMATIONS  #define RGBLED_NUM 8  #endif - -#endif diff --git a/keyboards/fleuron/config.h b/keyboards/fleuron/config.h index d6c802648a..c7a4ef052a 100644 --- a/keyboards/fleuron/config.h +++ b/keyboards/fleuron/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -160,5 +159,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define RGB_DI_PIN E6     // The pin the LED strip is connected to  #define RGBLED_NUM 18     // Number of LEDs in your strip  #define RGBLIGHT_ANIMATIONS - -#endif diff --git a/keyboards/fleuron/fleuron.h b/keyboards/fleuron/fleuron.h index abdccf2371..38f6bb38bf 100644 --- a/keyboards/fleuron/fleuron.h +++ b/keyboards/fleuron/fleuron.h @@ -13,8 +13,8 @@   * 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 FLEURON_H -#define FLEURON_H + +#pragma once  #include "quantum.h" @@ -23,22 +23,19 @@  // The first section contains all of the arguments  // The second converts the arguments into a two-dimensional array  #define LAYOUT_ortho_6x16( \ -    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \ -    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, \ -    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, \ -    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, \ -    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, \ -    k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, k5d, k5e, k5f \ -) \ -{ \ -    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \ -    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \ -    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f }, \ -    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \ -    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f }, \ -    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, k5d, k5e, k5f } \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \ +    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, \ +    k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F } \  }  #define LAYOUT_fleuron_grid LAYOUT_ortho_6x16 - -#endif diff --git a/keyboards/four_banger/config.h b/keyboards/four_banger/config.h index 30e2bd21ac..7ad7a5c369 100644 --- a/keyboards/four_banger/config.h +++ b/keyboards/four_banger/config.h @@ -1,5 +1,4 @@ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -45,5 +44,3 @@  #define RGBLIGHT_SAT_STEP 8  #define RGBLIGHT_VAL_STEP 8  #endif - -#endif diff --git a/keyboards/four_banger/four_banger.h b/keyboards/four_banger/four_banger.h index a6da8dd0b7..1d735a1f0f 100644 --- a/keyboards/four_banger/four_banger.h +++ b/keyboards/four_banger/four_banger.h @@ -1,14 +1,11 @@ -#ifndef KB_H -#define KB_H +#pragma once  #include "quantum.h"  #define LAYOUT_ortho_2x2( \ -  K00, K01, \ -  K10, K11  \ +    k00, k01, \ +    k10, k11 \  ) { \ -  { K00, K01 }, \ -  { K10, K11 }  \ +    { k00, k01 }, \ +    { k10, k11 } \  } - -#endif diff --git a/keyboards/fractal/config.h b/keyboards/fractal/config.h index 5d4e0d49e3..b9aeac3855 100755 --- a/keyboards/fractal/config.h +++ b/keyboards/fractal/config.h @@ -1,5 +1,4 @@ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -45,5 +44,3 @@  #define RGBLIGHT_SAT_STEP 8  #define RGBLIGHT_VAL_STEP 8  #endif - -#endif diff --git a/keyboards/gh80_3000/config.h b/keyboards/gh80_3000/config.h index 68a405c8d9..71adb3e249 100644 --- a/keyboards/gh80_3000/config.h +++ b/keyboards/gh80_3000/config.h @@ -1,5 +1,4 @@ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -44,5 +43,3 @@  #define RGBLIGHT_SAT_STEP 8  #define RGBLIGHT_VAL_STEP 8  #endif - -#endif diff --git a/keyboards/gh80_3000/gh80_3000.h b/keyboards/gh80_3000/gh80_3000.h index 803d30ece5..9c58d6fe58 100644 --- a/keyboards/gh80_3000/gh80_3000.h +++ b/keyboards/gh80_3000/gh80_3000.h @@ -1,138 +1,143 @@ -#ifndef GH80_3000 -#define GH80_3000 +#pragma once  #include "quantum.h" +#define XXX KC_NO +  // default keymap: all 117 keys with ANSI Enter  #define LAYOUT( \ -	K000,       K001, K002, K003, K300, K301, K302, K303, K306, K307, K308, K309, K310,         K004, K005, K006,    K007, K008, K009, K010, \ -	K100, K101, K102, K103, K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410,   K104, K105, K106,    K107, K108, K109, K110, \ -	K200, K201, K202, K203, K500, K501, K502, K503, K505, K506, K507, K508, K509, K510,         K204, K205, K206,    K207, K208, K209, K210, \ -	K800, K801, K802, K803, K600, K601, K602, K603, K606, K607, K608, K609, K610,                                    K807, K808, K809, K810, \ -	K900, K901, K902, K903, K700, K701, K702, K703, K705, K706, K707, K708, K709, K710,               K906,          K907, K908, K909, K910, \ -	KA00, KA01, KA02, KA03,       K804, K805, K806,             K604, K605, K904, K905,         KA04, KA05, KA06,    KA07, KA08, KA09, KA10  \ +    k00,      k01, k02, k03, k30, k31, k32, k33, k36, k37, k38, k39, k3A,        k04, k05, k06,   k07, k08, k09, k0A, \ +\ +    k10, k11, k12, k13, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A,   k14, k15, k16,   k17, k18, k19, k1A, \ +    k20, k21, k22, k23, k50, k51, k52, k53, k55, k56, k57, k58, k59, k5A,        k24, k25, k26,   k27, k28, k29, k2A, \ +    k80, k81, k82, k83, k60, k61, k62, k63, k66, k67, k68, k69,      k6A,                         k87, k88, k89, k8A, \ +    k90, k91, k92, k93, k70, k71, k72, k73, k75, k76, k77, k78, k79, k7A,             k96,        k97, k98, k99, k9A, \ +    kA0, kA1, kA2, kA3,      k84, k85, k86,           k64, k65, k94, k95,        kA4, kA5, kA6,   kA7, kA8, kA9, kAA \  ) { \ -	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010 }, \ -	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \ -	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210 }, \ -	{ K300, K301, K302, K303, KC_NO, KC_NO, K306, K307, K308, K309, K310 }, \ -	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410 }, \ -	{ K500, K501, K502, K503, KC_NO, K505, K506, K507, K508, K509, K510 }, \ -	{ K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, K610 }, \ -	{ K700, K701, K702, K703, KC_NO, K705, K706, K707, K708, K709, K710 }, \ -	{ K800, K801, K802, K803, K804, K805, K806, K807, K808, K809, K810 }, \ -	{ K900, K901, K902, K903, K904, K905, K906, K907, K908, K909, K910 }, \ -	{ KA00, KA01, KA02, KA03, KA04, KA05, KA06, KA07, KA08, KA09, KA10 }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \ +    { k30, k31, k32, k33, XXX, XXX, k36, k37, k38, k39, k3A }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A }, \ +    { k50, k51, k52, k53, XXX, k55, k56, k57, k58, k59, k5A }, \ +    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \ +    { k70, k71, k72, k73, XXX, k75, k76, k77, k78, k79, k7A }, \ +    { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8A }, \ +    { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9A }, \ +    { kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8, kA9, kAA } \  }  // default ISO keymap: all 117 keys with ISO Enter  #define LAYOUT_iso( \ -	K000,       K001, K002, K003, K300, K301, K302, K303, K306, K307, K308, K309, K310,         K004, K005, K006,    K007, K008, K009, K010, \ -	K100, K101, K102, K103, K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410,   K104, K105, K106,    K107, K108, K109, K110, \ -	K200, K201, K202, K203, K500, K501, K502, K503, K505, K506, K507, K508, K509,               K204, K205, K206,    K207, K208, K209, K210, \ -	K800, K801, K802, K803, K600, K601, K602, K603, K606, K607, K608, K609, K510, K610,                              K807, K808, K809, K810, \ -	K900, K901, K902, K903, K700, K701, K702, K703, K705, K706, K707, K708, K709, K710,               K906,          K907, K908, K909, K910, \ -	KA00, KA01, KA02, KA03,       K804, K805, K806,             K604, K605, K904, K905,         KA04, KA05, KA06,    KA07, KA08, KA09, KA10  \ +    k00,      k01, k02, k03, k30, k31, k32, k33, k36, k37, k38, k39, k3A,        k04, k05, k06,   k07, k08, k09, k0A, \ +\ +    k10, k11, k12, k13, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A,   k14, k15, k16,   k17, k18, k19, k1A, \ +    k20, k21, k22, k23, k50, k51, k52, k53, k55, k56, k57, k58, k59,             k24, k25, k26,   k27, k28, k29, k2A, \ +    k80, k81, k82, k83, k60, k61, k62, k63, k66, k67, k68, k69, k5A, k6A,                         k87, k88, k89, k8A, \ +    k90, k91, k92, k93, k70, k71, k72, k73, k75, k76, k77, k78, k79, k7A,             k96,        k97, k98, k99, k9A, \ +    kA0, kA1, kA2, kA3,      k84, k85, k86,           k64, k65, k94, k95,        kA4, kA5, kA6,   kA7, kA8, kA9, kAA \  ) { \ -	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010 }, \ -	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \ -	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210 }, \ -	{ K300, K301, K302, K303, KC_NO, KC_NO, K306, K307, K308, K309, K310 }, \ -	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410 }, \ -	{ K500, K501, K502, K503, KC_NO, K505, K506, K507, K508, K509, K510 }, \ -	{ K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, K610 }, \ -	{ K700, K701, K702, K703, KC_NO, K705, K706, K707, K708, K709, K710 }, \ -	{ K800, K801, K802, K803, K804, K805, K806, K807, K808, K809, K810 }, \ -	{ K900, K901, K902, K903, K904, K905, K906, K907, K908, K909, K910 }, \ -	{ KA00, KA01, KA02, KA03, KA04, KA05, KA06, KA07, KA08, KA09, KA10 }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \ +    { k30, k31, k32, k33, XXX, XXX, k36, k37, k38, k39, k3A }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A }, \ +    { k50, k51, k52, k53, XXX, k55, k56, k57, k58, k59, k5A }, \ +    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \ +    { k70, k71, k72, k73, XXX, k75, k76, k77, k78, k79, k7A }, \ +    { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8A }, \ +    { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9A }, \ +    { kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8, kA9, kAA } \  }  // Standard ANSI Keyboard  #define LAYOUT_fullsize_ansi( \ -	K000,       K001, K002, K003, K300, K301, K302, K303, K306, K307, K308, K309, K310,         K004, K005, K006,                            \ -	K100, K101, K102, K103, K400, K401, K402, K403, K404, K405, K406, K407, K408, K410,         K104, K105, K106,    K107, K108, K109, K110, \ -	K200, K201, K202, K203, K500, K501, K502, K503, K505, K506, K507, K508, K509, K510,         K204, K205, K206,    K207, K208, K209, K810, \ -	K800, K801, K802, K803, K600, K601, K602, K603, K606, K607, K608, K609, K610,                                    K807, K808, K809,       \ -	K900,       K902, K903, K700, K701, K702, K703, K705, K706, K707, K708, K709,                     K906,          K907, K908, K909, KA10, \ -	KA00, KA01, KA02,                         K805,             K604, K605, K904, K905,         KA04, KA05, KA06,    KA07,       KA09        \ +    k00,      k01, k02, k03, k30, k31, k32, k33, k36, k37, k38, k39, k3A,   k04, k05, k06, \ +\ +    k10, k11, k12, k13, k40, k41, k42, k43, k44, k45, k46, k47, k48, k4A,   k14, k15, k16,   k17, k18, k19, k1A, \ +    k20, k21, k22, k23, k50, k51, k52, k53, k55, k56, k57, k58, k59, k5A,   k24, k25, k26,   k27, k28, k29, k8A, \ +    k80, k81, k82, k83, k60, k61, k62, k63, k66, k67, k68, k69,      k6A,                    k87, k88, k89, \ +    k90,      k92, k93, k70, k71, k72, k73, k75, k76, k77, k78,      k79,        k96,        k97, k98, k99, kAA, \ +    kA0, kA1, kA2,                k85,                k64, k65, k94, k95,   kA4, kA5, kA6,   kA7,      kA9 \  ) { \ -	{ K000, K001, K002, K003, K004, K005, K006, KC_NO, KC_NO, KC_NO, KC_NO }, \ -	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \ -	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, KC_NO }, \ -	{ K300, K301, K302, K303, KC_NO, KC_NO, K306, K307, K308, K309, K310 }, \ -	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, KC_NO, K410 }, \ -	{ K500, K501, K502, K503, KC_NO, K505, K506, K507, K508, K509, K510 }, \ -	{ K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, K610 }, \ -	{ K700, K701, K702, K703, KC_NO, K705, K706, K707, K708, K709, KC_NO }, \ -	{ K800, K801, K802, K803, KC_NO, K805, KC_NO, K807, K808, K809, K810 }, \ -	{ K900, KC_NO, K902, K903, K904, K905, K906, K907, K908, K909, KC_NO }, \ -	{ KA00, KA01, KA02, KC_NO, KA04, KA05, KA06, KA07, KC_NO, KA09, KA10 }  \ +    { k00, k01, k02, k03, k04, k05, k06, XXX, XXX, XXX, XXX }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, XXX }, \ +    { k30, k31, k32, k33, XXX, XXX, k36, k37, k38, k39, k3A }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX, k4A }, \ +    { k50, k51, k52, k53, XXX, k55, k56, k57, k58, k59, k5A }, \ +    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \ +    { k70, k71, k72, k73, XXX, k75, k76, k77, k78, k79, XXX }, \ +    { k80, k81, k82, k83, XXX, k85, XXX, k87, k88, k89, k8A }, \ +    { k90, XXX, k92, k93, k94, k95, k96, k97, k98, k99, XXX }, \ +    { kA0, kA1, kA2, XXX, kA4, kA5, kA6, kA7, XXX, kA9, kAA } \  }  // Standard ISO Keyboard  #define LAYOUT_fullsize_iso( \ -	K000,       K001, K002, K003, K300, K301, K302, K303, K306, K307, K308, K309, K310,         K004, K005, K006,                            \ -	K100, K101, K102, K103, K400, K401, K402, K403, K404, K405, K406, K407, K408, K410,         K104, K105, K106,    K107, K108, K109, K110, \ -	K200, K201, K202, K203, K500, K501, K502, K503, K505, K506, K507, K508, K509,               K204, K205, K206,    K207, K208, K209, K810, \ -	K800, K801, K802, K803, K600, K601, K602, K603, K606, K607, K608, K609, K510, K610,                              K807, K808, K809,       \ -	K900, K901, K902, K903, K700, K701, K702, K703, K705, K706, K707, K708, K709,                     K906,          K907, K908, K909, KA10, \ -	KA00, KA01, KA02,                         K805,             K604, K605, K904, K905,         KA04, KA05, KA06,    KA07,       KA09        \ +    k00,      k01, k02, k03, k30, k31, k32, k33, k36, k37, k38, k39, k3A,   k04, k05, k06, \ +\ +    k10, k11, k12, k13, k40, k41, k42, k43, k44, k45, k46, k47, k48, k4A,   k14, k15, k16,   k17, k18, k19, k1A, \ +    k20, k21, k22, k23, k50, k51, k52, k53, k55, k56, k57, k58, k59,        k24, k25, k26,   k27, k28, k29, k8A, \ +    k80, k81, k82, k83, k60, k61, k62, k63, k66, k67, k68, k69, k5A, k6A,                    k87, k88, k89, \ +    k90, k91, k92, k93, k70, k71, k72, k73, k75, k76, k77, k78,      k79,        k96,        k97, k98, k99, kAA, \ +    kA0, kA1, kA2,                k85,                k64, k65, k94, k95,   kA4, kA5, kA6,   kA7,      kA9 \  ) { \ -	{ K000, K001, K002, K003, K004, K005, K006, KC_NO, KC_NO, KC_NO, KC_NO }, \ -	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \ -	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, KC_NO }, \ -	{ K300, K301, K302, K303, KC_NO, KC_NO, K306, K307, K308, K309, K310 }, \ -	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, KC_NO, K410 }, \ -	{ K500, K501, K502, K503, KC_NO, K505, K506, K507, K508, K509, K510 }, \ -	{ K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, K610 }, \ -	{ K700, K701, K702, K703, KC_NO, K705, K706, K707, K708, K709, KC_NO }, \ -	{ K800, K801, K802, K803, KC_NO, K805, KC_NO, K807, K808, K809, K810 }, \ -	{ K900, K901, K902, K903, K904, K905, K906, K907, K908, K909, KC_NO }, \ -	{ KA00, KA01, KA02, KC_NO, KA04, KA05, KA06, KA07, KC_NO, KA09, KA10 }  \ +    { k00, k01, k02, k03, k04, k05, k06, XXX, XXX, XXX, XXX }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, XXX }, \ +    { k30, k31, k32, k33, XXX, XXX, k36, k37, k38, k39, k3A }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX, k4A }, \ +    { k50, k51, k52, k53, XXX, k55, k56, k57, k58, k59, k5A }, \ +    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \ +    { k70, k71, k72, k73, XXX, k75, k76, k77, k78, k79, XXX }, \ +    { k80, k81, k82, k83, XXX, k85, XXX, k87, k88, k89, k8A }, \ +    { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, XXX }, \ +    { kA0, kA1, kA2, XXX, kA4, kA5, kA6, kA7, XXX, kA9, kAA } \  }  // Winkeyless ANSI Keyboard  #define LAYOUT_fullsize_ansi_wkl( \ -	K000,       K001, K002, K003, K300, K301, K302, K303, K306, K307, K308, K309, K310,         K004, K005, K006,                            \ -	K100, K101, K102, K103, K400, K401, K402, K403, K404, K405, K406, K407, K408, K410,         K104, K105, K106,    K107, K108, K109, K110, \ -	K200, K201, K202, K203, K500, K501, K502, K503, K505, K506, K507, K508, K509, K510,         K204, K205, K206,    K207, K208, K209, K810, \ -	K800, K801, K802, K803, K600, K601, K602, K603, K606, K607, K608, K609, K610,                                    K807, K808, K809,       \ -	K900,       K902, K903, K700, K701, K702, K703, K705, K706, K707, K708, K709,                     K906,          K907, K908, K909, KA10, \ -	KA00,       KA02,                         K805,                   K605,       K905,         KA04, KA05, KA06,    KA07,       KA09        \ +    k00,      k01, k02, k03, k30, k31, k32, k33, k36, k37, k38, k39, k3A,   k04, k05, k06, \ +\ +    k10, k11, k12, k13, k40, k41, k42, k43, k44, k45, k46, k47, k48, k4A,   k14, k15, k16,   k17, k18, k19, k1A, \ +    k20, k21, k22, k23, k50, k51, k52, k53, k55, k56, k57, k58, k59, k5A,   k24, k25, k26,   k27, k28, k29, k8A, \ +    k80, k81, k82, k83, k60, k61, k62, k63, k66, k67, k68, k69,      k6A,                    k87, k88, k89, \ +    k90,      k92, k93, k70, k71, k72, k73, k75, k76, k77, k78,      k79,        k96,        k97, k98, k99, kAA, \ +    kA0,      kA2,                     k85,                k65,      k95,   kA4, kA5, kA6,   kA7,      kA9 \  ) { \ -	{ K000, K001, K002, K003, K004, K005, K006, KC_NO, KC_NO, KC_NO, KC_NO }, \ -	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \ -	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, KC_NO }, \ -	{ K300, K301, K302, K303, KC_NO, KC_NO, K306, K307, K308, K309, K310 }, \ -	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, KC_NO, K410 }, \ -	{ K500, K501, K502, K503, KC_NO, K505, K506, K507, K508, K509, K510 }, \ -	{ K600, K601, K602, K603, KC_NO, K605, K606, K607, K608, K609, K610 }, \ -	{ K700, K701, K702, K703, KC_NO, K705, K706, K707, K708, K709, KC_NO }, \ -	{ K800, K801, K802, K803, KC_NO, K805, KC_NO, K807, K808, K809, K810 }, \ -	{ K900, KC_NO, K902, K903, KC_NO, K905, K906, K907, K908, K909, KC_NO }, \ -	{ KA00, KC_NO, KA02, KC_NO, KA04, KA05, KA06, KA07, KC_NO, KA09, KA10 }  \ +    { k00, k01, k02, k03, k04, k05, k06, XXX, XXX, XXX, XXX }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, XXX }, \ +    { k30, k31, k32, k33, XXX, XXX, k36, k37, k38, k39, k3A }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX, k4A }, \ +    { k50, k51, k52, k53, XXX, k55, k56, k57, k58, k59, k5A }, \ +    { k60, k61, k62, k63, XXX, k65, k66, k67, k68, k69, k6A }, \ +    { k70, k71, k72, k73, XXX, k75, k76, k77, k78, k79, XXX }, \ +    { k80, k81, k82, k83, XXX, k85, XXX, k87, k88, k89, k8A }, \ +    { k90, XXX, k92, k93, XXX, k95, k96, k97, k98, k99, XXX }, \ +    { kA0, XXX, kA2, XXX, kA4, kA5, kA6, kA7, XXX, kA9, kAA } \  }  // Winkeyless ISO Keyboard  #define LAYOUT_fullsize_iso_wkl( \ -	K000,       K001, K002, K003, K300, K301, K302, K303, K306, K307, K308, K309, K310,         K004, K005, K006,                            \ -	K100, K101, K102, K103, K400, K401, K402, K403, K404, K405, K406, K407, K408, K410,         K104, K105, K106,    K107, K108, K109, K110, \ -	K200, K201, K202, K203, K500, K501, K502, K503, K505, K506, K507, K508, K509,               K204, K205, K206,    K207, K208, K209, K810, \ -	K800, K801, K802, K803, K600, K601, K602, K603, K606, K607, K608, K609, K510, K610,                              K807, K808, K809,       \ -	K900, K901, K902, K903, K700, K701, K702, K703, K705, K706, K707, K708, K709,                     K906,          K907, K908, K909, KA10, \ -	KA00,       KA02,                         K805,                   K605,       K905,         KA04, KA05, KA06,    KA07,       KA09        \ +    k00,      k01, k02, k03, k30, k31, k32, k33, k36, k37, k38, k39, k3A,   k04, k05, k06, \ +\ +    k10, k11, k12, k13, k40, k41, k42, k43, k44, k45, k46, k47, k48, k4A,   k14, k15, k16,   k17, k18, k19, k1A, \ +    k20, k21, k22, k23, k50, k51, k52, k53, k55, k56, k57, k58, k59,        k24, k25, k26,   k27, k28, k29, k8A, \ +    k80, k81, k82, k83, k60, k61, k62, k63, k66, k67, k68, k69, k5A, k6A,                    k87, k88, k89, \ +    k90, k91, k92, k93, k70, k71, k72, k73, k75, k76, k77, k78, k79,             k96,        k97, k98, k99, kAA, \ +    kA0,      kA2,                     k85,                k65,      k95,   kA4, kA5, kA6,   kA7,      kA9 \  ) { \ -	{ K000, K001, K002, K003, K004, K005, K006, KC_NO, KC_NO, KC_NO, KC_NO }, \ -	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \ -	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, KC_NO }, \ -	{ K300, K301, K302, K303, KC_NO, KC_NO, K306, K307, K308, K309, K310 }, \ -	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, KC_NO, K410 }, \ -	{ K500, K501, K502, K503, KC_NO, K505, K506, K507, K508, K509, K510 }, \ -	{ K600, K601, K602, K603, KC_NO, K605, K606, K607, K608, K609, K610 }, \ -	{ K700, K701, K702, K703, KC_NO, K705, K706, K707, K708, K709, KC_NO }, \ -	{ K800, K801, K802, K803, KC_NO, K805, KC_NO, K807, K808, K809, K810 }, \ -	{ K900, K901, K902, K903, KC_NO, K905, K906, K907, K908, K909, KC_NO }, \ -	{ KA00, KC_NO, KA02, KC_NO, KA04, KA05, KA06, KA07, KC_NO, KA09, KA10 }  \ +    { k00, k01, k02, k03, k04, k05, k06, XXX, XXX, XXX, XXX }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, XXX }, \ +    { k30, k31, k32, k33, XXX, XXX, k36, k37, k38, k39, k3A }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX, k4A }, \ +    { k50, k51, k52, k53, XXX, k55, k56, k57, k58, k59, k5A }, \ +    { k60, k61, k62, k63, XXX, k65, k66, k67, k68, k69, k6A }, \ +    { k70, k71, k72, k73, XXX, k75, k76, k77, k78, k79, XXX }, \ +    { k80, k81, k82, k83, XXX, k85, XXX, k87, k88, k89, k8A }, \ +    { k90, k91, k92, k93, XXX, k95, k96, k97, k98, k99, XXX }, \ +    { kA0, XXX, kA2, XXX, kA4, kA5, kA6, kA7, XXX, kA9, kAA } \  } - -#endif diff --git a/keyboards/gray_studio/cod67/cod67.h b/keyboards/gray_studio/cod67/cod67.h index ed4a729971..85ebbab61b 100644 --- a/keyboards/gray_studio/cod67/cod67.h +++ b/keyboards/gray_studio/cod67/cod67.h @@ -13,24 +13,21 @@   * 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 COD67_H -#define COD67_H + +#pragma once  #include "quantum.h"  #define LAYOUT( \ -  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K48, \ -  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ -  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ -  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ -  K40, K41, K42, K43, K44, K45, K46, K47, K0D, K49, K4A, K4B, K4C, K4D \ -) \ -{ \ -    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ -    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ -    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ -    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \ -    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D }, \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k48, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \ +    k40, k41, k42, k43, k44, k45, k46, k47, k0D, k49, k4A, k4B, k4C, k4D \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D } \  } - -#endif diff --git a/keyboards/gskt00/gskt00.h b/keyboards/gskt00/gskt00.h index 90e9a1ad5a..151155d7f7 100755 --- a/keyboards/gskt00/gskt00.h +++ b/keyboards/gskt00/gskt00.h @@ -1,57 +1,56 @@ -#ifndef GSKT00_H -#define GSKT00_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  #define LAYOUT_all( \ -    K36, K37, K46, K47, K56, K57, K66, K67, K76, K77, K06, K07, K17, K26, K27, \ -    K34, K35, K44, K45, K54, K55, K64, K65, K75, K05, K15, K16, K25, K24, \ -    K32, K33, K43, K52, K53, K63, K73, K74, K03, K04, K13, K14, K23, \ -    K31, K41, K42, K51, K61, K62, K71, K72, K01, K02, K11, K12, K21, K22, \ -    K30, K40, K50,           K60,                          K00, K10, K20  \ +    k36, k37, k46, k47, k56, k57, k66, k67, k76, k77, k06, k07, k17, k26, k27, \ +    k34, k35, k44, k45, k54, k55, k64, k65, k75, k05, k15, k16, k25, k24, \ +    k32, k33, k43, k52, k53, k63, k73, k74, k03, k04, k13, k14, k23, \ +    k31, k41, k42, k51, k61, k62, k71, k72, k01, k02, k11, k12, k21, k22, \ +    k30, k40, k50,           k60,                          k00, k10, k20 \  ) { \ -    { K00, K01, K02, K03, K04, K05, K06, K07 }, \ -    { K10, K11, K12, K13, K14, K15, K16, K17 }, \ -    { K20, K21, K22, K23, K24, K25, K26, K27 }, \ -    { K30, K31, K32, K33, K34, K35, K36, K37 }, \ -    { K40, K41, K42, K43, K44, K45, K46, K47 }, \ -    { K50, K51, K52, K53, K54, K55, K56, K57 }, \ -    { K60, K61, K62, K63, K64, K65, K66, K67 }, \ -    { KC_NO, K71, K72, K73, K74, K75, K76, K77 } \ +    { k00, k01, k02, k03, k04, k05, k06, k07 }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17 }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27 }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37 }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47 }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57 }, \ +    { k60, k61, k62, k63, k64, k65, k66, k67 }, \ +    { XXX, k71, k72, k73, k74, k75, k76, k77 } \  }  #define LAYOUT_60_iso_tsangan( \ -    K36, K37, K46, K47, K56, K57, K66, K67, K76, K77, K06, K07, K17,      K27, \ -    K34, K35, K44, K45, K54, K55, K64, K65, K75, K05, K15, K16, K25, \ -    K32, K33, K43, K52, K53, K63, K73, K74, K03, K04, K13, K14, K24, K23, /* enter */ \ -    K31, K41, K42, K51, K61, K62, K71, K72, K01, K02, K11, K12, K21,  \ -    K30, K40, K50,           K60,                     K00, K10,      K20  \ +    k36, k37, k46, k47, k56, k57, k66, k67, k76, k77, k06, k07, k17,      k27, \ +    k34, k35, k44, k45, k54, k55, k64, k65, k75, k05, k15, k16, k25, \ +    k32, k33, k43, k52, k53, k63, k73, k74, k03, k04, k13, k14, k24, k23, \ +    k31, k41, k42, k51, k61, k62, k71, k72, k01, k02, k11, k12, k21, \ +    k30, k40, k50,           k60,                     k00, k10,      k20 \  ) { \ -    { K00,   K01, K02,   K03, K04, K05, K06,   K07 }, \ -    { KC_NO, K11, K12,   K13, K14, K15, K16,   K17 }, \ -    { K20,   K21, KC_NO, K23, K24, K25, KC_NO, K27 }, \ -    { K30,   K31, K32,   K33, K34, K35, K36,   K37 }, \ -    { K40,   K41, K42,   K43, K44, K45, K46,   K47 }, \ -    { K50,   K51, K52,   K53, K54, K55, K56,   K57 }, \ -    { K60,   K61, K62,   K63, K64, K65, K66,   K67 }, \ -    { KC_NO,   K71, K72,   K73, K74, K75, K76,   K77 } \ +    { k00, k01, k02, k03, k04, k05, k06, k07 }, \ +    { XXX, k11, k12, k13, k14, k15, k16, k17 }, \ +    { k20, k21, XXX, k23, k24, k25, XXX, k27 }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37 }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47 }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57 }, \ +    { k60, k61, k62, k63, k64, k65, k66, k67 }, \ +    { XXX, k71, k72, k73, k74, k75, k76, k77 } \  }  #define LAYOUT_60_ansi_tsangan( \ -    K36, K37, K46, K47, K56, K57, K66, K67, K76, K77, K06, K07, K17,      K27, \ -    K34, K35, K44, K45, K54, K55, K64, K65, K75, K05, K15, K16, K25, K24, \ -    K32, K33, K43, K52, K53, K63, K73, K74, K03, K04, K13, K14, K23, \ -    K31,      K42, K51, K61, K62, K71, K72, K01, K02, K11, K12, K21,  \ -    K30, K40, K50,           K60,                          K00, K10, K20  \ +    k36, k37, k46, k47, k56, k57, k66, k67, k76, k77, k06, k07, k17,      k27, \ +    k34, k35, k44, k45, k54, k55, k64, k65, k75, k05, k15, k16, k25, k24, \ +    k32, k33, k43, k52, k53, k63, k73, k74, k03, k04, k13, k14, k23, \ +    k31,      k42, k51, k61, k62, k71, k72, k01, k02, k11, k12, k21,  \ +    k30, k40, k50,           k60,                          k00, k10, k20  \  ) { \ -    { K00, K01,   K02,   K03, K04, K05, K06,   K07 }, \ -    { K10, K11,   K12,   K13, K14, K15, K16,   K17 }, \ -    { K20, K21,   KC_NO, K23, K24, K25, KC_NO, K27 }, \ -    { K30, K31,   K32,   K33, K34, K35, K36,   K37 }, \ -    { K40, KC_NO, K42,   K43, K44, K45, K46,   K47 }, \ -    { K50, K51,   K52,   K53, K54, K55, K56,   K57 }, \ -    { K60, K61,   K62,   K63, K64, K65, K66,   K67 }, \ -    { KC_NO, K71,   K72,   K73, K74, K75, K76,   K77 } \ +    { k00, k01, k02, k03, k04, k05, k06, k07 }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17 }, \ +    { k20, k21, XXX, k23, k24, k25, XXX, k27 }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37 }, \ +    { k40, XXX, k42, k43, k44, k45, k46, k47 }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57 }, \ +    { k60, k61, k62, k63, k64, k65, k66, k67 }, \ +    { XXX, k71, k72, k73, k74, k75, k76, k77 } \  } - -#endif diff --git a/keyboards/hadron/hadron.h b/keyboards/hadron/hadron.h index c11774729f..349311270e 100644 --- a/keyboards/hadron/hadron.h +++ b/keyboards/hadron/hadron.h @@ -1,33 +1,27 @@ -#ifndef HADRON_H -#define HADRON_H +#pragma once  #include "quantum.h" -#ifdef KEYBOARD_hadron_ver0 -    #include "ver0.h" -#endif -#ifdef KEYBOARD_hadron_ver2 -    #include "ver2.h" -#endif -#ifdef KEYBOARD_hadron_ver3 -    #include "ver3.h" +#if defined(KEYBOARD_hadron_ver0) +#    include "ver0.h" +#elif defined(KEYBOARD_hadron_ver2) +#    include "ver2.h" +#elif defined(KEYBOARD_hadron_ver3) +#    include "ver3.h"  #endif +#define XXX KC_NO  #define LAYOUT( \ -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ -    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ -    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ -    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ -    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E \ -  ) \ -{ \ -  {  K00,  K01,  K02,  K03,  K04,  K05,  K06,   K07,   K08,   K09,   K0A,   K0B, KC_NO, KC_NO, KC_NO  },  \ -  {  K10,  K11,  K12,  K13,  K14,  K15,  K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E  },  \ -  {  K20,  K21,  K22,  K23,  K24,  K25,  K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E  },  \ -  {  K30,  K31,  K32,  K33,  K34,  K35,  K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E  },  \ -  {  K40,  K41,  K42,  K43,  K44,  K45,  K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E  }   \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ +    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, XXX, XXX, XXX }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E } \  } - - -#endif diff --git a/keyboards/hadron/i2c.h b/keyboards/hadron/i2c.h index 2bd7f40968..7ecf6eb278 100644 --- a/keyboards/hadron/i2c.h +++ b/keyboards/hadron/i2c.h @@ -1,5 +1,4 @@ -#ifndef I2C_H -#define I2C_H +#pragma once  #include <stdint.h> @@ -45,5 +44,3 @@ extern unsigned char i2c_readNak(void);  extern unsigned char i2c_read(unsigned char ack);  #define i2c_read(ack)  (ack) ? i2c_readAck() : i2c_readNak(); - -#endif diff --git a/keyboards/hadron/ver2/ver2.h b/keyboards/hadron/ver2/ver2.h index 54e141ffac..e7577d2684 100644 --- a/keyboards/hadron/ver2/ver2.h +++ b/keyboards/hadron/ver2/ver2.h @@ -1,6 +1,3 @@ -#ifndef VER2_H -#define VER2_H +#pragma once  #include "../hadron.h" - -#endif
\ No newline at end of file diff --git a/keyboards/hadron/ver3/config.h b/keyboards/hadron/ver3/config.h index 574dc6b016..87d01726f5 100644 --- a/keyboards/hadron/ver3/config.h +++ b/keyboards/hadron/ver3/config.h @@ -15,8 +15,7 @@   * along with this program.  If not, see <http://www.gnu.org/licenses/>.   */ -#ifndef REV3_CONFIG_H -#define REV3_CONFIG_H +#pragma once  /* USB Device descriptor parameter */  #define DEVICE_VER 0x0003 @@ -186,5 +185,3 @@  // #define RGB_MATRIX_KEYPRESSES  #define SOLENOID_PIN A14 - -#endif diff --git a/keyboards/handwired/412_64/412_64.h b/keyboards/handwired/412_64/412_64.h index 27a32f15aa..9601f1257c 100644 --- a/keyboards/handwired/412_64/412_64.h +++ b/keyboards/handwired/412_64/412_64.h @@ -1,29 +1,23 @@ - -#ifndef FOURx16_H -#define FOURx16_H +#pragma once  #include "quantum.h" -#define ___ KC_NO  // This a shortcut to help you visually see your layout.  // The first section contains all of the arguments  // The second converts the arguments into a two-dimensional array  #define LAYOUT_ortho_4x16( \ -    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, K40, K41, K42, K43, K44, K45, K46, K47, \ -    K48, K49, K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K60, K61, K62, K63 \ -) \ -{ \ -    { K00, K02, K04, K06, K08, K10, K12, K14 }, \ -    { K01, K03, K05, K07, K09, K11, K13, K15 }, \ -    { K16, K18, K20, K22, K24, K26, K28, K30 }, \ -    { K17, K19, K21, K23, K25, K27, K29, K31 }, \ -    { K32, K34, K36, K38, K40, K42, K44, K46 }, \ -    { K33, K35, K37, K39, K41, K43, K45, K47 }, \ -    { K48, K50, K52, K54, K56, K58, K60, K62 }, \ -    { K49, K51, K53, K55, K57, K59, K61, K63 } \ +    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, \ +    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, \ +    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, \ +    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, k77 \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07 }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17 }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27 }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37 }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47 }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57 }, \ +    { k60, k61, k62, k63, k64, k65, k66, k67 }, \ +    { k70, k71, k72, k73, k74, k75, k76, k77 } \  } - -#endif diff --git a/keyboards/handwired/arrow_pad/arrow_pad.h b/keyboards/handwired/arrow_pad/arrow_pad.h index b93fd113f2..2d677beb5c 100644 --- a/keyboards/handwired/arrow_pad/arrow_pad.h +++ b/keyboards/handwired/arrow_pad/arrow_pad.h @@ -1,5 +1,4 @@ -#ifndef ARROW_PAD_H -#define ARROW_PAD_H +#pragma once  #include "quantum.h"  #include "matrix.h" @@ -10,34 +9,34 @@  #include <avr/io.h>  #include <stddef.h> +#define XXX KC_NO +  // This is the 21-key keypad to 4x6 element matrix mapping  #define LAYOUT( \ -    KM_ESC, KM_TAB, KM_BSL, KM_ARR, \ -    KM_NUM, KM_FSL, KM_AST, KM_MIN, \ -    KM___7, KM___8, KM___9, KM_EQU, \ -    KM___4, KM___5, KM___6, KM_PLS, \ -    KM___1, KM___2, KM___3, ___ENT, \ -    KM___0, _____0, KM_DOT, KM_ENT  \ +    k00, k01, k02, k03, \ +    k10, k11, k12, k13, \ +    k20, k21, k22, k23, \ +    k30, k31, k32, k33, \ +    k40, k41, k42, k43, \ +    k50, k51, k52, k53 \  ) { \ -    { KM_ESC, KM_TAB, KM_BSL, KM_ARR  }, \ -    { KM_NUM, KM_FSL, KM_AST, KM_MIN  }, \ -    { KM___7, KM___8, KM___9, KM_EQU  }, \ -    { KM___4, KM___5, KM___6, KM_PLS  }, \ -    { KM___1, KM___2, KM___3, KC_NO   }, \ -    { KM___0, KC_NO,  KM_DOT, KM_ENT  }  \ +    { k00, k01, k02, k03 }, \ +    { k10, k11, k12, k13 }, \ +    { k20, k21, k22, k23 }, \ +    { k30, k31, k32, k33 }, \ +    { k40, k41, k42, k43 }, \ +    { k50, k51, k52, k53 } \  }  // This is the 21-key keypad to 2x11 element matrix mapping  #define LAYOUT_pad21( \ -    KM_ESC, KM_TAB, KM_BSL, KM_ARR, \ -    KM_NUM, KM_FSL, KM_AST, KM_MIN, \ -    KM___7, KM___8, KM___9,         \ -    KM___4, KM___5, KM___6, KM_PLS, \ -    KM___1, KM___2, KM___3,         \ -    KM___0,         KM_DOT, KM_ENT  \ +    k00, k01, k02, k03, \ +    k10, k11, k12, k13, \ +    k04, k05, k06, \ +    k14, k15, k16, k07, \ +    k08, k09, k0A, \ +    k19,      k1A, k17 \  ) { \ -    { KM_ESC, KM_TAB, KM_BSL, KM_ARR, KM___7, KM___8, KM___9, KM_PLS, KM___1, KM___2, KM___3, }, \ -    { KM_NUM, KM_FSL, KM_AST, KM_MIN, KM___4, KM___5, KM___6, KM_ENT, KC_NO,  KM___0, KM_DOT, }, \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, XXX, k19, k1A } \  } - -#endif diff --git a/keyboards/handwired/arrow_pad/config.h b/keyboards/handwired/arrow_pad/config.h index 22d0f405d4..d07de849e6 100644 --- a/keyboards/handwired/arrow_pad/config.h +++ b/keyboards/handwired/arrow_pad/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -150,5 +149,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/handwired/atreus50/atreus50.h b/keyboards/handwired/atreus50/atreus50.h index a53c267424..710292a187 100644 --- a/keyboards/handwired/atreus50/atreus50.h +++ b/keyboards/handwired/atreus50/atreus50.h @@ -1,23 +1,21 @@ -#ifndef ATREUS50_H -#define ATREUS50_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  // The first section contains all of the arguments  // The second converts the arguments into a two-dimensional array  #define LAYOUT( \ -  k00, k01, k02, k03, k04, k05,           k06, k07, k08, k09, k0a, k0b, \ -  k10, k11, k12, k13, k14, k15,           k16, k17, k18, k19, k1a, k1b, \ -  k20, k21, k22, k23, k24, k25,           k26, k27, k28, k29, k2a, k2b, \ -  k30, k31, k32, k33, k34, k35, km0, km1, k36, k37, k38, k39, k3a, k3b \ -) \ -{ \ -	{ k00, k01, k02, k03, k04, k05, KC_NO, k06, k07, k08, k09, k0a, k0b }, \ -	{ k10, k11, k12, k13, k14, k15, KC_NO, k16, k17, k18, k19, k1a, k1b }, \ -	{ k20, k21, k22, k23, k24, k25, km0,   k26, k27, k28, k29, k2a, k2b }, \ -	{ k30, k31, k32, k33, k34, k35, km1,   k36, k37, k38, k39, k3a, k3b } \ +    k00, k01, k02, k03, k04, k05,           k06, k07, k08, k09, k0A, k0B, \ +    k10, k11, k12, k13, k14, k15,           k16, k17, k18, k19, k1A, k1B, \ +    k20, k21, k22, k23, k24, k25,           k26, k27, k28, k29, k2A, k2B, \ +    k30, k31, k32, k33, k34, k35, kM0, kM1, k36, k37, k38, k39, k3A, k3B \ +) { \ +    { k00, k01, k02, k03, k04, k05, XXX, k06, k07, k08, k09, k0A, k0B }, \ +    { k10, k11, k12, k13, k14, k15, XXX, k16, k17, k18, k19, k1A, k1B }, \ +    { k20, k21, k22, k23, k24, k25, kM0, k26, k27, k28, k29, k2A, k2B }, \ +    { k30, k31, k32, k33, k34, k35, kM1, k36, k37, k38, k39, k3A, k3B } \  }  #define KC_ KC_TRNS - -#endif diff --git a/keyboards/handwired/atreus50/config.h b/keyboards/handwired/atreus50/config.h index 978088b03d..d4fe839df5 100644 --- a/keyboards/handwired/atreus50/config.h +++ b/keyboards/handwired/atreus50/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -150,5 +149,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/handwired/cmd60/cmd60.h b/keyboards/handwired/cmd60/cmd60.h index 2e0baa9997..5c196e899f 100644 --- a/keyboards/handwired/cmd60/cmd60.h +++ b/keyboards/handwired/cmd60/cmd60.h @@ -1,20 +1,19 @@ -#ifndef CMD60_H -#define CMD60_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  #define LAYOUT( \ -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ -    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ -    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \ -    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,           K3D, \ -    K40, K41, K42,           K45,                     K4A, K4B, K4C, K4D  \ -    ) { \ -  {  K00,  K01,  K02,  K03,    K04,    K05,  K06,    K07,    K08,    K09,    K0A,  K0B,    K0C,    K0D  }, \ -  {  K10,  K11,  K12,  K13,    K14,    K15,  K16,    K17,    K18,    K19,    K1A,  K1B,    K1C,    K1D  }, \ -  {  K20,  K21,  K22,  K23,    K24,    K25,  K26,    K27,    K28,    K29,    K2A,  K2B,    KC_NO,  K2D  }, \ -  {  K30,  K31,  K32,  K33,    K34,    K35,  K36,    K37,    K38,    K39,    K3A,  KC_NO,  KC_NO,  K3D  }, \ -  {  K40,  K41,  K42,  KC_NO,  KC_NO,  K45,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  K4A,  K4B,    K4C,    K4D  }  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A,           k3D, \ +    k40, k41, k42,           k45,                     k4A, k4B, k4C, k4D \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, XXX, XXX, k3D }, \ +    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4A, k4B, k4C, k4D } \  } - -#endif diff --git a/keyboards/handwired/cmd60/config.h b/keyboards/handwired/cmd60/config.h index 8cc26c34dd..80cd00fcd3 100644 --- a/keyboards/handwired/cmd60/config.h +++ b/keyboards/handwired/cmd60/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -151,5 +150,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/handwired/dactyl/config.h b/keyboards/handwired/dactyl/config.h index 10c43d1307..29a008f0c6 100644 --- a/keyboards/handwired/dactyl/config.h +++ b/keyboards/handwired/dactyl/config.h @@ -17,8 +17,7 @@ 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 DACTYL_CONFIG_H -#define DACTYL_CONFIG_H +#pragma once  #include "config_common.h" @@ -64,5 +63,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define DEBOUNCE    15  #define USB_MAX_POWER_CONSUMPTION 500 - -#endif diff --git a/keyboards/handwired/dactyl/dactyl.h b/keyboards/handwired/dactyl/dactyl.h index a6a043496c..b901b67673 100644 --- a/keyboards/handwired/dactyl/dactyl.h +++ b/keyboards/handwired/dactyl/dactyl.h @@ -1,5 +1,4 @@ -#ifndef DACTYL_H -#define DACTYL_H +#pragma once  #include "quantum.h"  #include <stdint.h> @@ -25,39 +24,31 @@ extern bool i2c_initialized;  void init_dactyl(void);  void init_expander(void); -/* - *   LEFT HAND: LINES 38-45 - *  RIGHT HAND: LINES 47-54 - */ -#define LAYOUT_dactyl(                                                  \ -                                                                        \ -    k00,k01,k02,k03,k04,k05,                                            \ -    k10,k11,k12,k13,k14,k15,                                            \ -    k20,k21,k22,k23,k24,k25,                                            \ -    k30,k31,k32,k33,k34,k35,                                            \ -    k40,k41,k42,k43,k44,                                                \ -                            k55,k50,                                    \ -                                k54,                                    \ -                        k53,k52,k51,                                    \ -                                                                        \ -            k06,k07,k08,k09,k0A,k0B,                                    \ -            k16,k17,k18,k19,k1A,k1B,                                    \ -            k26,k27,k28,k29,k2A,k2B,                                    \ -            k36,k37,k38,k39,k3A,k3B,                                    \ -                k47,k48,k49,k4A,k4B,                                    \ -    k5B,k56,                                                            \ -    k57,                                                                \ -    k5A,k59,k58 )                                                       \ -                                                                        \ -   /* matrix positions */                                               \ -   {                                                                    \ -    { k00, k01, k02, k03, k04, k05,     k06, k07, k08, k09, k0A, k0B }, \ -    { k10, k11, k12, k13, k14, k15,     k16, k17, k18, k19, k1A, k1B }, \ -    { k20, k21, k22, k23, k24, k25,     k26, k27, k28, k29, k2A, k2B }, \ -    { k30, k31, k32, k33, k34, k35,     k36, k37, k38, k39, k3A, k3B }, \ -    { k40, k41, k42, k43, k44, KC_NO, KC_NO, k47, k48, k49, k4A, k4B }, \ -    { k50, k51, k52, k53, k54, k55,     k56, k57, k58, k59, k5A, k5B }, \ -   } +#define XXX KC_NO - -#endif +#define LAYOUT_dactyl( \ +    k00, k01, k02, k03, k04, k05, \ +    k10, k11, k12, k13, k14, k15, \ +    k20, k21, k22, k23, k24, k25, \ +    k30, k31, k32, k33, k34, k35, \ +    k40, k41, k42, k43, k44, \ +                                  k55, k50, \ +                                       k54, \ +                             k53, k52, k51, \ +\ +              k06, k07, k08, k09, k0A, k0B, \ +              k16, k17, k18, k19, k1A, k1B, \ +              k26, k27, k28, k29, k2A, k2B, \ +              k36, k37, k38, k39, k3A, k3B, \ +                   k47, k48, k49, k4A, k4B, \ +    k5B, k56, \ +    k57, \ +    k5A, k59, k58 \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \ +    { k40, k41, k42, k43, k44, XXX, XXX, k47, k48, k49, k4A, k4B }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B } \ +} diff --git a/keyboards/handwired/fivethirteen/config.h b/keyboards/handwired/fivethirteen/config.h index 86ce250e72..af83315c16 100644 --- a/keyboards/handwired/fivethirteen/config.h +++ b/keyboards/handwired/fivethirteen/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -151,5 +150,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/handwired/fivethirteen/fivethirteen.h b/keyboards/handwired/fivethirteen/fivethirteen.h index 6d14b7f1c0..ffa0bd59d5 100644 --- a/keyboards/handwired/fivethirteen/fivethirteen.h +++ b/keyboards/handwired/fivethirteen/fivethirteen.h @@ -1,21 +1,19 @@ -#ifndef FIVETHIRTEEN_H -#define FIVETHIRTEEN_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  #define LAYOUT( \ -  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, \ -  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, \ -  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, \ -  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, \ -  k40, k41, k42, k43, k44,      k46, k47, k48, k49, k410, k411, k412  \ -) \ -{ \ -  { k00, k01, k02, k03, k04, k05,   k06, k07, k08, k09, k010, k011, k012 }, \ -  { k10, k11, k12, k13, k14, k15,   k16, k17, k18, k19, k110, k111, k112 }, \ -  { k20, k21, k22, k23, k24, k25,   k26, k27, k28, k29, k210, k211, k212 }, \ -  { k30, k31, k32, k33, k34, k35,   k36, k37, k38, k39, k310, k311, k312 }, \ -  { k40, k41, k42, k43, k44, KC_NO, k46, k47, k48, k49, k410, k411, k412 }  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, \ +    k40, k41, k42, k43, k44,      k46, k47, k48, k49, k4A, k4B, k4C \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C }, \ +    { k40, k41, k42, k43, k44, XXX, k46, k47, k48, k49, k4A, k4B, k4C } \  } - -#endif diff --git a/keyboards/handwired/gamenum/config.h b/keyboards/handwired/gamenum/config.h index 4a62732a78..d7115db6ac 100644 --- a/keyboards/handwired/gamenum/config.h +++ b/keyboards/handwired/gamenum/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -151,5 +150,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/handwired/gamenum/gamenum.h b/keyboards/handwired/gamenum/gamenum.h index 3a1429ff8c..48883b1185 100644 --- a/keyboards/handwired/gamenum/gamenum.h +++ b/keyboards/handwired/gamenum/gamenum.h @@ -1,21 +1,19 @@ -#ifndef GAMENUM_H -#define GAMENUM_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  #define LAYOUT( \ -	k00, k01, k02, k03, \ -	k10, k11, k12, k13, \ -	k20, k21, k22,      \ -	k30, k31, k32,      \ -	     k41, k42, k43  \ -) \ -{ \ -	{ k00,   k01, k02, k03   }, \ -	{ k10,   k11, k12, k13   }, \ -	{ k20,   k21, k22, KC_NO }, \ -	{ k30,   k31, k32, KC_NO }, \ -	{ KC_NO, k41, k42, k43   }  \ +    k00, k01, k02, k03, \ +    k10, k11, k12, k13, \ +    k20, k21, k22, \ +    k30, k31, k32, \ +         k41, k42, k43 \ +) { \ +    { k00, k01, k02, k03 }, \ +    { k10, k11, k12, k13 }, \ +    { k20, k21, k22, XXX }, \ +    { k30, k31, k32, XXX }, \ +    { XXX, k41, k42, k43 } \  } - -#endif diff --git a/keyboards/handwired/jn68m/jn68m.h b/keyboards/handwired/jn68m/jn68m.h index d47f9f6c9c..a5500824bb 100644 --- a/keyboards/handwired/jn68m/jn68m.h +++ b/keyboards/handwired/jn68m/jn68m.h @@ -13,37 +13,37 @@   * 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 JN68M_H -#define JN68M_H + +#pragma once  #include "quantum.h" +#define XXX KC_NO +  #define LAYOUT( \ -  K1 , K2 , K3 , K4 , K5 , K6 , K7 , K8 , K9 , K10, K11, K12, K13, K14,      K67, K68,\ -  K16, K17, K18, K19, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,      K69, K70,\ -  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K40, K41, K42, \ -  K43, K44, K45, K46, K47, K48, K49, K50, K51, K52,      K53, K54,           K55, \ -  K56, K57, K58,           K59,                K60,      K61, K63,      K64, K65, K66 \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0E, k0F, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1E, k1F, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39,      k3B, k3C,           k3E, \ +    k40, k41, k42,           k45,                k49,      k4B, k4C,      k4D, k4E, k4F \  ) { \ -  { K1 , K2 , K3 , K4 , K5 , K6 , K7 , K8 , K9 , K10, K11, K12, K13, K14, K67, K68 }, \ -  { K16, K17, K18, K19, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K69, K70 }, \ -  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K40, K41, K42,KC_NO,KC_NO,KC_NO}, \ -  { K43, K44, K45, K46, K47, K48, K49, K50, K51, K52,KC_NO,K53, K54,KC_NO,K55,KC_NO}, \ -  { K56, K57, K58,KC_NO,KC_NO,K59,KC_NO,KC_NO,KC_NO,K60,KC_NO,K61, K63, K64, K65, K66} \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, XXX, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, XXX, k3B, k3C, XXX, k3E, XXX }, \ +    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, XXX, k4B, k4C, k4D, k4E, k4F } \  }  #define LAYOUT_splitbs( \ -  K1 , K2 , K3 , K4 , K5 , K6 , K7 , K8 , K9 , K10, K11, K12, K13, K14, K15,      K67, K68,\ -  K16, K17, K18, K19, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,           K69, K70,\ -  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K40, K41, K42, \ -  K43, K44, K45, K46, K47, K48, K49, K50, K51, K52,      K53, K54,                K55, \ -  K56, K57, K58,           K59,                K60,      K61, K63,           K64, K65, K66 \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k2D,      k0E, k0F, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,           k1E, k1F, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39,      k3B, k3C,                k3E, \ +    k40, k41, k42,           k45,                k49,      k4B, k4C,           k4D, k4E, k4F \  ) { \ -  { K1 , K2 , K3 , K4 , K5 , K6 , K7 , K8 , K9 , K10, K11, K12, K13, K14, K67, K68 }, \ -  { K16, K17, K18, K19, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K69, K70 }, \ -  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K40, K41, K42, K15,KC_NO,KC_NO}, \ -  { K43, K44, K45, K46, K47, K48, K49, K50, K51, K52,KC_NO,K53, K54,KC_NO,K55,KC_NO}, \ -  { K56, K57, K58,KC_NO,KC_NO,K59,KC_NO,KC_NO,KC_NO,K60,KC_NO,K61, K63, K64, K65, K66} \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, XXX, k3B, k3C, XXX, k3E, XXX }, \ +    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, XXX, k4B, k4C, k4D, k4E, k4F } \  } - -#endif diff --git a/keyboards/handwired/kbod/kbod.h b/keyboards/handwired/kbod/kbod.h index 5d9dbd05b3..86ff0e8ead 100644 --- a/keyboards/handwired/kbod/kbod.h +++ b/keyboards/handwired/kbod/kbod.h @@ -1,21 +1,22 @@ -#ifndef KBOD_H -#define KBOD_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  #define LAYOUT( \ -    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,    k0D, \ -    k10,    k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ -    k20,     k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,     k2C, \ -    k30,      k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A,         k3B, \ -    k40,  k41,  k42,               k43,               k44,  k45,  k46,  k47  \ -) \ -{                                                                                               \ -    { k00, k01, k02, k03, k04, k05, k06, k07 }, { k08, k09, k0A, k0B, k0C, k0D, KC_NO, KC_NO }, \ -    { k10, k11, k12, k13, k14, k15, k16, k17 }, { k18, k19, k1A, k1B, k1C, k1D, KC_NO,   k3B }, \ -    { k20, k21, k22, k23, k24, k25, k26, k27 }, { k28, k29, k2A, k2B, k2C, k38, k39,     k3A }, \ -    { k30, k31, k32, k33, k34, k35, k36, k37 },                                                 \ -    { k40, k41, k42, k43, k44, k45, k46, k47 },                                                 \ +    k00, k01, k02, k03, k04, k05, k06, k07, k10, k11, k12, k13, k14,    k15, \ +    k20,    k21, k22, k23, k24, k25, k26, k27, k30, k31, k32, k33, k34, k35, \ +    k40,     k41, k42, k43, k44, k45, k46, k47, k50, k51, k52, k53,     k54, \ +    k60,      k61, k62, k63, k64, k65, k66, k67, k55, k56, k57,         k37, \ +    k70,  k71,  k72,               k73,               k74,  k75,  k76,  k77 \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07 }, \ +    { k10, k11, k12, k13, k14, k15, XXX, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27 }, \ +    { k30, k31, k32, k33, k34, k35, XXX, k37 }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47 }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57 }, \ +    { k60, k61, k62, k63, k64, k65, k66, k67 }, \ +    { k70, k71, k72, k73, k74, k75, k76, k77 } \  } - -#endif diff --git a/keyboards/handwired/magicforce68/config.h b/keyboards/handwired/magicforce68/config.h index 430e294ba8..cf059e423d 100644 --- a/keyboards/handwired/magicforce68/config.h +++ b/keyboards/handwired/magicforce68/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -151,5 +150,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/handwired/magicforce68/magicforce68.h b/keyboards/handwired/magicforce68/magicforce68.h index 949507fef7..829e5932b5 100644 --- a/keyboards/handwired/magicforce68/magicforce68.h +++ b/keyboards/handwired/magicforce68/magicforce68.h @@ -1,20 +1,19 @@ -#ifndef MAGICFORCE68_H -#define MAGICFORCE68_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  #define LAYOUT( \ -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K2E, \ -    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K3E, \ -    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,   K2C, \ -    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,        K3C,    K3D, \ -    K40, K41, K42,           K45,                K49, K4A, K4B,      K4C, K4D, K4E  \ -    ) { \ -  {  K00, K01, K02, K03,   K04,   K05, K06,   K07,   K08,   K09, K0A, K0B,   K0C, K0D,   K0E  },  \ -  {  K10, K11, K12, K13,   K14,   K15, K16,   K17,   K18,   K19, K1A, K1B,   K1C, K1D,   K1E  },  \ -  {  K20, K21, K22, K23,   K24,   K25, K26,   K27,   K28,   K29, K2A, K2B,   K2C, KC_NO, K2E  },  \ -  {  K30, K31, K32, K33,   K34,   K35, K36,   K37,   K38,   K39, K3A, KC_NO, K3C, K3D,   K3E  },  \ -  {  K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B,   K4C, K4D,   K4E  }   \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k2E, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k3E, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,   k2C, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A,        k3C,    k3D, \ +    k40, k41, k42,           k45,                k49, k4A, k4B,      k4C, k4D, k4E \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, k2E }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, XXX, k3C, k3D, k3E }, \ +    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4A, k4B, k4C, k4D, k4E } \  } - -#endif diff --git a/keyboards/handwired/ms_sculpt_mobile/config.h b/keyboards/handwired/ms_sculpt_mobile/config.h index 1b61d8712a..c3c2a0962e 100644 --- a/keyboards/handwired/ms_sculpt_mobile/config.h +++ b/keyboards/handwired/ms_sculpt_mobile/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -85,5 +84,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.h b/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.h index cfa07c92ef..64d4f7bbc4 100644 --- a/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.h +++ b/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.h @@ -1,48 +1,43 @@ -#ifndef MICROSOFT_SCULPT_MOBILE_H -#define MICROSOFT_SCULPT_MOBILE_H +#pragma once  #include "quantum.h" +#define XXX KC_NO  #define LAYOUT( \ -                k7Q, k6O, k6P,  k6Q, k5O, k5P, k5Q, k7A, k7B, k7C, k7D, k7E, k7F, k1O, k1K, k1L, \ -                k5A,  k5K,  k5L, k5M, k5N, k5H, k5I, k2A, k2B, k2C, k2D, k5B, k5C, k5J, k2E, \ -                k6R,  k6D,  k6E, k6F, k7I, k7J, k4A, k4B, k4C, k4D, k3A, k3B, k3C, k3D, \ -                k0J, k6A, k6B, k6C, k7H, k1A, k1B, k5D, k5E, k5F, k5G, k1C, k7P,   k2G, \ -                k2P, k7K, k7L, k7M, k7O, k0A, k0B, k0C, k0D, k0E, k0F, k2L, k6G, k1P,\ -                k1Q, k4N, k3O,k6N, k3K, k0R, k1M, k6H, k6I, k6J \ -) \ -{ \ -        {k0A, k0B, k0C, k0D, k0E, k0F, KC_NO, KC_NO, KC_NO, k0J, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,KC_NO, KC_NO, k0R},\ -        {k1A, k1B, k1C, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k1K, k1L, k1M, KC_NO, k1O, k1P, k1Q, KC_NO},\ -        {k2A, k2B, k2C, k2D, k2E, KC_NO, k2G, KC_NO, KC_NO, KC_NO, KC_NO, k2L, KC_NO, KC_NO, KC_NO, k2P, KC_NO, KC_NO},\ -        {k3A, k3B, k3C, k3D, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k3K, KC_NO, KC_NO, KC_NO, k3O, KC_NO, KC_NO, KC_NO},\ -        {k4A, k4B, k4C, k4D, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k4N, KC_NO,KC_NO, KC_NO, KC_NO},\ -        {k5A, k5B, k5C, k5D, k5E, k5F, k5G, k5H, k5I, k5J, k5K, k5L, k5M, k5N, k5O, k5P, k5Q, KC_NO },\ -        {k6A, k6B, k6C, k6D, k6E, k6F, k6G, k6H, k6I, k6J, KC_NO, KC_NO, KC_NO, k6N, k6O, k6P, k6Q, k6R},\ -        {k7A, k7B, k7C, k7D, k7E, k7F, KC_NO, k7H, k7I, k7J, k7K, k7L, k7M, KC_NO, k7O, k7P, k7Q, KC_NO},\ +    k7G, k6E, k6F, k6G, k5E, k5F, k5G, k70, k71, k72, k73, k74, k75, k1E, k1A, k1B, \ +    k50, k5A, k5B, k5C, k5D, k57, k58, k20, k21, k22, k23, k51, k52, k59, k24, \ +    k6H, k63, k64, k65, k78, k79, k40, k41, k42, k43, k30, k31, k32, k33, \ +    k09, k60, k61, k62, k77, k10, k11, k53, k54, k55, k56, k12, k7F, k26, \ +    k2F, k7A, k7B, k7C, k7E, k00, k01, k02, k03, k04, k05, k2B, k66, k1F, \ +    k1G, k4D, k3E, k6D, k3A, k0H, k1C, k67, k68, k69 \ +) { \ +    { k00, k01, k02, k03, k04, k05, XXX, XXX, XXX, k09, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k0H }, \ +    { k10, k11, k12, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k1A, k1B, k1C, XXX, k1E, k1F, k1G, XXX }, \ +    { k20, k21, k22, k23, k24, XXX, k26, XXX, XXX, XXX, XXX, k2B, XXX, XXX, XXX, k2F, XXX, XXX }, \ +    { k30, k31, k32, k33, XXX, XXX, XXX, XXX, XXX, XXX, k3A, XXX, XXX, XXX, k3E, XXX, XXX, XXX }, \ +    { k40, k41, k42, k43, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k4D, XXX, XXX, XXX, XXX }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F, k5G, XXX }, \ +    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, XXX, XXX, XXX, k6D, k6E, k6F, k6G, k6H }, \ +    { k70, k71, k72, k73, k74, k75, XXX, k77, k78, k79, k7A, k7B, k7C, XXX, k7E, k7F, k7G, XXX } \  } -  #define MATRIX_TESTING_LAYOUT( \ -        k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0I, k0, k0J, k0K, k0L, k0M, k0N, k0O, k0P, k0Q,\ -        k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, k1, k1J, k1K, k1L, k1M, k1N, k1O, k1P, k1Q,\ -        k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, k2, k2J, k2K, k2L, k2M, k2N, k2O, k2P, k2Q,\ -        k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H, k3I, k3, k3J, k3K, k3L, k3M, k3N, k3O, k3P, k3Q,\ -        k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, k4I, k4, k4J, k4K, k4L, k4M, k4N, k4O, k4P, k4Q,\ -        k5A, k5B, k5C, k5D, k5E, k5F, k5G, k5H, k5I, k5, k5J, k5K, k5L, k5M, k5N, k5O, k5P, k5Q,\ -        k6A, k6B, k6C, k6D, k6E, k6F, k6G, k6H, k6I, k6, k6J, k6K, k6L, k6M, k6N, k6O, k6P, k6Q,\ -        k7A, k7B, k7C, k7D, k7E, k7F, k7G, k7H, k7I, k7, k7J, k7K, k7L, k7M, k7N, k7O, k7P, k7Q\ -) \ -{ \ -       {k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0I, k0, k0J, k0K, k0L, k0M, k0N, k0O, k0P, k0Q},\ -        {k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, k1, k1J, k1K, k1L, k1M, k1N, k1O, k1P, k1Q},\ -        {k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, k2, k2J, k2K, k2L, k2M, k2N, k2O, k2P, k2Q},\ -        {k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H, k3I, k3, k3J, k3K, k3L, k3M, k3N, k3O, k3P, k3Q},\ -        {k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, k4I, k4, k4J, k4K, k4L, k4M, k4N, k4O, k4P, k4Q},\ -        {k5A, k5B, k5C, k5D, k5E, k5F, k5G, k5H, k5I, k5, k5J, k5K, k5L, k5M, k5N, k5O, k5P, k5Q},\ -        {k6A, k6B, k6C, k6D, k6E, k6F, k6G, k6H, k6I, k6, k6J, k6K, k6L, k6M, k6N, k6O, k6P, k6Q},\ -        {k7A, k7B, k7C, k7D, k7E, k7F, k7G, k7H, k7I, k7, k7J, k7K, k7L, k7M, k7N, k7O, k7P, k7Q},\ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H, \ +    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, \ +    k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F, k5G, k5H, \ +    k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F, k6G, k6H, \ +    k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A, k7B, k7C, k7D, k7E, k7F, k7G, k7H \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F, k5G, k5H }, \ +    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F, k6G, k6H }, \ +    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A, k7B, k7C, k7D, k7E, k7F, k7G, k7H } \  } - -#endif diff --git a/keyboards/handwired/nicekey/config.h b/keyboards/handwired/nicekey/config.h index d1b18cc282..19e707c1fc 100644 --- a/keyboards/handwired/nicekey/config.h +++ b/keyboards/handwired/nicekey/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -65,5 +64,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/handwired/nicekey/nicekey.h b/keyboards/handwired/nicekey/nicekey.h index ee5bcfd6be..f008be168e 100644 --- a/keyboards/handwired/nicekey/nicekey.h +++ b/keyboards/handwired/nicekey/nicekey.h @@ -1,12 +1,9 @@ -#ifndef NICEKEY_H -#define NICEKEY_H +#pragma once  #include "quantum.h"  #define LAYOUT( \      k00 \ -  ) { \ -    { k00 }  \ +) { \ +    { k00 } \  } - -#endif diff --git a/keyboards/handwired/not_so_minidox/config.h b/keyboards/handwired/not_so_minidox/config.h index 9d2174b532..de9286eda5 100644 --- a/keyboards/handwired/not_so_minidox/config.h +++ b/keyboards/handwired/not_so_minidox/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -72,5 +71,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/handwired/not_so_minidox/i2c.h b/keyboards/handwired/not_so_minidox/i2c.h index c15b6bc506..8910e70f10 100644 --- a/keyboards/handwired/not_so_minidox/i2c.h +++ b/keyboards/handwired/not_so_minidox/i2c.h @@ -1,5 +1,4 @@ -#ifndef I2C_H -#define I2C_H +#pragma once  #include <stdint.h> @@ -45,5 +44,3 @@ extern unsigned char i2c_readNak(void);  extern unsigned char i2c_read(unsigned char ack);  #define i2c_read(ack)  (ack) ? i2c_readAck() : i2c_readNak(); - -#endif diff --git a/keyboards/handwired/not_so_minidox/not_so_minidox.h b/keyboards/handwired/not_so_minidox/not_so_minidox.h index c24a515e43..7c80dc9b3b 100644 --- a/keyboards/handwired/not_so_minidox/not_so_minidox.h +++ b/keyboards/handwired/not_so_minidox/not_so_minidox.h @@ -1,24 +1,21 @@ -#ifndef NOSOTMINIDOX_H -#define NOSOTMINIDOX_H - +#pragma once  #include "quantum.h" -#define LAYOUT( \ -	L00, L01, L02, L03, L04, L05,           R05, R04, R03, R02, R01, R00, \ -	L10, L11, L12, L13, L14, L15,           R15, R14, R13, R12, R11, R10, \ -	L20, L21, L22, L23, L24, L25,           R25, R24, R23, R22, R21, R20, \ -											LT1, LT2, LT3, RT3, RT2, RT1 \ -	) \ -	{ \ -		{ L00, L01, L02, L03, L04, L05 }, \ -		{ L10, L11, L12, L13, L14, L15 }, \ -		{ L20, L21, L22, L23, L24, L25 }, \ -		{ KC_NO, KC_NO, KC_NO, LT1, LT2, LT3 }, \ -		{ R00, R01, R02, R03, R04, R05 }, \ -		{ R10, R11, R12, R13, R14, R15 }, \ -		{ R20, R21, R22, R23, R24, R25 }, \ -		{ KC_NO, KC_NO, KC_NO, RT1, RT2, RT3 }, \ -	} +#define XXX KC_NO -#endif +#define LAYOUT( \ +    L00, L01, L02, L03, L04, L05,     R05, R04, R03, R02, R01, R00, \ +    L10, L11, L12, L13, L14, L15,     R15, R14, R13, R12, R11, R10, \ +    L20, L21, L22, L23, L24, L25,     R25, R24, R23, R22, R21, R20, \ +                   LT1, LT2, LT3,     RT3, RT2, RT1 \ +) { \ +    { L00, L01, L02, L03, L04, L05 }, \ +    { L10, L11, L12, L13, L14, L15 }, \ +    { L20, L21, L22, L23, L24, L25 }, \ +    { XXX, XXX, XXX, LT1, LT2, LT3 }, \ +    { R00, R01, R02, R03, R04, R05 }, \ +    { R10, R11, R12, R13, R14, R15 }, \ +    { R20, R21, R22, R23, R24, R25 }, \ +    { XXX, XXX, XXX, RT1, RT2, RT3 } \ +} diff --git a/keyboards/handwired/not_so_minidox/serial.h b/keyboards/handwired/not_so_minidox/serial.h index 15fe4db7b4..28fcc56ce7 100644 --- a/keyboards/handwired/not_so_minidox/serial.h +++ b/keyboards/handwired/not_so_minidox/serial.h @@ -1,5 +1,4 @@ -#ifndef MY_SERIAL_H -#define MY_SERIAL_H +#pragma once  #include "config.h"  #include <stdbool.h> @@ -22,5 +21,3 @@ void serial_master_init(void);  void serial_slave_init(void);  int serial_update_buffers(void);  bool serial_slave_data_corrupt(void); - -#endif diff --git a/keyboards/handwired/not_so_minidox/split_util.h b/keyboards/handwired/not_so_minidox/split_util.h index 595a0659e1..807412cd38 100644 --- a/keyboards/handwired/not_so_minidox/split_util.h +++ b/keyboards/handwired/not_so_minidox/split_util.h @@ -1,5 +1,4 @@ -#ifndef SPLIT_KEYBOARD_UTIL_H -#define SPLIT_KEYBOARD_UTIL_H +#pragma once  #include <stdbool.h>  #include "eeconfig.h" @@ -16,5 +15,3 @@ bool has_usb(void);  void keyboard_slave_loop(void);  void matrix_master_OLED_init (void); - -#endif diff --git a/keyboards/handwired/numpad20/config.h b/keyboards/handwired/numpad20/config.h index 7e7ddbeb2a..73a1d032f3 100644 --- a/keyboards/handwired/numpad20/config.h +++ b/keyboards/handwired/numpad20/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -151,5 +150,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/handwired/numpad20/numpad20.h b/keyboards/handwired/numpad20/numpad20.h index c15aa9ac70..03fdd6d923 100644 --- a/keyboards/handwired/numpad20/numpad20.h +++ b/keyboards/handwired/numpad20/numpad20.h @@ -1,20 +1,17 @@ -#ifndef NUMPAD20_H -#define NUMPAD20_H +#pragma once  #include "quantum.h"  #define LAYOUT( \ -    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 }   \ +    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 } \  } - -#endif diff --git a/keyboards/handwired/ortho5x13/config.h b/keyboards/handwired/ortho5x13/config.h index 65510c2a23..bead469fbe 100644 --- a/keyboards/handwired/ortho5x13/config.h +++ b/keyboards/handwired/ortho5x13/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -151,5 +150,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/handwired/pilcrow/config.h b/keyboards/handwired/pilcrow/config.h index a2eaaaefaf..fe5cbea668 100644 --- a/keyboards/handwired/pilcrow/config.h +++ b/keyboards/handwired/pilcrow/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -151,5 +150,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/handwired/pilcrow/pilcrow.h b/keyboards/handwired/pilcrow/pilcrow.h index 37d2914f24..30576e85c0 100644 --- a/keyboards/handwired/pilcrow/pilcrow.h +++ b/keyboards/handwired/pilcrow/pilcrow.h @@ -1,5 +1,4 @@ -#ifndef PILCROW_H -#define PILCROW_H +#pragma once  #include "quantum.h" @@ -12,12 +11,9 @@      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 } \  } - -#endif diff --git a/keyboards/handwired/prime_exl/prime_exl.h b/keyboards/handwired/prime_exl/prime_exl.h index 03524da3c2..1c9a8060fc 100644 --- a/keyboards/handwired/prime_exl/prime_exl.h +++ b/keyboards/handwired/prime_exl/prime_exl.h @@ -13,28 +13,28 @@   * 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 PRIME_EXL_H -//#define PRIME_EXL_H + +#pragma once  #include "quantum.h" +#define XXX KC_NO +  #define LAYOUT( \ -	K040, K050, K041, K051, K042, K052, 		K043, K053, K044, K054, K045, K055, 		K046, K056, K047, K057, K048, K058, \ -	K030, K060, K031, K061, K032, K062,		K033, K063, K034, K064, K035, K065, 		K036, K066, K037, K067, K038, K068, \ -	K020, K070, K021, K071, K022, K072,		K023, K073, K024, K074, K025, K075, 		K085, K026, K076, K027, K077, K028, K078, \ -	K010, K080, K011, K081, K012, K082,		K013, K083, K014, K084,    	K015,					K016,		  K086, K017, K087, K018, \ -	K000, K090, K001, K091, K002, K092 \ +    k40, k50, k41, k51, k42, k52,    k43, k53, k44, k54, k45, k55,    k46, k56, k47, k57, k48, k58, \ +    k30, k60, k31, k61, k32, k62,    k33, k63, k34, k64, k35, k65,    k36, k66, k37, k67, k38, k68, \ +    k20, k70, k21, k71, k22, k72,    k23, k73, k24, k74, k25, k75,    k85, k26, k76, k27, k77, k28, k78, \ +    k10, k80, k11, k81, k12, k82,    k13, k83, k14, k84,    k15,           k16,      k86, k17, k87, k18, \ +    k00, k90, k01, k91, k02, k92 \  ) { \ -	{ K000,  K001,  K002,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ -	{ K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \ -	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028 }, \ -	{ K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038 }, \ -	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  K047,  K048 }, \ -	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058 }, \ -	{ K060,  K061,  K062,  K063,  K064,  K065,  K066,  K067,  K068 }, \ -	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  K077,  K078 }, \ -	{ K080,  K081,  K082,  K083,  K084,  K085,  K086,  K087,  KC_NO }, \ -	{ K090,  K091,  K092,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }  \ +    { k00, k01, k02, XXX, XXX, XXX, XXX, XXX, XXX }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \ +    { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \ +    { k70, k71, k72, k73, k74, k75, k76, k77, k78 }, \ +    { k80, k81, k82, k83, k84, k85, k86, k87, XXX }, \ +    { k90, k91, k92, XXX, XXX, XXX, XXX, XXX, XXX } \  } - -//#endif
\ No newline at end of file diff --git a/keyboards/handwired/promethium/promethium.h b/keyboards/handwired/promethium/promethium.h index f35e5429bd..c4c90176b5 100644 --- a/keyboards/handwired/promethium/promethium.h +++ b/keyboards/handwired/promethium/promethium.h @@ -1,5 +1,4 @@ -#ifndef PROMETHIUM_H -#define PROMETHIUM_H +#pragma once  #include <stdint.h> @@ -7,23 +6,22 @@ void battery_poll(uint8_t level);  void led_set_kb(uint8_t usb_led);  void led_set_user(uint8_t usb_led); +#define XXX KC_NO +  #define LAYOUT( \ -    k11, k12, k13, k14, k15, k16,      k17, k18, k19, k1a, k1b, k1c, \ -    k21, k22, k23, k24, k25, k26,      k27, k28, k29, k2a, k2b, k2c, \ -    k31, k32, k33, k34, k35, k36,      k37, k38, k39, k3a, k3b, k3c, \ -    k41, k42, k43, k44, k45, k46,      k47, k48, k49, k4a, k4b, k4c, \ +    k00, k01, k02, k03, k04, k05,      k40, k41, k42, k43, k44, k45, \ +    k10, k11, k12, k13, k14, k15,      k50, k51, k52, k53, k54, k55, \ +    k20, k21, k22, k23, k24, k25,      k60, k61, k62, k63, k64, k65, \ +    k30, k31, k32, k33, k34, k35,      k70, k71, k72, k73, k74, k75, \                               tp1, tp2, tp3 \ -) \ -{ \ -    {k11, k12, k13, k14,   k15,   k16}, \ -    {k21, k22, k23, k24,   k25,   k26}, \ -    {k31, k32, k33, k34,   k35,   k36}, \ -    {k41, k42, k43, k44,   k45,   k46}, \ -    {k17, k18, k19, k1a,   k1b,   k1c}, \ -    {k27, k28, k29, k2a,   k2b,   k2c}, \ -    {k37, k38, k39, k3a,   k3b,   k3c}, \ -    {k47, k48, k49, k4a,   k4b,   k4c}, \ -    {tp1, tp2, tp3, KC_NO, KC_NO, KC_NO}  \ +) { \ +    { k00, k01, k02, k03, k04, k05 }, \ +    { k10, k11, k12, k13, k14, k15 }, \ +    { k20, k21, k22, k23, k24, k25 }, \ +    { k30, k31, k32, k33, k34, k35 }, \ +    { k40, k41, k42, k43, k44, k45 }, \ +    { k50, k51, k52, k53, k54, k55 }, \ +    { k60, k61, k62, k63, k64, k65 }, \ +    { k70, k71, k72, k73, k74, k75 }, \ +    { tp1, tp2, tp3, XXX, XXX, XXX } \  } - -#endif diff --git a/keyboards/handwired/qc60/qc60.h b/keyboards/handwired/qc60/qc60.h index 944ec10f5e..e26811ae72 100644 --- a/keyboards/handwired/qc60/qc60.h +++ b/keyboards/handwired/qc60/qc60.h @@ -1,10 +1,7 @@ -#ifndef QC60_H -#define QC60_H +#pragma once  #include "quantum.h" -#ifdef KEYBOARD_handwired_qc60_proto -    #include "proto.h" -#endif - +#if defined(KEYBOARD_handwired_qc60_proto) +#    include "proto.h"  #endif diff --git a/keyboards/handwired/reddot/config.h b/keyboards/handwired/reddot/config.h index 912cc6fc5f..31c27d446b 100755 --- a/keyboards/handwired/reddot/config.h +++ b/keyboards/handwired/reddot/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -149,5 +148,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/handwired/retro_refit/config.h b/keyboards/handwired/retro_refit/config.h index 9c36a19d5c..bf0550d65b 100644 --- a/keyboards/handwired/retro_refit/config.h +++ b/keyboards/handwired/retro_refit/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -112,5 +111,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/handwired/symmetric70_proto/post_rules.mk b/keyboards/handwired/symmetric70_proto/post_rules.mk new file mode 100644 index 0000000000..e2d35d60ab --- /dev/null +++ b/keyboards/handwired/symmetric70_proto/post_rules.mk @@ -0,0 +1,2 @@ +KEYBOARD_LOCAL_FEATURES_MK := $(dir $(lastword $(MAKEFILE_LIST)))local_features.mk +include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) diff --git a/keyboards/handwired/symmetric70_proto/promicro/fast/rules.mk b/keyboards/handwired/symmetric70_proto/promicro/fast/rules.mk index de489fcabd..fbc1c3bb38 100644 --- a/keyboards/handwired/symmetric70_proto/promicro/fast/rules.mk +++ b/keyboards/handwired/symmetric70_proto/promicro/fast/rules.mk @@ -1,6 +1,3 @@  CUSTOM_MATRIX = yes  SRC += matrix_common.c  SRC += matrix_fast/matrix.c - -KEYBOARD_LOCAL_FEATURES_MK := $(dir $(lastword $(MAKEFILE_LIST)))../../local_features.mk -include $(KEYBOARD_LOCAL_FEATURES_MK) diff --git a/keyboards/handwired/symmetric70_proto/promicro/normal/rules.mk b/keyboards/handwired/symmetric70_proto/promicro/normal/rules.mk index 0b2b707ef8..73192f4ff7 100644 --- a/keyboards/handwired/symmetric70_proto/promicro/normal/rules.mk +++ b/keyboards/handwired/symmetric70_proto/promicro/normal/rules.mk @@ -1,6 +1,3 @@  CUSTOM_MATRIX = yes  SRC += matrix_common.c  SRC += matrix_debug/matrix.c - -KEYBOARD_LOCAL_FEATURES_MK := $(dir $(lastword $(MAKEFILE_LIST)))../../local_features.mk -include $(KEYBOARD_LOCAL_FEATURES_MK) diff --git a/keyboards/handwired/symmetric70_proto/proton_c/fast/rules.mk b/keyboards/handwired/symmetric70_proto/proton_c/fast/rules.mk index de489fcabd..fbc1c3bb38 100644 --- a/keyboards/handwired/symmetric70_proto/proton_c/fast/rules.mk +++ b/keyboards/handwired/symmetric70_proto/proton_c/fast/rules.mk @@ -1,6 +1,3 @@  CUSTOM_MATRIX = yes  SRC += matrix_common.c  SRC += matrix_fast/matrix.c - -KEYBOARD_LOCAL_FEATURES_MK := $(dir $(lastword $(MAKEFILE_LIST)))../../local_features.mk -include $(KEYBOARD_LOCAL_FEATURES_MK) diff --git a/keyboards/handwired/symmetric70_proto/proton_c/normal/rules.mk b/keyboards/handwired/symmetric70_proto/proton_c/normal/rules.mk index 0b2b707ef8..73192f4ff7 100644 --- a/keyboards/handwired/symmetric70_proto/proton_c/normal/rules.mk +++ b/keyboards/handwired/symmetric70_proto/proton_c/normal/rules.mk @@ -1,6 +1,3 @@  CUSTOM_MATRIX = yes  SRC += matrix_common.c  SRC += matrix_debug/matrix.c - -KEYBOARD_LOCAL_FEATURES_MK := $(dir $(lastword $(MAKEFILE_LIST)))../../local_features.mk -include $(KEYBOARD_LOCAL_FEATURES_MK) diff --git a/keyboards/handwired/terminus_mini/config.h b/keyboards/handwired/terminus_mini/config.h index c31cf70594..26daed61af 100644 --- a/keyboards/handwired/terminus_mini/config.h +++ b/keyboards/handwired/terminus_mini/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -157,5 +156,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/handwired/terminus_mini/terminus_mini.h b/keyboards/handwired/terminus_mini/terminus_mini.h index 27fb450981..f498313cbb 100644 --- a/keyboards/handwired/terminus_mini/terminus_mini.h +++ b/keyboards/handwired/terminus_mini/terminus_mini.h @@ -13,28 +13,27 @@   * 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 TERMINUS_MINI_H -#define TERMINUS_MINI_H + +#pragma once  #include "quantum.h" +#define XXX KC_NO +  // This a shortcut to help you visually see your layout.  // The following is an example using the Terminus Mini layout  // The first section contains all of the arguments  // The second converts the arguments into a two-dimensional array  #define LAYOUT( \ -  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ -  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ -  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ -  k30, k31, k32, k33,    k35,      k37,   k38, k39, k3a, k3b  \ -) \ -{ \ -  { k00, k01, k02, k03, k04,   k05, k06,   k07, k08, k09, k0a, k0b }, \ -  { k10, k11, k12, k13, k14,   k15, k16,   k17, k18, k19, k1a, k1b }, \ -  { k20, k21, k22, k23, k24,   k25, k26,   k27, k28, k29, k2a, k2b }, \ -  { k30, k31, k32, k33, KC_NO, k35, KC_NO, k37, k38, k39, k3a, k3b }  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \ +    k30, k31, k32, k33,    k35,      k37,   k38, k39, k3A, k3B \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \ +    { k30, k31, k32, k33, XXX, k35, XXX, k37, k38, k39, k3A, k3B } \  }  #define KC_ KC_TRNS - -#endif
\ No newline at end of file diff --git a/keyboards/handwired/unicomp_mini_m/info.json b/keyboards/handwired/unicomp_mini_m/info.json index 4b5390779a..421fd9d5b0 100644 --- a/keyboards/handwired/unicomp_mini_m/info.json +++ b/keyboards/handwired/unicomp_mini_m/info.json @@ -1,461 +1,103 @@  {      "keyboard_name": "Unicomp Mini M", -    "url": "",      "maintainer": "stevendlander", -    "width": 15.5,      "height": 7.5, +    "url": "", +    "width": 15.5,      "layouts": {          "LAYOUT": {              "layout": [ -                { "label": "Esc", -                    "x": 0, -                    "y": 0 -                }, -                { -                    "label": "F1", -                    "x": 2, -                    "y": 0 -                }, -                { -                    "label": "F2", -                    "x": 3, -                    "y": 0 -                }, -                { -                    "label": "F3", -                    "x": 4, -                    "y": 0 -                }, -                { -                    "label": "F4", -                    "x": 5, -                    "y": 0 -                }, -                { -                    "label": "F5", -                    "x": 6.5, -                    "y": 0 -                }, -                { -                    "label": "F6", -                    "x": 7.5, -                    "y": 0 -                }, -                { -                    "label": "F7", -                    "x": 8.5, -                    "y": 0 -                }, -                { -                    "label": "F8", -                    "x": 9.5, -                    "y": 0 -                }, -                { -                    "label": "F9", -                    "x": 11, -                    "y": 0 -                }, -                { -                    "label": "F10", -                    "x": 12, -                    "y": 0 -                }, -                { -                    "label": "F11", -                    "x": 13, -                    "y": 0 -                }, -                { -                    "label": "F12", -                    "x": 14, -                    "y": 0 -                }, -                { -                    "label": "PrtSc", -                    "x": 15.25, -                    "y": 0 -                }, -                { -                    "label": "Scroll Lock", -                    "x": 16.25, -                    "y": 0 -                }, -                { -                    "label": "Pause", -                    "x": 17.25, -                    "y": 0 -                }, -                { -                    "label": "~", -                    "x": 0, -                    "y": 1.5 -                }, -                { -                    "label": "!", -                    "x": 1, -                    "y": 1.5 -                }, -                { -                    "label": "@", -                    "x": 2, -                    "y": 1.5 -                }, -                { -                    "label": "#", -                    "x": 3, -                    "y": 1.5 -                }, -                { -                    "label": "$", -                    "x": 4, -                    "y": 1.5 -                }, -                { -                    "label": "%", -                    "x": 5, -                    "y": 1.5 -                }, -                { -                    "label": "^", -                    "x": 6, -                    "y": 1.5 -                }, -                { -                    "label": "&", -                    "x": 7, -                    "y": 1.5 -                }, -                { -                    "label": "*", -                    "x": 8, -                    "y": 1.5 -                }, -                { -                    "label": "(", -                    "x": 9, -                    "y": 1.5 -                }, -                { -                    "label": ")", -                    "x": 10, -                    "y": 1.5 -                }, -                { -                    "label": "_", -                    "x": 11, -                    "y": 1.5 -                }, -                { -                    "label": "+", -                    "x": 12, -                    "y": 1.5 -                }, -                { -                    "label": "Backspace", -                    "x": 13, -                    "y": 1.5, -                    "w": 2 -                }, -                { -                    "label": "Insert", -                    "x": 15.25, -                    "y": 1.5 -                }, -                { -                    "label": "Home", -                    "x": 16.25, -                    "y": 1.5 -                }, -                { -                    "label": "PgUp", -                    "x": 17.25, -                    "y": 1.5 -                }, -                { -                    "label": "Tab", -                    "x": 0, -                    "y": 2.5, -                    "w": 1.5 -                }, -                { -                    "label": "Q", -                    "x": 1.5, -                    "y": 2.5 -                }, -                { -                    "label": "W", -                    "x": 2.5, -                    "y": 2.5 -                }, -                { -                    "label": "E", -                    "x": 3.5, -                    "y": 2.5 -                }, -                { -                    "label": "R", -                    "x": 4.5, -                    "y": 2.5 -                }, -                { -                    "label": "T", -                    "x": 5.5, -                    "y": 2.5 -                }, -                { -                    "label": "Y", -                    "x": 6.5, -                    "y": 2.5 -                }, -                { -                    "label": "U", -                    "x": 7.5, -                    "y": 2.5 -                }, -                { -                    "label": "I", -                    "x": 8.5, -                    "y": 2.5 -                }, -                { -                    "label": "O", -                    "x": 9.5, -                    "y": 2.5 -                }, -                { -                    "label": "P", -                    "x": 10.5, -                    "y": 2.5 -                }, -                { -                    "label": "{", -                    "x": 11.5, -                    "y": 2.5 -                }, -                { -                    "label": "}", -                    "x": 12.5, -                    "y": 2.5 -                }, -                { -                    "label": "|", -                    "x": 13.5, -                    "y": 2.5, -                    "w": 1.5 -                }, -                { -                    "label": "Delete", -                    "x": 15.25, -                    "y": 2.5 -                }, -                { -                    "label": "End", -                    "x": 16.25, -                    "y": 2.5 -                }, -                { -                    "label": "PgDn", -                    "x": 17.25, -                    "y": 2.5 -                }, -                { -                    "label": "Caps Lock", -                    "x": 0, -                    "y": 3.5, -                    "w": 1.75 -                }, -                { -                    "label": "A", -                    "x": 1.75, -                    "y": 3.5 -                }, -                { -                    "label": "S", -                    "x": 2.75, -                    "y": 3.5 -                }, -                { -                    "label": "D", -                    "x": 3.75, -                    "y": 3.5 -                }, -                { -                    "label": "F", -                    "x": 4.75, -                    "y": 3.5 -                }, -                { -                    "label": "G", -                    "x": 5.75, -                    "y": 3.5 -                }, -                { -                    "label": "H", -                    "x": 6.75, -                    "y": 3.5 -                }, -                { -                    "label": "J", -                    "x": 7.75, -                    "y": 3.5 -                }, -                { -                    "label": "K", -                    "x": 8.75, -                    "y": 3.5 -                }, -                { -                    "label": "L", -                    "x": 9.75, -                    "y": 3.5 -                }, -                { -                    "label": ":", -                    "x": 10.75, -                    "y": 3.5 -                }, -                { -                    "label": "\"", -                    "x": 11.75, -                    "y": 3.5 -                }, -                { -                    "label": "Enter", -                    "x": 12.75, -                    "y": 3.5, -                    "w": 2.25 -                }, -                { -                    "label": "Shift", -                    "x": 0, -                    "y": 4.5, -                    "w": 2.25 -                }, -                { -                    "label": "Z", -                    "x": 2.25, -                    "y": 4.5 -                }, -                { -                    "label": "X", -                    "x": 3.25, -                    "y": 4.5 -                }, -                { -                    "label": "C", -                    "x": 4.25, -                    "y": 4.5 -                }, -                { -                    "label": "V", -                    "x": 5.25, -                    "y": 4.5 -                }, -                { -                    "label": "B", -                    "x": 6.25, -                    "y": 4.5 -                }, -                { -                    "label": "N", -                    "x": 7.25, -                    "y": 4.5 -                }, -                { -                    "label": "M", -                    "x": 8.25, -                    "y": 4.5 -                }, -                { -                    "label": "<", -                    "x": 9.25, -                    "y": 4.5 -                }, -                { -                    "label": ">", -                    "x": 10.25, -                    "y": 4.5 -                }, -                { -                    "label": "?", -                    "x": 11.25, -                    "y": 4.5 -                }, -                { -                    "label": "Shift", -                    "x": 12.25, -                    "y": 4.5, -                    "w": 2.75 -                }, -                { -                    "label": "\u2191", -                    "x": 16.25, -                    "y": 4.5 -                }, -                { -                    "label": "Ctrl", -                    "x": 0, -                    "y": 5.5, -                    "w": 1.5 -                }, -                { -                    "label": "Meta", -                    "x": 1.5, -                    "y": 5.5, -                    "w": 1 -                }, -                { -                    "label": "Alt", -                    "x": 2.5, -                    "y": 5.5, -                    "w": 1.5 -                }, -                { -                    "label": "Space", -                    "x": 4, -                    "y": 5.5, -                    "w": 5.75 -                }, -                { -                    "label": "Alt", -                    "x": 9.75, -                    "y": 5.5, -                    "w": 1.25 -                }, -                { -                    "label": "Meta", -                    "x": 11, -                    "y": 5.5, -                    "w": 1.5 -                }, -                { -                    "label": "Menu", -                    "x": 12.5, -                    "y": 5.5, -                    "w": 1 -                }, -                { -                    "label": "Ctrl", -                    "x": 13.5, -                    "y": 5.5, -                    "w": 1.5 -                }, -                { -                    "label": "\u2190", -                    "x": 15.25, -                    "y": 5.5 -                }, -                { -                    "label": "\u2193", -                    "x": 16.25, -                    "y": 5.5 -                }, -                { -                    "label": "\u2192", -                    "x": 17.25, -                    "y": 5.5 -                } +                { "label": "Esc", "x": 0, "y": 0 }, +                { "label": "F1", "x": 2, "y": 0 }, +                { "label": "F2", "x": 3, "y": 0 }, +                { "label": "F3", "x": 4, "y": 0 }, +                { "label": "F4", "x": 5, "y": 0 }, +                { "label": "F5", "x": 6.5, "y": 0 }, +                { "label": "F6", "x": 7.5, "y": 0 }, +                { "label": "F7", "x": 8.5, "y": 0 }, +                { "label": "F8", "x": 9.5, "y": 0 }, +                { "label": "F9", "x": 11, "y": 0 }, +                { "label": "F10", "x": 12, "y": 0 }, +                { "label": "F11", "x": 13, "y": 0 }, +                { "label": "F12", "x": 14, "y": 0 }, +                { "label": "PrtSc", "x": 15.25, "y": 0 }, +                { "label": "Scroll Lock", "x": 16.25, "y": 0 }, +                { "label": "Pause", "x": 17.25, "y": 0 }, +                { "label": "~", "x": 0, "y": 1.5 }, +                { "label": "!", "x": 1, "y": 1.5 }, +                { "label": "@", "x": 2, "y": 1.5 }, +                { "label": "#", "x": 3, "y": 1.5 }, +                { "label": "$", "x": 4, "y": 1.5 }, +                { "label": "%", "x": 5, "y": 1.5 }, +                { "label": "^", "x": 6, "y": 1.5 }, +                { "label": "&", "x": 7, "y": 1.5 }, +                { "label": "*", "x": 8, "y": 1.5 }, +                { "label": "(", "x": 9, "y": 1.5 }, +                { "label": ")", "x": 10, "y": 1.5 }, +                { "label": "_", "x": 11, "y": 1.5 }, +                { "label": "+", "x": 12, "y": 1.5 }, +                { "label": "KC_NO", "w": 1, "x": 13, "y": 1.5 }, +                { "label": "Backspace", "w": 1, "x": 14, "y": 1.5 }, +                { "label": "Insert", "x": 15.25, "y": 1.5 }, +                { "label": "Home", "x": 16.25, "y": 1.5 }, +                { "label": "PgUp", "x": 17.25, "y": 1.5 }, +                { "label": "Tab", "w": 1.5, "x": 0, "y": 2.5 }, +                { "label": "Q", "x": 1.5, "y": 2.5 }, +                { "label": "W", "x": 2.5, "y": 2.5 }, +                { "label": "E", "x": 3.5, "y": 2.5 }, +                { "label": "R", "x": 4.5, "y": 2.5 }, +                { "label": "T", "x": 5.5, "y": 2.5 }, +                { "label": "Y", "x": 6.5, "y": 2.5 }, +                { "label": "U", "x": 7.5, "y": 2.5 }, +                { "label": "I", "x": 8.5, "y": 2.5 }, +                { "label": "O", "x": 9.5, "y": 2.5 }, +                { "label": "P", "x": 10.5, "y": 2.5 }, +                { "label": "{", "x": 11.5, "y": 2.5 }, +                { "label": "}", "x": 12.5, "y": 2.5 }, +                { "label": "|", "w": 1.5, "x": 13.5, "y": 2.5 }, +                { "label": "Delete", "x": 15.25, "y": 2.5 }, +                { "label": "End", "x": 16.25, "y": 2.5 }, +                { "label": "PgDn", "x": 17.25, "y": 2.5 }, +                { "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.5 }, +                { "label": "A", "x": 1.75, "y": 3.5 }, +                { "label": "S", "x": 2.75, "y": 3.5 }, +                { "label": "D", "x": 3.75, "y": 3.5 }, +                { "label": "F", "x": 4.75, "y": 3.5 }, +                { "label": "G", "x": 5.75, "y": 3.5 }, +                { "label": "H", "x": 6.75, "y": 3.5 }, +                { "label": "J", "x": 7.75, "y": 3.5 }, +                { "label": "K", "x": 8.75, "y": 3.5 }, +                { "label": "L", "x": 9.75, "y": 3.5 }, +                { "label": ":", "x": 10.75, "y": 3.5 }, +                { "label": "\"", "x": 11.75, "y": 3.5 }, +                { "label": "NUHS", "x": 12.75, "y": 3.5 }, +                { "label": "Enter", "w": 1.25, "x": 13.75, "y": 3.5 }, +                { "label": "Shift", "w": 1.25, "x": 0, "y": 4.5 }, +                { "label": "NUBS", "x": 1.25, "y": 4.5 }, +                { "label": "Z", "x": 2.25, "y": 4.5 }, +                { "label": "X", "x": 3.25, "y": 4.5 }, +                { "label": "C", "x": 4.25, "y": 4.5 }, +                { "label": "V", "x": 5.25, "y": 4.5 }, +                { "label": "B", "x": 6.25, "y": 4.5 }, +                { "label": "N", "x": 7.25, "y": 4.5 }, +                { "label": "M", "x": 8.25, "y": 4.5 }, +                { "label": "<", "x": 9.25, "y": 4.5 }, +                { "label": ">", "x": 10.25, "y": 4.5 }, +                { "label": "?", "x": 11.25, "y": 4.5 }, +                { "label": "KC_NO", "x": 12.25, "y": 4.5 }, +                { "label": "Shift", "w": 1.75, "x": 13.25, "y": 4.5 }, +                { "label": "\u2191", "x": 16.25, "y": 4.5 }, +                { "label": "Ctrl", "w": 1.5, "x": 0, "y": 5.5 }, +                { "label": "Meta", "w": 1, "x": 1.5, "y": 5.5 }, +                { "label": "Alt", "w": 1.5, "x": 2.5, "y": 5.5 }, +                { "label": "Space", "w": 5.75, "x": 4, "y": 5.5 }, +                { "label": "Alt", "w": 1.25, "x": 9.75, "y": 5.5 }, +                { "label": "Meta", "w": 1.5, "x": 11, "y": 5.5 }, +                { "label": "Menu", "w": 1, "x": 12.5, "y": 5.5 }, +                { "label": "Ctrl", "w": 1.5, "x": 13.5, "y": 5.5 }, +                { "label": "\u2190", "x": 15.25, "y": 5.5 }, +                { "label": "\u2193", "x": 16.25, "y": 5.5 }, +                { "label": "\u2192", "x": 17.25, "y": 5.5 }              ]          }      } diff --git a/keyboards/handwired/xealous/rev1/config.h b/keyboards/handwired/xealous/rev1/config.h index 946b0cb489..8bd5b464a4 100644 --- a/keyboards/handwired/xealous/rev1/config.h +++ b/keyboards/handwired/xealous/rev1/config.h @@ -16,8 +16,7 @@ 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 REV1_CONFIG_H -#define REV1_CONFIG_H +#pragma once  #include "config_common.h" @@ -81,4 +80,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION  #define IGNORE_MOD_TAP_INTERRUPT -#endif diff --git a/keyboards/handwired/xealous/rev1/rev1.h b/keyboards/handwired/xealous/rev1/rev1.h index 0d8913b2ea..88e5ef376e 100644 --- a/keyboards/handwired/xealous/rev1/rev1.h +++ b/keyboards/handwired/xealous/rev1/rev1.h @@ -1,30 +1,26 @@ -#ifndef REV1_H -#define REV1_H +#pragma once  #include "quantum.h"  #define XXX KC_NO  #define LAYOUT( \ -  L00, L01, L02, L03, L04, L05, L06,      R06, R05, R04, R03, R02, R01, R00, \ -  L10, L11, L12, L13, L14, L15,      R17, R16, R15, R14, R13, R12, R11, R10, \ -  L20, L21, L22, L23, L24, L25,           R26, R25, R24, R23, R22, R21, R20, \ -  L30, L31, L32, L33, L34, L35,                R35, R34, R33, R32, R31, R30, \ -  L40, L41, L42, L43, L44,                          R44, R43, R42, R41, R40 \ -	) \ -  { \ -  { XXX, L06, L05, L04, L03, L02, L01, L00 }, \ -  { XXX, XXX, L15, L14, L13, L12, L11, L10 }, \ -  { XXX, XXX, L25, L24, L23, L22, L21, L20 }, \ -  { XXX, XXX, L35, L34, L33, L32, L31, L30 }, \ -  { XXX, XXX, XXX, L44, L43, L42, L41, L40 }, \ -  { R00, R01, R02, R03, R04, R05, R06, XXX }, \ -  { R10, R11, R12, R13, R14, R15, R16, R17 }, \ -  { R20, R21, R22, R23, R24, R25, R26, XXX }, \ -  { R30, R31, R32, R33, R34, R35, XXX, XXX }, \ -  { R40, R41, R42, R43, R44, XXX, XXX, XXX } \ -	} +    L00, L01, L02, L03, L04, L05, L06,      R06, R05, R04, R03, R02, R01, R00, \ +    L10, L11, L12, L13, L14, L15,      R17, R16, R15, R14, R13, R12, R11, R10, \ +    L20, L21, L22, L23, L24, L25,           R26, R25, R24, R23, R22, R21, R20, \ +    L30, L31, L32, L33, L34, L35,                R35, R34, R33, R32, R31, R30, \ +    L40, L41, L42, L43, L44,                          R44, R43, R42, R41, R40 \ +) { \ +    { XXX, L06, L05, L04, L03, L02, L01, L00 }, \ +    { XXX, XXX, L15, L14, L13, L12, L11, L10 }, \ +    { XXX, XXX, L25, L24, L23, L22, L21, L20 }, \ +    { XXX, XXX, L35, L34, L33, L32, L31, L30 }, \ +    { XXX, XXX, XXX, L44, L43, L42, L41, L40 }, \ +    { R00, R01, R02, R03, R04, R05, R06, XXX }, \ +    { R10, R11, R12, R13, R14, R15, R16, R17 }, \ +    { R20, R21, R22, R23, R24, R25, R26, XXX }, \ +    { R30, R31, R32, R33, R34, R35, XXX, XXX }, \ +    { R40, R41, R42, R43, R44, XXX, XXX, XXX } \ +}  #define LAYOUT_split60 LAYOUT - -#endif diff --git a/keyboards/helix/local_drivers/i2c.h b/keyboards/helix/local_drivers/i2c.h index 47cf6bd1b2..710662c7ab 100644 --- a/keyboards/helix/local_drivers/i2c.h +++ b/keyboards/helix/local_drivers/i2c.h @@ -1,5 +1,4 @@ -#ifndef I2C_H -#define I2C_H +#pragma once  #include <stdint.h> @@ -45,5 +44,3 @@ extern unsigned char i2c_readNak(void);  extern unsigned char i2c_read(unsigned char ack);  #define i2c_read(ack)  (ack) ? i2c_readAck() : i2c_readNak(); - -#endif diff --git a/keyboards/helix/local_drivers/serial.h b/keyboards/helix/local_drivers/serial.h index 2e53928df2..b4dcdafe57 100644 --- a/keyboards/helix/local_drivers/serial.h +++ b/keyboards/helix/local_drivers/serial.h @@ -1,5 +1,4 @@ -#ifndef SOFT_SERIAL_H -#define SOFT_SERIAL_H +#pragma once  #include <stdbool.h> @@ -85,5 +84,3 @@ int  soft_serial_transaction(int sstd_index);  #ifdef SERIAL_USE_MULTI_TRANSACTION  int  soft_serial_get_and_clean_status(int sstd_index);  #endif - -#endif /* SOFT_SERIAL_H */ diff --git a/keyboards/helix/local_drivers/ssd1306.h b/keyboards/helix/local_drivers/ssd1306.h index bcb30f8859..a7527f4ebc 100644 --- a/keyboards/helix/local_drivers/ssd1306.h +++ b/keyboards/helix/local_drivers/ssd1306.h @@ -1,5 +1,4 @@ -#ifndef SSD1306_H -#define SSD1306_H +#pragma once  #include <stdbool.h>  #include <stdio.h> @@ -88,5 +87,3 @@ void matrix_write_P(struct CharacterMatrix *matrix, const char *data);  void matrix_render(struct CharacterMatrix *matrix);  bool process_record_gfx(uint16_t keycode, keyrecord_t *record); - -#endif diff --git a/keyboards/helix/pico/keymaps/biacco/rules.mk b/keyboards/helix/pico/keymaps/biacco/rules.mk index 37e49977c5..993ade2673 100644 --- a/keyboards/helix/pico/keymaps/biacco/rules.mk +++ b/keyboards/helix/pico/keymaps/biacco/rules.mk @@ -18,7 +18,3 @@ LTO_ENABLE = no  # if firmware size over limit, try this option  # LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)  LED_ANIMATIONS = no           # LED animations  # IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone) - -# convert Helix-specific options (that represent combinations of standard options) -#   into QMK standard options. -include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) diff --git a/keyboards/helix/pico/keymaps/default/rules.mk b/keyboards/helix/pico/keymaps/default/rules.mk index 8f198e3803..8977897f9b 100644 --- a/keyboards/helix/pico/keymaps/default/rules.mk +++ b/keyboards/helix/pico/keymaps/default/rules.mk @@ -18,7 +18,3 @@ LTO_ENABLE = no  # if firmware size over limit, try this option  # LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)  # LED_ANIMATIONS = yes        # LED animations  # IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone) - -# convert Helix-specific options (that represent combinations of standard options) -#   into QMK standard options. -include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) diff --git a/keyboards/helix/pico/keymaps/mtei/rules.mk b/keyboards/helix/pico/keymaps/mtei/rules.mk index 165233f5fe..05a60f67d5 100644 --- a/keyboards/helix/pico/keymaps/mtei/rules.mk +++ b/keyboards/helix/pico/keymaps/mtei/rules.mk @@ -18,7 +18,3 @@ LTO_ENABLE = no  # if firmware size over limit, try this option  # LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)  # LED_ANIMATIONS = yes        # LED animations  # IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone) - -# convert Helix-specific options (that represent combinations of standard options) -#   into QMK standard options. -include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) diff --git a/keyboards/helix/pico/local_features.mk b/keyboards/helix/pico/post_rules.mk index be5c739f97..38573d75a5 100644 --- a/keyboards/helix/pico/local_features.mk +++ b/keyboards/helix/pico/post_rules.mk @@ -1,12 +1,10 @@  # -#  local_features.mk contains post-processing rules for the Helix keyboard. +#  post_rules.mk contains post-processing rules for the Helix keyboard.  #  #   Post-processing rules convert keyboard-specific shortcuts (that represent  #   combinations of standard options) into QMK standard options.  # -KEYBOARD_LOCAL_FEATURES_MK := -  define HELIX_CUSTOMISE_MSG    $(info Helix Spacific Build Options)    $(info -  OLED_ENABLE          = $(OLED_ENABLE)) diff --git a/keyboards/helix/pico/rules.mk b/keyboards/helix/pico/rules.mk index cb9a70e00e..12caec37ef 100644 --- a/keyboards/helix/pico/rules.mk +++ b/keyboards/helix/pico/rules.mk @@ -1,5 +1,3 @@ -KEYBOARD_LOCAL_FEATURES_MK := $(dir $(lastword $(MAKEFILE_LIST)))local_features.mk -  # Helix Spacific Build Options default values  OLED_ENABLE = no            # OLED_ENABLE  LOCAL_GLCDFONT = no         # use each keymaps "helixfont.h" insted of "common/glcdfont.c" diff --git a/keyboards/helix/pico/split_util.h b/keyboards/helix/pico/split_util.h index c0ecdb0974..b839ce6e3e 100644 --- a/keyboards/helix/pico/split_util.h +++ b/keyboards/helix/pico/split_util.h @@ -1,5 +1,4 @@ -#ifndef SPLIT_KEYBOARD_UTIL_H -#define SPLIT_KEYBOARD_UTIL_H +#pragma once  #include <stdbool.h>  #include "eeconfig.h" @@ -15,5 +14,3 @@ void split_keyboard_setup(void);  bool is_helix_master(void);  void matrix_master_OLED_init (void); - -#endif diff --git a/keyboards/helix/rev1/split_util.h b/keyboards/helix/rev1/split_util.h index 595a0659e1..807412cd38 100644 --- a/keyboards/helix/rev1/split_util.h +++ b/keyboards/helix/rev1/split_util.h @@ -1,5 +1,4 @@ -#ifndef SPLIT_KEYBOARD_UTIL_H -#define SPLIT_KEYBOARD_UTIL_H +#pragma once  #include <stdbool.h>  #include "eeconfig.h" @@ -16,5 +15,3 @@ bool has_usb(void);  void keyboard_slave_loop(void);  void matrix_master_OLED_init (void); - -#endif diff --git a/keyboards/helix/rev2/keymaps/default/rules.mk b/keyboards/helix/rev2/keymaps/default/rules.mk index c16f3e2b87..58b43a6bda 100644 --- a/keyboards/helix/rev2/keymaps/default/rules.mk +++ b/keyboards/helix/rev2/keymaps/default/rules.mk @@ -29,7 +29,3 @@ OLED_SELECT = core  ifeq ($(strip $(OLED_ENABLE)), yes)      SRC += oled_display.c  endif - -# convert Helix-specific options (that represent combinations of standard options) -#   into QMK standard options. -include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) diff --git a/keyboards/helix/rev2/keymaps/five_rows/rules.mk b/keyboards/helix/rev2/keymaps/five_rows/rules.mk index e59ce73326..5f7e4668fc 100644 --- a/keyboards/helix/rev2/keymaps/five_rows/rules.mk +++ b/keyboards/helix/rev2/keymaps/five_rows/rules.mk @@ -95,7 +95,3 @@ endif  ifeq ($(strip $(OLED_ENABLE)), yes)      SRC += oled_display.c  endif - -# convert Helix-specific options (that represent combinations of standard options) -#   into QMK standard options. -include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) diff --git a/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk b/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk index d44382f86a..7c4a7b6045 100644 --- a/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk +++ b/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk @@ -17,7 +17,3 @@ HELIX_ROWS = 5              # Helix Rows is 4 or 5  # LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)  # LED_ANIMATIONS = yes        # LED animations  # IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone) - -# convert Helix-specific options (that represent combinations of standard options) -#   into QMK standard options. -include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) diff --git a/keyboards/helix/rev2/keymaps/fraanrosi/rules.mk b/keyboards/helix/rev2/keymaps/fraanrosi/rules.mk index 462a83f6e7..98585b0d60 100644 --- a/keyboards/helix/rev2/keymaps/fraanrosi/rules.mk +++ b/keyboards/helix/rev2/keymaps/fraanrosi/rules.mk @@ -22,7 +22,3 @@ LED_ANIMATIONS = yes        # LED animations  LED_BACK_ENABLE = no  LED_UNDERGLOW_ENABLE = yes - -# convert Helix-specific options (that represent combinations of standard options) -#   into QMK standard options. -include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) diff --git a/keyboards/helix/rev2/keymaps/froggy/rules.mk b/keyboards/helix/rev2/keymaps/froggy/rules.mk index 5a0fd9a2b1..2d01c43fe7 100644 --- a/keyboards/helix/rev2/keymaps/froggy/rules.mk +++ b/keyboards/helix/rev2/keymaps/froggy/rules.mk @@ -17,7 +17,3 @@ LED_BACK_ENABLE = yes       # LED backlight (Enable WS2812 RGB underlight.)  LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)  LED_ANIMATIONS = yes        # LED animations  # IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone) - -# convert Helix-specific options (that represent combinations of standard options) -#   into QMK standard options. -include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) diff --git a/keyboards/helix/rev2/keymaps/froggy_106/rules.mk b/keyboards/helix/rev2/keymaps/froggy_106/rules.mk index 5a0fd9a2b1..2d01c43fe7 100644 --- a/keyboards/helix/rev2/keymaps/froggy_106/rules.mk +++ b/keyboards/helix/rev2/keymaps/froggy_106/rules.mk @@ -17,7 +17,3 @@ LED_BACK_ENABLE = yes       # LED backlight (Enable WS2812 RGB underlight.)  LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)  LED_ANIMATIONS = yes        # LED animations  # IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone) - -# convert Helix-specific options (that represent combinations of standard options) -#   into QMK standard options. -include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) diff --git a/keyboards/helix/rev2/keymaps/led_test/rules.mk b/keyboards/helix/rev2/keymaps/led_test/rules.mk index 8b590eee86..3ab27acfc2 100644 --- a/keyboards/helix/rev2/keymaps/led_test/rules.mk +++ b/keyboards/helix/rev2/keymaps/led_test/rules.mk @@ -23,7 +23,3 @@ ifeq ($(strip $(OLED_ENABLE)), yes)      SRC += oled_display.c  endif  SRC += led_test_init.c - -# convert Helix-specific options (that represent combinations of standard options) -#   into QMK standard options. -include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) diff --git a/keyboards/helix/rev2/keymaps/yshrsmz/rules.mk b/keyboards/helix/rev2/keymaps/yshrsmz/rules.mk index 83dcc9b3b8..cd436cd9a3 100644 --- a/keyboards/helix/rev2/keymaps/yshrsmz/rules.mk +++ b/keyboards/helix/rev2/keymaps/yshrsmz/rules.mk @@ -17,7 +17,3 @@ OLED_ENABLE = yes            # OLED_ENABLE  # LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)  LED_ANIMATIONS = no        # LED animations  # IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone) - -# convert Helix-specific options (that represent combinations of standard options) -#   into QMK standard options. -include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) diff --git a/keyboards/helix/rev2/post_rules.mk b/keyboards/helix/rev2/post_rules.mk new file mode 100644 index 0000000000..4c671d4515 --- /dev/null +++ b/keyboards/helix/rev2/post_rules.mk @@ -0,0 +1,3 @@ +ifneq ($(strip $(KEYBOARD_LOCAL_FEATURES_MK)),) +  include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) +endif diff --git a/keyboards/helix/rev2/serial_config_simpleapi.h b/keyboards/helix/rev2/serial_config_simpleapi.h index e2d22a41e7..0e1dd9e4ac 100644 --- a/keyboards/helix/rev2/serial_config_simpleapi.h +++ b/keyboards/helix/rev2/serial_config_simpleapi.h @@ -1,8 +1,5 @@ -#ifndef SERIAL_CONFIG_SIMPLEAPI_H -#define SERIAL_CONFIG_SIMPLEAPI_H +#pragma once  #undef SERIAL_USE_MULTI_TRANSACTION  #define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2  #define SERIAL_MASTER_BUFFER_LENGTH MATRIX_ROWS/2 - -#endif // SERIAL_CONFIG_SIMPLEAPI_H diff --git a/keyboards/helix/rev2/split_scomm.h b/keyboards/helix/rev2/split_scomm.h index 873d8939d8..16887eb74f 100644 --- a/keyboards/helix/rev2/split_scomm.h +++ b/keyboards/helix/rev2/split_scomm.h @@ -1,5 +1,4 @@ -#ifndef SPLIT_COMM_H -#define SPLIT_COMM_H +#pragma once  #ifndef SERIAL_USE_MULTI_TRANSACTION  /* --- USE Simple API (OLD API, compatible with let's split serial.c) --- */ @@ -20,5 +19,3 @@ void serial_slave_init(void);  int serial_update_buffers(int master_changed);  #endif - -#endif /* SPLIT_COMM_H */ diff --git a/keyboards/helix/rev2/split_util.h b/keyboards/helix/rev2/split_util.h index c0ecdb0974..b839ce6e3e 100644 --- a/keyboards/helix/rev2/split_util.h +++ b/keyboards/helix/rev2/split_util.h @@ -1,5 +1,4 @@ -#ifndef SPLIT_KEYBOARD_UTIL_H -#define SPLIT_KEYBOARD_UTIL_H +#pragma once  #include <stdbool.h>  #include "eeconfig.h" @@ -15,5 +14,3 @@ void split_keyboard_setup(void);  bool is_helix_master(void);  void matrix_master_OLED_init (void); - -#endif diff --git a/keyboards/hhkb/ansi/post_rules.mk b/keyboards/hhkb/ansi/post_rules.mk new file mode 100644 index 0000000000..bc6ad5cd4c --- /dev/null +++ b/keyboards/hhkb/ansi/post_rules.mk @@ -0,0 +1,18 @@ +ifeq ($(strip $(HHKB_RN42_ENABLE)), yes) + +OPT_DEFS += -DHHKB_RN42_ENABLE + +# Support for the RN42 Bluetooth module. This is the BT module in Hasu's BT +# HHKB Alt controller. +RN42_DIR = ../rn42 + +SRC +=  serial_uart.c \ +	../rn42/suart.S \ +	../rn42/rn42.c \ +	../rn42/rn42_task.c \ +	../rn42/battery.c \ +	../rn42/main.c + +VPATH += $(RN42_DIR) + +endif diff --git a/keyboards/hhkb/ansi/rules.mk b/keyboards/hhkb/ansi/rules.mk index b0f17c93a0..56898e2602 100644 --- a/keyboards/hhkb/ansi/rules.mk +++ b/keyboards/hhkb/ansi/rules.mk @@ -33,26 +33,6 @@ MIDI_ENABLE = no              # MIDI support  # project specific files  SRC = matrix.c -ifeq ($(strip $(HHKB_RN42_ENABLE)), yes) - -OPT_DEFS += -DHHKB_RN42_ENABLE - -# Support for the RN42 Bluetooth module. This is the BT module in Hasu's BT -# HHKB Alt controller. -RN42_DIR = ../rn42 - -SRC +=  serial_uart.c \ -	../rn42/suart.S \ -	../rn42/rn42.c \ -	../rn42/rn42_task.c \ -	../rn42/battery.c \ -	../rn42/main.c - -VPATH += $(RN42_DIR) - -endif - -  # debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION  # debug-on: all diff --git a/keyboards/hhkb/jp/post_rules.mk b/keyboards/hhkb/jp/post_rules.mk new file mode 100644 index 0000000000..bc6ad5cd4c --- /dev/null +++ b/keyboards/hhkb/jp/post_rules.mk @@ -0,0 +1,18 @@ +ifeq ($(strip $(HHKB_RN42_ENABLE)), yes) + +OPT_DEFS += -DHHKB_RN42_ENABLE + +# Support for the RN42 Bluetooth module. This is the BT module in Hasu's BT +# HHKB Alt controller. +RN42_DIR = ../rn42 + +SRC +=  serial_uart.c \ +	../rn42/suart.S \ +	../rn42/rn42.c \ +	../rn42/rn42_task.c \ +	../rn42/battery.c \ +	../rn42/main.c + +VPATH += $(RN42_DIR) + +endif diff --git a/keyboards/hhkb/jp/rules.mk b/keyboards/hhkb/jp/rules.mk index 50e2c2c412..9b5b0b48b0 100644 --- a/keyboards/hhkb/jp/rules.mk +++ b/keyboards/hhkb/jp/rules.mk @@ -33,26 +33,6 @@ MIDI_ENABLE = no              # MIDI support  # project specific files  SRC = matrix.c -ifeq ($(strip $(HHKB_RN42_ENABLE)), yes) - -OPT_DEFS += -DHHKB_RN42_ENABLE - -# Support for the RN42 Bluetooth module. This is the BT module in Hasu's BT -# HHKB Alt controller. -RN42_DIR = ../rn42 - -SRC +=  serial_uart.c \ -	../rn42/suart.S \ -	../rn42/rn42.c \ -	../rn42/rn42_task.c \ -	../rn42/battery.c \ -	../rn42/main.c - -VPATH += $(RN42_DIR) - -endif - -  # debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION  # debug-on: all diff --git a/keyboards/hhkb/rn42/battery.h b/keyboards/hhkb/rn42/battery.h index 180d4dcfaa..c7f96d09a3 100644 --- a/keyboards/hhkb/rn42/battery.h +++ b/keyboards/hhkb/rn42/battery.h @@ -1,5 +1,4 @@ -#ifndef POWER_H -#define POWER_H +#pragma once  #include <stdint.h>  #include <stdbool.h> @@ -31,5 +30,3 @@ battery_status_t battery_status(void);  // ADC offset:16, resolution:5mV  #define BATTERY_ADC_OFFSET              16  #define BATTERY_ADC_RESOLUTION          5 - -#endif diff --git a/keyboards/hhkb/rn42/rn42.h b/keyboards/hhkb/rn42/rn42.h index dee214cc84..76bcef99bb 100644 --- a/keyboards/hhkb/rn42/rn42.h +++ b/keyboards/hhkb/rn42/rn42.h @@ -1,5 +1,4 @@ -#ifndef RN42_H -#define RN42_H +#pragma once  #include <stdbool.h>  #include "host_driver.h" @@ -26,5 +25,3 @@ void rn42_send_str(const char *str);  void rn42_print_response(void);  #define SEND_STR(str)       rn42_send_str(PSTR(str))  #define SEND_COMMAND(cmd)   rn42_send_command(PSTR(cmd)) - -#endif diff --git a/keyboards/hhkb/rn42/rn42_task.h b/keyboards/hhkb/rn42/rn42_task.h index ee00669ee5..05e80e9be2 100644 --- a/keyboards/hhkb/rn42/rn42_task.h +++ b/keyboards/hhkb/rn42/rn42_task.h @@ -1,5 +1,4 @@ -#ifndef RN42_TASK_H -#define RN42_TASK_H +#pragma once  #include <stdbool.h>  #include "rn42.h" @@ -10,5 +9,3 @@ bool rn42_nkro_last;  void rn42_task_init(void);  void rn42_task(void); - -#endif diff --git a/keyboards/hid_liber/config.h b/keyboards/hid_liber/config.h index 73ed005b7f..b82ac1de2a 100755 --- a/keyboards/hid_liber/config.h +++ b/keyboards/hid_liber/config.h @@ -15,8 +15,7 @@   * along with this program.  If not, see <http://www.gnu.org/licenses/>.   */ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -139,5 +138,3 @@  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/hs60/v1/v1.h b/keyboards/hs60/v1/v1.h index 4de781e5fa..4c81e90612 100644 --- a/keyboards/hs60/v1/v1.h +++ b/keyboards/hs60/v1/v1.h @@ -13,40 +13,39 @@   * 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 HS60_H -#define HS60_H -#define XXX KC_NO +#pragma once  #include "quantum.h" +#define XXX KC_NO +  // This a shortcut to help you visually see your layout.  #define LAYOUT_60_iso( \ -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ -    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \ -    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ -    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, \ -    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, \ +    k40, k41, k42,                k46,                k4A, k4B, k4C, k4D \  ) { \ -    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ -    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX }, \ -    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ -    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D }, \ -    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D }, \ +    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D } \  }  #define LAYOUT_60_ansi( \ -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ -    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, \ -    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \ -    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, \ -    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k2C, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, \ +    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, \ +    k40, k41, k42,                k46,                k4A, k4B, k4C, k4D \  ) { \ -    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ -    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX }, \ -    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ -    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D }, \ -    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \ +    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D }, \ +    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D } \  } -#endif
\ No newline at end of file diff --git a/keyboards/idobo/idobo.h b/keyboards/idobo/idobo.h index 386fcee1a9..9643a1efd3 100644 --- a/keyboards/idobo/idobo.h +++ b/keyboards/idobo/idobo.h @@ -13,8 +13,8 @@   * 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 IDOBO_H -#define IDOBO_H + +#pragma once  #include "quantum.h" @@ -27,18 +27,15 @@   * represents the switch matrix.   */  #define LAYOUT_ortho_5x15( \ -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ -    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ -    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ -    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ -    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E  \ -) \ -{ \ -    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ -    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ -    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ -    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ -    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ +    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E } \  } - -#endif diff --git a/keyboards/jc65/v32a/v32a.h b/keyboards/jc65/v32a/v32a.h index 4e24420913..91e6164ae2 100644 --- a/keyboards/jc65/v32a/v32a.h +++ b/keyboards/jc65/v32a/v32a.h @@ -15,25 +15,24 @@ 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 V32A_H -#define V32A_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  #define LAYOUT( \ -  K04,K14,K24,K34,K44,K54,K16,KB6,KB7,K17,KA4,KB4,KC4,KD4,KE4,KD0, \ -  K03,K13,K23,K33,K43,K53,K26,KC6,KC7,K27,KA3,KB3,KC3,    KD3,K67, \ -  K02,K12,K22,K32,K42,K52,K36,KD6,KD7,K37,KA2,KB2,KC2,    KD2,K87, \ -  K01,K30,K11,K21,K31,K41,K51,K46,KE6,KE7,K47,KA1,    KB1,K86,K77, \ -  K00,K10,K20,    K40,K56,K50,            K57,KB0,KC0,K96,K76,K66  \ -){ \ -  {   K00,  K10,  K20,  K30,  K40,  K50,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,  KB0,  KC0,  KD0,KC_NO }, \ -  {   K01,  K11,  K21,  K31,  K41,  K51,KC_NO,KC_NO,KC_NO,KC_NO,  KA1,  KB1,KC_NO,KC_NO,KC_NO }, \ -  {   K02,  K12,  K22,  K32,  K42,  K52,KC_NO,KC_NO,KC_NO,KC_NO,  KA2,  KB2,  KC2,  KD2,KC_NO }, \ -  {   K03,  K13,  K23,  K33,  K43,  K53,KC_NO,KC_NO,KC_NO,KC_NO,  KA3,  KB3,  KC3,  KD3,KC_NO }, \ -  {   K04,  K14,  K24,  K34,  K44,  K54,KC_NO,KC_NO,KC_NO,KC_NO,  KA4,  KB4,  KC4,  KD4,  KE4 }, \ -  { KC_NO,  K16,  K26,  K36,  K46,  K56,  K66,  K76,  K86,  K96,KC_NO,  KB6,  KC6,  KD6,  KE6 }, \ -  { KC_NO,  K17,  K27,  K37,  K47,  K57,  K67,  K77,  K87,KC_NO,KC_NO,  KB7,  KC7,  KD7,  KE7 }  \ +    k40, k41, k42, k43, k44, k45, k61, k6B, k7B, k71, k4A, k4B, k4C, k4D, k4E, k0D, \ +    k30, k31, k32, k33, k34, k35, k62, k6C, k7C, k72, k3A, k3B, k3C,      k3D, k76, \ +    k20, k21, k22, k23, k24, k25, k63, k6D, k7D, k73, k2A, k2B, k2C,      k2D, k78, \ +    k10, k03, k11, k12, k13, k14, k15, k64, k6E, k7E, k74, k1A,      k1B, k68, k77, \ +    k00, k01, k02,      k04, k65, k05,                k75, k0B, k0C, k69, k67, k66 \ +) { \ +    { k00, k01, k02, k03, k04, k05, XXX, XXX, XXX, XXX, XXX, k0B, k0C, k0D, XXX }, \ +    { k10, k11, k12, k13, k14, k15, XXX, XXX, XXX, XXX, k1A, k1B, XXX, XXX, XXX }, \ +    { k20, k21, k22, k23, k24, k25, XXX, XXX, XXX, XXX, k2A, k2B, k2C, k2D, XXX }, \ +    { k30, k31, k32, k33, k34, k35, XXX, XXX, XXX, XXX, k3A, k3B, k3C, k3D, XXX }, \ +    { k40, k41, k42, k43, k44, k45, XXX, XXX, XXX, XXX, k4A, k4B, k4C, k4D, k4E }, \ +    { XXX, k61, k62, k63, k64, k65, k66, k67, k68, k69, XXX, k6B, k6C, k6D, k6E }, \ +    { XXX, k71, k72, k73, k74, k75, k76, k77, k78, XXX, XXX, k7B, k7C, k7D, k7E } \  } - -#endif diff --git a/keyboards/jc65/v32u4/config.h b/keyboards/jc65/v32u4/config.h index 314bfbf259..108e4126be 100644 --- a/keyboards/jc65/v32u4/config.h +++ b/keyboards/jc65/v32u4/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -55,5 +54,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define DIODE_DIRECTION COL2ROW  #define DEBOUNCE 5 - -#endif diff --git a/keyboards/jc65/v32u4/v32u4.h b/keyboards/jc65/v32u4/v32u4.h index 866e6cc689..8bab085b11 100644 --- a/keyboards/jc65/v32u4/v32u4.h +++ b/keyboards/jc65/v32u4/v32u4.h @@ -1,21 +1,19 @@ -#ifndef V32U4_H -#define V32U4_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  #define LAYOUT( \ -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ -    K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \ -    K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \ -    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \ -    K40,  K41,  K43,    K44,      K46,      K48,      K4A, K4B, K4C, K4D, K4E, K4F \ -)\ -{\ -  {K00, K01,   K02,   K03, K04, K05,   K06, K07,   K08, K09,   K0A, K0B, K0C,   K0D, K0E,   K0F}, \ -  {K10, KC_NO, K12,   K13, K14, K15,   K16, K17,   K18, K19,   K1A, K1B, K1C,   K1D, K1E,   K1F}, \ -  {K20, KC_NO, K22,   K23, K24, K25,   K26, K27,   K28, K29,   K2A, K2B, K2C,   K2D, KC_NO, K2F}, \ -  {K30, K31,   K32,   K33, K34, K35,   K36, K37,   K38, K39,   K3A, K3B, KC_NO, K3D, K3E,   K3F}, \ -  {K40, K41,   KC_NO, K43, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, K4B, K4C,   K4D, K4E,   K4F}, \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ +    k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ +    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \ +    k40,  k41,  k43,    k44,      k46,      k48,      k4A, k4B, k4C, k4D, k4E, k4F \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \ +    { k40, k41, XXX, k43, k44, XXX, k46, XXX, k48, XXX, k4A, k4B, k4C, k4D, k4E, k4F } \  } - -#endif diff --git a/keyboards/jd40/config.h b/keyboards/jd40/config.h index 027aacfd58..dd6984f108 100644 --- a/keyboards/jd40/config.h +++ b/keyboards/jd40/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -68,5 +67,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.  #define RGBLIGHT_HUE_STEP 8  #define RGBLIGHT_SAT_STEP 8  #define RGBLIGHT_VAL_STEP 8 - -#endif diff --git a/keyboards/jd40/jd40.h b/keyboards/jd40/jd40.h index 4426fd7629..41ec860e8f 100644 --- a/keyboards/jd40/jd40.h +++ b/keyboards/jd40/jd40.h @@ -1,43 +1,18 @@ -#ifndef JD40_H -#define JD40_H +#pragma once  #include "quantum.h"  #include "led.h" -/* GH60 LEDs - *   GPIO pads - *   0 F7 WASD LEDs - *   1 F6 ESC LED - *   2 F5 FN LED - *   3 F4 POKER Arrow LEDs - *   B2 Capslock LED - *   B0 not connected - */ - - /* -inline void gh60_caps_led_on(void)      { DDRB |=  (1<<2); PORTB &= ~(1<<2); } -inline void gh60_poker_leds_on(void)    { DDRF |=  (1<<4); PORTF &= ~(1<<4); } -inline void gh60_fn_led_on(void)    	{ DDRF |=  (1<<5); PORTF &= ~(1<<5); } -inline void gh60_esc_led_on(void)    	{ DDRF |=  (1<<6); PORTF &= ~(1<<6); } -inline void gh60_wasd_leds_on(void)    	{ DDRF |=  (1<<7); PORTF &= ~(1<<7); } - -inline void gh60_caps_led_off(void)     { DDRB &= ~(1<<2); PORTB &= ~(1<<2); } -inline void gh60_poker_leds_off(void)   { DDRF &= ~(1<<4); PORTF &= ~(1<<4); } -inline void gh60_fn_led_off(void)   	{ DDRF &= ~(1<<5); PORTF &= ~(1<<5); } -inline void gh60_esc_led_off(void)   	{ DDRF &= ~(1<<6); PORTF &= ~(1<<6); } -inline void gh60_wasd_leds_off(void)   	{ DDRF &= ~(1<<7); PORTF &= ~(1<<7); } -*/ +#define XXX KC_NO  #define LAYOUT( \ -    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, K40, K41, K42, K43, K44 \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, \ +    k30, k31, k32, k33, k34,      k36, k37, k38, k39, k3A \  ) { \ -    { K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12 }, \ -    { K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, KC_NO    }, \ -    { K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, KC_NO    }, \ -    { K35, K36, K37, K38, K39, KC_NO,    K40, K41, K42, K43, K44, KC_NO    }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, XXX }, \ +    { k30, k31, k32, k33, k34, XXX, k36, k37, k38, k39, k3A, XXX } \  } - -#endif diff --git a/keyboards/jd45/config.h b/keyboards/jd45/config.h index 4cc46c646c..be2f0963ac 100644 --- a/keyboards/jd45/config.h +++ b/keyboards/jd45/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -72,5 +71,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/jd45/jd45.h b/keyboards/jd45/jd45.h index a0603d4e43..ab560e742c 100644 --- a/keyboards/jd45/jd45.h +++ b/keyboards/jd45/jd45.h @@ -1,20 +1,19 @@ -#ifndef JD45_H -#define JD45_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  /* JD45 keymap definition macro   */  #define LAYOUT( \ -    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \ -    k10,  k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,     k1b, \ -    k20,    k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a,   k2b, \ -    k30, k31, k32, k33,      k34,     k36,       k38, k39, k3a, k3b  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, \ +    k10,  k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A,     k1B, \ +    k20,    k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A,   k2B, \ +    k30, k31, k32, k33,      k34,     k36,       k38, k39, k3A, k3B \  ) { \ -    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k0a,   k0b,   k0c   }, \ -    { k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a,   k1b,   KC_NO }, \ -    { k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a,   k2b,   KC_NO }, \ -    { k30,   k31,   k32,   k33,   k34,   KC_NO, k36,   KC_NO, k38,   k39,   k3a,   k3b,   KC_NO }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX }, \ +    { k30, k31, k32, k33, k34, XXX, k36, XXX, k38, k39, k3A, k3B, XXX } \  } - -#endif diff --git a/keyboards/keebio/chocopad/config.h b/keyboards/keebio/chocopad/config.h index 08e62f034f..e07bd5da5b 100644 --- a/keyboards/keebio/chocopad/config.h +++ b/keyboards/keebio/chocopad/config.h @@ -1,5 +1,4 @@ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -42,5 +41,3 @@  #endif  #define RGB_DI_PIN D3  #define RGBLED_NUM 4 - -#endif diff --git a/keyboards/keebio/dilly/config.h b/keyboards/keebio/dilly/config.h index 835498f25e..9d7b08509d 100644 --- a/keyboards/keebio/dilly/config.h +++ b/keyboards/keebio/dilly/config.h @@ -1,5 +1,4 @@ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -46,5 +45,3 @@  #define RGB_DI_PIN D3  #define RGBLED_NUM 10 - -#endif diff --git a/keyboards/keebio/dilly/dilly.h b/keyboards/keebio/dilly/dilly.h index 229c6cd954..e0f13bae5e 100644 --- a/keyboards/keebio/dilly/dilly.h +++ b/keyboards/keebio/dilly/dilly.h @@ -1,19 +1,16 @@ -#ifndef DILLY_H -#define DILLY_H +#pragma once  #include "quantum.h"  #define LAYOUT_ortho_3x10( \ -    A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, \ -    B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, \ -    C1, C2, C3, C4, C5, C6, C7, C8, C9, C10 \ +    k00, k01, k02, k03, k04, k34, k33, k32, k31, k30, \ +    k10, k11, k12, k13, k14, k44, k43, k42, k41, k40, \ +    k20, k21, k22, k23, k24, k54, k53, k52, k51, k50 \  ) { \ -    { A1, A2, A3, A4, A5 }, \ -    { B1, B2, B3, B4, B5 }, \ -    { C1, C2, C3, C4, C5 }, \ -    { A10, A9, A8, A7, A6 }, \ -    { B10, B9, B8, B7, B6 }, \ -    { C10, C9, C8, C7, C6 } \ +    { k00, k01, k02, k03, k04 }, \ +    { k10, k11, k12, k13, k14 }, \ +    { k20, k21, k22, k23, k24 }, \ +    { k30, k31, k32, k33, k34 }, \ +    { k40, k41, k42, k43, k44 }, \ +    { k50, k51, k52, k53, k54 } \  } - -#endif diff --git a/keyboards/keebio/iris/config.h b/keyboards/keebio/iris/config.h index 863722d7d0..6868dc1354 100644 --- a/keyboards/keebio/iris/config.h +++ b/keyboards/keebio/iris/config.h @@ -15,9 +15,6 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" - -#endif  // CONFIG_H diff --git a/keyboards/keebio/levinson/config.h b/keyboards/keebio/levinson/config.h index ca0c79e554..4a3def7cc8 100644 --- a/keyboards/keebio/levinson/config.h +++ b/keyboards/keebio/levinson/config.h @@ -17,9 +17,6 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" - -#endif diff --git a/keyboards/kinesis/alvicstep/alvicstep.h b/keyboards/kinesis/alvicstep/alvicstep.h index 169012faf5..053698770a 100644 --- a/keyboards/kinesis/alvicstep/alvicstep.h +++ b/keyboards/kinesis/alvicstep/alvicstep.h @@ -1,80 +1,77 @@ -#ifndef KINESIS_ALVICSTEP_H -#define KINESIS_ALVICSTEP_H +#pragma once  #include "../kinesis.h"  #define ___ KC_NO -#define LAYOUT(                                    \ -    k02, k22, k12, k01, k21, k11, k00, k20, k10,   \ -    k80, k70, k60, k50, k40, k30,                  \ -    k81, k71, k61, k51, k41, k31,                  \ -    k82, k72, k62, k52, k42, k32,                  \ -    k83, k73, k63, k53, k43, k33,                  \ -         k74, k64, k54, k34,                       \ -                             k36, k35,             \ -                                  k55,             \ -                        k56, k46, k75,             \ -                                                   \ -    k03, k23, k13, k04, k24, k14, k05, k85, k84,   \ -                   k94, kA4, kB4, kD4, kE4, kF4,   \ -                   k95, kA5, kB5, kD5, kE5, kF5,   \ -                   k96, kA6, kB6, kD6, kE6, kF6,   \ -                   k97, kA7, kB7, kD7, kE7, kF7,   \ -                        k93, kB3, kD3, kE3,        \ -              k47, k66,                            \ -              k67,                                 \ -              k87, k76, k86                        \ -) {                                                \ -    { k00,  k01,  k02,  k03,  k04,  k05,  ___,  ___ }, \ -    { k10,  k11,  k12,  k13,  k14,  ___,  ___,  ___ }, \ -    { k20,  k21,  k22,  k23,  k24,  ___,  ___,  ___ }, \ -    { k30,  k31,  k32,  k33,  k34,  k35,  k36,  ___ }, \ -    { k40,  k41,  k42,  k43,  ___,  ___,  k46,  k47 }, \ -    { k50,  k51,  k52,  k53,  k54,  k55,  k56,  ___ }, \ -    { k60,  k61,  k62,  k63,  k64,  ___,  k66,  k67 }, \ -    { k70,  k71,  k72,  k73,  k74,  k75,  k76,  ___ }, \ -    { k80,  k81,  k82,  k83,  k84,  k85,  k86,  k87 }, \ -    { ___,  ___,  ___,  k93,  k94,  k95,  k96,  k97 }, \ -    { ___,  ___,  ___,  ___,  kA4,  kA5,  kA6,  kA7 }, \ -    { ___,  ___,  ___,  kB3,  kB4,  kB5,  kB6,  kB7 }, \ -    { ___,  ___,  ___,  ___,  ___,  ___,  ___,  ___ }, \ -    { ___,  ___,  ___,  kD3,  kD4,  kD5,  kD6,  kD7 }, \ -    { ___,  ___,  ___,  kE3,  kE4,  kE5,  kE6,  kE7 }, \ -    { ___,  ___,  ___,  ___,  kF4,  kF5,  kF6,  kF7 }  \ +#define LAYOUT( \ +    k02, k22, k12, k01, k21, k11, k00, k20, k10, \ +    k80, k70, k60, k50, k40, k30, \ +    k81, k71, k61, k51, k41, k31, \ +    k82, k72, k62, k52, k42, k32, \ +    k83, k73, k63, k53, k43, k33, \ +         k74, k64, k54, k34, \ +                             k36, k35, \ +                                  k55, \ +                        k56, k46, k75, \ +\ +    k03, k23, k13, k04, k24, k14, k05, k85, k84, \ +                   k94, kA4, kB4, kD4, kE4, kF4, \ +                   k95, kA5, kB5, kD5, kE5, kF5, \ +                   k96, kA6, kB6, kD6, kE6, kF6, \ +                   k97, kA7, kB7, kD7, kE7, kF7, \ +                        k93, kB3, kD3, kE3, \ +              k47, k66, \ +              k67, \ +              k87, k76, k86 \ +) { \ +    { k00, k01, k02, k03, k04, k05, ___, ___ }, \ +    { k10, k11, k12, k13, k14, ___, ___, ___ }, \ +    { k20, k21, k22, k23, k24, ___, ___, ___ }, \ +    { k30, k31, k32, k33, k34, k35, k36, ___ }, \ +    { k40, k41, k42, k43, ___, ___, k46, k47 }, \ +    { k50, k51, k52, k53, k54, k55, k56, ___ }, \ +    { k60, k61, k62, k63, k64, ___, k66, k67 }, \ +    { k70, k71, k72, k73, k74, k75, k76, ___ }, \ +    { k80, k81, k82, k83, k84, k85, k86, k87 }, \ +    { ___, ___, ___, k93, k94, k95, k96, k97 }, \ +    { ___, ___, ___, ___, kA4, kA5, kA6, kA7 }, \ +    { ___, ___, ___, kB3, kB4, kB5, kB6, kB7 }, \ +    { ___, ___, ___, ___, ___, ___, ___, ___ }, \ +    { ___, ___, ___, kD3, kD4, kD5, kD6, kD7 }, \ +    { ___, ___, ___, kE3, kE4, kE5, kE6, kE7 }, \ +    { ___, ___, ___, ___, kF4, kF5, kF6, kF7 } \  } -/*  ---------------- LEFT HAND -----------------   ---------------- RIGHT HAND ---------------- */ -#define LAYOUT_pretty(                                                                           \ -    k02, k22, k12, k01, k21, k11, k00, k20, k10,   k03, k23, k13, k04, k24, k14, k05, k85, k84,  \ -    k80, k70, k60, k50, k40, k30,                                 k94, kA4, kB4, kD4, kE4, kF4,  \ -    k81, k71, k61, k51, k41, k31,                                 k95, kA5, kB5, kD5, kE5, kF5,  \ -    k82, k72, k62, k52, k42, k32,                                 k96, kA6, kB6, kD6, kE6, kF6,  \ -    k83, k73, k63, k53, k43, k33,                                 k97, kA7, kB7, kD7, kE7, kF7,  \ -         k74, k64, k54, k34,                                           k93, kB3, kD3, kE3,       \ -                             k36, k35,                       k47, k66,                           \ -                                  k55,                       k67,                                \ -                        k56, k46, k75,                       k87, k76, k86                       \ -) {                                                    \ -    { k00,  k01,  k02,  k03,  k04,  k05,  ___,  ___ }, \ -    { k10,  k11,  k12,  k13,  k14,  ___,  ___,  ___ }, \ -    { k20,  k21,  k22,  k23,  k24,  ___,  ___,  ___ }, \ -    { k30,  k31,  k32,  k33,  k34,  k35,  k36,  ___ }, \ -    { k40,  k41,  k42,  k43,  ___,  ___,  k46,  k47 }, \ -    { k50,  k51,  k52,  k53,  k54,  k55,  k56,  ___ }, \ -    { k60,  k61,  k62,  k63,  k64,  ___,  k66,  k67 }, \ -    { k70,  k71,  k72,  k73,  k74,  k75,  k76,  ___ }, \ -    { k80,  k81,  k82,  k83,  k84,  k85,  k86,  k87 }, \ -    { ___,  ___,  ___,  k93,  k94,  k95,  k96,  k97 }, \ -    { ___,  ___,  ___,  ___,  kA4,  kA5,  kA6,  kA7 }, \ -    { ___,  ___,  ___,  kB3,  kB4,  kB5,  kB6,  kB7 }, \ -    { ___,  ___,  ___,  ___,  ___,  ___,  ___,  ___ }, \ -    { ___,  ___,  ___,  kD3,  kD4,  kD5,  kD6,  kD7 }, \ -    { ___,  ___,  ___,  kE3,  kE4,  kE5,  kE6,  kE7 }, \ -    { ___,  ___,  ___,  ___,  kF4,  kF5,  kF6,  kF7 }  \ +#define LAYOUT_pretty( \ +    k02, k22, k12, k01, k21, k11, k00, k20, k10,   k03, k23, k13, k04, k24, k14, k05, k85, k84, \ +    k80, k70, k60, k50, k40, k30,                                 k94, kA4, kB4, kD4, kE4, kF4, \ +    k81, k71, k61, k51, k41, k31,                                 k95, kA5, kB5, kD5, kE5, kF5, \ +    k82, k72, k62, k52, k42, k32,                                 k96, kA6, kB6, kD6, kE6, kF6, \ +    k83, k73, k63, k53, k43, k33,                                 k97, kA7, kB7, kD7, kE7, kF7, \ +         k74, k64, k54, k34,                                           k93, kB3, kD3, kE3, \ +                             k36, k35,                       k47, k66, \ +                                  k55,                       k67, \ +                        k56, k46, k75,                       k87, k76, k86 \ +) { \ +    { k00, k01, k02, k03, k04, k05, ___, ___ }, \ +    { k10, k11, k12, k13, k14, ___, ___, ___ }, \ +    { k20, k21, k22, k23, k24, ___, ___, ___ }, \ +    { k30, k31, k32, k33, k34, k35, k36, ___ }, \ +    { k40, k41, k42, k43, ___, ___, k46, k47 }, \ +    { k50, k51, k52, k53, k54, k55, k56, ___ }, \ +    { k60, k61, k62, k63, k64, ___, k66, k67 }, \ +    { k70, k71, k72, k73, k74, k75, k76, ___ }, \ +    { k80, k81, k82, k83, k84, k85, k86, k87 }, \ +    { ___, ___, ___, k93, k94, k95, k96, k97 }, \ +    { ___, ___, ___, ___, kA4, kA5, kA6, kA7 }, \ +    { ___, ___, ___, kB3, kB4, kB5, kB6, kB7 }, \ +    { ___, ___, ___, ___, ___, ___, ___, ___ }, \ +    { ___, ___, ___, kD3, kD4, kD5, kD6, kD7 }, \ +    { ___, ___, ___, kE3, kE4, kE5, kE6, kE7 }, \ +    { ___, ___, ___, ___, kF4, kF5, kF6, kF7 } \  } -  /*    Row pin configuration @@ -97,5 +94,3 @@    PB6   col6  |        |        |        | LCtrl  | Delete | Bksp   | RCtrl  | Enter  | Space  | H      | J      | K      |        | L      | ;:     | '"    PB7   col7  |        |        |        |        | RGUI   |        | PageUp |        | PageDn | N      | M      | ,<     |        | .>     | /?     | RShift  */ - -#endif diff --git a/keyboards/kinesis/alvicstep/config.h b/keyboards/kinesis/alvicstep/config.h index 02c7725cec..8a656264ee 100644 --- a/keyboards/kinesis/alvicstep/config.h +++ b/keyboards/kinesis/alvicstep/config.h @@ -1,5 +1,4 @@ -#ifndef ALVICSTEP_CONFIG_H -#define ALVICSTEP_CONFIG_H +#pragma once  #include "../config.h"  #include "config_common.h" @@ -31,6 +30,3 @@  /* COL2ROW or ROW2COL */  #define DIODE_DIRECTION COL2ROW -  - -#endif diff --git a/keyboards/kinesis/config.h b/keyboards/kinesis/config.h index c5a89d4533..c02d337f1b 100644 --- a/keyboards/kinesis/config.h +++ b/keyboards/kinesis/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  /* USB Device descriptor parameter */  #define VENDOR_ID       0xFEED @@ -126,5 +125,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/kinesis/kinesis.h b/keyboards/kinesis/kinesis.h index 1635c34436..54cf6b81a7 100644 --- a/keyboards/kinesis/kinesis.h +++ b/keyboards/kinesis/kinesis.h @@ -1,35 +1,24 @@ -#ifndef KINESIS_H -#define KINESIS_H +#pragma once -#ifdef KEYBOARD_kinesis_alvicstep -	#include "alvicstep.h" -#endif -#ifdef KEYBOARD_kinesis_stapelberg -	#include "stapelberg.h" -#endif -#ifdef KEYBOARD_kinesis_kint2pp -	#include "kint2pp.h" -#endif -#ifdef KEYBOARD_kinesis_nguyenvietyen -	#include "nguyenvietyen.h" -#endif -#ifdef KEYBOARD_kinesis_kint36 -	#include "kint36.h" -#endif -#ifdef KEYBOARD_kinesis_kint41 -	#include "kint41.h" +#if defined(KEYBOARD_kinesis_alvicstep) +#    include "alvicstep.h" +#elif defined(KEYBOARD_kinesis_stapelberg) +#    include "stapelberg.h" +#elif defined(KEYBOARD_kinesis_kint2pp) +#    include "kint2pp.h" +#elif defined(KEYBOARD_kinesis_nguyenvietyen) +#    include "nguyenvietyen.h" +#elif defined(KEYBOARD_kinesis_kint36) +#    include "kint36.h" +#elif defined(KEYBOARD_kinesis_kint41) +#    include "kint41.h"  #endif  #include "quantum.h" -  void all_led_off(void);  void all_led_on(void);  void num_lock_led_on(void);  void caps_lock_led_on(void);  void scroll_lock_led_on(void);  void keypad_led_on(void); - - - -#endif diff --git a/keyboards/kinesis/stapelberg/config.h b/keyboards/kinesis/stapelberg/config.h index 8f920c19c1..fe44131adb 100644 --- a/keyboards/kinesis/stapelberg/config.h +++ b/keyboards/kinesis/stapelberg/config.h @@ -1,5 +1,4 @@ -#ifndef STAPELBERG_CONFIG_H -#define STAPELBERG_CONFIG_H +#pragma once  #include "../config.h"  #include "config_common.h" @@ -46,5 +45,3 @@  */  #define IGNORE_MOD_TAP_INTERRUPT - -#endif diff --git a/keyboards/kinesis/stapelberg/stapelberg.h b/keyboards/kinesis/stapelberg/stapelberg.h index e35e2f5db8..f478c493fd 100644 --- a/keyboards/kinesis/stapelberg/stapelberg.h +++ b/keyboards/kinesis/stapelberg/stapelberg.h @@ -1,5 +1,4 @@ -#ifndef KINESIS_STAPELBERG_H -#define KINESIS_STAPELBERG_H +#pragma once  #include "quantum.h" @@ -9,71 +8,70 @@  // The first section contains all of the arguments as on the physical keyboard  // The second converts the arguments into the 2-D scanned array -#define LAYOUT(                                   \ -    kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2,  \ -    k00, k10, k20, k30, k40, k50,                 \ -    k01, k11, k21, k31, k41, k51,                 \ -    k02, k12, k22, k32, k42, k52,                 \ -    k03, k13, k23, k33, k43, k53,                 \ -         k14, k24, k34, k54,                      \ -                             k56, k55,            \ -                                  k35,            \ -                        k36, k46, k25,            \ -                                                  \ -    kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5,  \ -                   k60, k70, k80, k90, kA0, kB0,  \ -                   k61, k71, k81, k91, kA1, kB1,  \ -                   k62, k72, k82, k92, kA2, kB2,  \ -                   k63, k73, k83, k93, kA3, kB3,  \ -                        k64, k84, k94, kA4,       \ -              k96, k85,                           \ -              k86,                                \ -              k66, k75, k65                       \ -) {                                              \ -    { k00,  k01,  k02,  k03,  ___,  ___,  ___ }, \ -    { k10,  k11,  k12,  k13,  k14,  ___,  ___ }, \ -    { k20,  k21,  k22,  k23,  k24,  k25,  ___ }, \ -    { k30,  k31,  k32,  k33,  k34,  k35,  k36 }, \ -    { k40,  k41,  k42,  k43,  ___,  ___,  k46 }, \ -    { k50,  k51,  k52,  k53,  k54,  k55,  k56 }, \ -    { k60,  k61,  k62,  k63,  k64,  k65,  k66 }, \ -    { k70,  k71,  k72,  k73,  ___,  k75,  ___ }, \ -    { k80,  k81,  k82,  k83,  k84,  k85,  k86 }, \ -    { k90,  k91,  k92,  k93,  k94,  ___,  k96 }, \ -    { kA0,  kA1,  kA2,  kA3,  kA4,  ___,  ___ }, \ -    { kB0,  kB1,  kB2,  kB3,  ___,  ___,  ___ }, \ -    { kC0,  kC1,  kC2,  kC3,  kC4,  kC5,  ___ }, \ -    { kD0,  kD1,  kD2,  kD3,  kD4,  kD5,  ___ }, \ -    { kE0,  kE1,  kE2,  kE3,  kE4,  kE5,  ___ } \ +#define LAYOUT( \ +    kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2, \ +    k00, k10, k20, k30, k40, k50, \ +    k01, k11, k21, k31, k41, k51, \ +    k02, k12, k22, k32, k42, k52, \ +    k03, k13, k23, k33, k43, k53, \ +         k14, k24, k34, k54, \ +                             k56, k55, \ +                                  k35, \ +                        k36, k46, k25, \ +\ +    kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5, \ +                   k60, k70, k80, k90, kA0, kB0, \ +                   k61, k71, k81, k91, kA1, kB1, \ +                   k62, k72, k82, k92, kA2, kB2, \ +                   k63, k73, k83, k93, kA3, kB3, \ +                        k64, k84, k94, kA4, \ +              k96, k85, \ +              k86, \ +              k66, k75, k65 \ +) { \ +    { k00, k01, k02, k03, ___, ___, ___ }, \ +    { k10, k11, k12, k13, k14, ___, ___ }, \ +    { k20, k21, k22, k23, k24, k25, ___ }, \ +    { k30, k31, k32, k33, k34, k35, k36 }, \ +    { k40, k41, k42, k43, ___, ___, k46 }, \ +    { k50, k51, k52, k53, k54, k55, k56 }, \ +    { k60, k61, k62, k63, k64, k65, k66 }, \ +    { k70, k71, k72, k73, ___, k75, ___ }, \ +    { k80, k81, k82, k83, k84, k85, k86 }, \ +    { k90, k91, k92, k93, k94, ___, k96 }, \ +    { kA0, kA1, kA2, kA3, kA4, ___, ___ }, \ +    { kB0, kB1, kB2, kB3, ___, ___, ___ }, \ +    { kC0, kC1, kC2, kC3, kC4, kC5, ___ }, \ +    { kD0, kD1, kD2, kD3, kD4, kD5, ___ }, \ +    { kE0, kE1, kE2, kE3, kE4, kE5, ___ } \  } -/*  ---------------- LEFT HAND -----------------   ---------------- RIGHT HAND ---------------- */ -#define LAYOUT_pretty(                                                                           \ -    kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2,   kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5,  \ -    k00, k10, k20, k30, k40, k50,                            k60, k70, k80, k90, kA0, kB0,       \ -    k01, k11, k21, k31, k41, k51,                            k61, k71, k81, k91, kA1, kB1,       \ -    k02, k12, k22, k32, k42, k52,                            k62, k72, k82, k92, kA2, kB2,       \ -    k03, k13, k23, k33, k43, k53,                            k63, k73, k83, k93, kA3, kB3,       \ -         k14, k24, k34, k54,                                      k64, k84, k94, kA4,            \ -                             k56, k55,                  k96, k85,                                \ -                                  k35,                  k86,                                     \ -                        k36, k46, k25,                  k66, k75, k65                            \ -) {                                              \ -    { k00,  k01,  k02,  k03,  ___,  ___,  ___ }, \ -    { k10,  k11,  k12,  k13,  k14,  ___,  ___ }, \ -    { k20,  k21,  k22,  k23,  k24,  k25,  ___ }, \ -    { k30,  k31,  k32,  k33,  k34,  k35,  k36 }, \ -    { k40,  k41,  k42,  k43,  ___,  ___,  k46 }, \ -    { k50,  k51,  k52,  k53,  k54,  k55,  k56 }, \ -    { k60,  k61,  k62,  k63,  k64,  k65,  k66 }, \ -    { k70,  k71,  k72,  k73,  ___,  k75,  ___ }, \ -    { k80,  k81,  k82,  k83,  k84,  k85,  k86 }, \ -    { k90,  k91,  k92,  k93,  k94,  ___,  k96 }, \ -    { kA0,  kA1,  kA2,  kA3,  kA4,  ___,  ___ }, \ -    { kB0,  kB1,  kB2,  kB3,  ___,  ___,  ___ }, \ -    { kC0,  kC1,  kC2,  kC3,  kC4,  kC5,  ___ }, \ -    { kD0,  kD1,  kD2,  kD3,  kD4,  kD5,  ___ }, \ -    { kE0,  kE1,  kE2,  kE3,  kE4,  kE5,  ___ }  \ +#define LAYOUT_pretty( \ +    kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2,   kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5, \ +    k00, k10, k20, k30, k40, k50,                            k60, k70, k80, k90, kA0, kB0, \ +    k01, k11, k21, k31, k41, k51,                            k61, k71, k81, k91, kA1, kB1, \ +    k02, k12, k22, k32, k42, k52,                            k62, k72, k82, k92, kA2, kB2, \ +    k03, k13, k23, k33, k43, k53,                            k63, k73, k83, k93, kA3, kB3, \ +         k14, k24, k34, k54,                                      k64, k84, k94, kA4, \ +                             k56, k55,                  k96, k85, \ +                                  k35,                  k86, \ +                        k36, k46, k25,                  k66, k75, k65 \ +) { \ +    { k00, k01, k02, k03, ___, ___, ___ }, \ +    { k10, k11, k12, k13, k14, ___, ___ }, \ +    { k20, k21, k22, k23, k24, k25, ___ }, \ +    { k30, k31, k32, k33, k34, k35, k36 }, \ +    { k40, k41, k42, k43, ___, ___, k46 }, \ +    { k50, k51, k52, k53, k54, k55, k56 }, \ +    { k60, k61, k62, k63, k64, k65, k66 }, \ +    { k70, k71, k72, k73, ___, k75, ___ }, \ +    { k80, k81, k82, k83, k84, k85, k86 }, \ +    { k90, k91, k92, k93, k94, ___, k96 }, \ +    { kA0, kA1, kA2, kA3, kA4, ___, ___ }, \ +    { kB0, kB1, kB2, kB3, ___, ___, ___ }, \ +    { kC0, kC1, kC2, kC3, kC4, kC5, ___ }, \ +    { kD0, kD1, kD2, kD3, kD4, kD5, ___ }, \ +    { kE0, kE1, kE2, kE3, kE4, kE5, ___ } \  }  /* @@ -98,7 +96,3 @@ PC4 kCx Row: ESC F3  F6  F9  F12 PAU --  PC5 kDx Row: F1  F4  F7  F10 PRT PRG --  PC6 kEx Row: F2  F5  F8  F11 SLK KEY --  */ - - - -#endif diff --git a/keyboards/kira75/config.h b/keyboards/kira75/config.h index 408714cb32..b9a6aa0322 100644 --- a/keyboards/kira75/config.h +++ b/keyboards/kira75/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -163,5 +162,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/kira75/kira75.h b/keyboards/kira75/kira75.h index 8c564f2082..27fdab02db 100644 --- a/keyboards/kira75/kira75.h +++ b/keyboards/kira75/kira75.h @@ -13,11 +13,10 @@   * 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 KIRA75_H -#define KIRA75_H -#include "quantum.h" +#pragma once +#include "quantum.h"  // Functions for setting LEDs on toggle keys  inline void caps_led_on(void)     { DDRD |=  (1<<7); PORTD &= ~(1<<7); } @@ -26,25 +25,24 @@ inline void caps_led_off(void)    { DDRD &= ~(1<<7); PORTD &= ~(1<<7); }  inline void num_led_on(void)      { DDRD |=  (1<<6); PORTD &= ~(1<<6); }  inline void num_led_off(void)     { DDRD &= ~(1<<6); PORTD &= ~(1<<6); } +#define XXX KC_NO +  // This a shortcut to help you visually see your layout.  // The following is an example using the Planck MIT layout  // The first section contains all of the arguments  // The second converts the arguments into a two-dimensional array  #define LAYOUT( \ -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ -    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \ -    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \ -    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \ -         K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4E,      K4F, \ -    K50, K51,      K53,           K56,                K5A, K5B, K5D, K5E,      K5F  \ -) \ -{ \ -    { K00,   K01,   K02,   K03, K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   K0D, K0E,   K0F }, \ -    { K10,   K11,   K12,   K13, K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D, KC_NO, K1F }, \ -    { K20,   KC_NO, K22,   K23, K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   K2D, K2E,   K2F }, \ -    { K30,   KC_NO, K32,   K33, K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, K3C,   K3D, KC_NO, K3F }, \ -    { KC_NO, K41,   K42,   K43, K44,   K45,   K46, K47,   K48,   K49,   K4A, K4B, KC_NO, K4D, K4E,   K4F }, \ -    { K50,   K51,   KC_NO, K53, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A, K5B, KC_NO, K5D, K5E,   K5F }  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1F, \ +    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, \ +    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D,      k3F, \ +         k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4D, k4E,      k4F, \ +    k50, k51,      k53,           k56,                k5A, k5B, k5D, k5E,      k5F \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \ +    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ +    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \ +    { XXX, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, XXX, k4D, k4E, k4F }, \ +    { k50, k51, XXX, k53, XXX, XXX, k56, XXX, XXX, XXX, k5A, k5B, XXX, k5D, k5E, k5F } \  } - -#endif diff --git a/keyboards/kmini/config.h b/keyboards/kmini/config.h index a0592b4ecf..c242aff0d0 100755 --- a/keyboards/kmini/config.h +++ b/keyboards/kmini/config.h @@ -13,8 +13,8 @@   * 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 CONFIG_H -#define CONFIG_H + +#pragma once  #include "config_common.h" @@ -48,5 +48,3 @@  /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */  #define DEBOUNCE 5 - -#endif diff --git a/keyboards/kmini/kmini.h b/keyboards/kmini/kmini.h index 3d54c39d1f..e32ad5a0f9 100755 --- a/keyboards/kmini/kmini.h +++ b/keyboards/kmini/kmini.h @@ -13,24 +13,23 @@   * 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 KMINI_H -#define KMINI_H -#define ___ KC_NO + +#pragma once  #include "quantum.h" +#define ___ KC_NO +  #define LAYOUT( \ -    K00, K01,    K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \ -    K10, K11,    K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \ -    K20, K21,    K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, K2G, \ -    K30, K31,    K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, K3F, K3G, \ -    K40, K41,    K42, K43, K44,           K47,                     K4C,      K4E, K4F, K4G  \ +    k00, k01,    k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, \ +    k10, k11,    k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, \ +    k20, k21,    k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,      k2F, k2G, \ +    k30, k31,    k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,      k3E, k3F, k3G, \ +    k40, k41,    k42, k43, k44,           k47,                     k4C,      k4E, k4F, k4G \  ) { \ -   {K00, K01,    K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G}, \ -   {K10, K11,    K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G}, \ -   {K20, K21,    K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F, K2G}, \ -   {K30, K31,    K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, K3E, K3F, K3G}, \ -   {K40, K41,    K42, K43, K44, ___, ___, K47, ___, ___, ___, ___, K4C, ___, K4E, K4F, K4G}, \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___, k2F, k2G }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, k3E, k3F, k3G }, \ +    { k40, k41, k42, k43, k44, ___, ___, k47, ___, ___, ___, ___, k4C, ___, k4E, k4F, k4G } \  } - -#endif diff --git a/keyboards/knops/mini/config.h b/keyboards/knops/mini/config.h index cf603fbf6c..be1cf8819e 100644 --- a/keyboards/knops/mini/config.h +++ b/keyboards/knops/mini/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -156,5 +155,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/knops/mini/mini.h b/keyboards/knops/mini/mini.h index e2d6c546b0..e028dea6d7 100644 --- a/keyboards/knops/mini/mini.h +++ b/keyboards/knops/mini/mini.h @@ -13,18 +13,17 @@   * You should have received a copy of the GNU General Public License   * along with this program.  If not, see <http://www.gnu.org/licenses/>.   */ +  #include "quantum.h" -#ifndef KNOPS_MINI_H -#define KNOPS_MINI_H +#pragma once  // This a shortcut to help you visually see your layout.  // The following is an example using the Planck MIT layout  // The first section contains all of the arguments  // The second converts the arguments into a two-dimensional array  #define LAYOUT( \ -	K00, K01, K02, K03, K04, K05  \ +    k00, k01, k02, k03, k04, k05 \  ) { \ -	{ K00,   K01,   K02,   K03,   K04,   K05 },  \ +    { k00, k01, k02, k03, k04, k05 } \  } -#endif
\ No newline at end of file diff --git a/keyboards/kona_classic/config.h b/keyboards/kona_classic/config.h index e16f3017db..8b54f30869 100644 --- a/keyboards/kona_classic/config.h +++ b/keyboards/kona_classic/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -153,5 +152,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/kona_classic/kona_classic.h b/keyboards/kona_classic/kona_classic.h index 98eed3b3c2..66757fc9c4 100644 --- a/keyboards/kona_classic/kona_classic.h +++ b/keyboards/kona_classic/kona_classic.h @@ -13,139 +13,136 @@   * 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 KONACLASSIC_H -#define KONACLASSIC_H + +#pragma once  #include "quantum.h"  // readability  #define ___ KC_NO -  #define LAYOUT_all( \ -    KA0, KA1,   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ -    KA2, KA3,   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ -    KA4, KA5,   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      \ -    KA6, KA7,   K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ -    KA8, KA9,   K40, K41, K42,      K44,      K46, K47,      K49, K4A, K4B, K4C, K4D  \ +    k00, k01,   k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ +    k10, k11,   k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ +    k20, k21,   k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \ +    k30, k31,   k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \ +    k40, k41,   k42, k43, k44,      k46,      k48, k49,      k4B, k4C, k4D, k4E, k4F \  ) { \ -	{ KA0, KA1,   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ -	{ KA2, KA3,   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ -	{ KA4, KA5,   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___ }, \ -	{ KA6, KA7,   K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \ -	{ KA8, KA9,   K40, K41, K42, ___, K44, ___, K46, K47, ___, K49, K4A, K4B, K4C, K4D } \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, ___ }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ +    { k40, k41, k42, k43, k44, ___, k46, ___, k48, k49, ___, k4B, k4C, k4D, k4E, k4F } \  }  #define LAYOUT_ansi( \ -    KA0, KA1,   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ -    KA2, KA3,   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ -    KA4, KA5,   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      \ -    KA6, KA7,   K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      \ -    KA8, KA9,   K40, K41, K42,                K46,                K49, K4A, K4C, K4D  \ +    k00, k01,   k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ +    k10, k11,   k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ +    k20, k21,   k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \ +    k30, k31,   k32,      k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ +    k40, k41,   k42, k43, k44,                k48,                k4B, k4C, k4E, k4F  \  ) { \ -	{ KA0, KA1,   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ -	{ KA2, KA3,   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ -	{ KA4, KA5,   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___ }, \ -	{ KA6, KA7,   K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___ }, \ -	{ KA8, KA9,   K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, ___, K4C, K4D } \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, ___ }, \ +    { k30, k31, k32, ___, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, ___ }, \ +    { k40, k41, k42, k43, k44, ___, ___, ___, k48, ___, ___, k4B, k4C, ___, k4E, k4F } \  }  #define LAYOUT_ansi_arrows( \ -    KA0, KA1,   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ -    KA2, KA3,   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ -    KA4, KA5,   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      \ -    KA6, KA7,   K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ -    KA8, KA9,   K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D  \ +    k00, k01,   k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ +    k10, k11,   k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ +    k20, k21,   k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \ +    k30, k31,   k32,      k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \ +    k40, k41,   k42, k43, k44,                k48,           k4B, k4C, k4D, k4E, k4F \  ) { \ -	{ KA0, KA1,   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ -	{ KA2, KA3,   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ -	{ KA4, KA5,   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___ }, \ -	{ KA6, KA7,   K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \ -	{ KA8, KA9,   K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D } \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, ___ }, \ +    { k30, k31, k32, ___, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ +    { k40, k41, k42, k43, k44, ___, ___, ___, k48, ___, ___, k4B, k4C, k4D, k4E, k4F } \  }  #define LAYOUT_ansi_split( \ -    KA0, KA1,   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ -    KA2, KA3,   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ -    KA4, KA5,   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      \ -    KA6, KA7,   K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      \ -    KA8, KA9,   K40, K41, K42,      K44,      K46, K47,           K49, K4A, K4C, K4D  \ +    k00, k01,   k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ +    k10, k11,   k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ +    k20, k21,   k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \ +    k30, k31,   k32,      k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ +    k40, k41,   k42, k43, k44,      k46,      k48, k49,           k4B, k4C, k4E, k4F \  ) { \ -	{ KA0, KA1,   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ -	{ KA2, KA3,   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ -	{ KA4, KA5,   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___ }, \ -	{ KA6, KA7,   K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___ }, \ -	{ KA8, KA9,   K40, K41, K42, ___, K44, ___, K46, K47, ___, K49, K4A, ___, K4C, K4D } \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, ___ }, \ +    { k30, k31, k32, ___, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, ___ }, \ +    { k40, k41, k42, k43, k44, ___, k46, ___, k48, k49, ___, k4B, k4C, ___, k4E, k4F } \  }  #define LAYOUT_ansi_split_arrows( \ -    KA0, KA1,   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ -    KA2, KA3,   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ -    KA4, KA5,   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      \ -    KA6, KA7,   K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ -    KA8, KA9,   K40, K41, K42,      K44,      K46, K47,      K49, K4A, K4B, K4C, K4D  \ +    k00, k01,   k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ +    k10, k11,   k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ +    k20, k21,   k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \ +    k30, k31,   k32,      k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \ +    k40, k41,   k42, k43, k44,      k46,      k48, k49,      k4B, k4C, k4D, k4E, k4F \  ) { \ -	{ KA0, KA1,   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ -	{ KA2, KA3,   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ -	{ KA4, KA5,   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___ }, \ -	{ KA6, KA7,   K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \ -	{ KA8, KA9,   K40, K41, K42, ___, K44, ___, K46, K47, ___, K49, K4A, K4B, K4C, K4D } \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, ___ }, \ +    { k30, k31, k32, ___, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ +    { k40, k41, k42, k43, k44, ___, k46, ___, k48, k49, ___, k4B, k4C, k4D, k4E, k4F } \  }  #define LAYOUT_iso( \ -    KA0, KA1,   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ -    KA2, KA3,   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ -    KA4, KA5,   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      \ -    KA6, KA7,   K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      \ -    KA8, KA9,   K40, K41, K42,                K46,                K49, K4A, K4C, K4D  \ +    k00, k01,   k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ +    k10, k11,   k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ +    k20, k21,   k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \ +    k30, k31,   k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ +    k40, k41,   k42, k43, k44,                k48,                k4B, k4C, k4E, k4F \  ) { \ -	{ KA0, KA1,   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ -	{ KA2, KA3,   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ -	{ KA4, KA5,   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___ }, \ -	{ KA6, KA7,   K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___ }, \ -	{ KA8, KA9,   K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, ___, K4C, K4D } \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, ___ }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, ___ }, \ +    { k40, k41, k42, k43, k44, ___, ___, ___, k48, ___, ___, k4B, k4C, ___, k4E, k4F } \  }  #define LAYOUT_iso_arrows( \ -    KA0, KA1,   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ -    KA2, KA3,   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ -    KA4, KA5,   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      \ -    KA6, KA7,   K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ -    KA8, KA9,   K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D  \ +    k00, k01,   k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ +    k10, k11,   k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ +    k20, k21,   k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \ +    k30, k31,   k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \ +    k40, k41,   k42, k43, k44,                k48,           k4B, k4C, k4D, k4E, k4F \  ) { \ -	{ KA0, KA1,   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ -	{ KA2, KA3,   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ -	{ KA4, KA5,   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___ }, \ -	{ KA6, KA7,   K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \ -	{ KA8, KA9,   K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D } \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, ___ }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ +    { k40, k41, k42, k43, k44, ___, ___, ___, k48, ___, ___, k4B, k4C, k4D, k4E, k4F } \  }  #define LAYOUT_iso_split( \ -    KA0, KA1,   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ -    KA2, KA3,   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ -    KA4, KA5,   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      \ -    KA6, KA7,   K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      \ -    KA8, KA9,   K40, K41, K42,      K44,      K46, K47,           K49, K4A, K4C, K4D  \ +    k00, k01,   k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ +    k10, k11,   k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ +    k20, k21,   k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \ +    k30, k31,   k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ +    k40, k41,   k42, k43, k44,      k46,      k48, k49,           k4B, k4C, k4E, k4F \  ) { \ -	{ KA0, KA1,   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ -	{ KA2, KA3,   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ -	{ KA4, KA5,   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___ }, \ -	{ KA6, KA7,   K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___ }, \ -	{ KA8, KA9,   K40, K41, K42, ___, K44, ___, K46, K47, ___, K49, K4A, ___, K4C, K4D } \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, ___ }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, ___ }, \ +    { k40, k41, k42, k43, k44, ___, k46, ___, k48, k49, ___, k4B, k4C, ___, k4E, k4F } \  }  #define LAYOUT_iso_split_arrows( \ -    KA0, KA1,   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ -    KA2, KA3,   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ -    KA4, KA5,   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      \ -    KA6, KA7,   K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ -    KA8, KA9,   K40, K41, K42,      K44,      K46, K47,      K49, K4A, K4B, K4C, K4D  \ +    k00, k01,   k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ +    k10, k11,   k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ +    k20, k21,   k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \ +    k30, k31,   k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \ +    k40, k41,   k42, k43, k44,      k46,      k48, k49,      k4B, k4C, k4D, k4E, k4F \  ) { \ -	{ KA0, KA1,   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ -	{ KA2, KA3,   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ -	{ KA4, KA5,   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___ }, \ -	{ KA6, KA7,   K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \ -	{ KA8, KA9,   K40, K41, K42, ___, K44, ___, K46, K47, ___, K49, K4A, K4B, K4C, K4D } \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, ___ }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ +    { k40, k41, k42, k43, k44, ___, k46, ___, k48, k49, ___, k4B, k4C, k4D, k4E, k4F } \  } - -#endif diff --git a/keyboards/ktec/ergodone/config.h b/keyboards/ktec/ergodone/config.h index 39e0ae8c75..db626ab808 100644 --- a/keyboards/ktec/ergodone/config.h +++ b/keyboards/ktec/ergodone/config.h @@ -1,5 +1,4 @@ -#ifndef ERGODOX_ERGODONE_CONFIG_H -#define ERGODOX_ERGODONE_CONFIG_H +#pragma once  #include "config_common.h" @@ -77,5 +76,3 @@  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION  //#define DEBUG_MATRIX_SCAN_RATE - -#endif diff --git a/keyboards/ktec/ergodone/ergodone.h b/keyboards/ktec/ergodone/ergodone.h index 89edb8a0b5..77e4968543 100644 --- a/keyboards/ktec/ergodone/ergodone.h +++ b/keyboards/ktec/ergodone/ergodone.h @@ -1,5 +1,4 @@ -#ifndef ERGODOX_ERGODONE_H -#define ERGODOX_ERGODONE_H +#pragma once  #include "quantum.h"  #include <stdint.h> @@ -64,116 +63,94 @@ inline void ergodox_right_led_3_set(uint8_t n)          {}  inline void ergodox_right_led_set(uint8_t l, uint8_t n) {}  inline void ergodox_led_all_set(uint8_t n)              {} -/* - *   LEFT HAND: LINES 76-83 - *  RIGHT HAND: LINES 85-92 - */ -#define LAYOUT_ergodox(                                         \ -                                                                \ -    k00,k01,k02,k03,k04,k05,k06,                                \ -    k10,k11,k12,k13,k14,k15,k16,                                \ -    k20,k21,k22,k23,k24,k25,                                    \ -    k30,k31,k32,k33,k34,k35,k36,                                \ -    k40,k41,k42,k43,k44,                                        \ -                            k55,k56,                            \ -                                k54,                            \ -                        k53,k52,k51,                            \ -                                                                \ -        k07,k08,k09,k0A,k0B,k0C,k0D,                            \ -        k17,k18,k19,k1A,k1B,k1C,k1D,                            \ -            k28,k29,k2A,k2B,k2C,k2D,                            \ -        k37,k38,k39,k3A,k3B,k3C,k3D,                            \ -                k49,k4A,k4B,k4C,k4D,                            \ -    k57,k58,                                                    \ -    k59,                                                        \ -    k5C,k5B,k5A )                                               \ -                                                                \ -   /* matrix positions */                                       \ -   {                                                            \ -    { k00,   k01, k02, k03, k04, k05,   k06,      k07,   k08,   k09, k0A, k0B, k0C, k0D    }, \ -    { k10,   k11, k12, k13, k14, k15,   k16,      k17,   k18,   k19, k1A, k1B, k1C, k1D    }, \ -    { k20,   k21, k22, k23, k24, k25,   KC_NO,    KC_NO, k28,   k29, k2A, k2B, k2C, k2D    }, \ -    { k30,   k31, k32, k33, k34, k35,   k36,      k37,   k38,   k39, k3A, k3B, k3C, k3D    }, \ -    { k40,   k41, k42, k43, k44, KC_NO, KC_NO,    KC_NO, KC_NO, k49, k4A, k4B, k4C, k4D    }, \ -    { KC_NO, k51, k52, k53, k54, k55,   k56,      k57,   k58,   k59, k5A, k5B, k5C, KC_NO  }  \ -   } +#define XXX KC_NO -/* - *   LEFT HAND: LINES 110-117 - *  RIGHT HAND: LINES 119-126 - */ -#define LAYOUT_ergodox_80(                                      \ -                                                                \ -    k00,k01,k02,k03,k04,k05,k06,                                \ -    k10,k11,k12,k13,k14,k15,k16,                                \ -    k20,k21,k22,k23,k24,k25,                                    \ -    k30,k31,k32,k33,k34,k35,k36,                                \ -    k40,k41,k42,k43,k44,                                        \ -                            k55,k56,                            \ -                        k45,k46,k54,                            \ -                        k53,k52,k51,                            \ -                                                                \ -        k07,k08,k09,k0A,k0B,k0C,k0D,                            \ -        k17,k18,k19,k1A,k1B,k1C,k1D,                            \ -            k28,k29,k2A,k2B,k2C,k2D,                            \ -        k37,k38,k39,k3A,k3B,k3C,k3D,                            \ -                k49,k4A,k4B,k4C,k4D,                            \ -    k57,k58,                                                    \ -    k59,k47,k48,                                                \ -    k5C,k5B,k5A )                                               \ -                                                                \ -   /* matrix positions */                                       \ -   {                                                            \ -    { k00,   k01, k02, k03, k04, k05, k06,      k07,   k08, k09, k0A, k0B, k0C, k0D    }, \ -    { k10,   k11, k12, k13, k14, k15, k16,      k17,   k18, k19, k1A, k1B, k1C, k1D    }, \ -    { k20,   k21, k22, k23, k24, k25, KC_NO,    KC_NO, k28, k29, k2A, k2B, k2C, k2D    }, \ -    { k30,   k31, k32, k33, k34, k35, k36,      k37,   k38, k39, k3A, k3B, k3C, k3D    }, \ -    { k40,   k41, k42, k43, k44, k45, k46,      k47,   k48, k49, k4A, k4B, k4C, k4D    }, \ -    { KC_NO, k51, k52, k53, k54, k55, k56,      k57,   k58, k59, k5A, k5B, k5C, KC_NO  }  \ -   } +#define LAYOUT_ergodox( \ +    k00, k01, k02, k03, k04, k05, k06, \ +    k10, k11, k12, k13, k14, k15, k16, \ +    k20, k21, k22, k23, k24, k25, \ +    k30, k31, k32, k33, k34, k35, k36, \ +    k40, k41, k42, k43, k44, \ +                             k55, k56, \ +                                  k54, \ +                        k53, k52, k51, \ +\ +    k07, k08, k09, k0A, k0B, k0C, k0D, \ +    k17, k18, k19, k1A, k1B, k1C, k1D, \ +         k28, k29, k2A, k2B, k2C, k2D, \ +    k37, k38, k39, k3A, k3B, k3C, k3D, \ +              k49, k4A, k4B, k4C, k4D, \ +    k57, k58, \ +    k59, \ +    k5C, k5B, k5A \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \ +    { k20, k21, k22, k23, k24, k25, XXX, XXX, k28, k29, k2A, k2B, k2C, k2D }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \ +    { k40, k41, k42, k43, k44, XXX, XXX, XXX, XXX, k49, k4A, k4B, k4C, k4D }, \ +    { XXX, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, XXX } \ +} -/*  ---------- LEFT HAND -----------       ---------- RIGHT HAND ---------- */ -#define LAYOUT_ergodox_pretty(                                                  \ -                                                                                \ -    L00,L01,L02,L03,L04,L05,L06,               R00,R01,R02,R03,R04,R05,R06,     \ -    L10,L11,L12,L13,L14,L15,L16,               R10,R11,R12,R13,R14,R15,R16,     \ -    L20,L21,L22,L23,L24,L25,                       R21,R22,R23,R24,R25,R26,     \ -    L30,L31,L32,L33,L34,L35,L36,               R30,R31,R32,R33,R34,R35,R36,     \ -    L40,L41,L42,L43,L44,                               R42,R43,R44,R45,R46,     \ -                            L55,L56,       R50,R51,                             \ -                                L54,       R52,                                 \ -                        L53,L52,L51,       R55,R54,R53 )                        \ -                                                                                \ -   /* matrix positions */                                                       \ -   {                                                                            \ -    {   L00,L01,L02,L03,L04,L05,L06,            R00,R01,R02,R03,R04,R05,R06  }, \ -    {   L10,L11,L12,L13,L14,L15,L16,            R10,R11,R12,R13,R14,R15,R16  }, \ -    {   L20,L21,L22,L23,L24,L25,KC_NO,        KC_NO,R21,R22,R23,R24,R25,R26  }, \ -    {   L30,L31,L32,L33,L34,L35,L36,            R30,R31,R32,R33,R34,R35,R36  }, \ -    { L40,L41,L42,L43,L44,KC_NO,KC_NO,    KC_NO,KC_NO,R42,R43,R44,R45,R46    }, \ -    { KC_NO,L51,L52,L53,L54,L55,L56,          R50,R51,R52,R53,R54,R55,KC_NO  }  \ +#define LAYOUT_ergodox_80( \ +    k00, k01, k02, k03, k04, k05, k06, \ +    k10, k11, k12, k13, k14, k15, k16, \ +    k20, k21, k22, k23, k24, k25, \ +    k30, k31, k32, k33, k34, k35, k36, \ +    k40, k41, k42, k43, k44, \ +                             k55, k56, \ +                        k45, k46, k54, \ +                        k53, k52, k51, \ +\ +    k07, k08, k09, k0A, k0B, k0C, k0D, \ +    k17, k18, k19, k1A, k1B, k1C, k1D, \ +         k28, k29, k2A, k2B, k2C, k2D, \ +    k37, k38, k39, k3A, k3B, k3C, k3D, \ +              k49, k4A, k4B, k4C, k4D, \ +    k57, k58, \ +    k59, k47, k48, \ +    k5C, k5B, k5A \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \ +    { k20, k21, k22, k23, k24, k25, XXX, XXX, k28, k29, k2A, k2B, k2C, k2D }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D }, \ +    { XXX, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, XXX } \     } -/*  ---------- LEFT HAND -----------       ---------- RIGHT HAND ---------- */ -#define LAYOUT_ergodox_pretty_80(                                              \ -                                                                               \ -    L00,L01,L02,L03,L04,L05,L06,               R00,R01,R02,R03,R04,R05,R06,    \ -    L10,L11,L12,L13,L14,L15,L16,               R10,R11,R12,R13,R14,R15,R16,    \ -    L20,L21,L22,L23,L24,L25,                       R21,R22,R23,R24,R25,R26,    \ -    L30,L31,L32,L33,L34,L35,L36,               R30,R31,R32,R33,R34,R35,R36,    \ -    L40,L41,L42,L43,L44,                               R42,R43,R44,R45,R46,    \ -                            L55,L56,       R50,R51,                            \ -                        L45,L46,L54,       R52,R40,R41,                        \ -                        L53,L52,L51,       R55,R54,R53 )                       \ -                                                                               \ -   /* matrix positions */                                                      \ -   {                                                                           \ -    {   L00,L01,L02,L03,L04,L05,L06,          R00,R01,R02,R03,R04,R05,R06   }, \ -    {   L10,L11,L12,L13,L14,L15,L16,          R10,R11,R12,R13,R14,R15,R16   }, \ -    {   L20,L21,L22,L23,L24,L25,KC_NO,      KC_NO,R21,R22,R23,R24,R25,R26   }, \ -    {   L30,L31,L32,L33,L34,L35,L36,          R30,R31,R32,R33,R34,R35,R36   }, \ -    {   L40,L41,L42,L43,L44,L45,L46,          R40,R41,R42,R43,R44,R45,R46   }, \ -    { KC_NO,L51,L52,L53,L54,L55,L56,          R50,R51,R52,R53,R54,R55,KC_NO }  \ -   } +#define LAYOUT_ergodox_pretty( \ +    L00, L01, L02, L03, L04, L05, L06,                 R00, R01, R02, R03, R04, R05, R06, \ +    L10, L11, L12, L13, L14, L15, L16,                 R10, R11, R12, R13, R14, R15, R16, \ +    L20, L21, L22, L23, L24, L25,                           R21, R22, R23, R24, R25, R26, \ +    L30, L31, L32, L33, L34, L35, L36,                 R30, R31, R32, R33, R34, R35, R36, \ +    L40, L41, L42, L43, L44,                                     R42, R43, R44, R45, R46, \ +                                  L55, L56,       R50, R51, \ +                                       L54,       R52, \ +                             L53, L52, L51,       R55, R54, R53 \ +) { \ +    { L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06 }, \ +    { L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16 }, \ +    { L20, L21, L22, L23, L24, L25, XXX, XXX, R21, R22, R23, R24, R25, R26 }, \ +    { L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36 }, \ +    { L40, L41, L42, L43, L44, XXX, XXX, XXX, XXX, R42, R43, R44, R45, R46 }, \ +    { XXX, L51, L52, L53, L54, L55, L56, R50, R51, R52, R53, R54, R55, XXX } \ +} -#endif +#define LAYOUT_ergodox_pretty_80( \ +    L00, L01, L02, L03, L04, L05, L06,                 R00, R01, R02, R03, R04, R05, R06, \ +    L10, L11, L12, L13, L14, L15, L16,                 R10, R11, R12, R13, R14, R15, R16, \ +    L20, L21, L22, L23, L24, L25,                           R21, R22, R23, R24, R25, R26, \ +    L30, L31, L32, L33, L34, L35, L36,                 R30, R31, R32, R33, R34, R35, R36, \ +    L40, L41, L42, L43, L44,                                     R42, R43, R44, R45, R46, \ +                                  L55, L56,       R50, R51,  \ +                             L45, L46, L54,       R52, R40, R41, \ +                             L53, L52, L51,       R55, R54, R53 \ +) { \ +    { L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06 }, \ +    { L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16 }, \ +    { L20, L21, L22, L23, L24, L25, XXX, XXX, R21, R22, R23, R24, R25, R26 }, \ +    { L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36 }, \ +    { L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 }, \ +    { XXX, L51, L52, L53, L54, L55, L56, R50, R51, R52, R53, R54, R55, XXX } \ +} diff --git a/keyboards/ktec/ergodone/expander.h b/keyboards/ktec/ergodone/expander.h index 8676fed693..071570c408 100644 --- a/keyboards/ktec/ergodone/expander.h +++ b/keyboards/ktec/ergodone/expander.h @@ -1,5 +1,4 @@ -#ifndef EXPANDER_H -#define EXPANDER_H +#pragma once  #include <stdint.h>  #include "matrix.h" @@ -44,5 +43,3 @@ uint8_t expander_get_col(uint8_t col);  matrix_row_t expander_read_row(void);  void expander_unselect_rows(void);  void expander_select_row(uint8_t row); - -#endif diff --git a/keyboards/laptreus/laptreus.h b/keyboards/laptreus/laptreus.h index f367c13dc3..2e7932e494 100644 --- a/keyboards/laptreus/laptreus.h +++ b/keyboards/laptreus/laptreus.h @@ -1,26 +1,19 @@ -#ifndef LAPTREUS_H -#define LAPTREUS_H +#pragma once  #include "quantum.h"  #include "outputselect.h" -/* -// This a shortcut to help you visually see your layout. -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -*/ +#define XXX KC_NO +  #define LAYOUT( \ -  A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, \ -  B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B11, B12, \ -  C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, \ -  D1, D2, D3, D4, D5, D6, D7, D8, D9, D10, D11, D12 \ -) \ -{ \ -  {A2, A3, A4, A5, A6, A7, A8, A9, A10, A11}, \ -  {B2, B3, B4, B5, B6, B7, B8, B9, B10, B11}, \ -  {C2, C3, C4, C5, C6, C7, C8, C9, C10, C11}, \ -  {D2, D3, D4, D5, D6, D7, D8, D9, D10, D11}, \ -  {A1, B1, C1, D1, KC_NO, KC_NO, D12, C12, B12, A12} \ +    k40, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k49, \ +    k41, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k48, \ +    k42, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k47, \ +    k43, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k46 \ +) { \ +    { 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 }, \ +    { k40, k41, k42, k43, XXX, XXX, k46, k47, k48, k49 } \  } - -#endif diff --git a/keyboards/launchpad/config.h b/keyboards/launchpad/config.h index e9a13a3bdf..327d67016b 100644 --- a/keyboards/launchpad/config.h +++ b/keyboards/launchpad/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -65,5 +64,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #ifdef SUBPROJECT_rev1      #include "rev1/config.h"  #endif - -#endif diff --git a/keyboards/launchpad/launchpad.h b/keyboards/launchpad/launchpad.h index 85432de0ad..59cf64afec 100644 --- a/keyboards/launchpad/launchpad.h +++ b/keyboards/launchpad/launchpad.h @@ -1,11 +1,7 @@ -#ifndef LAUNCHPAD_H -#define LAUNCHPAD_H +#pragma once -#ifdef KEYBOARD_launchpad_rev1 -    #include "rev1.h" +#if defined(KEYBOARD_launchpad_rev1) +#    include "rev1.h"  #endif  #include "quantum.h" - - -#endif diff --git a/keyboards/launchpad/rev1/rev1.h b/keyboards/launchpad/rev1/rev1.h index 6644db8300..2ea6e7e775 100644 --- a/keyboards/launchpad/rev1/rev1.h +++ b/keyboards/launchpad/rev1/rev1.h @@ -1,21 +1,17 @@ -#ifndef REV1_H -#define REV1_H +#pragma once  #include "../launchpad.h"  #include "quantum.h"  #define LAYOUT( \ -	K00, K01, \ -	K10, K11, \ -	K20, K21, \ -	K30, K31  \ -	) \ -	{ \ -		{ K00, K01 }, \ -		{ K10, K11 }, \ -		{ K20, K21 }, \ -		{ K30, K31 } \ -	} - -#endif +    k00, k01, \ +    k10, k11, \ +    k20, k21, \ +    k30, k31 \ +) { \ +    { k00, k01 }, \ +    { k10, k11 }, \ +    { k20, k21 }, \ +    { k30, k31 } \ +} diff --git a/keyboards/lazydesigners/the60/rev2/info.json b/keyboards/lazydesigners/the60/rev2/info.json index 742a65cda5..d88d67405b 100755 --- a/keyboards/lazydesigners/the60/rev2/info.json +++ b/keyboards/lazydesigners/the60/rev2/info.json @@ -263,7 +263,10 @@                  {"label":"Shift", "x":13.25, "y":3, "w":1.75},                  {"label":"Ctrl", "x":0, "y":4, "w":1.5},                  {"label":"Alt", "x":2.5, "y":4, "w":1.5}, -                {"label":"Space","x":4, "y":4, "w":7}, +                {"label":"Space","x":4, "y":4, "w":2}, +                {"label":"Space","x":6, "y":4, "w":1.5}, +                {"label":"Space","x":7.5, "y":4, "w":1.5}, +                {"label":"Space","x":9, "y":4, "w":2},                  {"label":"Win", "x":11, "y":4, "w":1.5},                  {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}              ] @@ -328,7 +331,10 @@                  {"label":"Shift", "x":13.25, "y":3, "w":1.75},                  {"label":"Win", "x":1.5, "y":4},                  {"label":"Alt", "x":2.5, "y":4, "w":1.5}, -                {"label":"Space","x":4, "y":4, "w":7}, +                {"label":"Space","x":4, "y":4, "w":2}, +                {"label":"Space","x":6, "y":4, "w":1.5}, +                {"label":"Space","x":7.5, "y":4, "w":1.5}, +                {"label":"Space","x":9, "y":4, "w":2},                  {"label":"Win", "x":11, "y":4, "w":1.5},                  {"label":"Menu", "x":12.5, "y":4}              ] diff --git a/keyboards/lfkeyboards/issi.h b/keyboards/lfkeyboards/issi.h index 51777f6ee3..74379ddbc8 100644 --- a/keyboards/lfkeyboards/issi.h +++ b/keyboards/lfkeyboards/issi.h @@ -1,6 +1,6 @@ +#pragma once +  #ifdef ISSI_ENABLE -#ifndef ISSI_H -#define ISSI_H  typedef struct ISSIDeviceStruct{      uint8_t fn_dirty;       // function registers need to be resent @@ -37,4 +37,3 @@ void activateLED(uint8_t matrix, uint8_t cx, uint8_t cy, uint8_t pwm);  void update_issi(uint8_t device_addr, uint8_t blocking);  #endif -#endif
\ No newline at end of file diff --git a/keyboards/lfkeyboards/lfk65_hs/config.h b/keyboards/lfkeyboards/lfk65_hs/config.h index 8107d3ccc0..e980bb97b1 100644 --- a/keyboards/lfkeyboards/lfk65_hs/config.h +++ b/keyboards/lfkeyboards/lfk65_hs/config.h @@ -1,5 +1,4 @@ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -131,5 +130,3 @@  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.h b/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.h index 3256451658..6ba3a63e88 100644 --- a/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.h +++ b/keyboards/lfkeyboards/lfk65_hs/lfk65_hs.h @@ -1,5 +1,4 @@ -#ifndef LFK65_HS_H -#define LFK65_HS_H +#pragma once  #include "quantum.h"  #include "matrix.h" @@ -13,58 +12,56 @@ void reset_keyboard_kb(void);  /* All Keymap - contains every possible switch  * ,-------------------------------------------------------------------------------. -* | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A | 1B | 1C | 1D | 1E | 1F | 1G | +* | 00 | 01 | 02 | 03 | 04 | 05 | 06 | 07 | 08 | 09 | 0A | 0B | 0C | 0D | 0E | 0F |  * |-------------------------------------------------------------------------------| -* | 21  | 22 |23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A | 2B | 2C | 2D |    2F   | 2G | +* | 10  | 11 |12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A | 1B | 1C |    1E   | 1F |  * |-------------------------------------------------------------------------------| -* | 31   | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | 3A | 3B | 3C |      3F    | 3G | +* | 20   | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A | 2B | 2C  | 2E   | 2F |  * |-------------------------------------------------------------------------------| -* | 41     | 42 | 43 | 45 | 46 | 47 | 48 | 49 | 4A | 4B | 4C |    4D    | 4F | 4G | +* | 30  |31 | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | 3A | 3B |    3C   | 3E | 3F |  * |-------------------------------------------------------------------------------| -* | 51  |  52  | 53  |              57        | 5A | 5B | 5C | 5D |  5E | 3E | 4E | +* | 40  |  41  | 42  |              46              | 4A | 4B | 4C | 4D | 2D | 3D |  * `-------------------------------------------------------------------------------'  */  // The first section contains all of the arguements  // The second converts the arguments into a two-dimensional array  #define LAYOUT_all( \ -    k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, \ -    k21,   k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,    k2F, k2G, \ -    k31,    k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D,   k3F, k3G, \ -    k41, k42, k43, k44,  k45, k46, k47, k48, k49, k4A, k4B, k4C,     k4D, k4F, k4G, \ -    k51, k52, k53,              k57,                   k5B, k5C, k5D, k5E, k3E, k4E \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ +    k10,   k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,    k1E, k1F, \ +    k20,    k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,   k2E, k2F, \ +    k30, k31, k32, k33,  k34, k35, k36, k37, k38, k39, k3A, k3B,     k3C, k3E, k3F, \ +    k40, k41, k42,              k46,                  k4A, k4B, k4C, k4D, k2D, k3D \  ) { \ -    { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \ -    { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___, k2F, k2G }, \ -    { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G }, \ -    { k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G }, \ -    { k51, k52, k53, ___, ___, ___, k57, ___, ___, ___, k5B, k5C, k5D, k5E, ___, ___ } \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, ___, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ +    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4A, k4B, k4C, k4D, ___, ___ } \  }  /* ANSI Keymap  * ,-------------------------------------------------------------------------------. -* | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A | 1B | 1C | 1D |   1E    | 1G | +* | 00 | 01 | 02 | 03 | 04 | 05 | 06 | 07 | 08 | 09 | 0A | 0B | 0C |   0E    | 0F |  * |-------------------------------------------------------------------------------| -* | 21   | 22 |23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A | 2B | 2C | 2D |   2F   | 2G | +* | 10   | 11 |12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A | 1B | 1C |   1E   | 1F |  * |-------------------------------------------------------------------------------| -* | 31    | 32 |33 | 34 | 35 | 36 | 37 | 38 | 39 | 3A | 3B | 3C |      3F    | 3G | +* | 20    | 21 |22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A | 2B |      2E    | 2F |  * |-------------------------------------------------------------------------------| -* | 41      | 42 |43 | 45 | 46 | 47 | 48 | 49 | 4A | 4B | 4C |    4D    | 4F | 4G | +* | 30      | 32 |33 | 34 | 35 | 36 | 37 | 38 | 39 | 3A | 3B |    3C    | 3E | 3F |  * |-------------------------------------------------------------------------------| -* | 51  |  52  | 53  |              57        | 5A | 5B | 5C | 5D |  5E | 3E | 4E | +* | 40  |  41  | 42  |              46              | 4A | 4B | 4C | 4D | 2D | 3D |  * `-------------------------------------------------------------------------------'  */  #define LAYOUT_ansi( \ -    k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,         k1F, k1G, \ -    k21,   k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,       k2F, k2G, \ -    k31,    k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,           k3F, k3G, \ -    k41,     k43, k44,  k45, k46, k47, k48, k49, k4A, k4B, k4C,         k4D, k4F, k4G, \ -    k51, k52, k53,              k57,                      k5B, k5C, k5D, k5E, k3E, k4E \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,         k0E, k0F, \ +    k10,   k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,       k1E, k1F, \ +    k20,    k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2E, k2F, \ +    k30,     k32, k33,  k34, k35, k36, k37, k38, k39, k3A, k3B,         k3C, k3E, k3F, \ +    k40, k41, k42,              k46,                     k4A, k4B, k4C, k4D, k2D, k3D \  ) { \ -    { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___, k1F, k1G }, \ -    { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___, k2F, k2G }, \ -    { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, k3E, k3F, k3G }, \ -    { k41, ___, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G }, \ -    { k51, k52, k53, ___, ___, ___, k57, ___, ___, ___, k5B, k5C, k5D, k5E, ___, ___ } \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, ___, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, k2D, k2E, k2F }, \ +    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ +    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4A, k4B, k4C, k4D, ___, ___ } \  } - -#endif //LFK65_HS_H diff --git a/keyboards/lfkeyboards/lfk78/post_rules.mk b/keyboards/lfkeyboards/lfk78/post_rules.mk new file mode 100644 index 0000000000..03f975b9df --- /dev/null +++ b/keyboards/lfkeyboards/lfk78/post_rules.mk @@ -0,0 +1,14 @@ +# Extra source files for IS3731 lighting +SRC += TWIlib.c issi.c lighting.c + +ifeq ($(strip $(ISSI_ENABLE)), yes) +    TMK_COMMON_DEFS += -DISSI_ENABLE +endif + +ifeq ($(strip $(WATCHDOG_ENABLE)), yes) +    TMK_COMMON_DEFS += -DWATCHDOG_ENABLE +endif + +ifeq ($(strip $(CAPSLOCK_LED)), yes) +    TMK_COMMON_DEFS += -DCAPSLOCK_LED +endif diff --git a/keyboards/lfkeyboards/lfk78/rules.mk b/keyboards/lfkeyboards/lfk78/rules.mk index 81f532615f..972e09af52 100644 --- a/keyboards/lfkeyboards/lfk78/rules.mk +++ b/keyboards/lfkeyboards/lfk78/rules.mk @@ -24,19 +24,4 @@ ISSI_ENABLE = yes               # If the I2C pullup resistors aren't install thi  WATCHDOG_ENABLE = no            # Resets keyboard if matrix_scan isn't run every 250ms  CAPSLOCK_LED = no              # Toggle back light LED of Caps Lock -# Extra source files for IS3731 lighting -SRC = TWIlib.c issi.c lighting.c - -ifeq ($(strip $(ISSI_ENABLE)), yes) -    TMK_COMMON_DEFS += -DISSI_ENABLE -endif - -ifeq ($(strip $(WATCHDOG_ENABLE)), yes) -    TMK_COMMON_DEFS += -DWATCHDOG_ENABLE -endif - -ifeq ($(strip $(CAPSLOCK_LED)), yes) -    TMK_COMMON_DEFS += -DCAPSLOCK_LED -endif -  DEFAULT_FOLDER = lfkeyboards/lfk78/revj diff --git a/keyboards/lfkeyboards/lfk87/config.h b/keyboards/lfkeyboards/lfk87/config.h index c030590921..1628deab23 100644 --- a/keyboards/lfkeyboards/lfk87/config.h +++ b/keyboards/lfkeyboards/lfk87/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -162,5 +161,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/lfkeyboards/lfk87/lfk87.h b/keyboards/lfkeyboards/lfk87/lfk87.h index 5c1fba6bab..1b1368659b 100644 --- a/keyboards/lfkeyboards/lfk87/lfk87.h +++ b/keyboards/lfkeyboards/lfk87/lfk87.h @@ -1,5 +1,4 @@ -#ifndef LFK87_H -#define LFK87_H +#pragma once  #include "quantum.h"  #include "matrix.h" @@ -44,85 +43,75 @@ void click(uint16_t freq, uint16_t duration);  #define ___ KC_NO  #ifdef LFK_TKL_REV_A -    #ifndef LAYOUT_tkl_ansi -        #define LAYOUT_tkl_ansi( \ -            k11,       k13, k14, k15, k16,    k17, k18, k19, k1a,    k1b, k1c, k1d, k1e,   k1f, k1g, k1h, \ -            k21,  k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,       k2e,   k2f, k2g, k2h, \ -            k31,    k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,     k3e,   k3f, k3g, k3h, \ -            k41,     k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c,         k4d, \ -            k51,      k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c,             k5d,        k5g, \ -            k61,   k62,   k63,                 k67,            k6b,   k6c,   k6d,   k6e,   k6f, k6g, k6h  \ -        ) \ -        { \ -            { k11, ___, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h }, \ -            { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h }, \ -            { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g, k3h }, \ -            { k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, ___, ___, ___, ___ }, \ -            { k51, ___, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, k5d, ___, ___, k5g, ___ }, \ -            { k61, k62, k63, ___, ___, ___, k67, ___, ___, ___, k6b, k6c, k6d, k6e, k6f, k6g, k6h }, \ -        } - +#    ifndef LAYOUT_tkl_ansi +#        define LAYOUT_tkl_ansi( \ +    k00,       k02, k03, k04, k05,    k06, k07, k08, k09,    k0A, k0B, k0C, k0D,   k0E, k0F, k0G, \ +    k10,  k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,       k1D,   k1E, k1F, k1G, \ +    k20,    k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,     k2D,   k2E, k2F, k2G, \ +    k30,     k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,         k3C, \ +    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B,             k4C,        k4F, \ +    k50,   k51,   k52,                 k56,            k5A,   k5B,   k5C,   k5D,   k5E, k5F, k5G \ +) { \ +    { k00, ___, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, ___, ___, ___ }, \ +    { k40, ___, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, ___, ___, k4F, ___ }, \ +    { k50, k51, k52, ___, ___, ___, k56, ___, ___, ___, k5A, k5B, k5C, k5D, k5E, k5F, k5G } \ +}      #endif // !LAYOUT_tkl_ansi -    #ifndef LAYOUT_tkl_iso -        #define LAYOUT_tkl_iso( \ -            k11,       k13, k14, k15, k16,    k17, k18, k19, k1a,    k1b, k1c, k1d, k1e,   k1f, k1g, k1h, \ -            k21,  k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,       k2e,   k2f, k2g, k2h, \ -            k31,    k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,            k3f, k3g, k3h, \ -            k41,     k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d,    k3e, \ -            k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c,             k5d,        k5g, \ -            k61,   k62,   k63,                 k67,            k6b,   k6c,   k6d,   k6e,   k6f, k6g, k6h  \ -        ) \ -        { \ -            { k11, ___, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h }, \ -            { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h }, \ -            { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g, k3h }, \ -            { k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, ___, ___, ___, ___ }, \ -            { k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, k5d, ___, ___, k5g, ___ }, \ -            { k61, k62, k63, ___, ___, ___, k67, ___, ___, ___, k6b, k6c, k6d, k6e, k6f, k6g, k6h }, \ -        } - -    #endif // !LAYOUT_tkl_iso +#    ifndef LAYOUT_tkl_iso +#        define LAYOUT_tkl_iso( \ +    k00,       k02, k03, k04, k05,    k06, k07, k08, k09,    k0A, k0B, k0C, k0D,   k0E, k0F, k0G, \ +    k10,  k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,       k1D,   k1E, k1F, k1G, \ +    k20,    k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,            k2E, k2F, k2G, \ +    k30,     k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,    k2D, \ +    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B,             k4C,        k4F, \ +    k50,   k51,   k52,                 k56,            k5A,   k5B,   k5C,   k5D,   k5E, k5F, k5G \ +) { \ +    { k00, ___, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, ___, ___, ___ }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, ___, ___, k4F, ___ }, \ +    { k50, k51, k52, ___, ___, ___, k56, ___, ___, ___, k5A, k5B, k5C, k5D, k5E, k5F, k5G } \ +} +#    endif // !LAYOUT_tkl_iso  #else  // RevC+ keymaps -    #ifndef LAYOUT_tkl_ansi -        #define LAYOUT_tkl_ansi( \ -            k71,       k11, k12, k13, k14,    k15, k16, k17, k18,    k19, k1a, k1b, k1c,   k1e, k1f, k1g, \ -            k72,  k73, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,       k2c,   k2e, k2f, k2g, \ -            k74,    k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,     k3d,   k3e, k3f, k3g, \ -            k61,     k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,         k4c, \ -            k62,      k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b,             k5c,        k5f, \ -            k63,   k64,   k65,                 k67,            k6a,   k6b,   k6c,   k6d,   k6e, k6f, k6g  \ -        ) \ -        { \ -            { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, ___, k1e, k1f, k1g }, \ -            { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, ___, k2e, k2f, k2g }, \ -            { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g }, \ -            { k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, ___, ___, ___, ___ }, \ -            { ___, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, ___, ___, k5f, ___ }, \ -            { k61, k62, k63, k64, k65, ___, k67, ___, ___, k6a, k6b, k6c, k6d, k6e, k6f, k6g }, \ -            { k71, k72, k73, k74, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ -        } - -    #endif // !LAYOUT_tkl_ansi -    #ifndef LAYOUT_tkl_iso -        #define LAYOUT_tkl_iso( \ -            k71,       k11, k12, k13, k14,    k15, k16, k17, k18,    k19, k1a, k1b, k1c,   k1e, k1f, k1g, \ -            k72,  k73, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,       k2c,   k2e, k2f, k2g, \ -            k74,    k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,            k3e, k3f, k3g, \ -            k61,     k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c,    k3d, \ -            k62, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b,             k5c,        k5f, \ -            k63,   k64,   k65,                 k67,            k6a,   k6b,   k6c,   k6d,   k6e, k6f, k6g  \ -        ) \ -        { \ -            { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, ___, k1e, k1f, k1g }, \ -            { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, ___, k2e, k2f, k2g }, \ -            { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g }, \ -            { k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, ___, ___, ___, ___ }, \ -            { k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, ___, ___, k5f, ___ }, \ -            { k61, k62, k63, k64, k65, ___, k67, ___, ___, k6a, k6b, k6c, k6d, k6e, k6f, k6g }, \ -            { k71, k72, k73, k74, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \ -        } - -    #endif // !LAYOUT_tkl_iso +#    ifndef LAYOUT_tkl_ansi +#        define LAYOUT_tkl_ansi( \ +    k60,       k00, k01, k02, k03,    k04, k05, k06, k07,    k08, k09, k0A, k0B,   k0D, k0E, k0F, \ +    k61,  k62, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A,       k1B,   k1D, k1E, k1F, \ +    k63,    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,     k2C,   k2D, k2E, k2F, \ +    k50,     k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A,         k3B, \ +    k51,      k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A,             k4B,        k4E, \ +    k52,   k53,   k54,                 k56,            k59,   k5A,   k5B,   k5C,   k5D, k5E, k5F \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, ___, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, ___, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, ___, ___, ___, ___ }, \ +    { ___, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, ___, ___, k4E, ___ }, \ +    { k50, k51, k52, k53, k54, ___, k56, ___, ___, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \ +    { k60, k61, k62, k63, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ } \ +} +#    endif // !LAYOUT_tkl_ansi +#    ifndef LAYOUT_tkl_iso +#        define LAYOUT_tkl_iso( \ +    k60,       k00, k01, k02, k03,    k04, k05, k06, k07,    k08, k09, k0A, k0B,   k0D, k0E, k0F, \ +    k61,  k62, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A,       k1B,   k1D, k1E, k1F, \ +    k63,    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,            k2D, k2E, k2F, \ +    k50,     k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,    k2C, \ +    k51, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A,             k4B,        k4E, \ +    k52,   k53,   k54,                 k56,            k59,   k5A,   k5B,   k5C,   k5D, k5E, k5F \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, ___, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, ___, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, ___, ___, ___, ___ }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, ___, ___, k4E, ___ }, \ +    { k50, k51, k52, k53, k54, ___, k56, ___, ___, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \ +    { k60, k61, k62, k63, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ } \ +} +#    endif // !LAYOUT_tkl_iso  #endif //Rev - -#endif //LFK87_H diff --git a/keyboards/lfkeyboards/lfk87/post_rules.mk b/keyboards/lfkeyboards/lfk87/post_rules.mk new file mode 100644 index 0000000000..563462dd99 --- /dev/null +++ b/keyboards/lfkeyboards/lfk87/post_rules.mk @@ -0,0 +1,13 @@ +ifeq ($(LFK_REV), A) +    MCU = at90usb1286 +else +    MCU = at90usb646 +endif + +ifeq ($(strip $(ISSI_ENABLE)), yes) +    OPT_DEFS += -DISSI_ENABLE +endif + +ifeq ($(strip $(WATCHDOG_ENABLE)), yes) +    OPT_DEFS += -DWATCHDOG_ENABLE +endif diff --git a/keyboards/lfkeyboards/lfk87/rules.mk b/keyboards/lfkeyboards/lfk87/rules.mk index 7f5621b030..bc988f15aa 100644 --- a/keyboards/lfkeyboards/lfk87/rules.mk +++ b/keyboards/lfkeyboards/lfk87/rules.mk @@ -6,11 +6,6 @@  #  LFK_REV = C -ifeq ($(LFK_REV), A) -    MCU = at90usb1286 -else -    MCU = at90usb646 -endif  BOOTLOADER = atmel-dfu  OPT_DEFS += -DLFK_TKL_REV_$(LFK_REV) @@ -42,13 +37,3 @@ TAP_DANCE_ENABLE = no  ISSI_ENABLE = yes			# If the I2C pullup resistors aren't install this must be disabled  WATCHDOG_ENABLE = no		# Resets keyboard if matrix_scan isn't run every 250ms - - - -ifeq ($(strip $(ISSI_ENABLE)), yes) -    OPT_DEFS += -DISSI_ENABLE -endif - -ifeq ($(strip $(WATCHDOG_ENABLE)), yes) -    OPT_DEFS += -DWATCHDOG_ENABLE -endif diff --git a/keyboards/lfkeyboards/lfkpad/post_rules.mk b/keyboards/lfkeyboards/lfkpad/post_rules.mk new file mode 100644 index 0000000000..ad997587b2 --- /dev/null +++ b/keyboards/lfkeyboards/lfkpad/post_rules.mk @@ -0,0 +1,7 @@ +ifeq ($(strip $(ISSI_ENABLE)), yes) +    TMK_COMMON_DEFS += -DISSI_ENABLE +endif + +ifeq ($(strip $(WATCHDOG_ENABLE)), yes) +    TMK_COMMON_DEFS += -DWATCHDOG_ENABLE +endif diff --git a/keyboards/lfkeyboards/lfkpad/rules.mk b/keyboards/lfkeyboards/lfkpad/rules.mk index 942f11368a..392a0bdb9e 100644 --- a/keyboards/lfkeyboards/lfkpad/rules.mk +++ b/keyboards/lfkeyboards/lfkpad/rules.mk @@ -29,12 +29,4 @@ WATCHDOG_ENABLE = no         # Resets keyboard if matrix_scan() isn't run every  SRC = TWIlib.c issi.c lighting.c -ifeq ($(strip $(ISSI_ENABLE)), yes) -    TMK_COMMON_DEFS += -DISSI_ENABLE -endif - -ifeq ($(strip $(WATCHDOG_ENABLE)), yes) -    TMK_COMMON_DEFS += -DWATCHDOG_ENABLE -endif -  LAYOUTS = numpad_6x4 diff --git a/keyboards/lfkeyboards/lighting.h b/keyboards/lfkeyboards/lighting.h index 69e63268dd..cb07755c53 100644 --- a/keyboards/lfkeyboards/lighting.h +++ b/keyboards/lfkeyboards/lighting.h @@ -1,6 +1,4 @@ -#ifndef LIGHTING_H -#define LIGHTING_H - +#pragma once  // rgb_sequence[RGBLED_NUM]  // @@ -49,5 +47,3 @@ void set_backlight(uint8_t level);  void set_underglow(uint8_t red, uint8_t green, uint8_t blue);  void set_rgb(uint8_t rgb_led, uint8_t red, uint8_t green, uint8_t blue);  void set_backlight_by_keymap(uint8_t col, uint8_t row); - -#endif
\ No newline at end of file diff --git a/keyboards/lfkeyboards/mini1800/config.h b/keyboards/lfkeyboards/mini1800/config.h index b8c0f2b671..df9f1c4ba0 100644 --- a/keyboards/lfkeyboards/mini1800/config.h +++ b/keyboards/lfkeyboards/mini1800/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -149,5 +148,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/lfkeyboards/mini1800/mini1800.h b/keyboards/lfkeyboards/mini1800/mini1800.h index c007d7f76a..3e460c8a11 100644 --- a/keyboards/lfkeyboards/mini1800/mini1800.h +++ b/keyboards/lfkeyboards/mini1800/mini1800.h @@ -1,5 +1,4 @@ -#ifndef LFK87_H -#define LFK87_H +#pragma once  #include "quantum.h"  #include "matrix.h" @@ -43,33 +42,18 @@ void click(uint16_t freq, uint16_t duration);  #define ___ KC_NO -        // a = 10 -        // b = 11 -        // c = 12 -        // d = 13 -        // e = 14 -        // f = 15 -        // g = 16 -        // h = 17 -        // i = 18 -        // j = 19 -  #ifndef LAYOUT -    #define LAYOUT( \ -        k11,  k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,        k1f,        k1g, k1h, k1i, k1j,\ -        k21,    k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      k2e,        k2g, k2h, k2i, k2j,\ -        k31,     k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,          k2f,        k3g, k3h, k3i, k3j,\ -        k41,      k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c,          k4d,   k4f,     k4g, k4h, k4i, k4j,\ -        k51,   k52,   k53,                 k56,             k5b, k5c, k5d,     k5f, k5g, k5h,     k5i, k5j \ -    ) \ -    { \ -        { k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, ___, k1f, k1g, k1h, k1i, k1j }, \ -        { k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h, k2i, k2j }, \ -        { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, ___, ___, ___, k3g, k3h, k3i, k3j }, \ -        { k41, ___, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, ___, k4f, k4g, k4h, k4i, k4j }, \ -        { k51, k52, k53, ___, ___, k56, ___, ___, ___, ___, k5b, k5c, k5d, ___, k5f, k5g, k5h, k5i, k5j }, \ -    } - +#    define LAYOUT( \ +    k00,  k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,        k0E,        k0F, k0G, k0H, k0I, \ +    k10,    k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1D,        k1F, k1G, k1H, k1I, \ +    k20,     k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,          k1E,        k2F, k2G, k2H, k2I, \ +    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,          k3C,   k3E,     k3F, k3G, k3H, k3I, \ +    k40,   k41,   k42,                 k45,             k4A, k4B, k4C,     k4E, k4F, k4G,     k4H, k4I \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E, k0F, k0G, k0H, k0I }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, ___, ___, k2F, k2G, k2H, k2I }, \ +    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, k3E, k3F, k3G, k3H, k3I }, \ +    { k40, k41, k42, ___, ___, k45, ___, ___, ___, ___, k4A, k4B, k4C, ___, k4E, k4F, k4G, k4H, k4I } \ +}  #endif // !LAYOUT #endif - -#endif //LFK87_H diff --git a/keyboards/lfkeyboards/mini1800/post_rules.mk b/keyboards/lfkeyboards/mini1800/post_rules.mk new file mode 100644 index 0000000000..f04e10e4a3 --- /dev/null +++ b/keyboards/lfkeyboards/mini1800/post_rules.mk @@ -0,0 +1,9 @@ +ifeq ($(LFK_REV), A) +    MCU = at90usb1286 +else +    MCU = at90usb646 +endif + +ifeq ($(strip $(ISSI_ENABLE)), yes) +    # TMK_COMMON_DEFS += -DISSI_ENABLE +endif diff --git a/keyboards/lfkeyboards/mini1800/rules.mk b/keyboards/lfkeyboards/mini1800/rules.mk index a9c29c4b91..c9a9b01054 100644 --- a/keyboards/lfkeyboards/mini1800/rules.mk +++ b/keyboards/lfkeyboards/mini1800/rules.mk @@ -7,21 +7,12 @@  # Set to A or C  LFK_REV = C -ifeq ($(LFK_REV), A) -    MCU = at90usb1286 -else -    MCU = at90usb646 -endif  BOOTLOADER = atmel-dfu  OPT_DEFS += -DLFK_TKL_REV_$(LFK_REV)  # Extra source files for IS3731 lighting  SRC = TWIlib.c issi.c lighting.c -ifeq ($(strip $(ISSI_ENABLE)), yes) -    # TMK_COMMON_DEFS += -DISSI_ENABLE -endif -  # Build Options  #   change yes to no to disable  # diff --git a/keyboards/manta60/post_rules.mk b/keyboards/manta60/post_rules.mk new file mode 100644 index 0000000000..e26b52df30 --- /dev/null +++ b/keyboards/manta60/post_rules.mk @@ -0,0 +1,3 @@ +ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes) +    OPT_DEFS += -DIOS_DEVICE_ENABLE +endif diff --git a/keyboards/manta60/rules.mk b/keyboards/manta60/rules.mk index db012a1551..dbd3ce3093 100644 --- a/keyboards/manta60/rules.mk +++ b/keyboards/manta60/rules.mk @@ -23,7 +23,3 @@ AUDIO_ENABLE = no           # Audio output  SPLIT_KEYBOARD = yes  IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad, iPhone) - -ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes) -    OPT_DEFS += -DIOS_DEVICE_ENABLE -endif diff --git a/keyboards/mechmini/mechmini.h b/keyboards/mechmini/mechmini.h index 637021cd20..cbd405285f 100644 --- a/keyboards/mechmini/mechmini.h +++ b/keyboards/mechmini/mechmini.h @@ -14,17 +14,12 @@   * along with this program.  If not, see <http://www.gnu.org/licenses/>.  */ -#ifndef MECHMINI_H -#define MECHMINI_H +#pragma once  #include "quantum.h" -#ifdef KEYBOARD_mechmini_v1 -    #include "v1.h" -#endif - -#ifdef KEYBOARD_mechmini_v2 -    #include "v2.h" -#endif - +#if defined(KEYBOARD_mechmini_v1) +#    include "v1.h" +#elif defined(KEYBOARD_mechmini_v2) +#    include "v2.h"  #endif diff --git a/keyboards/mechmini/v2/config.h b/keyboards/mechmini/v2/config.h index c19e030bf4..7936caef00 100755 --- a/keyboards/mechmini/v2/config.h +++ b/keyboards/mechmini/v2/config.h @@ -12,8 +12,8 @@   * 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 V2_CONFIG_H -#define V2_CONFIG_H + +#pragma once  #include "config_common.h" @@ -62,5 +62,3 @@  #define RGBLIGHT_SAT_STEP 8  #define RGBLIGHT_VAL_STEP 8  #endif - -#endif diff --git a/keyboards/mechmini/v2/v2.h b/keyboards/mechmini/v2/v2.h index 67a13abbb5..a0a620675e 100755 --- a/keyboards/mechmini/v2/v2.h +++ b/keyboards/mechmini/v2/v2.h @@ -13,57 +13,56 @@   * along with this program.  If not, see <http://www.gnu.org/licenses/>.  */ -#ifndef V2_H -#define V2_H +#pragma once  #include "../mechmini.h" +#define XXX KC_NO +  #define LAYOUT_ortho( \ -	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ -	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ -	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ -	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B \  ) { \ -	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \ -	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \ -	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \ -	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311 }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B } \  }  #define LAYOUT_625_space( \ -    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ -    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109,       K111, \ -    K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ -    K300, K301, K302,                   K306,                   K310, K311  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,      k1B, \ +    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \ +    k30, k31, k32,                k36,                k3A, k3B \  ) { \ -    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \ -    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  KC_NO, K111 }, \ -    { K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \ -    { K300,  K301,  K302,  KC_NO, KC_NO, KC_NO, K306,  KC_NO, KC_NO, KC_NO, K310,  K311 }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, XXX, k1B }, \ +    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \ +    { k30, k31, k32, XXX, XXX, XXX, k36, XXX, XXX, XXX, k3A, k3B } \  }  #define LAYOUT_split_space( \ -    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ -    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109,       K111, \ -    K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ -    K300, K301, K302,       K304,             K307,       K309, K310, K311  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,      k1B, \ +    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \ +    k30, k31, k32,      k34,           k37,      k39, k3A, k3B \  ) { \ -    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \ -    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  KC_NO, K111 }, \ -    { K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \ -    { K300,  K301,  K302,  KC_NO, K304,  KC_NO, KC_NO, K307,  KC_NO, K309,  K310,  K311 }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, XXX, k1B }, \ +    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \ +    { k30, k31, k32, XXX, k34, XXX, XXX, k37, XXX, k39, k3A, k3B } \  }  #define LAYOUT_2u_space_ortho( \ -    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ -    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ -    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ -    K300, K301, K302, K303, K304,    K305,    K307, K308, K309, K310, K311  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \ +    k30, k31, k32, k33, k34,   k35,    k37, k38, k39, k3A, k3B \  ) { \ -    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \ -    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \ -    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \ -    { K300,  K301,  K302,  K303,  K304,  K305,  K305,  K307,  K308,  K309,  K310,  K311 }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \ +    { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3A, k3B } \  } - -#endif diff --git a/keyboards/mehkee96/mehkee96.h b/keyboards/mehkee96/mehkee96.h index 1e1eb44a64..a92e7ffe0f 100644 --- a/keyboards/mehkee96/mehkee96.h +++ b/keyboards/mehkee96/mehkee96.h @@ -1,24 +1,23 @@ -#ifndef KEYMAP_COMMON_H -#define KEYMAP_COMMON_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  #define LAYOUT( \ -  K05, K25, K35, K45, K55, K06, KA6, KA7, K07, KB5, KC5, KD5, KE5, KD1, KE2, KD0, K67, K87, K97, \ -  K04, K14, K24, K34, K44, K54, K16, KB6, KB7, K17, KA4, KB4, KC4, KE4,      K64, K74, K84, K94, \ -  K03, K13, K23, K33, K43, K53, K26, KC6, KC7, K27, KA3, KB3, KC3, KD3,      K63, K73, K83, K93, \ -  K02, K12, K22, K32, K42, K52, K36, KD6, KD7, K37, KA2, KB2, KD2,           K62, K72, K82, K92, \ -  K01, K11, K21, K31, K41, K51, K46, KE6, KE7, K47, KA1, KB1,           K86, K61, K71, K81, K91, \ -  K00, K10, K20,           K56,                     K57, KA0, KB0, K66, K76, K96, K60, K80, K90  \ +    k50, k52, k53, k54, k55, k60, k6A, k7A, k70, k5B, k5C, k5D, k5E, k1D, k2E, k0D, k76, k78, k79, \ +    k40, k41, k42, k43, k44, k45, k61, k6B, k7B, k71, k4A, k4B, k4C, k4E,      k46, k47, k48, k49, \ +    k30, k31, k32, k33, k34, k35, k62, k6C, k7C, k72, k3A, k3B, k3C, k3D,      k36, k37, k38, k39, \ +    k20, k21, k22, k23, k24, k25, k63, k6D, k7D, k73, k2A, k2B, k2D,           k26, k27, k28, k29, \ +    k10, k11, k12, k13, k14, k15, k64, k6E, k7E, k74, k1A, k1B,           k68, k16, k17, k18, k19, \ +    k00, k01, k02,           k65,                     k75, k0A, k0B, k66, k67, k69, k06, k08, k09 \  ) { \ -	{ K00,  K10,    K20,  KC_NO,  KC_NO,  KC_NO,  K60,    KC_NO,  K80, K90,   KA0,   KB0, KC_NO, KD0,   KC_NO }, \ -	{ K01,  K11,    K21,  K31,    K41,    K51,    K61,    K71,  K81,   K91,   KA1,   KB1, KC_NO, KD1,   KC_NO }, \ -	{ K02,  K12,    K22,  K32,    K42,    K52,    K62,    K72,  K82,   K92,   KA2,   KB2, KC_NO, KD2,   KE2   }, \ -	{ K03,  K13,    K23,  K33,    K43,    K53,    K63,    K73,  K83,   K93,   KA3,   KB3, KC3,   KD3,   KC_NO }, \ -	{ K04,  K14,    K24,  K34,    K44,    K54,    K64,    K74,  K84,   K94,   KA4,   KB4, KC4,   KC_NO, KE4   }, \ -	{ K05,  KC_NO,  K25,  K35,    K45,    K55,    KC_NO,  KC_NO,KC_NO, KC_NO, KC_NO, KB5, KC5,   KD5,   KE5   }, \ -	{ K06,  K16,    K26,  K36,    K46,    K56,    K66,    K76,  K86,   K96,   KA6,   KB6, KC6,   KD6,   KE6   }, \ -	{ K07,  K17,    K27,  K37,    K47,    K57,    K67,    KC_NO,K87,   K97,   KA7,   KB7, KC7,   KD7,   KE7   }  \ +    { k00, k01, k02, XXX, XXX, XXX, k06, XXX, k08, k09, k0A, k0B, XXX, k0D, XXX }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, XXX, k1D, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, k2E }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, XXX, k4E }, \ +    { k50, XXX, k52, k53, k54, k55, XXX, XXX, XXX, XXX, XXX, k5B, k5C, k5D, k5E }, \ +    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E }, \ +    { k70, k71, k72, k73, k74, k75, k76, XXX, k78, k79, k7A, k7B, k7C, k7D, k7E } \  } - -#endif diff --git a/keyboards/meira/config.h b/keyboards/meira/config.h index 4d864a8a76..999ab1bf8a 100644 --- a/keyboards/meira/config.h +++ b/keyboards/meira/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -44,5 +43,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define RGBLED_NUM 15    // Number of LEDs  #endif - -#endif diff --git a/keyboards/meira/featherble/config.h b/keyboards/meira/featherble/config.h index b3ee954749..24f50ec17a 100644 --- a/keyboards/meira/featherble/config.h +++ b/keyboards/meira/featherble/config.h @@ -15,8 +15,7 @@ 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 FEATHERBLECONFIG_H -#define FEATHERBLECONFIG_H +#pragma once  #include "config_common.h" @@ -144,5 +143,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/meira/featherble/featherble.h b/keyboards/meira/featherble/featherble.h index b7599b9941..afc05d7c71 100644 --- a/keyboards/meira/featherble/featherble.h +++ b/keyboards/meira/featherble/featherble.h @@ -1,9 +1,5 @@ -#ifndef FEATHERBLE_H -#define FEATHERBLE_H +#pragma once  #include "../meira.h"  #include "quantum.h" - - -#endif diff --git a/keyboards/meira/issi.h b/keyboards/meira/issi.h index 51777f6ee3..74379ddbc8 100755 --- a/keyboards/meira/issi.h +++ b/keyboards/meira/issi.h @@ -1,6 +1,6 @@ +#pragma once +  #ifdef ISSI_ENABLE -#ifndef ISSI_H -#define ISSI_H  typedef struct ISSIDeviceStruct{      uint8_t fn_dirty;       // function registers need to be resent @@ -37,4 +37,3 @@ void activateLED(uint8_t matrix, uint8_t cx, uint8_t cy, uint8_t pwm);  void update_issi(uint8_t device_addr, uint8_t blocking);  #endif -#endif
\ No newline at end of file diff --git a/keyboards/meira/lighting.h b/keyboards/meira/lighting.h index dc55b70ef9..42fee8ac92 100755 --- a/keyboards/meira/lighting.h +++ b/keyboards/meira/lighting.h @@ -1,9 +1,6 @@ -#ifndef LIGHTING_H -#define LIGHTING_H +#pragma once  void led_test(void);  void force_issi_refresh(void);  void set_backlight(uint8_t level);  void set_backlight_by_keymap(uint8_t col, uint8_t row); - -#endif diff --git a/keyboards/meira/meira.h b/keyboards/meira/meira.h index d968394400..c88561fa04 100644 --- a/keyboards/meira/meira.h +++ b/keyboards/meira/meira.h @@ -13,8 +13,8 @@   * 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 MEIRA_H -#define MEIRA_H + +#pragma once  #include "quantum.h"  #include "issi.h" @@ -26,19 +26,15 @@ void reset_keyboard_kb(void);  // The first section contains all of the arguments  // The second converts the arguments into a two-dimensional array  #define LAYOUT_ortho_4x12( \ -   k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ -	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ -	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ -	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \ -) \ -{ \ -	{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \ -	{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ -	{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \ -	{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B } \  }  #define LAYOUT LAYOUT_ortho_4x12 - -#endif - diff --git a/keyboards/meira/promicro/config.h b/keyboards/meira/promicro/config.h index 53844745b0..0fb8b5207e 100644 --- a/keyboards/meira/promicro/config.h +++ b/keyboards/meira/promicro/config.h @@ -15,8 +15,7 @@ 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 PROMICROCONFIG_H -#define PROMICROCONFIG_H +#pragma once  #include "config_common.h" @@ -135,5 +134,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/meira/promicro/promicro.h b/keyboards/meira/promicro/promicro.h index 9e6800b497..afc05d7c71 100644 --- a/keyboards/meira/promicro/promicro.h +++ b/keyboards/meira/promicro/promicro.h @@ -1,8 +1,5 @@ -#ifndef FEATHERBLE_H -#define FEATHERBLE_H +#pragma once  #include "../meira.h"  #include "quantum.h" - -#endif diff --git a/keyboards/melgeek/mj6xy/info.json b/keyboards/melgeek/mj6xy/info.json index 5e9724716d..f0134582ff 100755 --- a/keyboards/melgeek/mj6xy/info.json +++ b/keyboards/melgeek/mj6xy/info.json @@ -3268,7 +3268,6 @@                  {"x": 10.5, "y": 1},                  {"x": 11.5, "y": 1},                  {"x": 12.5, "y": 1}, -                {"x": 13.5, "y": 1, "w": 1.5},                  {"x": 0, "y": 2, "w": 1.75},                  {"x": 1.75, "y": 2}, @@ -3415,7 +3414,6 @@                  {"x": 10.5, "y": 1},                  {"x": 11.5, "y": 1},                  {"x": 12.5, "y": 1}, -                {"x": 13.5, "y": 1, "w": 1.5},                  {"x": 0, "y": 2, "w": 1.75},                  {"x": 1.75, "y": 2}, diff --git a/keyboards/meme/config.h b/keyboards/meme/config.h index e157ade9ad..5db47b11b3 100644 --- a/keyboards/meme/config.h +++ b/keyboards/meme/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -156,5 +155,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/meme/meme.h b/keyboards/meme/meme.h index 4c4b29a046..36c533ea9d 100644 --- a/keyboards/meme/meme.h +++ b/keyboards/meme/meme.h @@ -13,90 +13,85 @@   * 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 MEME_H -#define MEME_H + +#pragma once  #include "quantum.h" +#define XXX KC_NO +  #define LAYOUT_spicy( \ -    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, \ -    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,      K37, \ -    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K56,      K57, \ -    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,           K76, K67, K77, \ -    K80, K90, K81,           K92,                     K85, K95, K86, K96, K87, K97 \ -)\ -{\ -  {K00, K01,   K02,   K03,   K04,   K05,   K06,   K07}, \ -  {K10, K11,   K12,   K13,   K14,   K15,   K16,   K17}, \ -  {K20, K21,   K22,   K23,   K24,   K25,   K26,   KC_NO}, \ -  {K30, K31,   K32,   K33,   K34,   K35,   K36,   K37}, \ -  {K40, K41,   K42,   K43,   K44,   K45,   KC_NO, KC_NO}, \ -  {K50, K51,   K52,   K53,   K54,   K55,   K56,   K57}, \ -  {K60, K61,   K62,   K63,   K64,   K65,   KC_NO, K67}, \ -  {K70, K71,   K72,   K73,   K74,   KC_NO, K76,   K77}, \ -  {K80, K81,   KC_NO, KC_NO, KC_NO, K85,   K86,   K87}, \ -  {K90, KC_NO, K92,   KC_NO, KC_NO, K95,   K96,   K97}, \ +    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, \ +    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,      k37, \ +    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55,      k56,      k57, \ +    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65,           k76, k67, k77, \ +    k80, k90, k81,           k92,                     k85, k95, k86, k96, k87, k97 \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07 }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17 }, \ +    { k20, k21, k22, k23, k24, k25, k26, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37 }, \ +    { k40, k41, k42, k43, k44, k45, XXX, XXX }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57 }, \ +    { k60, k61, k62, k63, k64, k65, XXX, k67 }, \ +    { k70, k71, k72, k73, k74, XXX, k76, k77 }, \ +    { k80, k81, XXX, XXX, XXX, k85, k86, k87 }, \ +    { k90, XXX, k92, XXX, XXX, k95, k96, k97 } \  }  #define LAYOUT_normie( \ -    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06,      K07, K17, \ -    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,      K37, \ -    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K56,      K57, \ -    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,           K76, K67, K77, \ -    K80, K90, K81,           K92,                     K85, K95, K86, K96, K87, K97 \ -)\ -{\ -  {K00, K01,   K02,   K03,   K04,   K05,   K06,   K07}, \ -  {K10, K11,   K12,   K13,   K14,   K15,   KC_NO, K17}, \ -  {K20, K21,   K22,   K23,   K24,   K25,   K26,   KC_NO}, \ -  {K30, K31,   K32,   K33,   K34,   K35,   K36,   K37}, \ -  {K40, K41,   K42,   K43,   K44,   K45,   KC_NO, KC_NO}, \ -  {K50, K51,   K52,   K53,   K54,   K55,   K56,   K57}, \ -  {K60, K61,   K62,   K63,   K64,   K65,   KC_NO, K67}, \ -  {K70, K71,   K72,   K73,   K74,   KC_NO, K76,   K77}, \ -  {K80, K81,   KC_NO, KC_NO, KC_NO, K85,   K86,   K87}, \ -  {K90, KC_NO, K92,   KC_NO, KC_NO, K95,   K96,   K97}, \ +    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06,      k07, k17, \ +    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,      k37, \ +    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55,      k56,      k57, \ +    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65,           k76, k67, k77, \ +    k80, k90, k81,           k92,                     k85, k95, k86, k96, k87, k97 \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07 }, \ +    { k10, k11, k12, k13, k14, k15, XXX, k17 }, \ +    { k20, k21, k22, k23, k24, k25, k26, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37 }, \ +    { k40, k41, k42, k43, k44, k45, XXX, XXX }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57 }, \ +    { k60, k61, k62, k63, k64, k65, XXX, k67 }, \ +    { k70, k71, k72, k73, k74, XXX, k76, k77 }, \ +    { k80, k81, XXX, XXX, XXX, k85, k86, k87 }, \ +    { k90, XXX, k92, XXX, XXX, k95, k96, k97 } \  }  #define LAYOUT_dank( \ -    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06,      K07, K17, \ -    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,      K37, \ -    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K56,      K57, \ -    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,           K76, K67, K77, \ -    K80, K90, K81,           K92,                     K85,      K86, K96, K87, K97 \ -)\ -{\ -  {K00, K01,   K02,   K03,   K04,   K05,   K06,   K07}, \ -  {K10, K11,   K12,   K13,   K14,   K15,   KC_NO, K17}, \ -  {K20, K21,   K22,   K23,   K24,   K25,   K26,   KC_NO}, \ -  {K30, K31,   K32,   K33,   K34,   K35,   K36,   K37}, \ -  {K40, K41,   K42,   K43,   K44,   K45,   KC_NO, KC_NO}, \ -  {K50, K51,   K52,   K53,   K54,   K55,   K56,   K57}, \ -  {K60, K61,   K62,   K63,   K64,   K65,   KC_NO, K67}, \ -  {K70, K71,   K72,   K73,   K74,   KC_NO, K76,   K77}, \ -  {K80, K81,   KC_NO, KC_NO, KC_NO, K85,   K86,   K87}, \ -  {K90, KC_NO, K92,   KC_NO, KC_NO, KC_NO, K96,   K97}, \ +    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06,      k07, k17, \ +    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,      k37, \ +    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55,      k56,      k57, \ +    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65,           k76, k67, k77, \ +    k80, k90, k81,           k92,                     k85,      k86, k96, k87, k97 \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07 }, \ +    { k10, k11, k12, k13, k14, k15, XXX, k17 }, \ +    { k20, k21, k22, k23, k24, k25, k26, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37 }, \ +    { k40, k41, k42, k43, k44, k45, XXX, XXX }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57 }, \ +    { k60, k61, k62, k63, k64, k65, XXX, k67 }, \ +    { k70, k71, k72, k73, k74, XXX, k76, k77 }, \ +    { k80, k81, XXX, XXX, XXX, k85, k86, k87 }, \ +    { k90, XXX, k92, XXX, XXX, XXX, k96, k97 } \  }  #define LAYOUT_meme( \ -    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, \ -    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,      K37, \ -    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K56,      K57, \ -    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,           K76, K67, K77, \ -    K80, K90, K81,           K92,                     K85,      K86, K96, K87, K97 \ -)\ -{\ -  {K00, K01,   K02,   K03,   K04,   K05,   K06,   K07}, \ -  {K10, K11,   K12,   K13,   K14,   K15,   K16,   K17}, \ -  {K20, K21,   K22,   K23,   K24,   K25,   K26,   KC_NO}, \ -  {K30, K31,   K32,   K33,   K34,   K35,   K36,   K37}, \ -  {K40, K41,   K42,   K43,   K44,   K45,   KC_NO, KC_NO}, \ -  {K50, K51,   K52,   K53,   K54,   K55,   K56,   K57}, \ -  {K60, K61,   K62,   K63,   K64,   K65,   KC_NO, K67}, \ -  {K70, K71,   K72,   K73,   K74,   KC_NO, K76,   K77}, \ -  {K80, K81,   KC_NO, KC_NO, KC_NO, K85,   K86,   K87}, \ -  {K90, KC_NO, K92,   KC_NO, KC_NO, KC_NO, K96,   K97}, \ +    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, \ +    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,      k37, \ +    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55,      k56,      k57, \ +    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65,           k76, k67, k77, \ +    k80, k90, k81,           k92,                     k85,      k86, k96, k87, k97 \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07 }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17 }, \ +    { k20, k21, k22, k23, k24, k25, k26, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37 }, \ +    { k40, k41, k42, k43, k44, k45, XXX, XXX }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57 }, \ +    { k60, k61, k62, k63, k64, k65, XXX, k67 }, \ +    { k70, k71, k72, k73, k74, XXX, k76, k77 }, \ +    { k80, k81, XXX, XXX, XXX, k85, k86, k87 }, \ +    { k90, XXX, k92, XXX, XXX, XXX, k96, k97 } \  } - - -#endif diff --git a/keyboards/miniaxe/miniaxe.h b/keyboards/miniaxe/miniaxe.h index b6a6051123..fc23865c36 100644 --- a/keyboards/miniaxe/miniaxe.h +++ b/keyboards/miniaxe/miniaxe.h @@ -13,8 +13,8 @@   * 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 MINIAXE_H -#define MINIAXE_H + +#pragma once  #include "quantum.h" @@ -31,22 +31,19 @@  #define ___ KC_NO  #define LAYOUT_split_3x5_3( \ -        L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, \ -        L06, L07, L08, L09, L10, R06, R07, R08, R09, R10, \ -        L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, \ -                  L16, L17, L18, R16, R17, R18            \ -    ) \ -    { \ -        { L01, L02, L03, L04, L05 }, \ -        { L06, L07, L08, L09, L10 }, \ -        { L11, L12, L13, L14, L15 }, \ -        { L16, L17, L18, ___, ___ }, \ -        { R01, R02, R03, R04, R05 }, \ -        { R06, R07, R08, R09, R10 }, \ -        { R11, R12, R13, R14, R15 }, \ -        { R16, R17, R18, ___, ___ }  \ -    } - -#endif +    L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, \ +    L06, L07, L08, L09, L10, R06, R07, R08, R09, R10, \ +    L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, \ +              L16, L17, L18, R16, R17, R18 \ +) { \ +    { L01, L02, L03, L04, L05 }, \ +    { L06, L07, L08, L09, L10 }, \ +    { L11, L12, L13, L14, L15 }, \ +    { L16, L17, L18, ___, ___ }, \ +    { R01, R02, R03, R04, R05 }, \ +    { R06, R07, R08, R09, R10 }, \ +    { R11, R12, R13, R14, R15 }, \ +    { R16, R17, R18, ___, ___ } \ +}  #define LAYOUT LAYOUT_split_3x5_3 diff --git a/keyboards/mitosis/config.h b/keyboards/mitosis/config.h index 0e089269e8..94e84e680e 100644 --- a/keyboards/mitosis/config.h +++ b/keyboards/mitosis/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -66,5 +65,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.      UCSR1B = _BV(TXEN1) | _BV(RXEN1); \      /* 8-bit data */                  \      UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); - -#endif diff --git a/keyboards/mitosis/mitosis.h b/keyboards/mitosis/mitosis.h index 80476e71c8..4b7d3a60c4 100644 --- a/keyboards/mitosis/mitosis.h +++ b/keyboards/mitosis/mitosis.h @@ -1,5 +1,4 @@ -#ifndef MITOSIS_H -#define MITOSIS_H +#pragma once  #include "quantum.h" @@ -43,21 +42,21 @@  #define set_led_white   PORTF |= (1<<LED_B) | (1<<LED_R) | (1<<LED_G)  */ +#define XXX KC_NO +  // This a shortcut to help you visually see your layout.  // The first section contains all of the arguments  // The second converts the arguments into a two-dimensional array  #define LAYOUT( \ -  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, \ -       k31, k32, k33, k34,      k35, k36, k37, k38, \ -       k41, k42, k43, k44,      k45, k46, k47, k48  \ -) \ -  {                                                           \ -    { 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   }, \ -    { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, KC_NO }, \ -    { KC_NO, k41, k42, k43, k44, k45, k46, k47, k48, KC_NO }  \ -  } -#endif +    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, \ +         k31, k32, k33, k34,      k35, k36, k37, k38, \ +         k41, k42, k43, k44,      k45, k46, k47, k48 \ +) { \ +    { 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 }, \ +    { XXX, k31, k32, k33, k34, k35, k36, k37, k38, XXX }, \ +    { XXX, k41, k42, k43, k44, k45, k46, k47, k48, XXX } \ +} diff --git a/keyboards/miuni32/config.h b/keyboards/miuni32/config.h index c2a40cf1ba..f677ce3347 100644 --- a/keyboards/miuni32/config.h +++ b/keyboards/miuni32/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -158,5 +157,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define RGBLIGHT_HUE_STEP 10  #define RGBLIGHT_SAT_STEP 17  #define RGBLIGHT_VAL_STEP 17 - -#endif diff --git a/keyboards/miuni32/miuni32.h b/keyboards/miuni32/miuni32.h index ff74675450..c95a37e2e8 100644 --- a/keyboards/miuni32/miuni32.h +++ b/keyboards/miuni32/miuni32.h @@ -1,28 +1,27 @@ -#ifndef MIUNI32_H -#define MIUNI32_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  #define LAYOUT( \ -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \ -    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \ -    K20, K21, K22, K23,      K25, K26, K27, K28, K29, K2A  \ -  ) { \ -  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A }, \ -  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A }, \ -  { K20, K21, K22, K23, KC_NO, K25, K26, K27, K28, K29, K2A }  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, \ +    k20, k21, k22, k23,      k25, k26, k27, k28, k29, k2A \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \ +    { k20, k21, k22, k23, XXX, k25, k26, k27, k28, k29, k2A } \  }  #define LAYOUT_ortho_3x11( \ -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \ -    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \ -    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \ -  ) { \ -  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A }, \ -  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A }, \ -  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A }  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A } \  }  #define LAYOUT_all LAYOUT_ortho_3x11 - -#endif diff --git a/keyboards/mschwingen/modelm/post_rules.mk b/keyboards/mschwingen/modelm/post_rules.mk new file mode 100644 index 0000000000..a1c2040f4c --- /dev/null +++ b/keyboards/mschwingen/modelm/post_rules.mk @@ -0,0 +1,3 @@ +ifeq ($(strip $(UART_DEBUG)), yes) +    OPT_DEFS += -DUART_DEBUG +endif diff --git a/keyboards/mschwingen/modelm/rules.mk b/keyboards/mschwingen/modelm/rules.mk index ef70f5449c..d8bcf9b4ad 100644 --- a/keyboards/mschwingen/modelm/rules.mk +++ b/keyboards/mschwingen/modelm/rules.mk @@ -36,8 +36,4 @@ OPT_DEFS += -DSLEEP_LED_ENABLE # we need our own sleep callbacks to turn of WS28  LTO_ENABLE = yes -ifeq ($(strip $(UART_DEBUG)), yes) -    OPT_DEFS += -DUART_DEBUG -endif -  DEFAULT_FOLDER = mschwingen/modelm/led_wired diff --git a/keyboards/mt40/config.h b/keyboards/mt40/config.h index 8e04fe38c4..8a968dc3b7 100644 --- a/keyboards/mt40/config.h +++ b/keyboards/mt40/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -165,5 +164,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/mt40/mt40.h b/keyboards/mt40/mt40.h index c202d5f6c7..dc0de22b28 100644 --- a/keyboards/mt40/mt40.h +++ b/keyboards/mt40/mt40.h @@ -13,31 +13,30 @@   * 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 MT40_H -#define MT40_H + +#pragma once  #include "quantum.h" +#define XXX KC_NO  // This a shortcut to help you visually see your layout.  // The following is an example using the Planck MIT layout  // The first section contains all of the arguments  // The second converts the arguments into a two-dimensional array  #define LAYOUT_planck_mit( \ -    K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B, \ -    K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B, \ -    K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B, \ -    K30,  K31,  K32,  K33,  K34,     K35,     K37,  K38,  K39,  K3A,  K3B \ +    k40, k31, k32, k33, k34, k35, k52, k5C, k6C, k62, k3A, k4E, \ +    k30, k21, k22, k23, k24, k25, k53, k5D, k6D, k63, k2A, k2B, \ +    k10, k11, k12, k13, k14, k15, k54, k5E, k6E, k64, k1A, k66, \ +    k20, k00, k01, k02, k04,    k05,   k0B, k56, k58, k57, k59 \  ) { \ -    { K31,   K32,   K33,   KC_NO, K34,   K35,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K37,   KC_NO, KC_NO, KC_NO }, \ -    { K20,   K21,   K22,   K23,   K24,   K25,   KC_NO, KC_NO, KC_NO, KC_NO, K2A,   KC_NO, KC_NO, KC_NO, KC_NO }, \ -    { K30,   K11,   K12,   K13,   K14,   K15,   KC_NO, KC_NO, KC_NO, KC_NO, K1A,   K1B,   KC_NO, KC_NO, KC_NO }, \ -    { K10,   K01,   K02,   K03,   K04,   K05,   KC_NO, KC_NO, KC_NO, KC_NO, K0A,   KC_NO, KC_NO, KC_NO, KC_NO }, \ -    { K00,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K0B   }, \ -    { KC_NO, KC_NO, K06,   K16,   K26,   K35,   K38,   K3A,   K39,   K3B,   KC_NO, KC_NO, K07,   K17,   K27   }, \ -    { KC_NO, KC_NO, K09,   K19,   K29,   KC_NO, K2B,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K08,   K18,   K28   }  \ +    { k00, k01, k02, XXX, k04, k05, XXX, XXX, XXX, XXX, XXX, k0B, XXX, XXX, XXX }, \ +    { k10, k11, k12, k13, k14, k15, XXX, XXX, XXX, XXX, k1A, XXX, XXX, XXX, XXX }, \ +    { k20, k21, k22, k23, k24, k25, XXX, XXX, XXX, XXX, k2A, k2B, XXX, XXX, XXX }, \ +    { k30, k31, k32, k33, k34, k35, XXX, XXX, XXX, XXX, k3A, XXX, XXX, XXX, XXX }, \ +    { k40, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k4E }, \ +    { XXX, XXX, k52, k53, k54, k05, k56, k57, k58, k59, XXX, XXX, k5C, k5D, k5E }, \ +    { XXX, XXX, k62, k63, k64, XXX, k66, XXX, XXX, XXX, XXX, XXX, k6C, k6D, k6E } \  }  #define LAYOUT LAYOUT_planck_mit - -#endif diff --git a/keyboards/mxss/config.h b/keyboards/mxss/config.h index b0aef68116..139f107a0e 100644 --- a/keyboards/mxss/config.h +++ b/keyboards/mxss/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -135,5 +134,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define MAGIC_KEY_EEPROM         E  //#define MAGIC_KEY_NKRO           N  //#define MAGIC_KEY_SLEEP_LED      Z - -#endif diff --git a/keyboards/namecard2x4/namecard2x4.h b/keyboards/namecard2x4/namecard2x4.h index f2e27a0102..f3f6992703 100644 --- a/keyboards/namecard2x4/namecard2x4.h +++ b/keyboards/namecard2x4/namecard2x4.h @@ -13,8 +13,8 @@   * 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 NAMECARD2X4_H -#define NAMECARD2X4_H + +#pragma once  #include "quantum.h" @@ -24,10 +24,8 @@  // The second converts the arguments into a two-dimensional array  #define LAYOUT( \      k00, k01, k02, k03, \ -    k10, k11, k12, k13   \ +    k10, k11, k12, k13 \  ) { \      { k00, k01, k02, k03 }, \ -    { k10, k11, k12, k13 }, \ +    { k10, k11, k12, k13 } \  } - -#endif diff --git a/keyboards/nek_type_a/mcp23017.h b/keyboards/nek_type_a/mcp23017.h index 41c747beab..df1a305571 100644 --- a/keyboards/nek_type_a/mcp23017.h +++ b/keyboards/nek_type_a/mcp23017.h @@ -13,8 +13,8 @@   * 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 MAP23017_H -#define MAP23017_H + +#pragma once  #define EXPANDER_ADDR 0x27  #define I2C_TIMEOUT 200 // milliseconds @@ -67,5 +67,3 @@ void expander_init(void);  void expander_select(uint8_t pin);  void expander_unselect(uint8_t pin);  void expander_unselect_all(void); - -#endif
\ No newline at end of file diff --git a/keyboards/nek_type_a/nek_type_a.h b/keyboards/nek_type_a/nek_type_a.h index 9bf6028cb9..78f019c0fd 100644 --- a/keyboards/nek_type_a/nek_type_a.h +++ b/keyboards/nek_type_a/nek_type_a.h @@ -13,8 +13,8 @@   * 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 NEK_TYPE_A_H -#define NEK_TYPE_A_H + +#pragma once  #include "quantum.h"  #include <stdint.h> @@ -39,20 +39,20 @@ extern bool i2c_initialized;  void init_expander(void); +#define XXX KC_NO +  #define LAYOUT( \           L12,      L14, L15, L16, L17,   R11, R12, R13, R14, R15, R16, R17, R18, R19, R1A, R1B, \      L21, L22, L23, L24, L25, L26, L27,   R21, R22, R23, R24, R25, R26,      R28, R29, R2A, R2B, \      L31, L32, L33, L34, L35, L36,        R31, R32, R33, R34, R35, R36, R37, R38, R39, R3A, R3B, \ -    L41, L42, L43, L44, L45, L46,        R41, R42, R43, R44, R45, R46,      R48,                \ -    L51, L52, L53, L54, L55, L56,        R51, R52, R53, R54, R55,           R58,      R5A,      \ -    L61, L62, L63,      L65,             R61,      R63,      R65, R66,      R68, R69, R6A, R6B  \ -) \ -{ \ -    { KC_NO,   L12, KC_NO,   L14,   L15,   L16,   L17,   R11,   R12,   R13,   R14,   R15,   R16,   R17,   R18,   R19,   R1A,   R1B }, \ -    {   L21,   L22,   L23,   L24,   L25,   L26,   L27,   R21,   R22,   R23,   R24,   R25,   R26, KC_NO,   R28,   R29,   R2A,   R2B }, \ -    {   L31,   L32,   L33,   L34,   L35,   L36, KC_NO,   R31,   R32,   R33,   R34,   R35,   R36,   R37,   R38,   R39,   R3A,   R3B }, \ -    {   L41,   L42,   L43,   L44,   L45,   L46, KC_NO,   R41,   R42,   R43,   R44,   R45,   R46, KC_NO,   R48, KC_NO, KC_NO, KC_NO }, \ -    {   L51,   L52,   L53,   L54,   L55,   L56, KC_NO,   R51,   R52,   R53,   R54,   R55, KC_NO, KC_NO,   R58, KC_NO,   R5A, KC_NO }, \ -    {   L61,   L62,   L63, KC_NO,   L65, KC_NO, KC_NO,   R61, KC_NO,   R63, KC_NO,   R65,   R66, KC_NO,   R68,   R69,   R6A,   R6B }, \ +    L41, L42, L43, L44, L45, L46,        R41, R42, R43, R44, R45, R46,      R48, \ +    L51, L52, L53, L54, L55, L56,        R51, R52, R53, R54, R55,           R58,      R5A, \ +    L61, L62, L63,      L65,             R61,      R63,      R65, R66,      R68, R69, R6A, R6B \ +) { \ +    { XXX, L12, XXX, L14, L15, L16, L17, R11, R12, R13, R14, R15, R16, R17, R18, R19, R1A, R1B }, \ +    { L21, L22, L23, L24, L25, L26, L27, R21, R22, R23, R24, R25, R26, XXX, R28, R29, R2A, R2B }, \ +    { L31, L32, L33, L34, L35, L36, XXX, R31, R32, R33, R34, R35, R36, R37, R38, R39, R3A, R3B }, \ +    { L41, L42, L43, L44, L45, L46, XXX, R41, R42, R43, R44, R45, R46, XXX, R48, XXX, XXX, XXX }, \ +    { L51, L52, L53, L54, L55, L56, XXX, R51, R52, R53, R54, R55, XXX, XXX, R58, XXX, R5A, XXX }, \ +    { L61, L62, L63, XXX, L65, XXX, XXX, R61, XXX, R63, XXX, R65, R66, XXX, R68, R69, R6A, R6B } \  } -#endif diff --git a/keyboards/newgame40/newgame40.h b/keyboards/newgame40/newgame40.h index 6044f37657..e6146e4f14 100644 --- a/keyboards/newgame40/newgame40.h +++ b/keyboards/newgame40/newgame40.h @@ -1,19 +1,15 @@ -#ifndef NEWGAME40_H -#define NEWGAME40_H +#pragma once  #include "quantum.h"  #define LAYOUT_ortho_4x10( \ -      k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, \ -      k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, \ -      k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, \ -      k401, k402, k403, k404, k405, k406, k407, k408, k409, k410 \ -) \ -{ \ -      {k101, k102, k103, k104, k105, k106, k107, k108, k109, k110}, \ -      {k201, k202, k203, k204, k205, k206, k207, k208, k209, k210}, \ -      {k301, k302, k303, k304, k305, k306, k307, k308, k309, k310}, \ -      {k401, k402, k403, k404, k405, k406, k407, k408, k409, k410} \ +    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 } \  } - -#endif diff --git a/keyboards/newgame40/post_rules.mk b/keyboards/newgame40/post_rules.mk new file mode 100644 index 0000000000..68229fe12b --- /dev/null +++ b/keyboards/newgame40/post_rules.mk @@ -0,0 +1,3 @@ +ifeq ($(strip $(IOS_DEVICE_ENABLE )), yes) +    OPT_DEFS += -DIOS_DEVICE_ENABLE  +endif diff --git a/keyboards/newgame40/rules.mk b/keyboards/newgame40/rules.mk index 87d565cff4..4b580c7d2d 100644 --- a/keyboards/newgame40/rules.mk +++ b/keyboards/newgame40/rules.mk @@ -21,10 +21,6 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID  RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.  IOS_DEVICE_ENABLE = no     # connect to IOS Device -  ifeq ($(strip $(IOS_DEVICE_ENABLE )), yes) -    OPT_DEFS += -DIOS_DEVICE_ENABLE  -  endif -  # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE  SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend diff --git a/keyboards/noxary/x268/x268.h b/keyboards/noxary/x268/x268.h index 9961b7dfdb..d2f63dc919 100644 --- a/keyboards/noxary/x268/x268.h +++ b/keyboards/noxary/x268/x268.h @@ -13,23 +13,23 @@   * 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 X268_H -#define X268_H + +#pragma once  #include "quantum.h" +#define XXX KC_NO +  #define LAYOUT( \ -	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \ -	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, \ -	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, \ -	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K314, K315, \ -	K400, K401, K402,                   K406,             K409, K410, K411, K412,       K414, K415 \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1E, k1F, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2E, k2F, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,      k3E, k3F, \ +    k40, k41, k42,                k46,           k49, k4A, k4B, k4C,      k4E, k4F \  ) { \ -	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \ -	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115 }, \ -	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214,  K215 }, \ -	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314,  K315 }, \ -	{ K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, K409,  K410,  K411,  K412,  KC_NO, K414,  K415 }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, k2E, k2F }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, XXX, k3E, k3F }, \ +    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4A, k4B, k4C, XXX, k4E, k4F } \  } - -#endif diff --git a/keyboards/numatreus/post_rules.mk b/keyboards/numatreus/post_rules.mk new file mode 100644 index 0000000000..1f49875d0f --- /dev/null +++ b/keyboards/numatreus/post_rules.mk @@ -0,0 +1,3 @@ +ifeq ($(strip $(LED_ANIMATIONS)), yes) +    OPT_DEFS += -DLED_ANIMATIONS +endif diff --git a/keyboards/numatreus/rules.mk b/keyboards/numatreus/rules.mk index 1dd016ab0d..f9d5498961 100644 --- a/keyboards/numatreus/rules.mk +++ b/keyboards/numatreus/rules.mk @@ -19,9 +19,5 @@ UNICODE_ENABLE = yes         # Unicode  RGBLIGHT_ENABLE = no  LED_ANIMATIONS = no -ifeq ($(strip $(LED_ANIMATIONS)), yes) -    OPT_DEFS += -DLED_ANIMATIONS -endif -  # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE  SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend diff --git a/keyboards/ok60/config.h b/keyboards/ok60/config.h index aafed8a407..faccfcc646 100644 --- a/keyboards/ok60/config.h +++ b/keyboards/ok60/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -71,5 +70,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.  #define RGBLIGHT_HUE_STEP 8  #define RGBLIGHT_SAT_STEP 8  #define RGBLIGHT_VAL_STEP 8 - -#endif diff --git a/keyboards/ok60/ok60.h b/keyboards/ok60/ok60.h index d64f951c42..4e6aeb2c35 100644 --- a/keyboards/ok60/ok60.h +++ b/keyboards/ok60/ok60.h @@ -1,77 +1,75 @@ -#ifndef OK60_H -#define OK60_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  #define LAYOUT_60_ansi( \ -	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K014, \ -	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       \ -	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213,       \ -	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,       \ -	K400, K401, K402,                   K406,                   K410, K411, K412, K413        \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, \ +    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, \ +    k40, k41, k42,                k46,                k4A, k4B, k4C, k4D \  ) { \ -	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  KC_NO, K014 }, \ -	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  KC_NO }, \ -	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, K213,  KC_NO }, \ -	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  KC_NO }, \ -	{ K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  K411,  K412,  K413,  KC_NO }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX }, \ +    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX }, \ +    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, XXX } \  }  #define LAYOUT_60_ansi_split_bksp_rshift( \ -	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ -	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       \ -	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213,       \ -	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \ -	K400, K401, K402,                   K406,                   K410, K411, K412, K413        \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, \ +    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E, \ +    k40, k41, k42,                k46,                k4A, k4B, k4C, k4D \  ) { \ -	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \ -	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  KC_NO }, \ -	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, K213,  KC_NO }, \ -	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314 }, \ -	{ K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  K411,  K412,  K413,  KC_NO }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX }, \ +    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \ +    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, XXX } \  }  #define LAYOUT_60_iso( \ -	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K014, \ -	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,             \ -	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       \ -	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,       \ -	K400, K401, K402,                   K406,                   K410, K411, K412, K413        \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, \ +    k40, k41, k42,                k46,                k4A, k4B, k4C, k4D \  ) { \ -	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  KC_NO, K014 }, \ -	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, KC_NO }, \ -	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO }, \ -	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  KC_NO }, \ -	{ K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  K411,  K412,  K413,  KC_NO }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX }, \ +    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, XXX } \  }  #define LAYOUT_60_iso_split_rshift( \ -	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K014, \ -	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,             \ -	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       \ -	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \ -	K400, K401, K402,                   K406,                   K410, K411, K412, K413        \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E, \ +    k40, k41, k42,                k46,                k4A, k4B, k4C, k4D \  ) { \ -	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  KC_NO, K014 }, \ -	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, KC_NO }, \ -	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO }, \ -	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  KC314 }, \ -	{ K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  K411,  K412,  K413,  KC_NO }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \ +    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, XXX } \  }  #define LAYOUT_60_hhkb( \ -	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ -	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       \ -	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213,       \ -	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \ -	      K401, K402,                   K406,                   K411, K412 \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, \ +    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E, \ +         k41, k42,                k46,                k4B, k4C \  ) { \ -	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014  }, \ -	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  KC_NO }, \ -	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, K213,  KC_NO }, \ -	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314  }, \ -	{ KC_NO, K401,  K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, KC_NO, K411,  K412,  KC_NO, KC_NO }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX }, \ +    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \ +    { XXX, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4B, k4C, XXX, XXX } \  } - - -#endif diff --git a/keyboards/omnikey_bh/config.h b/keyboards/omnikey_bh/config.h index 272424cf9e..7d170077a9 100644 --- a/keyboards/omnikey_bh/config.h +++ b/keyboards/omnikey_bh/config.h @@ -1,5 +1,4 @@ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -46,5 +45,3 @@  #define RGBLIGHT_SAT_STEP 8  #define RGBLIGHT_VAL_STEP 8  #endif - -#endif diff --git a/keyboards/org60/config.h b/keyboards/org60/config.h index 8189bc0960..42dbb83169 100644 --- a/keyboards/org60/config.h +++ b/keyboards/org60/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -72,5 +71,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.  #define LOCKING_RESYNC_ENABLE  #define TAPPING_TERM 200 - -#endif diff --git a/keyboards/org60/org60.h b/keyboards/org60/org60.h index 8ee94179cb..34a41571f8 100644 --- a/keyboards/org60/org60.h +++ b/keyboards/org60/org60.h @@ -1,5 +1,4 @@ -#ifndef Org60_H -#define Org60_H +#pragma once  #include "quantum.h"  #include "led.h" @@ -19,33 +18,33 @@ inline void org60_bl_led_on(void)    	{ DDRF |=  (1<<5); PORTF &= ~(1<<5); }  inline void org60_caps_led_off(void)   { DDRB &= ~(1<<2); PORTB &= ~(1<<2); }  inline void org60_bl_led_off(void)   	{ DDRF &= ~(1<<5); PORTF &= ~(1<<5); } +#define XXX KC_NO +  /* Org60 Keymap Definition Macro */  #define LAYOUT( \ -      K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D,  K49, \ -      K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1D,       \ -      K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,       \ -      K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K47,  K3D,  K3C, \ -      K40,  K41,  K42,              K45,                          K4A,  K4B,  K48,  K4C,  K4D  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k49, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k47, k3D, k3C, \ +    k40, k41, k42,           k45,                     k4A, k4B, k48, k4C, k4D \  ) { \ -    { K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D }, \ -    { K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1D }, \ -    { K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D }, \ -    { K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C,  K3D }, \ -    { K40,  K41,  K42,  KC_NO,KC_NO,K45,  KC_NO,K47,  K48,  K49,  K4A,  K4B,  K4C,  K4D }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \ +    { k40, k41, k42, XXX, XXX, k45, XXX, k47, k48, k49, k4A, k4B, k4C, k4D } \  }  #define LAYOUT_60_ansi( \ -      K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D, \ -      K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1D, \ -      K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,        K2D, \ -      K30,        K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,        K3D, \ -      K40,  K41,  K42,              K45,                          K4A,  K4B,  K4C,  K4D  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, \ +    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, \ +    k40, k41, k42,           k45,                     k4A, k4B, k4C, k4D \  ) { \ -    { K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D }, \ -    { K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1D }, \ -    { K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  KC_NO,K2D }, \ -    { K30,  KC_NO,K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  KC_NO,K3D }, \ -    { K40,  K41,  K42,  KC_NO,KC_NO,K45,  KC_NO,KC_NO,KC_NO,KC_NO,K4A,  K4B,  K4C,  K4D }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D }, \ +    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D }, \ +    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4A, k4B, k4C, k4D } \  } - -#endif diff --git a/keyboards/paladin64/config.h b/keyboards/paladin64/config.h index fa588ee354..10e4901a66 100755 --- a/keyboards/paladin64/config.h +++ b/keyboards/paladin64/config.h @@ -1,5 +1,4 @@ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -112,5 +111,3 @@  #define RGBLIGHT_SAT_STEP 17  #define RGBLIGHT_VAL_STEP 12  #endif - -#endif diff --git a/keyboards/paladin64/paladin64.h b/keyboards/paladin64/paladin64.h index 9666b08988..1a55cf328f 100755 --- a/keyboards/paladin64/paladin64.h +++ b/keyboards/paladin64/paladin64.h @@ -1,92 +1,90 @@ -#ifndef PALADIN64_H -#define PALADIN64_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  #define LAYOUT_all( \ -    K36, K37, K46, K47, K56, K57, K66, K67, K76, K77, K06, K07, K17, K26, K27, \ -    K34, K35, K44, K45, K54, K55, K64, K65, K75, K05, K15, K16, K25, K24, \ -    K32, K33, K43, K52, K53, K63, K73, K74, K03, K04, K13, K14, K23, \ -    K31, K41, K42, K51, K61, K62, K71, K72, K01, K02, K11, K12, K21, K22, \ -    K30, K40, K50,           K60,                     K70, K00, K10, K20  \ +    k36, k37, k46, k47, k56, k57, k66, k67, k76, k77, k06, k07, k17, k26, k27, \ +    k34, k35, k44, k45, k54, k55, k64, k65, k75, k05, k15, k16, k25, k24, \ +    k32, k33, k43, k52, k53, k63, k73, k74, k03, k04, k13, k14, k23, \ +    k31, k41, k42, k51, k61, k62, k71, k72, k01, k02, k11, k12, k21, k22, \ +    k30, k40, k50,           k60,                     k70, k00, k10, k20 \  ) { \ -    { K00, K01, K02, K03, K04, K05, K06, K07 }, \ -    { K10, K11, K12, K13, K14, K15, K16, K17 }, \ -    { K20, K21, K22, K23, K24, K25, K26, K27 }, \ -    { K30, K31, K32, K33, K34, K35, K36, K37 }, \ -    { K40, K41, K42, K43, K44, K45, K46, K47 }, \ -    { K50, K51, K52, K53, K54, K55, K56, K57 }, \ -    { K60, K61, K62, K63, K64, K65, K66, K67 }, \ -    { K70, K71, K72, K73, K74, K75, K76, K77 } \ +    { k00, k01, k02, k03, k04, k05, k06, k07 }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17 }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27 }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37 }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47 }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57 }, \ +    { k60, k61, k62, k63, k64, k65, k66, k67 }, \ +    { k70, k71, k72, k73, k74, k75, k76, k77 } \  }  #define LAYOUT_iso( \ -    K36, K37, K46, K47, K56, K57, K66, K67, K76, K77, K06, K07, K17,      K27, \ -    K34, K35, K44, K45, K54, K55, K64, K65, K75, K05, K15, K16, K25, K24, \ -    K32, K33, K43, K52, K53, K63, K73, K74, K03, K04, K13, K14, K23, \ -    K31, K41, K42, K51, K61, K62, K71, K72, K01, K02, K11, K12, K21,  \ -    K30, K40, K50,           K60,                     K70, K00,      K20  \ +    k36, k37, k46, k47, k56, k57, k66, k67, k76, k77, k06, k07, k17,      k27, \ +    k34, k35, k44, k45, k54, k55, k64, k65, k75, k05, k15, k16, k25, k24, \ +    k32, k33, k43, k52, k53, k63, k73, k74, k03, k04, k13, k14, k23, \ +    k31, k41, k42, k51, k61, k62, k71, k72, k01, k02, k11, k12, k21, \ +    k30, k40, k50,           k60,                     k70, k00,      k20 \  ) { \ -    { K00,   K01, K02,   K03, K04, K05, K06,   K07 }, \ -    { KC_NO, K11, K12,   K13, K14, K15, K16,   K17 }, \ -    { K20,   K21, KC_NO, K23, K24, K25, KC_NO, K27 }, \ -    { K30,   K31, K32,   K33, K34, K35, K36,   K37 }, \ -    { K40,   K41, K42,   K43, K44, K45, K46,   K47 }, \ -    { K50,   K51, K52,   K53, K54, K55, K56,   K57 }, \ -    { K60,   K61, K62,   K63, K64, K65, K66,   K67 }, \ -    { K70,   K71, K72,   K73, K74, K75, K76,   K77 } \ +    { k00, k01, k02, k03, k04, k05, k06, k07 }, \ +    { XXX, k11, k12, k13, k14, k15, k16, k17 }, \ +    { k20, k21, XXX, k23, k24, k25, XXX, k27 }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37 }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47 }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57 }, \ +    { k60, k61, k62, k63, k64, k65, k66, k67 }, \ +    { k70, k71, k72, k73, k74, k75, k76, k77 } \  }  #define LAYOUT_60_ansi( \ -    K36, K37, K46, K47, K56, K57, K66, K67, K76, K77, K06, K07, K17,      K27, \ -    K34, K35, K44, K45, K54, K55, K64, K65, K75, K05, K15, K16, K25, K24, \ -    K32, K33, K43, K52, K53, K63, K73, K74, K03, K04, K13, K14, K23, \ -    K31,      K42, K51, K61, K62, K71, K72, K01, K02, K11, K12, K21,  \ -    K30, K40, K50,           K60,                     K70, K00, K10, K20  \ +    k36, k37, k46, k47, k56, k57, k66, k67, k76, k77, k06, k07, k17,      k27, \ +    k34, k35, k44, k45, k54, k55, k64, k65, k75, k05, k15, k16, k25, k24, \ +    k32, k33, k43, k52, k53, k63, k73, k74, k03, k04, k13, k14, k23, \ +    k31,      k42, k51, k61, k62, k71, k72, k01, k02, k11, k12, k21, \ +    k30, k40, k50,           k60,                     k70, k00, k10, k20 \  ) { \ -    { K00, K01,   K02,   K03, K04, K05, K06,   K07 }, \ -    { K10, K11,   K12,   K13, K14, K15, K16,   K17 }, \ -    { K20, K21,   KC_NO, K23, K24, K25, KC_NO, K27 }, \ -    { K30, K31,   K32,   K33, K34, K35, K36,   K37 }, \ -    { K40, KC_NO, K42,   K43, K44, K45, K46,   K47 }, \ -    { K50, K51,   K52,   K53, K54, K55, K56,   K57 }, \ -    { K60, K61,   K62,   K63, K64, K65, K66,   K67 }, \ -    { K70, K71,   K72,   K73, K74, K75, K76,   K77 } \ +    { k00, k01, k02, k03, k04, k05, k06, k07 }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17 }, \ +    { k20, k21, XXX, k23, k24, k25, XXX, k27 }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37 }, \ +    { k40, XXX, k42, k43, k44, k45, k46, k47 }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57 }, \ +    { k60, k61, k62, k63, k64, k65, k66, k67 }, \ +    { k70, k71, k72, k73, k74, k75, k76, k77 } \  }  #define LAYOUT_infinity( \ -    K36, K37, K46, K47, K56, K57, K66, K67, K76, K77, K06, K07, K17, K26, K27, \ -    K34, K35, K44, K45, K54, K55, K64, K65, K75, K05, K15, K16, K25, K24, \ -    K32, K33, K43, K52, K53, K63, K73, K74, K03, K04, K13, K14, K23, \ -    K31,      K42, K51, K61, K62, K71, K72, K01, K02, K11, K12, K21, K22, \ -    K30, K40, K50,           K60,                     K70, K00, K10, K20  \ +    k36, k37, k46, k47, k56, k57, k66, k67, k76, k77, k06, k07, k17, k26, k27, \ +    k34, k35, k44, k45, k54, k55, k64, k65, k75, k05, k15, k16, k25, k24, \ +    k32, k33, k43, k52, k53, k63, k73, k74, k03, k04, k13, k14, k23, \ +    k31,      k42, k51, k61, k62, k71, k72, k01, k02, k11, k12, k21, k22, \ +    k30, k40, k50,           k60,                     k70, k00, k10, k20 \  ) { \ -    { K00, K01,   K02, K03, K04, K05, K06, K07 }, \ -    { K10, K11,   K12, K13, K14, K15, K16, K17 }, \ -    { K20, K21,   K22, K23, K24, K25, K26, K27 }, \ -    { K30, K31,   K32, K33, K34, K35, K36, K37 }, \ -    { K40, KC_NO, K42, K43, K44, K45, K46, K47 }, \ -    { K50, K51,   K52, K53, K54, K55, K56, K57 }, \ -    { K60, K61,   K62, K63, K64, K65, K66, K67 }, \ -    { K70, K71,   K72, K73, K74, K75, K76, K77 } \ +    { k00, k01, k02, k03, k04, k05, k06, k07 }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17 }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27 }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37 }, \ +    { k40, XXX, k42, k43, k44, k45, k46, k47 }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57 }, \ +    { k60, k61, k62, k63, k64, k65, k66, k67 }, \ +    { k70, k71, k72, k73, k74, k75, k76, k77 } \  }  #define LAYOUT_aek_103( \ -    K36, K37, K46, K47, K56, K57, K66, K67, K76, K77, K06, K07, K17,     K27, \ -    K34, K35, K44, K45, K54, K55, K64, K65, K75, K05, K15, K16, K25, K24, \ -    K32, K33, K43, K52, K53, K63, K73, K74, K03, K04, K13, K14, K23, \ -    K31,      K42, K51, K61, K62, K71, K72, K01, K02, K11, K12, K21,  \ -    K30, K40, K50,           K60,                     K70, K00,      K20  \ +    k36, k37, k46, k47, k56, k57, k66, k67, k76, k77, k06, k07, k17,     k27, \ +    k34, k35, k44, k45, k54, k55, k64, k65, k75, k05, k15, k16, k25, k24, \ +    k32, k33, k43, k52, k53, k63, k73, k74, k03, k04, k13, k14, k23, \ +    k31,      k42, k51, k61, k62, k71, k72, k01, k02, k11, k12, k21, \ +    k30, k40, k50,           k60,                     k70, k00,      k20 \  ) { \ -    { K00,   K01,   K02,   K03, K04, K05, K06,   K07 }, \ -    { KC_NO, K11,   K12,   K13, K14, K15, K16,   K17 }, \ -    { K20,   K21,   KC_NO, K23, K24, K25, KC_NO, K27 }, \ -    { K30,   K31,   K32,   K33, K34, K35, K36,   K37 }, \ -    { K40,   KC_NO, K42,   K43, K44, K45, K46,   K47 }, \ -    { K50,   K51,   K52,   K53, K54, K55, K56,   K57 }, \ -    { K60,   K61,   K62,   K63, K64, K65, K66,   K67 }, \ -    { K70,   K71,   K72,   K73, K74, K75, K76,   K77 } \ +    { k00, k01, k02, k03, k04, k05, k06, k07 }, \ +    { XXX, k11, k12, k13, k14, k15, k16, k17 }, \ +    { k20, k21, XXX, k23, k24, k25, XXX, k27 }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37 }, \ +    { k40, XXX, k42, k43, k44, k45, k46, k47 }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57 }, \ +    { k60, k61, k62, k63, k64, k65, k66, k67 }, \ +    { k70, k71, k72, k73, k74, k75, k76, k77 } \  } - - -#endif diff --git a/keyboards/percent/canoe/config.h b/keyboards/percent/canoe/config.h index c349c1106c..56793bab41 100644 --- a/keyboards/percent/canoe/config.h +++ b/keyboards/percent/canoe/config.h @@ -15,8 +15,7 @@ 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 CANOE_CONFIG_H -#define CANOE_CONFIG_H +#pragma once  #include "config_common.h" @@ -44,5 +43,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define BACKLIGHT_LEVELS 3  #define RGBLIGHT_ANIMATIONS - -#endif diff --git a/keyboards/pinky/pinky.h b/keyboards/pinky/pinky.h index 9cc5d8d589..67dfbe3370 100644 --- a/keyboards/pinky/pinky.h +++ b/keyboards/pinky/pinky.h @@ -13,17 +13,13 @@   * 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 PINKY_H -#define PINKY_H -#include "quantum.h" - -#ifdef KEYBOARD_pinky_3 -  #include "3.h" -#endif +#pragma once -#ifdef KEYBOARD_pinky_4 -  #include "4.h" -#endif +#include "quantum.h" +#if defined(KEYBOARD_pinky_3) +#    include "3.h" +#elif defined(KEYBOARD_pinky_4) +#    include "4.h"  #endif diff --git a/keyboards/pizzakeyboards/pizza65/info.json b/keyboards/pizzakeyboards/pizza65/info.json index 551edc70e3..9d1634fe1c 100644 --- a/keyboards/pizzakeyboards/pizza65/info.json +++ b/keyboards/pizzakeyboards/pizza65/info.json @@ -266,7 +266,6 @@                  {"label": "r2_11", "x": 10.5, "y": 1},                  {"label": "r2_12", "x": 11.5, "y": 1},                  {"label": "r2_13", "x": 12.5, "y": 1}, -                {"label": "r2_14", "x": 13.5, "y": 1},                  {"label": "r2_15", "x": 15, "y": 1},                  {"label": "r3_01", "x": 0, "y": 2, "w": 1.75}, diff --git a/keyboards/planck/config.h b/keyboards/planck/config.h index 71111eca21..a86359327a 100644 --- a/keyboards/planck/config.h +++ b/keyboards/planck/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -78,5 +77,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/planck/keymaps/aviator/config.h b/keyboards/planck/keymaps/aviator/config.h index b2b3104501..c0060de141 100644 --- a/keyboards/planck/keymaps/aviator/config.h +++ b/keyboards/planck/keymaps/aviator/config.h @@ -1,9 +1,8 @@ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H +#pragma once  #include "config_common.h" -#ifndef LIGHT_CONFIG_H +#ifndef KEYBOARD_planck_light  #define BACKLIGHT_BREATHING  #define BREATHING_PERIOD 3  #endif @@ -40,5 +39,3 @@  /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */  //#define MIDI_TONE_KEYCODE_OCTAVES 2 - -#endif diff --git a/keyboards/planck/keymaps/cbbrowne/config.h b/keyboards/planck/keymaps/cbbrowne/config.h index 4ec7d081ba..87953c339e 100644 --- a/keyboards/planck/keymaps/cbbrowne/config.h +++ b/keyboards/planck/keymaps/cbbrowne/config.h @@ -14,8 +14,7 @@   * along with this program.  If not, see <http://www.gnu.org/licenses/>.   */ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H +#pragma once  #ifndef NO_DEBUG  #define NO_DEBUG @@ -28,7 +27,7 @@  #define LEADER_TIMEOUT 300 -#ifndef LIGHT_CONFIG_H +#ifndef KEYBOARD_planck_light  #define BACKLIGHT_BREATHING  #endif @@ -42,6 +41,3 @@   * borrowed from basic keymap            */  #define _____   KC_NO - -#endif - diff --git a/keyboards/planck/keymaps/khord/config.h b/keyboards/planck/keymaps/khord/config.h index 055d741c62..819cef60c6 100644 --- a/keyboards/planck/keymaps/khord/config.h +++ b/keyboards/planck/keymaps/khord/config.h @@ -1,5 +1,4 @@ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H +#pragma once  #include "config_common.h" @@ -12,7 +11,7 @@                                  }  #endif -#ifndef LIGHT_CONFIG_H +#ifndef KEYBOARD_planck_light  #define BACKLIGHT_BREATHING  #endif  #define TAPPING_TERM 150 @@ -39,5 +38,3 @@  /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */  //#define MIDI_TONE_KEYCODE_OCTAVES 2 - -#endif diff --git a/keyboards/planck/keymaps/pvc/config.h b/keyboards/planck/keymaps/pvc/config.h index fc7211fe6a..0fb08540d4 100644 --- a/keyboards/planck/keymaps/pvc/config.h +++ b/keyboards/planck/keymaps/pvc/config.h @@ -15,8 +15,7 @@ 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 CONFIG_USER_H -#define CONFIG_USER_H +#pragma once  #include "config_common.h" @@ -25,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define MATRIX_COLS 12  /* Planck PCB default pin-out */ -#ifndef LIGHT_CONFIG_H +#ifndef KEYBOARD_planck_light  #define MATRIX_ROW_PINS { D0, D5, B5, B6 }  #define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 }  #define UNUSED_PINS @@ -68,7 +67,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  /* Only print user print statements */  #define USER_PRINT -#ifndef LIGHT_CONFIG_H +#ifndef KEYBOARD_planck_light  #define BACKLIGHT_BREATHING  #endif @@ -78,4 +77,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION -#endif diff --git a/keyboards/planck/keymaps/zrichard/config.h b/keyboards/planck/keymaps/zrichard/config.h index fb7ebb9885..d12c19065c 100755 --- a/keyboards/planck/keymaps/zrichard/config.h +++ b/keyboards/planck/keymaps/zrichard/config.h @@ -15,18 +15,16 @@ 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 CONFIG_USER_H -#define CONFIG_USER_H +#pragma once  #include "config_common.h" -  /* key matrix size */  #define MATRIX_ROWS 4  #define MATRIX_COLS 12  /* Planck PCB default pin-out */ -#ifndef LIGHT_CONFIG_H +#ifndef KEYBOARD_planck_light  #define MATRIX_ROW_PINS { D0, D5, B5, B6 }  #define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 }  #define UNUSED_PINS @@ -63,7 +61,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  /* Only print user print statements */  #define USER_PRINT -#ifndef LIGHT_CONFIG_H +#ifndef KEYBOARD_planck_light  #define BACKLIGHT_BREATHING  #endif @@ -73,5 +71,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/planck/light/config.h b/keyboards/planck/light/config.h index ccf9f09843..8c55c3432f 100644 --- a/keyboards/planck/light/config.h +++ b/keyboards/planck/light/config.h @@ -1,5 +1,4 @@ -#ifndef LIGHT_CONFIG_H -#define LIGHT_CONFIG_H +#pragma once  #include "config_common.h" @@ -39,6 +38,3 @@  #define DRIVER_1_LED_TOTAL 25  #define DRIVER_2_LED_TOTAL 24  #define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) - - -#endif diff --git a/keyboards/planck/light/light.h b/keyboards/planck/light/light.h index f014c50171..623ffa707d 100644 --- a/keyboards/planck/light/light.h +++ b/keyboards/planck/light/light.h @@ -14,40 +14,35 @@   * along with this program.  If not, see <http://www.gnu.org/licenses/>.   */ -#ifndef LIGHT_H -#define LIGHT_H +#pragma once  #include "planck.h"  #include "rgb_matrix.h"  #define LAYOUT_planck_1x2uC( \ -    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ -    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ -    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ -    k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b \ -) \ -{ \ -    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \ -    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ -    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \ -    { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3a, k3b } \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \ +    k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3A, k3B \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \ +    { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3A, k3B } \  }  #define LAYOUT_ortho_4x12( \ -    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ -    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ -    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ -    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \ -) \ -{ \ -    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \ -    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ -    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \ -    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B } \  }  #define LAYOUT LAYOUT_ortho_4x12  #define LAYOUT_planck_mit LAYOUT_planck_1x2uC  #define LAYOUT_planck_grid LAYOUT_ortho_4x12 - -#endif diff --git a/keyboards/planck/planck.h b/keyboards/planck/planck.h index 31e3ec9158..be33bf253b 100644 --- a/keyboards/planck/planck.h +++ b/keyboards/planck/planck.h @@ -1,26 +1,23 @@ -#ifndef PLANCK_H -#define PLANCK_H +#pragma once  #include "quantum.h"  #if defined(KEYBOARD_planck_ez) -  #include "ez.h" +#    include "ez.h"  #elif defined(KEYBOARD_planck_light) -  #include "light.h" +#    include "light.h"  #elif defined(KEYBOARD_planck_thk) -  #include "thk.h" +#    include "thk.h"  #elif defined(KEYBOARD_planck_rev1) -  #include "rev1.h" +#    include "rev1.h"  #elif defined(KEYBOARD_planck_rev2) -  #include "rev2.h" +#    include "rev2.h"  #elif defined(KEYBOARD_planck_rev3) -  #include "rev3.h" +#    include "rev3.h"  #elif defined(KEYBOARD_planck_rev4) -  #include "rev4.h" +#    include "rev4.h"  #elif defined(KEYBOARD_planck_rev5) -  #include "rev5.h" +#    include "rev5.h"  #elif defined(KEYBOARD_planck_rev6) -  #include "rev6.h" -#endif // Planck revisions - +#    include "rev6.h"  #endif diff --git a/keyboards/planck/rev6/config.h b/keyboards/planck/rev6/config.h index bae075de10..aa70d46a8e 100644 --- a/keyboards/planck/rev6/config.h +++ b/keyboards/planck/rev6/config.h @@ -15,8 +15,7 @@   * along with this program.  If not, see <http://www.gnu.org/licenses/>.   */ -#ifndef REV6_CONFIG_H -#define REV6_CONFIG_H +#pragma once  /* USB Device descriptor parameter */  #define PRODUCT_ID 0xA4F9 @@ -121,5 +120,3 @@  #define WS2812_DMA_CHANNEL 2  #define RGB_DISABLE_WHEN_USB_SUSPENDED - -#endif diff --git a/keyboards/planck/rev6/rev6.h b/keyboards/planck/rev6/rev6.h index 9fd51e70fe..9bf3603ed7 100644 --- a/keyboards/planck/rev6/rev6.h +++ b/keyboards/planck/rev6/rev6.h @@ -13,99 +13,92 @@   * 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 REV6_H -#define REV6_H +#pragma once  #include "planck.h" +#define XXX KC_NO +  #define LAYOUT_planck_1x2uC( \ -    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ -    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ -    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ -    k30, k31, k32, k33, k34,    k36,   k37, k38, k39, k3a, k3b \ -) \ -{ \ -    { k00, k01, k02, k03, k04, k05   }, \ -    { k10, k11, k12, k13, k14, k15   }, \ -    { k20, k21, k22, k23, k24, k25   }, \ -    { k30, k31, k32, k39, k3a, k3b   }, \ -    { k06, k07, k08, k09, k0a, k0b   }, \ -    { k16, k17, k18, k19, k1a, k1b   }, \ -    { k26, k27, k28, k29, k2a, k2b   }, \ -    { k36, k37, k38, k33, k34, KC_NO } \ +    k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \ +    k10, k11, k12, k13, k14, k15, k50, k51, k52, k53, k54, k55, \ +    k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \ +    k30, k31, k32, k73, k74,    k70,   k71, k72, k33, k34, k35 \ +) { \ +    { k00, k01, k02, k03, k04, k05 }, \ +    { k10, k11, k12, k13, k14, k15 }, \ +    { k20, k21, k22, k23, k24, k25 }, \ +    { k30, k31, k32, k33, k34, k35 }, \ +    { k40, k41, k42, k43, k44, k45 }, \ +    { k50, k51, k52, k53, k54, k55 }, \ +    { k60, k61, k62, k63, k64, k65 }, \ +    { k70, k71, k72, k73, k74, XXX } \  }  #define LAYOUT_planck_1x2uR( \ -    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ -    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ -    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ -    k30, k31, k32, k33, k34, k35,   k37,    k38, k39, k3a, k3b \ -) \ -{ \ -    { k00,   k01, k02, k03, k04, k05 }, \ -    { k10,   k11, k12, k13, k14, k15 }, \ -    { k20,   k21, k22, k23, k24, k25 }, \ -    { k30,   k31, k32, k39, k3a, k3b }, \ -    { k06,   k07, k08, k09, k0a, k0b }, \ -    { k16,   k17, k18, k19, k1a, k1b }, \ -    { k26,   k27, k28, k29, k2a, k2b }, \ -    { KC_NO, k37, k38, k33, k34, k35 } \ +    k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \ +    k10, k11, k12, k13, k14, k15, k50, k51, k52, k53, k54, k55, \ +    k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \ +    k30, k31, k32, k73, k74, k75,   k71,    k72, k33, k34, k35 \ +) { \ +    { k00, k01, k02, k03, k04, k05 }, \ +    { k10, k11, k12, k13, k14, k15 }, \ +    { k20, k21, k22, k23, k24, k25 }, \ +    { k30, k31, k32, k33, k34, k35 }, \ +    { k40, k41, k42, k43, k44, k45 }, \ +    { k50, k51, k52, k53, k54, k55 }, \ +    { k60, k61, k62, k63, k64, k65 }, \ +    { XXX, k71, k72, k73, k74, k75 } \  }  #define LAYOUT_planck_1x2uL( \ -    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ -    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ -    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ -    k30, k31, k32, k33,   k35,    k36, k37, k38, k39, k3a, k3b \ -) \ -{ \ -    { k00, k01, k02, k03, k04,   k05 }, \ -    { k10, k11, k12, k13, k14,   k15 }, \ -    { k20, k21, k22, k23, k24,   k25 }, \ -    { k30, k31, k32, k39, k3a,   k3b }, \ -    { k06, k07, k08, k09, k0a,   k0b }, \ -    { k16, k17, k18, k19, k1a,   k1b }, \ -    { k26, k27, k28, k29, k2a,   k2b }, \ -    { k36, k37, k38, k33, KC_NO, k35 } \ +    k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \ +    k10, k11, k12, k13, k14, k15, k50, k51, k52, k53, k54, k55, \ +    k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \ +    k30, k31, k32, k73,   k75,    k70, k71, k72, k33, k34, k35 \ +) { \ +    { k00, k01, k02, k03, k04, k05 }, \ +    { k10, k11, k12, k13, k14, k15 }, \ +    { k20, k21, k22, k23, k24, k25 }, \ +    { k30, k31, k32, k33, k34, k35 }, \ +    { k40, k41, k42, k43, k44, k45 }, \ +    { k50, k51, k52, k53, k54, k55 }, \ +    { k60, k61, k62, k63, k64, k65 }, \ +    { k70, k71, k72, k73, XXX, k75 } \  }  #define LAYOUT_planck_2x2u( \ -    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ -    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ -    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ -    k30, k31, k32, k33,   k35,      k37,    k38, k39, k3a, k3b \ -) \ -{ \ -    { k00,   k01, k02, k03, k04,   k05 }, \ -    { k10,   k11, k12, k13, k14,   k15 }, \ -    { k20,   k21, k22, k23, k24,   k25 }, \ -    { k30,   k31, k32, k39, k3a,   k3b }, \ -    { k06,   k07, k08, k09, k0a,   k0b }, \ -    { k16,   k17, k18, k19, k1a,   k1b }, \ -    { k26,   k27, k28, k29, k2a,   k2b }, \ -    { KC_NO, k37, k38, k33, KC_NO, k35 } \ +    k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \ +    k10, k11, k12, k13, k14, k15, k50, k51, k52, k53, k54, k55, \ +    k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \ +    k30, k31, k32, k73,   k75,      k71,    k72, k33, k34, k35 \ +) { \ +    { k00, k01, k02, k03, k04, k05 }, \ +    { k10, k11, k12, k13, k14, k15 }, \ +    { k20, k21, k22, k23, k24, k25 }, \ +    { k30, k31, k32, k33, k34, k35 }, \ +    { k40, k41, k42, k43, k44, k45 }, \ +    { k50, k51, k52, k53, k54, k55 }, \ +    { k60, k61, k62, k63, k64, k65 }, \ +    { XXX, k71, k72, k73, XXX, k75 } \  }  #define LAYOUT_ortho_4x12( \ -    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ -    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ -    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ -    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \ -) \ -{ \ +    k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \ +    k10, k11, k12, k13, k14, k15, k50, k51, k52, k53, k54, k55, \ +    k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \ +    k30, k31, k32, k73, k74, k75, k70, k71, k72, k33, k34, k35 \ +) { \      { k00, k01, k02, k03, k04, k05 }, \      { k10, k11, k12, k13, k14, k15 }, \      { k20, k21, k22, k23, k24, k25 }, \ -    { k30, k31, k32, k39, k3a, k3b }, \ -    { k06, k07, k08, k09, k0a, k0b }, \ -    { k16, k17, k18, k19, k1a, k1b }, \ -    { k26, k27, k28, k29, k2a, k2b }, \ -    { k36, k37, k38, k33, k34, k35 } \ +    { k30, k31, k32, k33, k34, k35 }, \ +    { k40, k41, k42, k43, k44, k45 }, \ +    { k50, k51, k52, k53, k54, k55 }, \ +    { k60, k61, k62, k63, k64, k65 }, \ +    { k70, k71, k72, k73, k74, k75 } \  } -  #define LAYOUT LAYOUT_ortho_4x12  #define LAYOUT_planck_mit LAYOUT_planck_1x2uC  #define LAYOUT_planck_grid LAYOUT_ortho_4x12 - -#endif diff --git a/keyboards/playkbtw/pk60/config.h b/keyboards/playkbtw/pk60/config.h index 6084f34197..0a6ee47d44 100644 --- a/keyboards/playkbtw/pk60/config.h +++ b/keyboards/playkbtw/pk60/config.h @@ -1,5 +1,4 @@ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -48,5 +47,3 @@  #define RGBLIGHT_SAT_STEP 8  #define RGBLIGHT_VAL_STEP 8  #endif - -#endif diff --git a/keyboards/playkbtw/pk60/pk60.h b/keyboards/playkbtw/pk60/pk60.h index 4a7a8f3bf0..c92057c0a6 100644 --- a/keyboards/playkbtw/pk60/pk60.h +++ b/keyboards/playkbtw/pk60/pk60.h @@ -1,90 +1,89 @@ -#ifndef pk60_H -#define pk60_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  #define LAYOUT_60_ansi_split_bs_rshift( \ -	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ -	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \ -	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      \ -	K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, \ -	K40, K41, K42,                     K47,      K49, K4A,      K4C, K4D       \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, \ +    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E, \ +    k40, k41, k42,                     k47,      k49, k4A,      k4C, k4D \  ) { \ -	{ K00,  K01,    K02,  K03,    K04,    K05,    K06,    K07,  K08,    K09,  K0A,  K0B,    K0C,    K0D,  K0E   }, \ -	{ K10,  K11,    K12,  K13,    K14,    K15,    K16,    K17,  K18,    K19,  K1A,  K1B,    K1C,    K1D,  KC_NO }, \ -	{ K20,  K21,    K22,  K23,    K24,    K25,    K26,    K27,  K28,    K29,  K2A,  K2B,    KC_NO,  K2D,  KC_NO }, \ -	{ K30,  KC_NO,  K32,  K33,    K34,    K35,    K36,    K37,  K38,    K39,  K3A,  K3B,    KC_NO,  K3D,  K3E   }, \ -	{ K40,  K41,    K42,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  K47,  KC_NO,  K49,  K4A,  KC_NO,  K4C,    K4D,  KC_NO }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX }, \ +    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \ +    { k40, k41, k42, XXX, XXX, XXX, XXX, k47, XXX, k49, k4A, XXX, k4C, k4D, XXX } \  }  #define LAYOUT_iso( \ -	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ -	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,           \ -	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      \ -	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, \ -	K40, K41, K42,                     K47,      K49, K4A,      K4C, K4D       \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E, \ +    k40, k41, k42,                     k47,      k49, k4A,      k4C, k4D \  ) { \ -	{ K00,  K01,  K02,  K03,    K04,    K05,    K06,    K07,  K08,    K09,  K0A,  K0B,    K0C,    K0D,    K0E   }, \ -	{ K10,  K11,  K12,  K13,    K14,    K15,    K16,    K17,  K18,    K19,  K1A,  K1B,    K1C,    KC_NO,  KC_NO }, \ -	{ K20,  K21,  K22,  K23,    K24,    K25,    K26,    K27,  K28,    K29,  K2A,  K2B,    K2C,    K2D,    KC_NO }, \ -	{ K30,  K31,  K32,  K33,    K34,    K35,    K36,    K37,  K38,    K39,  K3A,  K3B,    KC_NO,  K3D,    K3E   }, \ -	{ K40,  K41,  K42,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  K47,  KC_NO,  K49,  K4A,  KC_NO,  K4C,    K4D,    KC_NO }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \ +    { k40, k41, k42, XXX, XXX, XXX, XXX, k47, XXX, k49, k4A, XXX, k4C, k4D, XXX } \  }  #define LAYOUT_225u_arrow( \ -	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B,  K0C, K0D, K0E, \ -	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,  K1C, K1D,      \ -	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,       K2D,      \ -	K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,       K3D, K3E, \ -	K40, K41, K42,                     K47,      K49, K4A, K4B,  K4C, K4D       \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B,  k0C, k0D, k0E, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B,  k1C, k1D, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,       k2D, \ +    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,       k3D, k3E, \ +    k40, k41, k42,                     k47,      k49, k4A, k4B,  k4C, k4D \  ) { \ -	{ K00,  K01,    K02,  K03,    K04,    K05,    K06,    K07,  K08,    K09,  K0A,  K0B,  K0C,    K0D,  K0E   }, \ -	{ K10,  K11,    K12,  K13,    K14,    K15,    K16,    K17,  K18,    K19,  K1A,  K1B,  K1C,    K1D,  KC_NO }, \ -	{ K20,  K21,    K22,  K23,    K24,    K25,    K26,    K27,  K28,    K29,  K2A,  K2B,  KC_NO,  K2D,  KC_NO }, \ -	{ K30,  KC_NO,  K32,  K33,    K34,    K35,    K36,    K37,  K38,    K39,  K3A,  K3B,  KC_NO,  K3D,  K3E   }, \ -	{ K40,  K41,    K42,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  K47,  KC_NO,  K49,  K4A,  K4B,  K4C,    K4D,  KC_NO }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX }, \ +    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \ +    { k40, k41, k42, XXX, XXX, XXX, XXX, k47, XXX, k49, k4A, k4B, k4C, k4D, XXX } \  }  #define LAYOUT_2u_arrow( \ -	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ -	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \ -	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      \ -	K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ -	K40, K41, K42,                     K47,      K49, K4A, K4B, K4C, K4D       \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, \ +    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ +    k40, k41, k42,                     k47,      k49, k4A, k4B, k4C, k4D \  ) { \ -	{ K00,  K01,    K02,  K03,    K04,    K05,    K06,    K07,  K08,    K09,  K0A,  K0B,  K0C,    K0D,  K0E   }, \ -	{ K10,  K11,    K12,  K13,    K14,    K15,    K16,    K17,  K18,    K19,  K1A,  K1B,  K1C,    K1D,  KC_NO }, \ -	{ K20,  K21,    K22,  K23,    K24,    K25,    K26,    K27,  K28,    K29,  K2A,  K2B,  KC_NO,  K2D,  KC_NO }, \ -	{ K30,  KC_NO,  K32,  K33,    K34,    K35,    K36,    K37,  K38,    K39,  K3A,  K3B,  K3C,    K3D,  K3E   }, \ -	{ K40,  K41,    K42,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  K47,  KC_NO,  K49,  K4A,  K4B,  K4C,    K4D,  KC_NO }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX }, \ +    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \ +    { k40, k41, k42, XXX, XXX, XXX, XXX, k47, XXX, k49, k4A, k4B, k4C, k4D, XXX } \  }  #define LAYOUT_minila( \ -	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ -	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \ -	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      \ -	K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ -	K40, K41, K42, K43,                K47, K48, K49, K4A, K4B, K4C, K4D       \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, \ +    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ +    k40, k41, k42, k43,                k47, k48, k49, k4A, k4B, k4C, k4D \  ) { \ -	{ K00,  K01,    K02,  K03,  K04,    K05,    K06,    K07,  K08,  K09,  K0A,  K0B,  K0C,    K0D,  K0E   }, \ -	{ K10,  K11,    K12,  K13,  K14,    K15,    K16,    K17,  K18,  K19,  K1A,  K1B,  K1C,    K1D,  KC_NO }, \ -	{ K20,  K21,    K22,  K23,  K24,    K25,    K26,    K27,  K28,  K29,  K2A,  K2B,  KC_NO,  K2D,  KC_NO }, \ -	{ K30,  KC_NO,  K32,  K33,  K34,    K35,    K36,    K37,  K38,  K39,  K3A,  K3B,  K3C,    K3D,  K3E   }, \ -	{ K40,  K41,    K42,  K43,  KC_NO,  KC_NO,  KC_NO,  K47,  K48,  K49,  K4A,  K4B,  K4C,    K4D,  KC_NO }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX }, \ +    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \ +    { k40, k41, k42, k43, XXX, XXX, XXX, k47, k48, k49, k4A, k4B, k4C, k4D, XXX } \  }  #define LAYOUT_all( \ -	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ -	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \ -	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      \ -	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ -	K40, K41, K42, K43,                K47, K48, K49, K4A, K4B, K4C, K4D       \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ +    k40, k41, k42, k43,                k47, k48, k49, k4A, k4B, k4C, k4D \  ) { \ -	{ K00,  K01,  K02,  K03,  K04,   K05,   K06,   K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D,  K0E   }, \ -	{ K10,  K11,  K12,  K13,  K14,   K15,   K16,   K17,  K18,  K19,  K1A,  K1B,  K1C,  K1D,  KC_NO }, \ -	{ K20,  K21,  K22,  K23,  K24,   K25,   K26,   K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,  KC_NO }, \ -	{ K30,  K31,  K32,  K33,  K34,   K35,   K36,   K37,  K38,  K39,  K3A,  K3B,  K3C,  K3D,  K3E   }, \ -	{ K40,  K41,  K42,  K43,  KC_NO, KC_NO, KC_NO, K47,  K48,  K49,  K4A,  K4B,  K4C,  K4D,  KC_NO }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \ +    { k40, k41, k42, k43, XXX, XXX, XXX, k47, k48, k49, k4A, k4B, k4C, k4D, XXX } \  } - -#endif
\ No newline at end of file diff --git a/keyboards/plx/info.json b/keyboards/plx/info.json index c385e5c54b..f833242367 100644 --- a/keyboards/plx/info.json +++ b/keyboards/plx/info.json @@ -1,12 +1,77 @@  { -    "keyboard_name": "PLX",  -    "url": "https://peac.design/",  -    "maintainer": "2Moons",  -    "width": 18,  -    "height": 7.25,  +    "keyboard_name": "PLX", +    "maintainer": "2Moons", +    "height": 7.25, +    "url": "https://peac.design/", +    "width": 18,      "layouts": {          "LAYOUT": { -            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Del", "x":16, "y":0}, {"label":"Bksp", "x":17, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Enter", "x":16.75, "y":1, "w":1.25, "h":2}, {"label":"Caps Lock", "x":0, "y":2, "w":1.25}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"#", "x":15.75, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.25}, {"label":"Shift", "x":15.25, "y":3, "w":1.75}, {"label":"Fn", "x":17, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}, {"label":"Caps", "x":0, "y":5.25, "w":1.25}, {"label":"Shift", "x":0, "y":6.25, "w":1.25}, {"x":1.25, "y":6.25}] +            "layout": [ +                { "label": "Esc", "x": 0, "y": 0 }, +                { "label": "!", "x": 1, "y": 0 }, +                { "label": "@", "x": 2, "y": 0 }, +                { "label": "#", "x": 3, "y": 0 }, +                { "label": "$", "x": 4, "y": 0 }, +                { "label": "%", "x": 5, "y": 0 }, +                { "label": "^", "x": 6, "y": 0 }, +                { "label": "&", "x": 7, "y": 0 }, +                { "label": "*", "x": 8, "y": 0 }, +                { "label": "(", "x": 9, "y": 0 }, +                { "label": ")", "x": 10, "y": 0 }, +                { "label": "_", "x": 11, "y": 0 }, +                { "label": "+", "x": 12, "y": 0 }, +                { "label": "Backspace", "w": 2, "x": 13, "y": 0 }, +                { "label": "Del", "x": 16, "y": 0 }, +                { "label": "Tab", "w": 1.5, "x": 0, "y": 1 }, +                { "label": "Q", "x": 1.5, "y": 1 }, +                { "label": "W", "x": 2.5, "y": 1 }, +                { "label": "E", "x": 3.5, "y": 1 }, +                { "label": "R", "x": 4.5, "y": 1 }, +                { "label": "T", "x": 5.5, "y": 1 }, +                { "label": "Y", "x": 6.5, "y": 1 }, +                { "label": "U", "x": 7.5, "y": 1 }, +                { "label": "I", "x": 8.5, "y": 1 }, +                { "label": "O", "x": 9.5, "y": 1 }, +                { "label": "P", "x": 10.5, "y": 1 }, +                { "label": "{", "x": 11.5, "y": 1 }, +                { "label": "}", "x": 12.5, "y": 1 }, +                { "label": "|", "w": 1.5, "x": 13.5, "y": 1 }, +                { "label": "Caps Lock", "w": 1.25, "x": 0, "y": 2 }, +                { "label": "A", "x": 1.75, "y": 2 }, +                { "label": "S", "x": 2.75, "y": 2 }, +                { "label": "D", "x": 3.75, "y": 2 }, +                { "label": "F", "x": 4.75, "y": 2 }, +                { "label": "G", "x": 5.75, "y": 2 }, +                { "label": "H", "x": 6.75, "y": 2 }, +                { "label": "J", "x": 7.75, "y": 2 }, +                { "label": "K", "x": 8.75, "y": 2 }, +                { "label": "L", "x": 9.75, "y": 2 }, +                { "label": ":", "x": 10.75, "y": 2 }, +                { "label": "\"", "x": 11.75, "y": 2 }, +                { "label": "NUBS", "x": 12.75, "y": 2 }, +                { "h": 2, "label": "Enter", "w": 1.25, "x": 13.75, "y": 1 }, +                { "label": "Shift", "w": 1.25, "x": 0, "y": 3 }, +                { "label": "NUHS", "x": 1.25, "y": 3 }, +                { "label": "Z", "x": 2.25, "y": 3 }, +                { "label": "X", "x": 3.25, "y": 3 }, +                { "label": "C", "x": 4.25, "y": 3 }, +                { "label": "V", "x": 5.25, "y": 3 }, +                { "label": "B", "x": 6.25, "y": 3 }, +                { "label": "N", "x": 7.25, "y": 3 }, +                { "label": "M", "x": 8.25, "y": 3 }, +                { "label": "<", "x": 9.25, "y": 3 }, +                { "label": ">", "x": 10.25, "y": 3 }, +                { "label": "?", "x": 11.25, "y": 3 }, +                { "label": "Shift", "w": 1.75, "x": 12.25, "y": 3 }, +                { "label": "Fn", "x": 14, "y": 3 }, +                { "label": "Ctrl", "w": 1.5, "x": 0, "y": 4 }, +                { "label": "Win", "x": 1.5, "y": 4 }, +                { "label": "Alt", "w": 1.5, "x": 2.5, "y": 4 }, +                { "w": 7, "x": 4, "y": 4 }, +                { "label": "Alt", "w": 1.5, "x": 11, "y": 4 }, +                { "label": "Win", "x": 12.5, "y": 4 }, +                { "label": "Ctrl", "w": 1.5, "x": 13.5, "y": 4 } +            ]          }      } -}
\ No newline at end of file +} diff --git a/keyboards/preonic/config.h b/keyboards/preonic/config.h index dfd0a8439a..8f72de9094 100644 --- a/keyboards/preonic/config.h +++ b/keyboards/preonic/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -78,5 +77,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/preonic/keymaps/badger/keymap.c b/keyboards/preonic/keymaps/badger/keymap.c index 495cf28c45..761beb861f 100644 --- a/keyboards/preonic/keymaps/badger/keymap.c +++ b/keyboards/preonic/keymaps/badger/keymap.c @@ -14,7 +14,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */  // if not REV3, just compile the default keymaps -#ifndef REV3_CONFIG_H +#ifndef KEYBOARD_preonic_rev3  #include "../default/keymap.c"  #else diff --git a/keyboards/preonic/rev1/config.h b/keyboards/preonic/rev1/config.h index 76b6465909..a1091b10ed 100644 --- a/keyboards/preonic/rev1/config.h +++ b/keyboards/preonic/rev1/config.h @@ -15,12 +15,9 @@ 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 REV1_CONFIG_H -#define REV1_CONFIG_H +#pragma once  #include "config_common.h"  #define DEVICE_VER      0x0001  #define PRODUCT_ID      0x67F3 - -#endif
\ No newline at end of file diff --git a/keyboards/preonic/rev2/config.h b/keyboards/preonic/rev2/config.h index 29fc091848..a62fed4850 100644 --- a/keyboards/preonic/rev2/config.h +++ b/keyboards/preonic/rev2/config.h @@ -15,12 +15,9 @@ 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 REV2_CONFIG_H -#define REV2_CONFIG_H +#pragma once  #include "config_common.h"  #define DEVICE_VER      0x0002  #define PRODUCT_ID      0x67F3 - -#endif
\ No newline at end of file diff --git a/keyboards/preonic/rev3/config.h b/keyboards/preonic/rev3/config.h index 420e7e5413..f2c4b3c3d8 100644 --- a/keyboards/preonic/rev3/config.h +++ b/keyboards/preonic/rev3/config.h @@ -15,8 +15,7 @@   * along with this program.  If not, see <http://www.gnu.org/licenses/>.   */ -#ifndef REV3_CONFIG_H -#define REV3_CONFIG_H +#pragma once  /* USB Device descriptor parameter */  #define DEVICE_VER 0x0003 @@ -107,5 +106,3 @@  #define WS2812_PWM_PAL_MODE 1  #define WS2812_DMA_STREAM STM32_DMA1_STREAM2  #define WS2812_DMA_CHANNEL 2 - -#endif diff --git a/keyboards/primekb/prime_o/prime_o.h b/keyboards/primekb/prime_o/prime_o.h index 99a8054522..fec3392b31 100644 --- a/keyboards/primekb/prime_o/prime_o.h +++ b/keyboards/primekb/prime_o/prime_o.h @@ -13,28 +13,26 @@   * 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 PRIME_O_H -#define PRIME_O_H + +#pragma once  #include "quantum.h"  #define LAYOUT( \ -	K001, K008, K013, K018, K023, K029, K035, K041, K046, K052, K058, K064, K071, K076, K081, K086, \ -	K002, K009, K014, K019, K024, K030, K036, K042, K047, K053, K059, K065, K072, K077, K082, K087, \ -	K004, K010, K015, K020, K025, K031, K037, K043, K048, K054, K060, K066, K073, K078, K083, K089, \ -	K005, K011, K016, K021, K026, K032, K038, K044, K049, K055, K061, K067, K074, K079, K084, K090, \ -	K007, K012, K017, K022, K028, K034, K040, K045, K051, K057, K063, K069, K075, K080, K085, K092  \ +    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, \ +    k30, k60, k31, k61, k32, k62, k33, k63, k34, k64, k35, k65, k36, k66, k37, k67, \ +    k20, k70, k21, k71, k22, k72, k23, k73, k24, k74, k25, k75, k26, k76, k27, k77, \ +    k10, k80, k11, k81, k12, k82, k13, k83, k14, k84, k15, k85, k16, k86, k17, k87, \ +    k00, k90, k01, k91, k02, k92, k03, k93, k04, k94, k05, k95, k06, k96, k07, k97 \  ) { \ -	{ K007,  K017,  K028,  K040,  K051,  K063,  K075,  K085 }, \ -	{ K005,  K016,  K026,  K038,  K049,  K061,  K074,  K084 }, \ -	{ K004,  K015,  K025,  K037,  K048,  K060,  K073,  K083 }, \ -	{ K002,  K014,  K024,  K036,  K047,  K059,  K072,  K082 }, \ -	{ K001,  K013,  K023,  K035,  K046,  K058,  K071,  K081 }, \ -	{ K008,  K018,  K029,  K041,  K052,  K064,  K076,  K086 }, \ -	{ K009,  K019,  K030,  K042,  K053,  K065,  K077,  K087 }, \ -	{ K010,  K020,  K031,  K043,  K054,  K066,  K078,  K089 }, \ -	{ K011,  K021,  K032,  K044,  K055,  K067,  K079,  K090 }, \ -	{ K012,  K022,  K034,  K045,  K057,  K069,  K080,  K092 }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07 }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17 }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27 }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37 }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47 }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57 }, \ +    { k60, k61, k62, k63, k64, k65, k66, k67 }, \ +    { k70, k71, k72, k73, k74, k75, k76, k77 }, \ +    { k80, k81, k82, k83, k84, k85, k86, k87 }, \ +    { k90, k91, k92, k93, k94, k95, k96, k97 } \  } - -#endif diff --git a/keyboards/primekb/prime_r/config.h b/keyboards/primekb/prime_r/config.h index abf559d8aa..b73eb346a7 100644 --- a/keyboards/primekb/prime_r/config.h +++ b/keyboards/primekb/prime_r/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -61,5 +60,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define RGBLIGHT_SAT_STEP 8  #define RGBLIGHT_VAL_STEP 8  #endif - -#endif diff --git a/keyboards/primekb/prime_r/prime_r.h b/keyboards/primekb/prime_r/prime_r.h index 8295fc336c..905b5c8cf8 100644 --- a/keyboards/primekb/prime_r/prime_r.h +++ b/keyboards/primekb/prime_r/prime_r.h @@ -13,23 +13,23 @@   * 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 PRIMER_H -#define PRIMER_H + +#pragma once  #include "quantum.h" +#define XXX KC_NO +  #define LAYOUT( \ -	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \ -	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \ -	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,       K212, K213, K214, K215, \ -	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \ -	K400,       K402, K403, K404, K405,       K407,       K409, K410, K411, K412, K413, K414, K415  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A,      k2C, k2D, k2E, k2F, \ +    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \ +    k40,      k42, k43, k44, k45,      k47,      k49, k4A, k4B, k4C, k4D, k4E, k4F \  ) { \ -	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \ -	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \ -	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  KC_NO, K212,  K213,  K214,  K215 }, \ -	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314,  K315 }, \ -	{ K400,  KC_NO, K402,  K403,  K404,  K405,  KC_NO, K407,  KC_NO, K409,  K410,  K411,  K412,  K413,  K414,  K415 }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, XXX, k2C, k2D, k2E, k2F }, \ +    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ +    { k40, XXX, k42, k43, k44, k45, XXX, k47, XXX, k49, k4A, k4B, k4C, k4D, k4E, k4F } \  } - -#endif
\ No newline at end of file diff --git a/keyboards/projectcain/vault45/info.json b/keyboards/projectcain/vault45/info.json index a9627895c9..0e0915ac9e 100644 --- a/keyboards/projectcain/vault45/info.json +++ b/keyboards/projectcain/vault45/info.json @@ -48,8 +48,7 @@          { "label": "Super", "x": 1.25, "y": 3 },          { "label": "Meta", "x": 2.25, "y": 3, "w": 1.25 },          { "label": "Alt", "x": 3.5, "y": 3, "w": 1.25 }, -        { "x": 4.75, "y": 3, "w": 1.75 }, -        { "x": 6.5, "y": 3, "w": 1.75 }, +        { "x": 4.75, "y": 3, "w": 3.5 },          { "label": "Meta", "x": 8.25, "y": 3, "w": 1.25 },          { "label": "Super", "x": 9.5, "y": 3, "w": 1.25 },          { "label": "Fn2", "x": 10.75, "y": 3 }, diff --git a/keyboards/puck/puck.h b/keyboards/puck/puck.h index 0f2a284a67..31fff79555 100644 --- a/keyboards/puck/puck.h +++ b/keyboards/puck/puck.h @@ -1,18 +1,15 @@ -#ifndef PUCK_H -#define PUCK_H +#pragma once  #include "quantum.h"  #define LAYOUT( \ -    K00, K01, K02, \ -    K03, K04, K05, \ -    K06, K07, K08, \ -    K09, K0A, K0B  \ +    k00, k01, k02, \ +    k10, k11, k12, \ +    k20, k21, k22, \ +    k30, k31, k32 \  ) { \ -    { K00, K01, K02 }, \ -    { K03, K04, K05 }, \ -    { K06, K07, K08 }, \ -    { K09, K0A, K0B }, \ +    { k00, k01, k02 }, \ +    { k10, k11, k12 }, \ +    { k20, k21, k22 }, \ +    { k30, k31, k32 } \  } - -#endif diff --git a/keyboards/rgbkb/zen/post_rules.mk b/keyboards/rgbkb/zen/post_rules.mk new file mode 100644 index 0000000000..3ddb449efa --- /dev/null +++ b/keyboards/rgbkb/zen/post_rules.mk @@ -0,0 +1,14 @@ +ifeq ($(strip $(CTPC)), yes) +  CONVERT_TO_PROTON_C=yes +endif + +ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes) +  SPLIT_KEYBOARD = no       # currently unsupported on ARM +  RGBLIGHT_ENABLE = no      # currently unsupported on ARM + +  EXTRAFLAGS += -DUSE_PROTON_C +else +  # Currently moved to Pro Micro only section because of lack of Proton-C support +  SPLIT_KEYBOARD = yes +  RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. +endif diff --git a/keyboards/rgbkb/zen/rev2/post_rules.mk b/keyboards/rgbkb/zen/rev2/post_rules.mk new file mode 100644 index 0000000000..2a4397e980 --- /dev/null +++ b/keyboards/rgbkb/zen/rev2/post_rules.mk @@ -0,0 +1,5 @@ +# Setup so that OLED can be turned on/off easily +ifeq ($(strip $(OLED_ENABLE)), yes) +  # Custom local font file +  OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\" +endif diff --git a/keyboards/rgbkb/zen/rev2/rules.mk b/keyboards/rgbkb/zen/rev2/rules.mk index 9bb8b8cd0d..6dd9d2e270 100644 --- a/keyboards/rgbkb/zen/rev2/rules.mk +++ b/keyboards/rgbkb/zen/rev2/rules.mk @@ -1,9 +1,3 @@  ENCODER_ENABLE = yes  OLED_ENABLE = no - -# Setup so that OLED can be turned on/off easily -ifeq ($(strip $(OLED_ENABLE)), yes) -  # Custom local font file -  OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\" -endif diff --git a/keyboards/rgbkb/zen/rules.mk b/keyboards/rgbkb/zen/rules.mk index c18c84be54..0bf7eae653 100644 --- a/keyboards/rgbkb/zen/rules.mk +++ b/keyboards/rgbkb/zen/rules.mk @@ -4,21 +4,6 @@ MCU = atmega32u4  # Bootloader selection  BOOTLOADER = caterina -ifeq ($(strip $(CTPC)), yes) -  CONVERT_TO_PROTON_C=yes -endif - -ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes) -  SPLIT_KEYBOARD = no       # currently unsupported on ARM -  RGBLIGHT_ENABLE = no      # currently unsupported on ARM - -  EXTRAFLAGS += -DUSE_PROTON_C -else -  # Currently moved to Pro Micro only section because of lack of Proton-C support -  SPLIT_KEYBOARD = yes -  RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. -endif -  # Build Options  #   change to "no" to disable the options, or define them in the Makefile in  #   the appropriate keymap folder that will get included automatically diff --git a/keyboards/sentraq/s65_plus/config.h b/keyboards/sentraq/s65_plus/config.h index 4d4819efce..2f02e8e162 100644 --- a/keyboards/sentraq/s65_plus/config.h +++ b/keyboards/sentraq/s65_plus/config.h @@ -1,5 +1,4 @@ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -45,5 +44,3 @@  /* Locking resynchronize hack */  #define LOCKING_RESYNC_ENABLE - -#endif diff --git a/keyboards/sentraq/s65_x/config.h b/keyboards/sentraq/s65_x/config.h index d3c9adbf3c..b8886bf67f 100644 --- a/keyboards/sentraq/s65_x/config.h +++ b/keyboards/sentraq/s65_x/config.h @@ -1,5 +1,4 @@ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -44,5 +43,3 @@  /* Locking resynchronize hack */  #define LOCKING_RESYNC_ENABLE - -#endif diff --git a/keyboards/sidderskb/majbritt/rev2/info.json b/keyboards/sidderskb/majbritt/rev2/info.json index 2863ceee4e..37ca2d5c1f 100644 --- a/keyboards/sidderskb/majbritt/rev2/info.json +++ b/keyboards/sidderskb/majbritt/rev2/info.json @@ -1,12 +1,83 @@  {      "keyboard_name": "Majbritt Rev2", -    "url": "https://sidderskb.co.uk/",      "maintainer": "Sleepdealr", -    "width": 17.5,      "height": 5, +    "url": "https://sidderskb.co.uk/", +    "width": 17.5,      "layouts": {          "LAYOUT": { -            "layout": [{"label":"Esc", "x":0.75, "y":0}, {"label":"!", "x":1.75, "y":0}, {"label":"\"", "x":2.75, "y":0}, {"label":"\u00a3", "x":3.75, "y":0}, {"label":"$", "x":4.75, "y":0}, {"label":"%", "x":5.75, "y":0}, {"label":"^", "x":6.75, "y":0}, {"label":"&", "x":8.5, "y":0}, {"label":"*", "x":9.5, "y":0}, {"label":"(", "x":10.5, "y":0}, {"label":")", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"|", "x":14.5, "y":0}, {"label":"~", "x":15.5, "y":0}, {"label":"Del", "x":16.5, "y":0}, {"label":"Tab", "x":0.5, "y":1, "w":1.5}, {"label":"Q", "x":2, "y":1}, {"label":"W", "x":3, "y":1}, {"label":"E", "x":4, "y":1}, {"label":"R", "x":5, "y":1}, {"label":"T", "x":6, "y":1}, {"label":"Y", "x":8, "y":1}, {"label":"U", "x":9, "y":1}, {"label":"I", "x":10, "y":1}, {"label":"O", "x":11, "y":1}, {"label":"P", "x":12, "y":1}, {"label":"{", "x":13, "y":1}, {"label":"}", "x":14, "y":1}, {"label":"Enter", "x":15.25, "y":1, "w":1.25, "h":2}, {"label":"Pgup", "x":16.5, "y":1}, {"label":"Caps Lock", "x":0.25, "y":2, "w":1.75}, {"label":"A", "x":2, "y":2}, {"label":"S", "x":3, "y":2}, {"label":"D", "x":4, "y":2}, {"label":"F", "x":5, "y":2}, {"label":"G", "x":6, "y":2}, {"label":"H", "x":8.25, "y":2}, {"label":"J", "x":9.25, "y":2}, {"label":"K", "x":10.25, "y":2}, {"label":"L", "x":11.25, "y":2}, {"label":":", "x":12.25, "y":2}, {"label":"@", "x":13.25, "y":2}, {"label":"~", "x":14.25, "y":2}, {"label":"Pgdn", "x":16.5, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":8.75, "y":3}, {"label":"M", "x":9.75, "y":3}, {"label":"<", "x":10.75, "y":3}, {"label":">", "x":11.75, "y":3}, {"label":"?", "x":12.75, "y":3}, {"label":"Shift", "x":13.75, "y":3, "w":1.75}, {"label":"Up", "x":15.5, "y":3}, {"label":"Fn", "x":16.5, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Alt", "x":3, "y":4, "w":1.5}, {"label":"LSpace", "x":4.5, "y":4, "w":2.25}, {"label":"Fn", "x":6.75, "y":4}, {"label":"RSpace", "x":8.25, "y":4, "w":2.75}, {"label":"AltGr", "x":11, "y":4, "w":1.5}, {"label":"Left", "x":14.5, "y":4}, {"label":"Down", "x":15.5, "y":4}, {"label":"Right", "x":16.5, "y":4}] +            "layout": [ +                { "label": "Esc", "x": 0.75, "y": 0 }, +                { "label": "!", "x": 1.75, "y": 0 }, +                { "label": "\"", "x": 2.75, "y": 0 }, +                { "label": "\u00a3", "x": 3.75, "y": 0 }, +                { "label": "$", "x": 4.75, "y": 0 }, +                { "label": "%", "x": 5.75, "y": 0 }, +                { "label": "^", "x": 6.75, "y": 0 }, +                { "label": "&", "x": 8.5, "y": 0 }, +                { "label": "*", "x": 9.5, "y": 0 }, +                { "label": "(", "x": 10.5, "y": 0 }, +                { "label": ")", "x": 11.5, "y": 0 }, +                { "label": "_", "x": 12.5, "y": 0 }, +                { "label": "+", "x": 13.5, "y": 0 }, +                { "label": "|", "x": 14.5, "y": 0 }, +                { "label": "~", "x": 15.5, "y": 0 }, +                { "label": "Del", "x": 16.5, "y": 0 }, +                { "label": "Tab", "w": 1.5, "x": 0.5, "y": 1 }, +                { "label": "Q", "x": 2, "y": 1 }, +                { "label": "W", "x": 3, "y": 1 }, +                { "label": "E", "x": 4, "y": 1 }, +                { "label": "R", "x": 5, "y": 1 }, +                { "label": "T", "x": 6, "y": 1 }, +                { "label": "Y", "x": 8, "y": 1 }, +                { "label": "U", "x": 9, "y": 1 }, +                { "label": "I", "x": 10, "y": 1 }, +                { "label": "O", "x": 11, "y": 1 }, +                { "label": "P", "x": 12, "y": 1 }, +                { "label": "{", "x": 13, "y": 1 }, +                { "label": "}", "x": 14, "y": 1 }, +                { "label": "Enter", "w": 1.5, "x": 15, "y": 1 }, +                { "label": "Pgup", "x": 16.5, "y": 1 }, +                { "label": "Caps Lock", "w": 1.75, "x": 0.25, "y": 2 }, +                { "label": "A", "x": 2, "y": 2 }, +                { "label": "S", "x": 3, "y": 2 }, +                { "label": "D", "x": 4, "y": 2 }, +                { "label": "F", "x": 5, "y": 2 }, +                { "label": "G", "x": 6, "y": 2 }, +                { "label": "H", "x": 8.25, "y": 2 }, +                { "label": "J", "x": 9.25, "y": 2 }, +                { "label": "K", "x": 10.25, "y": 2 }, +                { "label": "L", "x": 11.25, "y": 2 }, +                { "label": ":", "x": 12.25, "y": 2 }, +                { "label": "@", "x": 13.25, "y": 2 }, +                { "label": "~", "x": 14.25, "y": 2 }, +                { "label": "Enter", "w": 1.25, "x": 15.25, "y": 2 }, +                { "label": "Pgdn", "x": 16.5, "y": 2 }, +                { "label": "Shift", "w": 1.25, "x": 0, "y": 3 }, +                { "label": "|", "x": 1.25, "y": 3 }, +                { "label": "Z", "x": 2.25, "y": 3 }, +                { "label": "X", "x": 3.25, "y": 3 }, +                { "label": "C", "x": 4.25, "y": 3 }, +                { "label": "V", "x": 5.25, "y": 3 }, +                { "label": "B", "x": 6.25, "y": 3 }, +                { "label": "N", "x": 8.75, "y": 3 }, +                { "label": "M", "x": 9.75, "y": 3 }, +                { "label": "<", "x": 10.75, "y": 3 }, +                { "label": ">", "x": 11.75, "y": 3 }, +                { "label": "?", "x": 12.75, "y": 3 }, +                { "label": "Shift", "w": 1.75, "x": 13.75, "y": 3 }, +                { "label": "Up", "x": 15.5, "y": 3 }, +                { "label": "Fn", "x": 16.5, "y": 3 }, +                { "label": "Ctrl", "w": 1.5, "x": 0, "y": 4 }, +                { "label": "Alt", "w": 1.5, "x": 3, "y": 4 }, +                { "label": "LSpace", "w": 2.25, "x": 4.5, "y": 4 }, +                { "label": "Fn", "x": 6.75, "y": 4 }, +                { "label": "RSpace", "w": 2.75, "x": 8.25, "y": 4 }, +                { "label": "AltGr", "w": 1.5, "x": 11, "y": 4 }, +                { "label": "Left", "x": 14.5, "y": 4 }, +                { "label": "Down", "x": 15.5, "y": 4 }, +                { "label": "Right", "x": 16.5, "y": 4 } +            ]          }      }  } diff --git a/keyboards/singa/keymaps/test/config.h b/keyboards/singa/keymaps/test/config.h deleted file mode 100644 index e176ed3479..0000000000 --- a/keyboards/singa/keymaps/test/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2018 amnesia0287 - * - * 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/>. - */ - -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include "config_common.h" - -// place overrides here - -#endif diff --git a/keyboards/sixkeyboard/config.h b/keyboards/sixkeyboard/config.h index b8fcb8d7d1..8f215aece9 100644 --- a/keyboards/sixkeyboard/config.h +++ b/keyboards/sixkeyboard/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -104,5 +103,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/sixkeyboard/sixkeyboard.h b/keyboards/sixkeyboard/sixkeyboard.h index 353e2a78c8..3f563af6d1 100644 --- a/keyboards/sixkeyboard/sixkeyboard.h +++ b/keyboards/sixkeyboard/sixkeyboard.h @@ -1,20 +1,7 @@ -#ifndef SIXKEYBOARD_H -#define SIXKEYBOARD_H +#pragma once  #include "quantum.h" -// This macro is an example of using a non-standard row-column matrix. The -// keyboard in question had 11 rows and 8 columns, but the rows were not all -// horizontal, and the columns were not all vertical. For example, row 2 -// contained "Print Screen", "N", "M", ",", ".", "/", "Right Shift", and -// "Left Alt". Column 0 contained "F6", "7", "O", "'", "Q", "D", "B", -// "Left Alt", "Up Arrow", and "Down Arrow". -// -// The macro makes programming the keys easier and in a more straight-forward -// manner because it realigns the keys into a 6x15 sensible keyboard layout -// instead of the obtuse 11x8 matrix. - -  /*   * ┌───┬───┬───┐   * │ A │ B │ C │ @@ -24,11 +11,8 @@   */  #define LAYOUT_ortho_2x3( \      k00, k01, k02, \ -    k10, k11, k12  \ -  ) { \ +    k10, k11, k12 \ +) { \      { k00, k01, k02 }, \ -    { k10, k11, k12 }  \ +    { k10, k11, k12 } \  } - - -#endif diff --git a/keyboards/spacey/info.json b/keyboards/spacey/info.json index 39a4e46b54..e249a10fe5 100644 --- a/keyboards/spacey/info.json +++ b/keyboards/spacey/info.json @@ -73,10 +73,10 @@                  {"label":"k43", "x":3, "y":4},                  {"label":"k44", "x":4, "y":4},                  {"label":"k45", "x":5, "y":4}, -                +                {"label":"k46", "x":6, "y":4},                  {"label":"k47", "x":7, "y":4},                  {"label":"k48", "x":8, "y":4}, -                 +                {"label":"k49", "x":9, "y":4},                  {"label":"k4A", "x":10, "y":4},                  {"label":"k4B", "x":11, "y":4},                  {"label":"k4C", "x":12, "y":4}, diff --git a/keyboards/standaside/standaside.h b/keyboards/standaside/standaside.h index b661696397..9601f1257c 100644 --- a/keyboards/standaside/standaside.h +++ b/keyboards/standaside/standaside.h @@ -1,29 +1,23 @@ - -#ifndef STANDASIDE_H -#define STANDASIDE_H +#pragma once  #include "quantum.h" -#define ___ KC_NO  // This a shortcut to help you visually see your layout.  // The first section contains all of the arguments  // The second converts the arguments into a two-dimensional array  #define LAYOUT_ortho_4x16( \ -    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, K40, K41, K42, K43, K44, K45, K46, K47, \ -    K48, K49, K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K60, K61, K62, K63 \ -) \ -{ \ -    { K00, K02, K04, K06, K08, K10, K12, K14 }, \ -    { K01, K03, K05, K07, K09, K11, K13, K15 }, \ -    { K16, K18, K20, K22, K24, K26, K28, K30 }, \ -    { K17, K19, K21, K23, K25, K27, K29, K31 }, \ -    { K32, K34, K36, K38, K40, K42, K44, K46 }, \ -    { K33, K35, K37, K39, K41, K43, K45, K47 }, \ -    { K48, K50, K52, K54, K56, K58, K60, K62 }, \ -    { K49, K51, K53, K55, K57, K59, K61, K63 } \ +    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, \ +    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, \ +    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, \ +    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, k77 \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07 }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17 }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27 }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37 }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47 }, \ +    { k50, k51, k52, k53, k54, k55, k56, k57 }, \ +    { k60, k61, k62, k63, k64, k65, k66, k67 }, \ +    { k70, k71, k72, k73, k74, k75, k76, k77 } \  } - -#endif diff --git a/keyboards/subatomic/config.h b/keyboards/subatomic/config.h index b19339ad6c..47fcc72fd2 100644 --- a/keyboards/subatomic/config.h +++ b/keyboards/subatomic/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -75,5 +74,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/sx60/sx60.h b/keyboards/sx60/sx60.h index f533d8e899..605b6fe78d 100755 --- a/keyboards/sx60/sx60.h +++ b/keyboards/sx60/sx60.h @@ -1,5 +1,4 @@ -#ifndef SX60_H -#define SX60_H +#pragma once  #include "quantum.h"  #include <stdint.h> @@ -23,60 +22,60 @@ extern uint8_t mcp23018_status;  uint8_t init_mcp23018(void); +#define XXX KC_NO +  #define LAYOUT( \ -	      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, K40, K41, K42, K43, K44, \ -	K45,   K46,  K47, K48, K49, K50, K51, K52,    K53, K54, K55, K56, K57,  K58,   K59, \ -	K60,  K61,   K62,   K63,   K64,   K65,       K66,     K67,    K68,   K69, K70, K71 \ +          k00, k01, k02, k03, k04, k05, k06,    k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ +    k10,  k11,    k12, k13, k14, k15, k16,    k18, k19, k1A, k1B, k1C, k1D, k1E,  k1F, \ +    k20,    k21,    k22, k23, k24, k25, k26,    k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, \ +    k30,   k31,  k32, k33, k34, k35, k36, k37,    k38, k39, k3A, k3B, k3C,  k3D,   k3E, \ +    k40,  k41,   k42,   k43,   k44,   k45,       k48,     k49,    k4A,   k4B, k4C, k4D \  ) { \ -	{ K00, K01, K02, K03, K04, K05, K06,   KC_NO, K07, K08, K09, K10, K11, K12, K13,   K14   }, \ -	{ K15, K16, K17, K18, K19, K20, K21,   KC_NO, K22, K23, K24, K25, K26, K27, K28,   K29   }, \ -	{ K30, K31, K32, K33, K34, K35, K36,   KC_NO, K37, K38, K39, K40, K41, K42, K43,   K44   }, \ -	{ K45, K46, K47, K48, K49, K50, K51,   K52,   K53, K54, K55, K56, K57, K58, K59,   K59   }, \ -	{ K60, K61, K62, K63, K64, K65, KC_NO, KC_NO, K66, K67, K68, K69, K70, K71, KC_NO, KC_NO }  \ +    { k00, k01, k02, k03, k04, k05, k06, XXX, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3E }, \ +    { k40, k41, k42, k43, k44, k45, XXX, XXX, k48, k49, k4A, k4B, k4C, k4D, XXX, XXX } \  }  #define LAYOUT_ansi_split_bs_rshift( \ -	      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, K40, K41, K42,      K43, \ -	K44,     K45,   K46, K47, K48, K49, K50,    K51, K52, K53, K54, K55,   K56,    K57, \ -	K58,  K59,   K60,   K61,   K62,   K63,        K64,     K65,   K66,   K67, K68, K69 \ +          k00, k01, k02, k03, k04, k05, k06,    k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ +    k10,  k11,   k12, k13, k14, k15, k16,    k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F, \ +    k20,    k21,  k22, k23, k24, k25, k26,    k28, k29, k2A, k2B, k2C, k2D,      k2E, \ +    k30,     k31,   k33, k34, k35, k36, k37,    k38, k39, k3A, k3B, k3C,   k3D,    k3E, \ +    k40,  k41,   k42,   k43,   k44,   k45,        k48,     k49,   k4A,   k4B, k4C, k4E \  ) { \ -	{ K00, K01, K02,   K03, K04, K05, K06,   KC_NO, K07, K08, K09, K10, K11, K12, K13,   K14   }, \ -	{ K15, K16, K17,   K18, K19, K20, K21,   KC_NO, K22, K23, K24, K25, K26, K27, K28,   K29   }, \ -	{ K30, K31, K32,   K33, K34, K35, K36,   KC_NO, K37, K38, K39, K40, K41, K42, K43,   KC_NO }, \ -	{ K44, K45, KC_NO, K46, K47, K48, K49,   K50,   K51, K52, K53, K54, K55, K56, K57,   K57   }, \ -	{ K58, K59, K60,   K61, K62, K63, KC_NO, KC_NO, K64, K65, K66, K67, K68, K69, KC_NO, KC_NO }  \ +    { k00, k01, k02, k03, k04, k05, k06, XXX, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2A, k2B, k2C, k2D, k2E, XXX }, \ +    { k30, k31, XXX, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3E }, \ +    { k40, k41, k42, k43, k44, k45, XXX, XXX, k48, k49, k4A, k4B, k4C, k4E, XXX, XXX } \  }  #define LAYOUT_ansi_split_bs( \ -	      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, K40, K41, K42,      K43, \ -	K44,     K45,   K46, K47, K48, K49, K50,    K51, K52, K53, K54, K55,     K56, \ - 	K57,  K58,   K59,   K60,   K61,   K62,        K63,     K64,   K65,   K66, K67, K68 \ +          k00, k01, k02, k03, k04, k05, k06,    k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ +    k10,  k11,   k12, k13, k14, k15, k16,    k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F, \ +    k20,    k21,  k22, k23, k24, k25, k26,    k28, k29, k2A, k2B, k2C, k2D,      k2E, \ +    k30,     k31,   k33, k34, k35, k36, k37,    k38, k39, k3A, k3B, k3C,     k3D, \ +    k40,  k41,   k42,   k43,   k44,   k45,        k48,     k49,   k4A,   k4B, k4C, k4D \  ) { \ -	{ K00, K01, K02,   K03, K04, K05, K06,   KC_NO, K07, K08, K09, K10, K11, K12, K13,   K14   }, \ -	{ K15, K16, K17,   K18, K19, K20, K21,   KC_NO, K22, K23, K24, K25, K26, K27, K28,   K29   }, \ -	{ K30, K31, K32,   K33, K34, K35, K36,   KC_NO, K37, K38, K39, K40, K41, K42, K43,   KC_NO }, \ -	{ K44, K45, KC_NO, K46, K47, K48, K49,   K50,   K51, K52, K53, K54, K55, K56, KC_NO, KC_NO }, \ -	{ K57, K58, K59,   K60, K61, K62, KC_NO, KC_NO, K63, K64, K65, K66, K67, K68, KC_NO, KC_NO }  \ +    { k00, k01, k02, k03, k04, k05, k06, XXX, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2A, k2B, k2C, k2D, k2E, XXX }, \ +    { k30, k31, XXX, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, XXX }, \ +    { k40, k41, k42, k43, k44, k45, XXX, XXX, k48, k49, k4A, k4B, k4C, k4D, XXX, XXX } \  }  #define LAYOUT_ansi_split_rshift( \ -	      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, K40, K41,      K42, \ -	K43,     K44,   K45, K46, K47, K48, K49,    K50, K51, K52, K53, K54,   K55,    K56, \ -	K57,  K58,   K59,   K60,   K61,   K62,        K63,     K64,   K65,   K66, K67, K68 \ +         k00, k01, k02, k03, k04, k05, k06,    k08, k09, k0A, k0B, k0C, k0D, k0E, \ +    k10,  k11,   k12, k13, k14, k15, k16,    k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F, \ +    k20,    k21,  k22, k23, k24, k25, k26,    k28, k29, k2A, k2B, k2C, k2D,      k2E, \ +    k30,     k31,   k33, k34, k35, k36, k37,    k38, k39, k3A, k3B, k3C,   k3D,    k3E, \ +    k40,  k41,   k42,   k43,   k44,   k45,        k48,     k49,   k4A,   k4B, k4C, k4D \  ) { \ -	{ K00, K01, K02,   K03, K04, K05, K06,   KC_NO, K07, K08, K09, K10, K11, K12, K13,   K13   }, \ -	{ K14, K15, K16,   K17, K18, K19, K20,   KC_NO, K21, K22, K23, K24, K25, K26, K27,   K28   }, \ -	{ K29, K30, K31,   K32, K33, K34, K35,   KC_NO, K36, K37, K38, K39, K40, K41, K42,   KC_NO }, \ -	{ K43, K44, KC_NO, K45, K46, K47, K48,   K49,   K50, K51, K52, K53, K54, K55, K56,   K56   }, \ -	{ K57, K58, K59,   K60, K61, K62, KC_NO, KC_NO, K63, K64, K65, K66, K67, K68, KC_NO, KC_NO }  \ +    { k00, k01, k02, k03, k04, k05, k06, XXX, k08, k09, k0A, k0B, k0C, k0D, k0E, k0E }, \ +    { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ +    { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2A, k2B, k2C, k2D, k2E, XXX }, \ +    { k30, k31, XXX, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3E }, \ +    { k40, k41, k42, k43, k44, k45, XXX, XXX, k48, k49, k4A, k4B, k4C, k4D, XXX, XXX } \  } - -#endif diff --git a/keyboards/tanuki/config.h b/keyboards/tanuki/config.h index f73ffa79a2..4680753dd4 100644 --- a/keyboards/tanuki/config.h +++ b/keyboards/tanuki/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -76,5 +75,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/tetris/tetris.h b/keyboards/tetris/tetris.h index f5d13e5c2f..56f4ecbfc7 100755 --- a/keyboards/tetris/tetris.h +++ b/keyboards/tetris/tetris.h @@ -1,20 +1,19 @@ -#ifndef TETRIS_H -#define TETRIS_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  #define LAYOUT_planck_mit( \ -	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ -	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ -	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ -	K300, K301, K302, K303, K304, K305,       K307, K308, K309, K310, K311, \ -	K400, K401,                                                 K410, K411  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \ +    k30, k31, k32, k33, k34, k35,      k37, k38, k39, k3A, k3B, \ +    k40, k41,                                         k4A, k4B \  ) { \ -	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \ -	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \ -	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \ -	{ K300,  K301,  K302,  K303,  K304,  K305,  KC_NO, K307,  K308,  K309,  K310,  K311 }, \ -	{ K400,  K401,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K410,  K411 }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \ +    { k30, k31, k32, k33, k34, k35, XXX, k37, k38, k39, k3A, k3B }, \ +    { k40, k41, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k4A, k4B } \  } - -#endif diff --git a/keyboards/thevankeyboards/roadkit/config.h b/keyboards/thevankeyboards/roadkit/config.h index 815dd715b4..ebcb8b820e 100644 --- a/keyboards/thevankeyboards/roadkit/config.h +++ b/keyboards/thevankeyboards/roadkit/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -151,5 +150,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_ONESHOT  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/thevankeyboards/roadkit/roadkit.h b/keyboards/thevankeyboards/roadkit/roadkit.h index 62cfabc5eb..f367c88ff4 100644 --- a/keyboards/thevankeyboards/roadkit/roadkit.h +++ b/keyboards/thevankeyboards/roadkit/roadkit.h @@ -1,33 +1,30 @@ -#ifndef ROADKIT_H -#define ROADKIT_H +#pragma once  #include "quantum.h" +#define XXX KC_NO +  // This is a shortcut to help you visually see your layout.  #define LAYOUT_numpad_4x4( \ -    K00, K01, K02, K03, \ -    K10, K11, K12,      \ -    K20, K21, K22, K23, \ -    K30,      K32       \ -) \ -{ \ -    { K00, K01,   K02, K03   }, \ -    { K10, K11,   K12, KC_NO }, \ -    { K20, K21,   K22, K23   }, \ -    { K30, KC_NO, K32, KC_NO }  \ +    k00, k01, k02, k03, \ +    k10, k11, k12, \ +    k20, k21, k22, k23, \ +    k30,      k32 \ +) { \ +    { k00, k01, k02, k03 }, \ +    { k10, k11, k12, XXX }, \ +    { k20, k21, k22, k23 }, \ +    { k30, XXX, k32, XXX } \  }  #define LAYOUT_ortho_4x4( \ -    K00, K01, K02, K03, \ -    K10, K11, K12, K13, \ -    K20, K21, K22, K23, \ -    K30, K31, K32, K33  \ -) \ -{ \ -    { K00,   K01,   K02,   K03 }, \ -    { K10,   K11,   K12,   K13 }, \ -    { K20,   K21,   K22,   K23 }, \ -    { K30,   K31,   K32,   K33 }  \ +    k00, k01, k02, k03, \ +    k10, k11, k12, k13, \ +    k20, k21, k22, k23, \ +    k30, k31, k32, k33 \ +) { \ +    { k00, k01, k02, k03 }, \ +    { k10, k11, k12, k13 }, \ +    { k20, k21, k22, k23 }, \ +    { k30, k31, k32, k33 } \  } - -#endif diff --git a/keyboards/toad/config.h b/keyboards/toad/config.h index e4391437b6..793e740fa3 100644 --- a/keyboards/toad/config.h +++ b/keyboards/toad/config.h @@ -1,5 +1,4 @@ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -48,5 +47,3 @@  #define RGBLIGHT_SAT_STEP 8  #define RGBLIGHT_VAL_STEP 8  #endif - -#endif diff --git a/keyboards/treasure/type9/type9.h b/keyboards/treasure/type9/type9.h index 4e3c235d11..6034416f16 100644 --- a/keyboards/treasure/type9/type9.h +++ b/keyboards/treasure/type9/type9.h @@ -13,8 +13,8 @@   * 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 TYPE9_H -#define TYPE9_H + +#pragma once  #include "quantum.h" @@ -26,15 +26,12 @@   * The second converts the arguments into a two-dimensional array which   * represents the switch matrix.   */ -#define LAYOUT(    \ -    K00, K01, K02, \ -    K10, K11, K12, \ -    K20, K21, K22  \ -) \ -{ \ -    { K00, K01, K02 }, \ -    { K10, K11, K12 }, \ -    { K20, K21, K22 }, \ +#define LAYOUT( \ +    k00, k01, k02, \ +    k10, k11, k12, \ +    k20, k21, k22 \ +) { \ +    { k00, k01, k02 }, \ +    { k10, k11, k12 }, \ +    { k20, k21, k22 } \  } - -#endif diff --git a/keyboards/uk78/config.h b/keyboards/uk78/config.h index 272e8401e6..4ac138a9b5 100644 --- a/keyboards/uk78/config.h +++ b/keyboards/uk78/config.h @@ -15,8 +15,7 @@ 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 CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -63,5 +62,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define RGBLIGHT_SAT_STEP 8  #define RGBLIGHT_VAL_STEP 8  #endif - -#endif diff --git a/keyboards/uk78/uk78.h b/keyboards/uk78/uk78.h index 32c72d8fde..46e53e7b31 100644 --- a/keyboards/uk78/uk78.h +++ b/keyboards/uk78/uk78.h @@ -1,49 +1,47 @@ -#ifndef UK78_H -#define UK78_H +#pragma once  #include "quantum.h"  // readability -#define ____ KC_NO +#define ___ KC_NO  /* Re: Right Shift   * - * Per a conversation I had on reddit with Rozakiin, matrix positions K312, - * K313 and K314 are never in use all together at the same time. + * Per a conversation I had on reddit with Rozakiin, matrix positions k3C, + * k3D and k3E are never in use all together at the same time.   * - * A 2.75u-sized right Shift uses position K313, rendering K312 and K314 + * A 2.75u-sized right Shift uses position k3D, rendering k3C and k3E   * inaccessible.   *   * A split right Shift, in either 1.75u/1u or 1u/1.75u (JIS layout) uses - * positions K312 and K314, rendering K313 inaccessible. + * positions k3C and k3E, rendering k3D inaccessible.   *   *                                                            - @noroadsleft   *                                                             July 13, 2018   */ -  #define LAYOUT_all( \ -	  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, \ -	  K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, K116, K117, K118, \ -	  K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, K216, K217, K218, \ -	  K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, K318, \ -	  K400, K401, K402,                   K406,                   K410, K411, K412, K413, K414, K415, K416, K417, K418  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0I, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1E, k1F, k1G, k1H, k1I, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2E, k2F, k2G, k2H, k2I, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H, k3I, \ +    k40, k41, k42,                k46,                k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, k4I \  ) { \ -  { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018 }, \ -  { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, ____, K114, K115, K116, K117, K118 }, \ -  { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, ____, K214, K215, K216, K217, K218 }, \ -  { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, K318 }, \ -  { K400, K401, K402, ____, ____, ____, K406, ____, ____, ____, K410, K411, K412, K413, K414, K415, K416, K417, K418 } \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0I }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, ___, k1E, k1F, k1G, k1H, k1I }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, ___, k2E, k2F, k2G, k2H, k2I }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H, k3I }, \ +    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, k4I } \  }  /* LAYOUT_ansi   *   * This layout uses:   * - *   - Split Backspace (K013 and K014) - *   - ANSI Enter (K214) - *   - ANSI 2.25u Left Shift (K300) - *   - Compact right Shift (K312 and K314) - *   - Two 1.5u modifiers (K410 and K412) between the spacebar and the Left + *   - Split Backspace (k0D and k0E) + *   - ANSI Enter (k2E) + *   - ANSI 2.25u Left Shift (k30) + *   - Compact right Shift (k3C and k3E) + *   - Two 1.5u modifiers (k4A and k4C) between the spacebar and the Left   *     arrow key   * ,---------------------------------------------------------------------------.   * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0| -_| =+| \||Bsp|Del|P/ |P* |P- | @@ -58,28 +56,28 @@   * `---------------------------------------------------------------------------'   */  #define LAYOUT_ansi( \ -	  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014,     K015, K016, K017, K018, \ -	  K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114,     K115, K116, K117, K118, \ -	  K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K214,     K215, K216, K217, K218, \ -	  K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,         K314,   K315, K316, K317, K318, \ -	  K400, K401, K402,                   K406,                     K410,   K412,     K413, K414, K415,   K416, K417, K418  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,     k0F, k0G, k0H, k0I, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1E,     k1F, k1G, k1H, k1I, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2E,               k2F, k2G, k2H, k2I, \ +    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,        k3E,   k3F, k3G, k3H, k3I, \ +    k40, k41, k42,                k46,                 k4A,   k4C,     k4D, k4E, k4F,   k4G, k4H, k4I \  ) { \ -  { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018 }, \ -  { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, ____, K114, K115, K116, K117, K118 }, \ -  { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, ____, ____, K214, K215, K216, K217, K218 }, \ -  { K300, ____, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, ____, K314, K315, K316, K317, K318 }, \ -  { K400, K401, K402, ____, ____, ____, K406, ____, ____, ____, K410, ____, K412, K413, K414, K415, K416, K417, K418 } \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0I }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, ___, k1E, k1F, k1G, k1H, k1I }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, ___, k2E, k2F, k2G, k2H, k2I }, \ +    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, k3E, k3F, k3G, k3H, k3I }, \ +    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4A, ___, k4C, k4D, k4E, k4F, k4G, k4H, k4I } \  }  /* LAYOUT_iso   *   * This layout uses:   * - *   - Split Backspace (K013 and K014) - *   - ISO Enter (K114) - *   - ISO Left Shift and 1u (K300 and K301) - *   - Compact right Shift (K312 and K314) - *   - Two 1.5u modifiers (K410 and K412) between the spacebar and the Left + *   - Split Backspace (k0D and k0E) + *   - ISO Enter (k1E) + *   - ISO Left Shift and 1u (k30 and k31) + *   - Compact right Shift (k3C and k3E) + *   - Two 1.5u modifiers (k4A and k4C) between the spacebar and the Left   *     arrow key   * ,---------------------------------------------------------------------------.   * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0| -_| =+| \||Bsp|Del|P/ |P* |P- | @@ -94,17 +92,15 @@   * `---------------------------------------------------------------------------'   */  #define LAYOUT_iso( \ -	  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014,     K015, K016, K017, K018, \ -	  K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114,     K115, K116, K117, K118, \ -	  K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,                 K215, K216, K217, K218, \ -	  K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,         K314,   K315, K316, K317, K318, \ -	  K400, K401, K402,                   K406,                     K410,   K412,     K413, K414, K415,   K416, K417, K418  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,     k0F, k0G, k0H, k0I, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1E,     k1F, k1G, k1H, k1I, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,               k2F, k2G, k2H, k2I, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,        k3E,   k3F, k3G, k3H, k3I, \ +    k40, k41, k42,                k46,                 k4A,   k4C,     k4D, k4E, k4F,   k4G, k4H, k4I \  ) { \ -  { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018 }, \ -  { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, ____, K114, K115, K116, K117, K118 }, \ -  { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, ____, ____, K215, K216, K217, K218 }, \ -  { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, ____, K314, K315, K316, K317, K318 }, \ -  { K400, K401, K402, ____, ____, ____, K406, ____, ____, ____, K410, ____, K412, K413, K414, K415, K416, K417, K418 } \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0I }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, ___, k1E, k1F, k1G, k1H, k1I }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, ___, ___, k2F, k2G, k2H, k2I }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, k3E, k3F, k3G, k3H, k3I }, \ +    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4A, ___, k4C, k4D, k4E, k4F, k4G, k4H, k4I } \  } - -#endif diff --git a/keyboards/waldo/keymaps/default_split_shft_bck/config.h b/keyboards/waldo/keymaps/default_split_shft_bck/config.h deleted file mode 100644 index 19a485296e..0000000000 --- a/keyboards/waldo/keymaps/default_split_shft_bck/config.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - - -#endif diff --git a/keyboards/westfoxtrot/aanzee/aanzee.h b/keyboards/westfoxtrot/aanzee/aanzee.h index aa1b916560..1cfa1784fb 100644 --- a/keyboards/westfoxtrot/aanzee/aanzee.h +++ b/keyboards/westfoxtrot/aanzee/aanzee.h @@ -13,8 +13,8 @@  * 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 AANZEE_H -#define AANZEE_H + +#pragma once  #define ___ KC_NO @@ -28,38 +28,33 @@  * The second converts the arguments into a two-dimensional array which  * represents the switch matrix.  */ -// readability -  #define LAYOUT_ansi( \ -  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0F, K0D, K0E, \ -  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1D, K1E, \ -  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,           K2D, K2E, \ -  K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3D, K3E, \ -  K40, K41, K42,                K46,           K49, K4A,      K4C,      K4D, K4E  \ -) \ -{ \ -  {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F}, \ -  {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, ___}, \ -  {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E, ___}, \ -  {K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___}, \ -  {K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, ___, K4C, K4D, K4E, ___}  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0F, k0D, k0E, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1D, k1E, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2D, k2E, \ +    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,      k3D, k3E, \ +    k40, k41, k42,                k46,           k49, k4A,      k4C,      k4D, k4E \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, ___ }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, k2D, k2E, ___ }, \ +    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, ___ }, \ +    { k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4A, ___, k4C, k4D, k4E, ___ } \  } +  #define LAYOUT_iso( \ -  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ -  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \ -  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ -  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ -  K40, K41, K42,                K46,           K49, K4A,      K4C, K4D, K4E  \ -) \ -{ \ -  {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, ___}, \ -  {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E, ___}, \ -  {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, ___}, \ -  {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___}, \ -  {K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, ___, K4C, K4D, K4E, ___}  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1E, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ +    k40, k41, k42,                k46,           k49, k4A,      k4C, k4D, k4E \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, ___ }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, ___, k1E, ___ }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, ___ }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, ___ }, \ +    { k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4A, ___, k4C, k4D, k4E, ___ } \  }  void matrix_init_user(void);  void matrix_scan_user(void); - -#endif diff --git a/keyboards/westfoxtrot/cyclops/cyclops.h b/keyboards/westfoxtrot/cyclops/cyclops.h index d82c56744c..50744929de 100644 --- a/keyboards/westfoxtrot/cyclops/cyclops.h +++ b/keyboards/westfoxtrot/cyclops/cyclops.h @@ -13,11 +13,13 @@   * 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 CYCLOPS_H -#define CYCLOPS_H + +#pragma once  #include "quantum.h" +#define XXX KC_NO +  /* This a shortcut to help you visually see your layout.   *   * The first section contains all of the arguments representing the physical @@ -27,17 +29,15 @@   * represents the switch matrix.   */  #define LAYOUT( \ -	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ -	K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ -	K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K4D, \ -	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ -	K40, K41, K42,                K46,                K4A, K4B, K4C, K4E, K2E  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ +    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \ +    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k4D, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ +    k40, k41, k42,                k46,                k4A, k4B, k4C, k4E, k2E \  ) { \ -	{ K00,  K01,   K02,  K03,   K04,   K05,   K06,  K07,   K08,   K09,   K0A,  K0B,  K0C,  K0D,  K0E }, \ -	{ K10,  KC_NO, K12,  K13,   K14,   K15,   K16,  K17,   K18,   K19,   K1A,  K1B,  K1C,  K1D,  K1E }, \ -	{ K20,  KC_NO, K22,  K23,   K24,   K25,   K26,  K27,   K28,   K29,   K2A,  K2B,  K2C,  K2D,  K2E }, \ -	{ K30,  K31,   K32,  K33,   K34,   K35,   K36,  K37,   K38,   K39,   K3A,  K3B,  K3C,  K3D,  K3E }, \ -	{ K40,  K41,   K42,  KC_NO, KC_NO, KC_NO, K46,  KC_NO, KC_NO, KC_NO, K4A,  K4B,  K4C,  K4D,  K4E }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ +    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ +    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \ +    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, k4E } \  } - -#endif diff --git a/keyboards/wilba_tech/rama_works_m10_b/rama_works_m10_b.h b/keyboards/wilba_tech/rama_works_m10_b/rama_works_m10_b.h index d55ad598ca..c23a4d003c 100644 --- a/keyboards/wilba_tech/rama_works_m10_b/rama_works_m10_b.h +++ b/keyboards/wilba_tech/rama_works_m10_b/rama_works_m10_b.h @@ -13,17 +13,18 @@   * You should have received a copy of the GNU General Public License   * along with this program.  If not, see <http://www.gnu.org/licenses/>.   */ -#include "quantum.h" +#pragma once -#ifndef RAMA_M10_B_H -#define RAMA_M10_B_H +#include "quantum.h"  // This a shortcut to help you visually see your layout.  // The first section contains all of the arguments  // The second converts the arguments into a two-dimensional array -#define LAYOUT(                         \ -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 )       \ -    {                                   \ -        {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09}, \ -    } -#endif // RAMA_M10_B +#define LAYOUT( \ +    k00, k01, k02, \ +    k03, k04, k05, \ +    k06, k07, k08, \ +            k09 \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 } \ +} diff --git a/keyboards/wilba_tech/rama_works_m6_a/rama_works_m6_a.h b/keyboards/wilba_tech/rama_works_m6_a/rama_works_m6_a.h index d3c7bad332..0a38581450 100644 --- a/keyboards/wilba_tech/rama_works_m6_a/rama_works_m6_a.h +++ b/keyboards/wilba_tech/rama_works_m6_a/rama_works_m6_a.h @@ -13,17 +13,17 @@   * You should have received a copy of the GNU General Public License   * along with this program.  If not, see <http://www.gnu.org/licenses/>.   */ -#include "quantum.h" -#ifndef RAMA_M6_A_H -#define RAMA_M6_A_H +#pragma once + +#include "quantum.h"  // This a shortcut to help you visually see your layout.  // The first section contains all of the arguments  // The second converts the arguments into a two-dimensional array -#define LAYOUT(                         \ -    K00, K01, K02, K03, K04, K05)       \ -    {                                   \ -        {K00, K01, K02, K03, K04, K05}, \ -    } -#endif // RAMA_M6_A +#define LAYOUT( \ +    k00, k01, k02, \ +    k03, k04, k05 \ +) { \ +    { k00, k01, k02, k03, k04, k05 } \ +} diff --git a/keyboards/xiudi/xd87/xd87.h b/keyboards/xiudi/xd87/xd87.h index 0dec1f6a14..2d700d7ba4 100644 --- a/keyboards/xiudi/xd87/xd87.h +++ b/keyboards/xiudi/xd87/xd87.h @@ -13,58 +13,57 @@   * 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 XD87_H -#define XD87_H + +#pragma once  #include "quantum.h" +#define XXX KC_NO +  #define LAYOUT_all( \ -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E, K0F, K0G, \ -    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3E, K1E, K1F, K1G, \ -    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2E, K2F, K2G, \ -    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                     \ -    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,      K4E, K4F, K4G, \ -    K50, K51, K52,           K55,      K58,           K5A, K5B, K5C, K5D,      K5E, K5F, K5G  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0E, k0F, k0G, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k3E, k1E, k1F, k1G, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,      k2E, k2F, k2G, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \ +    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D,      k4E, k4F, k4G, \ +    k50, k51, k52,           k55,      k58,           k5A, k5B, k5C, k5D,      k5E, k5F, k5G \  ) { \ -/*          0      1      2      3      4      5      6      7      8      9      A      B      C      D      E      F      G    */  \ -/* 0 */   { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \ -/* 1 */   { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \ -/* 2 */   { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \ -/* 3 */   { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO }, \ -/* 4 */   { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E,   K4F,   K4G   }, \ -/* 5 */   { K50,   K51,   K52,   KC_NO, KC_NO, K55,   KC_NO, KC_NO, K58,   KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G   }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, XXX, XXX }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G }, \ +    { k50, k51, k52, XXX, XXX, k55, XXX, XXX, k58, XXX, k5A, k5B, k5C, k5D, k5E, k5F, k5G } \  }  #define LAYOUT_tkl_ansi( \ -    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E, K0F, K0G, \ -    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1E, K1F, K1G, \ -    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2E, K2F, K2G, \ -    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                     \ -    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,                K4F,      \ -    K50, K51, K52,                K58,                K5A, K5B, K5C, K5D,      K5E, K5F, K5G  \ +    k00,      k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0E, k0F, k0G, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1E, k1F, k1G, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,      k2E, k2F, k2G, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, \ +    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C,                k4F, \ +    k50, k51, k52,                k58,                k5A, k5B, k5C, k5D,      k5E, k5F, k5G \  ) { \ -    {K00,   KC_NO, K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,          K0E,   K0F,   K0G  }, \ -    {K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,          K1E,   K1F,   K1G  }, \ -    {K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,          K2E,   K2F,   K2G  }, \ -    {K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   KC_NO, K3D,          KC_NO, KC_NO,KC_NO }, \ -    {K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO,        KC_NO, K4F,  KC_NO }, \ -    {K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K58,   KC_NO, K5A,   K5B,   K5C,   K5D,          K5E,   K5F,  K5G   } \ +    { k00, XXX, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, XXX }, \ +    { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, XXX, XXX, k4F, XXX }, \ +    { k50, k51, k52, XXX, XXX, XXX, XXX, XXX, k58, XXX, k5A, k5B, k5C, k5D, k5E, k5F, k5G } \  }  #define LAYOUT_tkl_iso( \ -    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E, K0F, K0G, \ -    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1E, K1F, K1G, \ -    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2E, K2F, K2G, \ -    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                     \ -    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,                K4F,      \ -    K50, K51, K52,                K58,                K5A, K5B, K5C, K5D,      K5E, K5F, K5G  \ +    k00,      k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0E, k0F, k0G, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1E, k1F, k1G, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,           k2E, k2F, k2G, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \ +    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C,                k4F, \ +    k50, k51, k52,                k58,                k5A, k5B, k5C, k5D,      k5E, k5F, k5G \  ) { \ -    {K00,   KC_NO, K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,          K0E,   K0F,   K0G   }, \ -    {K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,          K1E,   K1F,   K1G   }, \ -    {K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   KC_NO,        K2E,   K2F,   K2G   }, \ -    {K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,          KC_NO, KC_NO,KC_NO  }, \ -    {K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO,        KC_NO, K4F,  KC_NO  }, \ -    {K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K58,   KC_NO, K5A,   K5B,   K5C,   K5D,          K5E,   K5F,  K5G    } \ +    { k00, XXX, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, k2E, k2F, k2G }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, XXX, XXX }, \ +    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, XXX, XXX, k4F, XXX }, \ +    { k50, k51, k52, XXX, XXX, XXX, XXX, XXX, k58, XXX, k5A, k5B, k5C, k5D, k5E, k5F, k5G } \  } - -#endif diff --git a/keyboards/xmmx/config.h b/keyboards/xmmx/config.h index c54e432398..773f612089 100644 --- a/keyboards/xmmx/config.h +++ b/keyboards/xmmx/config.h @@ -1,5 +1,4 @@ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -48,5 +47,3 @@  #define RGBLIGHT_SAT_STEP 8  #define RGBLIGHT_VAL_STEP 8  #endif - -#endif diff --git a/keyboards/yd68/yd68.h b/keyboards/yd68/yd68.h index d5d98dec08..3303bd899e 100644 --- a/keyboards/yd68/yd68.h +++ b/keyboards/yd68/yd68.h @@ -13,8 +13,8 @@   * 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 YD68_H -#define YD68_H + +#pragma once  #include "quantum.h" @@ -45,18 +45,15 @@  // The second converts the arguments into a two-dimensional array  #define LAYOUT_ansi( \ -    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, k48, \ -    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ -    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, k2e, \ -    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \ -    k40, k41, k42,                k46,           k49, k4a, k4b, k4c, k4d, k4e  \ -) \ -{ \ -    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e}, \ -    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \ -    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, k2e}, \ -    {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \ -    {k40, k41, k42, XXX, XXX, XXX, k46, XXX, k48, k49, k4a, k4b, k4c, k4d, k4e}  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k48, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, k2E, \ +    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ +    k40, k41, k42,                k46,           k49, k4A, k4B, k4C, k4D, k4E \ +) { \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, k2E }, \ +    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \ +    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, k48, k49, k4A, k4B, k4C, k4D, k4E } \  } - -#endif diff --git a/keyboards/yosino58/rev1/split_scomm.h b/keyboards/yosino58/rev1/split_scomm.h index 873d8939d8..16887eb74f 100644 --- a/keyboards/yosino58/rev1/split_scomm.h +++ b/keyboards/yosino58/rev1/split_scomm.h @@ -1,5 +1,4 @@ -#ifndef SPLIT_COMM_H -#define SPLIT_COMM_H +#pragma once  #ifndef SERIAL_USE_MULTI_TRANSACTION  /* --- USE Simple API (OLD API, compatible with let's split serial.c) --- */ @@ -20,5 +19,3 @@ void serial_slave_init(void);  int serial_update_buffers(int master_changed);  #endif - -#endif /* SPLIT_COMM_H */ diff --git a/keyboards/yosino58/rev1/split_util.h b/keyboards/yosino58/rev1/split_util.h index 687ca19bd3..f593047560 100644 --- a/keyboards/yosino58/rev1/split_util.h +++ b/keyboards/yosino58/rev1/split_util.h @@ -1,5 +1,4 @@ -#ifndef SPLIT_KEYBOARD_UTIL_H -#define SPLIT_KEYBOARD_UTIL_H +#pragma once  #include <stdbool.h>  #include "eeconfig.h" @@ -15,5 +14,3 @@ void split_keyboard_setup(void);  bool has_usb(void);  void matrix_master_OLED_init (void); - -#endif diff --git a/keyboards/yosino58/serial.h b/keyboards/yosino58/serial.h index 7e0c0847a4..ac3459c876 100644 --- a/keyboards/yosino58/serial.h +++ b/keyboards/yosino58/serial.h @@ -1,5 +1,4 @@ -#ifndef SOFT_SERIAL_H -#define SOFT_SERIAL_H +#pragma once  #include <stdbool.h> @@ -80,5 +79,3 @@ int  soft_serial_transaction(int sstd_index);  #ifdef SERIAL_USE_MULTI_TRANSACTION  int  soft_serial_get_and_clean_status(int sstd_index);  #endif - -#endif /* SOFT_SERIAL_H */ diff --git a/keyboards/zlant/config.h b/keyboards/zlant/config.h index fd5632199b..922c446a01 100755 --- a/keyboards/zlant/config.h +++ b/keyboards/zlant/config.h @@ -1,5 +1,4 @@ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once  #include "config_common.h" @@ -45,5 +44,3 @@  #define RGBLIGHT_SAT_STEP 8  #define RGBLIGHT_VAL_STEP 8  #endif - -#endif diff --git a/keyboards/zlant/zlant.h b/keyboards/zlant/zlant.h index 5fbc968ad8..86cd9fef85 100755 --- a/keyboards/zlant/zlant.h +++ b/keyboards/zlant/zlant.h @@ -1,32 +1,29 @@ -#ifndef KB_H -#define KB_H +#pragma once  #include "quantum.h"  #define LAYOUT_ortho_4x12( \ -    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ -    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ -    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ -    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \ +    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B \  ) { \ -    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \ -    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \ -    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \ -    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311 }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \ +    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B } \  }  #define LAYOUT_planck_mit( \ -    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ -    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ -    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ -    K300, K301, K302, K303, K304,    K305,    K307, K308, K309, K310, K311  \ +    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ +    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \ +    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \ +    k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3A, k3B \  ) { \ -    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \ -    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \ -    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \ -    { K300,  K301,  K302,  K303,  K304,  K305,  K305,  K307,  K308,  K309,  K310,  K311 }  \ +    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \ +    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \ +    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \ +    { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3A, k3B } \  }  #define LAYOUT LAYOUT_ortho_4x12 - -#endif diff --git a/lib/python/qmk/cli/__init__.py b/lib/python/qmk/cli/__init__.py index f45e33240c..292dcbe812 100644 --- a/lib/python/qmk/cli/__init__.py +++ b/lib/python/qmk/cli/__init__.py @@ -35,7 +35,6 @@ subcommands = [      'qmk.cli.chibios.confmigrate',      'qmk.cli.clean',      'qmk.cli.compile', -    'qmk.cli.console',      'qmk.cli.docs',      'qmk.cli.doctor',      'qmk.cli.fileformat', diff --git a/lib/python/qmk/cli/console.py b/lib/python/qmk/cli/console.py deleted file mode 100644 index 98c6bc0dc0..0000000000 --- a/lib/python/qmk/cli/console.py +++ /dev/null @@ -1,303 +0,0 @@ -"""Acquire debugging information from usb hid devices - -cli implementation of https://www.pjrc.com/teensy/hid_listen.html -""" -from pathlib import Path -from threading import Thread -from time import sleep, strftime - -import hid -import usb.core - -from milc import cli - -LOG_COLOR = { -    'next': 0, -    'colors': [ -        '{fg_blue}', -        '{fg_cyan}', -        '{fg_green}', -        '{fg_magenta}', -        '{fg_red}', -        '{fg_yellow}', -    ], -} - -KNOWN_BOOTLOADERS = { -    # VID  ,  PID -    ('03EB', '2FEF'): 'atmel-dfu: ATmega16U2', -    ('03EB', '2FF0'): 'atmel-dfu: ATmega32U2', -    ('03EB', '2FF3'): 'atmel-dfu: ATmega16U4', -    ('03EB', '2FF4'): 'atmel-dfu: ATmega32U4', -    ('03EB', '2FF9'): 'atmel-dfu: AT90USB64', -    ('03EB', '2FFA'): 'atmel-dfu: AT90USB162', -    ('03EB', '2FFB'): 'atmel-dfu: AT90USB128', -    ('03EB', '6124'): 'Microchip SAM-BA', -    ('0483', 'DF11'): 'stm32-dfu: STM32 BOOTLOADER', -    ('16C0', '05DC'): 'usbasploader: USBaspLoader', -    ('16C0', '05DF'): 'bootloadhid: HIDBoot', -    ('16C0', '0478'): 'halfkay: Teensy Halfkay', -    ('1B4F', '9203'): 'caterina: Pro Micro 3.3V', -    ('1B4F', '9205'): 'caterina: Pro Micro 5V', -    ('1B4F', '9207'): 'caterina: LilyPadUSB', -    ('1C11', 'B007'): 'kiibohd: Kiibohd DFU Bootloader', -    ('1EAF', '0003'): 'stm32duino: Maple 003', -    ('1FFB', '0101'): 'caterina: Polou A-Star 32U4 Bootloader', -    ('2341', '0036'): 'caterina: Arduino Leonardo', -    ('2341', '0037'): 'caterina: Arduino Micro', -    ('239A', '000C'): 'caterina: Adafruit Feather 32U4', -    ('239A', '000D'): 'caterina: Adafruit ItsyBitsy 32U4 3v', -    ('239A', '000E'): 'caterina: Adafruit ItsyBitsy 32U4 5v', -    ('2A03', '0036'): 'caterina: Arduino Leonardo', -    ('2A03', '0037'): 'caterina: Arduino Micro', -    ('314B', '0106'): 'apm32-dfu: APM32 DFU ISP Mode', -    ('03EB', '2067'): 'qmk-hid: HID Bootloader', -    ('03EB', '2045'): 'lufa-ms: LUFA Mass Storage Bootloader' -} - - -class MonitorDevice(object): -    def __init__(self, hid_device, numeric): -        self.hid_device = hid_device -        self.numeric = numeric -        self.device = hid.Device(path=hid_device['path']) -        self.current_line = '' - -        cli.log.info('Console Connected: %(color)s%(manufacturer_string)s %(product_string)s{style_reset_all} (%(color)s%(vendor_id)04X:%(product_id)04X:%(index)d{style_reset_all})', hid_device) - -    def read(self, size, encoding='ascii', timeout=1): -        """Read size bytes from the device. -        """ -        return self.device.read(size, timeout).decode(encoding) - -    def read_line(self): -        """Read from the device's console until we get a \n. -        """ -        while '\n' not in self.current_line: -            self.current_line += self.read(32).replace('\x00', '') - -        lines = self.current_line.split('\n', 1) -        self.current_line = lines[1] - -        return lines[0] - -    def run_forever(self): -        while True: -            try: -                message = {**self.hid_device, 'text': self.read_line()} -                identifier = (int2hex(message['vendor_id']), int2hex(message['product_id'])) if self.numeric else (message['manufacturer_string'], message['product_string']) -                message['identifier'] = ':'.join(identifier) -                message['ts'] = '{style_dim}{fg_green}%s{style_reset_all} ' % (strftime(cli.config.general.datetime_fmt),) if cli.args.timestamp else '' - -                cli.echo('%(ts)s%(color)s%(identifier)s:%(index)d{style_reset_all}: %(text)s' % message) - -            except hid.HIDException: -                break - - -class FindDevices(object): -    def __init__(self, vid, pid, index, numeric): -        self.vid = vid -        self.pid = pid -        self.index = index -        self.numeric = numeric - -    def run_forever(self): -        """Process messages from our queue in a loop. -        """ -        live_devices = {} -        live_bootloaders = {} - -        while True: -            try: -                for device in list(live_devices): -                    if not live_devices[device]['thread'].is_alive(): -                        cli.log.info('Console Disconnected: %(color)s%(manufacturer_string)s %(product_string)s{style_reset_all} (%(color)s%(vendor_id)04X:%(product_id)04X:%(index)d{style_reset_all})', live_devices[device]) -                        del live_devices[device] - -                for device in self.find_devices(): -                    if device['path'] not in live_devices: -                        device['color'] = LOG_COLOR['colors'][LOG_COLOR['next']] -                        LOG_COLOR['next'] = (LOG_COLOR['next'] + 1) % len(LOG_COLOR['colors']) -                        live_devices[device['path']] = device - -                        try: -                            monitor = MonitorDevice(device, self.numeric) -                            device['thread'] = Thread(target=monitor.run_forever, daemon=True) - -                            device['thread'].start() -                        except Exception as e: -                            device['e'] = e -                            device['e_name'] = e.__class__.__name__ -                            cli.log.error("Could not connect to %(color)s%(manufacturer_string)s %(product_string)s{style_reset_all} (%(color)s:%(vendor_id)04X:%(product_id)04X:%(index)d): %(e_name)s: %(e)s", device) -                            if cli.config.general.verbose: -                                cli.log.exception(e) -                            del live_devices[device['path']] - -                if cli.args.bootloaders: -                    for device in self.find_bootloaders(): -                        if device.address in live_bootloaders: -                            live_bootloaders[device.address]._qmk_found = True -                        else: -                            name = KNOWN_BOOTLOADERS[(int2hex(device.idVendor), int2hex(device.idProduct))] -                            cli.log.info('Bootloader Connected: {style_bright}{fg_magenta}%s', name) -                            device._qmk_found = True -                            live_bootloaders[device.address] = device - -                    for device in list(live_bootloaders): -                        if live_bootloaders[device]._qmk_found: -                            live_bootloaders[device]._qmk_found = False -                        else: -                            name = KNOWN_BOOTLOADERS[(int2hex(live_bootloaders[device].idVendor), int2hex(live_bootloaders[device].idProduct))] -                            cli.log.info('Bootloader Disconnected: {style_bright}{fg_magenta}%s', name) -                            del live_bootloaders[device] - -                sleep(.1) - -            except KeyboardInterrupt: -                break - -    def is_bootloader(self, hid_device): -        """Returns true if the device in question matches a known bootloader vid/pid. -        """ -        return (int2hex(hid_device.idVendor), int2hex(hid_device.idProduct)) in KNOWN_BOOTLOADERS - -    def is_console_hid(self, hid_device): -        """Returns true when the usage page indicates it's a teensy-style console. -        """ -        return hid_device['usage_page'] == 0xFF31 and hid_device['usage'] == 0x0074 - -    def is_filtered_device(self, hid_device): -        """Returns True if the device should be included in the list of available consoles. -        """ -        return int2hex(hid_device['vendor_id']) == self.vid and int2hex(hid_device['product_id']) == self.pid - -    def find_devices_by_report(self, hid_devices): -        """Returns a list of available teensy-style consoles by doing a brute-force search. - -        Some versions of linux don't report usage and usage_page. In that case we fallback to reading the report (possibly inaccurately) ourselves. -        """ -        devices = [] - -        for device in hid_devices: -            path = device['path'].decode('utf-8') - -            if path.startswith('/dev/hidraw'): -                number = path[11:] -                report = Path(f'/sys/class/hidraw/hidraw{number}/device/report_descriptor') - -                if report.exists(): -                    rp = report.read_bytes() - -                    if rp[1] == 0x31 and rp[3] == 0x09: -                        devices.append(device) - -        return devices - -    def find_bootloaders(self): -        """Returns a list of available bootloader devices. -        """ -        return list(filter(self.is_bootloader, usb.core.find(find_all=True))) - -    def find_devices(self): -        """Returns a list of available teensy-style consoles. -        """ -        hid_devices = hid.enumerate() -        devices = list(filter(self.is_console_hid, hid_devices)) - -        if not devices: -            devices = self.find_devices_by_report(hid_devices) - -        if self.vid and self.pid: -            devices = list(filter(self.is_filtered_device, devices)) - -        # Add index numbers -        device_index = {} -        for device in devices: -            id = ':'.join((int2hex(device['vendor_id']), int2hex(device['product_id']))) - -            if id not in device_index: -                device_index[id] = 0 - -            device_index[id] += 1 -            device['index'] = device_index[id] - -        return devices - - -def int2hex(number): -    """Returns a string representation of the number as hex. -    """ -    return "%04X" % number - - -def list_devices(device_finder): -    """Show the user a nicely formatted list of devices. -    """ -    devices = device_finder.find_devices() - -    if devices: -        cli.log.info('Available devices:') -        for dev in devices: -            color = LOG_COLOR['colors'][LOG_COLOR['next']] -            LOG_COLOR['next'] = (LOG_COLOR['next'] + 1) % len(LOG_COLOR['colors']) -            cli.log.info("\t%s%s:%s:%d{style_reset_all}\t%s %s", color, int2hex(dev['vendor_id']), int2hex(dev['product_id']), dev['index'], dev['manufacturer_string'], dev['product_string']) - -    if cli.args.bootloaders: -        bootloaders = device_finder.find_bootloaders() - -        if bootloaders: -            cli.log.info('Available Bootloaders:') - -            for dev in bootloaders: -                cli.log.info("\t%s:%s\t%s", int2hex(dev.idVendor), int2hex(dev.idProduct), KNOWN_BOOTLOADERS[(int2hex(dev.idVendor), int2hex(dev.idProduct))]) - - [email protected]('--bootloaders', arg_only=True, default=True, action='store_boolean', help='displaying bootloaders.') [email protected]('-d', '--device', help='Device to select - uses format <pid>:<vid>[:<index>].') [email protected]('-l', '--list', arg_only=True, action='store_true', help='List available hid_listen devices.') [email protected]('-n', '--numeric', arg_only=True, action='store_true', help='Show VID/PID instead of names.') [email protected]('-t', '--timestamp', arg_only=True, action='store_true', help='Print the timestamp for received messages as well.') [email protected]('-w', '--wait', type=int, default=1, help="How many seconds to wait between checks (Default: 1)") [email protected]('Acquire debugging information from usb hid devices.', hidden=False if cli.config.user.developer else True) -def console(cli): -    """Acquire debugging information from usb hid devices -    """ -    vid = None -    pid = None -    index = 1 - -    if cli.config.console.device: -        device = cli.config.console.device.split(':') - -        if len(device) == 2: -            vid, pid = device - -        elif len(device) == 3: -            vid, pid, index = device - -            if not index.isdigit(): -                cli.log.error('Device index must be a number! Got "%s" instead.', index) -                exit(1) - -            index = int(index) - -            if index < 1: -                cli.log.error('Device index must be greater than 0! Got %s', index) -                exit(1) - -        else: -            cli.log.error('Invalid format for device, expected "<pid>:<vid>[:<index>]" but got "%s".', cli.config.console.device) -            cli.print_help() -            exit(1) - -        vid = vid.upper() -        pid = pid.upper() - -    device_finder = FindDevices(vid, pid, index, cli.args.numeric) - -    if cli.args.list: -        return list_devices(device_finder) - -    print('Looking for devices...', flush=True) -    device_finder.run_forever() diff --git a/lib/python/qmk/cli/doctor/check.py b/lib/python/qmk/cli/doctor/check.py index 0807f41518..2d691b64b0 100644 --- a/lib/python/qmk/cli/doctor/check.py +++ b/lib/python/qmk/cli/doctor/check.py @@ -26,7 +26,6 @@ ESSENTIAL_BINARIES = {      'arm-none-eabi-gcc': {          'version_arg': '-dumpversion'      }, -    'bin/qmk': {},  } diff --git a/lib/python/qmk/cli/format/python.py b/lib/python/qmk/cli/format/python.py index 00612f97ec..b32a726401 100755 --- a/lib/python/qmk/cli/format/python.py +++ b/lib/python/qmk/cli/format/python.py @@ -11,15 +11,15 @@ def format_python(cli):      """Format python code according to QMK's style.      """      edit = '--diff' if cli.args.dry_run else '--in-place' -    yapf_cmd = ['yapf', '-vv', '--recursive', edit, 'bin/qmk', 'lib/python'] +    yapf_cmd = ['yapf', '-vv', '--recursive', edit, 'lib/python']      try:          cli.run(yapf_cmd, check=True, capture_output=False, stdin=DEVNULL) -        cli.log.info('Python code in `bin/qmk` and `lib/python` is correctly formatted.') +        cli.log.info('Python code in `lib/python` is correctly formatted.')          return True      except CalledProcessError:          if cli.args.dry_run: -            cli.log.error('Python code in `bin/qmk` and `lib/python` incorrectly formatted!') +            cli.log.error('Python code in `lib/python` is incorrectly formatted!')          else:              cli.log.error('Error formatting python code!') diff --git a/lib/python/qmk/cli/lint.py b/lib/python/qmk/cli/lint.py index 02b31fbc41..96593ed69b 100644 --- a/lib/python/qmk/cli/lint.py +++ b/lib/python/qmk/cli/lint.py @@ -1,72 +1,129 @@  """Command to look over a keyboard/keymap and check for common mistakes.  """ +from pathlib import Path +  from milc import cli  from qmk.decorators import automagic_keyboard, automagic_keymap  from qmk.info import info_json -from qmk.keyboard import find_readme, keyboard_completer +from qmk.keyboard import keyboard_completer, list_keyboards  from qmk.keymap import locate_keymap  from qmk.path import is_keyboard, keyboard [email protected]('--strict', action='store_true', help='Treat warnings as errors.') [email protected]('-kb', '--keyboard', completer=keyboard_completer, help='The keyboard to check.') [email protected]('-km', '--keymap', help='The keymap to check.') +def keymap_check(kb, km): +    """Perform the keymap level checks. +    """ +    ok = True +    keymap_path = locate_keymap(kb, km) + +    if not keymap_path: +        ok = False +        cli.log.error("%s: Can't find %s keymap.", kb, km) + +    return ok + + +def rules_mk_assignment_only(keyboard_path): +    """Check the keyboard-level rules.mk to ensure it only has assignments. +    """ +    current_path = Path() +    errors = [] + +    for path_part in keyboard_path.parts: +        current_path = current_path / path_part +        rules_mk = current_path / 'rules.mk' + +        if rules_mk.exists(): +            continuation = None + +            for i, line in enumerate(rules_mk.open()): +                line = line.strip() + +                if '#' in line: +                    line = line[:line.index('#')] + +                if continuation: +                    line = continuation + line +                    continuation = None + +                if line: +                    if line[-1] == '\\': +                        continuation = line[:-1] +                        continue + +                    if line and '=' not in line: +                        errors.append(f'Non-assignment code on line +{i} {rules_mk}: {line}') + +    return errors + + [email protected]('--strict', action='store_true', help='Treat warnings as errors') [email protected]('-kb', '--keyboard', completer=keyboard_completer, help='Comma separated list of keyboards to check') [email protected]('-km', '--keymap', help='The keymap to check') [email protected]('--all-kb', action='store_true', arg_only=True, help='Check all keyboards')  @cli.subcommand('Check keyboard and keymap for common mistakes.')  @automagic_keyboard  @automagic_keymap  def lint(cli):      """Check keyboard and keymap for common mistakes.      """ -    if not cli.config.lint.keyboard: -        cli.log.error('Missing required argument: --keyboard') -        cli.print_help() -        return False +    failed = [] -    if not is_keyboard(cli.config.lint.keyboard): -        cli.log.error('No such keyboard: %s', cli.config.lint.keyboard) -        return False +    # Determine our keyboard list +    if cli.args.all_kb: +        if cli.args.keyboard: +            cli.log.warning('Both --all-kb and --keyboard passed, --all-kb takes presidence.') -    # Gather data about the keyboard. -    ok = True -    keyboard_path = keyboard(cli.config.lint.keyboard) -    keyboard_info = info_json(cli.config.lint.keyboard) -    readme_path = find_readme(cli.config.lint.keyboard) -    missing_readme_path = keyboard_path / 'readme.md' +        keyboard_list = list_keyboards() +    elif not cli.config.lint.keyboard: +        cli.log.error('Missing required arguments: --keyboard or --all-kb') +        cli.print_help() +        return False +    else: +        keyboard_list = cli.config.lint.keyboard.split(',') -    # Check for errors in the info.json -    if keyboard_info['parse_errors']: -        ok = False -        cli.log.error('Errors found when generating info.json.') +    # Lint each keyboard +    for kb in keyboard_list: +        if not is_keyboard(kb): +            cli.log.error('No such keyboard: %s', kb) +            continue -    if cli.config.lint.strict and keyboard_info['parse_warnings']: -        ok = False -        cli.log.error('Warnings found when generating info.json (Strict mode enabled.)') +        # Gather data about the keyboard. +        ok = True +        keyboard_path = keyboard(kb) +        keyboard_info = info_json(kb) -    # Check for a readme.md and warn if it doesn't exist -    if not readme_path: -        ok = False -        cli.log.error('Missing %s', missing_readme_path) +        # Check for errors in the info.json +        if keyboard_info['parse_errors']: +            ok = False +            cli.log.error('%s: Errors found when generating info.json.', kb) -    # Keymap specific checks -    if cli.config.lint.keymap: -        keymap_path = locate_keymap(cli.config.lint.keyboard, cli.config.lint.keymap) +        if cli.config.lint.strict and keyboard_info['parse_warnings']: +            ok = False +            cli.log.error('%s: Warnings found when generating info.json (Strict mode enabled.)', kb) -        if not keymap_path: +        # Check the rules.mk file(s) +        rules_mk_assignment_errors = rules_mk_assignment_only(keyboard_path) +        if rules_mk_assignment_errors:              ok = False -            cli.log.error("Can't find %s keymap for %s keyboard.", cli.config.lint.keymap, cli.config.lint.keyboard) -        else: -            keymap_readme = keymap_path.parent / 'readme.md' -            if not keymap_readme.exists(): -                cli.log.warning('Missing %s', keymap_readme) +            cli.log.error('%s: Non-assignment code found in rules.mk. Move it to post_rules.mk instead.', kb) +            for assignment_error in rules_mk_assignment_errors: +                cli.log.error(assignment_error) -                if cli.config.lint.strict: -                    ok = False +        # Keymap specific checks +        if cli.config.lint.keymap: +            if not keymap_check(kb, cli.config.lint.keymap): +                ok = False + +        # Report status +        if not ok: +            failed.append(kb)      # Check and report the overall status -    if ok: -        cli.log.info('Lint check passed!') -        return True +    if failed: +        cli.log.error('Lint check failed for: %s', ', '.join(failed)) +        return False -    cli.log.error('Lint check failed!') -    return False +    cli.log.info('Lint check passed!') +    return True diff --git a/lib/python/qmk/cli/pytest.py b/lib/python/qmk/cli/pytest.py index bdb336b9a7..a7f01a872a 100644 --- a/lib/python/qmk/cli/pytest.py +++ b/lib/python/qmk/cli/pytest.py @@ -12,6 +12,6 @@ def pytest(cli):      """Run several linting/testing commands.      """      nose2 = cli.run(['nose2', '-v'], capture_output=False, stdin=DEVNULL) -    flake8 = cli.run(['flake8', 'lib/python', 'bin/qmk'], capture_output=False, stdin=DEVNULL) +    flake8 = cli.run(['flake8', 'lib/python'], capture_output=False, stdin=DEVNULL)      return flake8.returncode | nose2.returncode diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py index 421453d837..01c23b2612 100644 --- a/lib/python/qmk/commands.py +++ b/lib/python/qmk/commands.py @@ -233,7 +233,7 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, **env_va          f'VERBOSE={verbose}',          f'COLOR={color}',          'SILENT=false', -        f'QMK_BIN={"bin/qmk" if "DEPRECATED_BIN_QMK" in os.environ else "qmk"}', +        'QMK_BIN="qmk"',      ])      return make_command diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py index b39fe5e46d..e4eaef899a 100644 --- a/lib/python/qmk/tests/test_cli_commands.py +++ b/lib/python/qmk/tests/test_cli_commands.py @@ -83,7 +83,7 @@ def test_hello():  def test_format_python():      result = check_subcommand('format-python', '--dry-run')      check_returncode(result) -    assert 'Python code in `bin/qmk` and `lib/python` is correctly formatted.' in result.stdout +    assert 'Python code in `lib/python` is correctly formatted.' in result.stdout  def test_list_keyboards(): diff --git a/platforms/avr/drivers/analog.c b/platforms/avr/drivers/analog.c index 8d299ffdb9..628835ccef 100644 --- a/platforms/avr/drivers/analog.c +++ b/platforms/avr/drivers/analog.c @@ -23,29 +23,6 @@ static uint8_t aref = ADC_REF_POWER;  void analogReference(uint8_t mode) { aref = mode & (_BV(REFS1) | _BV(REFS0)); } -// Arduino compatible pin input -int16_t analogRead(uint8_t pin) { -#if defined(__AVR_ATmega32U4__) -    // clang-format off -    static const uint8_t PROGMEM pin_to_mux[] = { -        //A0    A1    A2    A3    A4    A5 -        //F7    F6    F5    F4    F1    F0 -        0x07, 0x06, 0x05, 0x04, 0x01, 0x00, -        //A6    A7    A8    A9   A10   A11 -        //D4    D7    B4    B5    B6    D6 -        0x20, 0x22, 0x23, 0x24, 0x25, 0x21 -    }; -    // clang-format on -    if (pin >= 12) return 0; -    return adc_read(pgm_read_byte(pin_to_mux + pin)); -#elif defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) || defined(__AVR_ATmega328P__) || defined(__AVR_ATmega328__) -    if (pin >= 8) return 0; -    return adc_read(pin); -#else -    return 0; -#endif -} -  int16_t analogReadPin(pin_t pin) { return adc_read(pinToMux(pin)); }  uint8_t pinToMux(pin_t pin) { diff --git a/platforms/avr/drivers/analog.h b/platforms/avr/drivers/analog.h index 058882450d..b3c05e1976 100644 --- a/platforms/avr/drivers/analog.h +++ b/platforms/avr/drivers/analog.h @@ -23,7 +23,6 @@  extern "C" {  #endif  void    analogReference(uint8_t mode); -int16_t analogRead(uint8_t pin);  int16_t analogReadPin(pin_t pin);  uint8_t pinToMux(pin_t pin); diff --git a/quantum/quantum.c b/quantum/quantum.c index e60378afe4..9d77fa4383 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -480,3 +480,99 @@ void api_send_unicode(uint32_t unicode) {  __attribute__((weak)) void startup_user() {}  __attribute__((weak)) void shutdown_user() {} + +/** \brief Run keyboard level Power down + * + * FIXME: needs doc + */ +__attribute__((weak)) void suspend_power_down_user(void) {} +/** \brief Run keyboard level Power down + * + * FIXME: needs doc + */ +__attribute__((weak)) void suspend_power_down_kb(void) { suspend_power_down_user(); } + +void suspend_power_down_quantum(void) { +#ifndef NO_SUSPEND_POWER_DOWN +// Turn off backlight +#    ifdef BACKLIGHT_ENABLE +    backlight_set(0); +#    endif + +#    ifdef LED_MATRIX_ENABLE +    led_matrix_task(); +#    endif +#    ifdef RGB_MATRIX_ENABLE +    rgb_matrix_task(); +#    endif + +    // Turn off LED indicators +    uint8_t leds_off = 0; +#    if defined(BACKLIGHT_CAPS_LOCK) && defined(BACKLIGHT_ENABLE) +    if (is_backlight_enabled()) { +        // Don't try to turn off Caps Lock indicator as it is backlight and backlight is already off +        leds_off |= (1 << USB_LED_CAPS_LOCK); +    } +#    endif +    led_set(leds_off); + +// Turn off audio +#    ifdef AUDIO_ENABLE +    stop_all_notes(); +#    endif + +// Turn off underglow +#    if defined(RGBLIGHT_SLEEP) && defined(RGBLIGHT_ENABLE) +    rgblight_suspend(); +#    endif + +#    if defined(LED_MATRIX_ENABLE) +    led_matrix_set_suspend_state(true); +#    endif +#    if defined(RGB_MATRIX_ENABLE) +    rgb_matrix_set_suspend_state(true); +#    endif + +#    ifdef OLED_ENABLE +    oled_off(); +#    endif +#    ifdef ST7565_ENABLE +    st7565_off(); +#    endif +#endif +} + +/** \brief run user level code immediately after wakeup + * + * FIXME: needs doc + */ +__attribute__((weak)) void suspend_wakeup_init_user(void) {} + +/** \brief run keyboard level code immediately after wakeup + * + * FIXME: needs doc + */ +__attribute__((weak)) void suspend_wakeup_init_kb(void) { suspend_wakeup_init_user(); } + +__attribute__((weak)) void suspend_wakeup_init_quantum(void) { +// Turn on backlight +#ifdef BACKLIGHT_ENABLE +    backlight_init(); +#endif + +    // Restore LED indicators +    led_set(host_keyboard_leds()); + +// Wake up underglow +#if defined(RGBLIGHT_SLEEP) && defined(RGBLIGHT_ENABLE) +    rgblight_wakeup(); +#endif + +#if defined(LED_MATRIX_ENABLE) +    led_matrix_set_suspend_state(false); +#endif +#if defined(RGB_MATRIX_ENABLE) +    rgb_matrix_set_suspend_state(false); +#endif +    suspend_wakeup_init_kb(); +} @@ -14,7 +14,7 @@ let      projectDir = ./util/nix;      overrides = poetry2nix.overrides.withDefaults (self: super: {        qmk = super.qmk.overridePythonAttrs(old: { -        # Allow QMK CLI to run "bin/qmk" as a subprocess (the wrapper changes +        # Allow QMK CLI to run "qmk" as a subprocess (the wrapper changes          # $PATH and breaks these invocations).          dontWrapPythonPrograms = true;        }); diff --git a/tmk_core/common/avr/suspend.c b/tmk_core/common/avr/suspend.c index 690d7f38ca..b614746e6c 100644 --- a/tmk_core/common/avr/suspend.c +++ b/tmk_core/common/avr/suspend.c @@ -16,25 +16,6 @@  #    include "vusb.h"  #endif -#ifdef BACKLIGHT_ENABLE -#    include "backlight.h" -#endif - -#ifdef AUDIO_ENABLE -#    include "audio.h" -#endif /* AUDIO_ENABLE */ - -#if defined(RGBLIGHT_SLEEP) && defined(RGBLIGHT_ENABLE) -#    include "rgblight.h" -#endif - -#ifdef LED_MATRIX_ENABLE -#    include "led_matrix.h" -#endif -#ifdef RGB_MATRIX_ENABLE -#    include "rgb_matrix.h" -#endif -  /** \brief Suspend idle   *   * FIXME: needs doc @@ -50,17 +31,6 @@ void suspend_idle(uint8_t time) {  // TODO: This needs some cleanup -/** \brief Run keyboard level Power down - * - * FIXME: needs doc - */ -__attribute__((weak)) void suspend_power_down_user(void) {} -/** \brief Run keyboard level Power down - * - * FIXME: needs doc - */ -__attribute__((weak)) void suspend_power_down_kb(void) { suspend_power_down_user(); } -  #if !defined(NO_SUSPEND_POWER_DOWN) && defined(WDT_vect)  // clang-format off @@ -135,41 +105,9 @@ void suspend_power_down(void) {      if (!vusb_suspended) return;  #endif -    suspend_power_down_kb(); +    suspend_power_down_quantum();  #ifndef NO_SUSPEND_POWER_DOWN -    // Turn off backlight -#    ifdef BACKLIGHT_ENABLE -    backlight_set(0); -#    endif - -    // Turn off LED indicators -    uint8_t leds_off = 0; -#    if defined(BACKLIGHT_CAPS_LOCK) && defined(BACKLIGHT_ENABLE) -    if (is_backlight_enabled()) { -        // Don't try to turn off Caps Lock indicator as it is backlight and backlight is already off -        leds_off |= (1 << USB_LED_CAPS_LOCK); -    } -#    endif -    led_set(leds_off); - -    // Turn off audio -#    ifdef AUDIO_ENABLE -    stop_all_notes(); -#    endif - -    // Turn off underglow -#    if defined(RGBLIGHT_SLEEP) && defined(RGBLIGHT_ENABLE) -    rgblight_suspend(); -#    endif - -#    if defined(LED_MATRIX_ENABLE) -    led_matrix_set_suspend_state(true); -#    endif -#    if defined(RGB_MATRIX_ENABLE) -    rgb_matrix_set_suspend_state(true); -#    endif -      // Enter sleep state if possible (ie, the MCU has a watchdog timeout interrupt)  #    if defined(WDT_vect)      power_down(WDTO_15MS); @@ -189,18 +127,6 @@ bool                       suspend_wakeup_condition(void) {      return false;  } -/** \brief run user level code immediately after wakeup - * - * FIXME: needs doc - */ -__attribute__((weak)) void suspend_wakeup_init_user(void) {} - -/** \brief run keyboard level code immediately after wakeup - * - * FIXME: needs doc - */ -__attribute__((weak)) void suspend_wakeup_init_kb(void) { suspend_wakeup_init_user(); } -  /** \brief run immediately after wakeup   *   * FIXME: needs doc @@ -209,27 +135,7 @@ void suspend_wakeup_init(void) {      // clear keyboard state      clear_keyboard(); -    // Turn on backlight -#ifdef BACKLIGHT_ENABLE -    backlight_init(); -#endif - -    // Restore LED indicators -    led_set(host_keyboard_leds()); - -    // Wake up underglow -#if defined(RGBLIGHT_SLEEP) && defined(RGBLIGHT_ENABLE) -    rgblight_wakeup(); -#endif - -#if defined(LED_MATRIX_ENABLE) -    led_matrix_set_suspend_state(false); -#endif -#if defined(RGB_MATRIX_ENABLE) -    rgb_matrix_set_suspend_state(false); -#endif - -    suspend_wakeup_init_kb(); +    suspend_wakeup_init_quantum();  }  #if !defined(NO_SUSPEND_POWER_DOWN) && defined(WDT_vect) diff --git a/tmk_core/common/chibios/suspend.c b/tmk_core/common/chibios/suspend.c index 38517e06f0..991fe6e08b 100644 --- a/tmk_core/common/chibios/suspend.c +++ b/tmk_core/common/chibios/suspend.c @@ -12,25 +12,6 @@  #include "led.h"  #include "wait.h" -#ifdef AUDIO_ENABLE -#    include "audio.h" -#endif /* AUDIO_ENABLE */ - -#ifdef BACKLIGHT_ENABLE -#    include "backlight.h" -#endif - -#if defined(RGBLIGHT_SLEEP) && defined(RGBLIGHT_ENABLE) -#    include "rgblight.h" -#endif - -#ifdef LED_MATRIX_ENABLE -#    include "led_matrix.h" -#endif -#ifdef RGB_MATRIX_ENABLE -#    include "rgb_matrix.h" -#endif -  /** \brief suspend idle   *   * FIXME: needs doc @@ -40,61 +21,12 @@ void suspend_idle(uint8_t time) {      wait_ms(time);  } -/** \brief Run keyboard level Power down - * - * FIXME: needs doc - */ -__attribute__((weak)) void suspend_power_down_user(void) {} -/** \brief Run keyboard level Power down - * - * FIXME: needs doc - */ -__attribute__((weak)) void suspend_power_down_kb(void) { suspend_power_down_user(); } -  /** \brief suspend power down   *   * FIXME: needs doc   */  void suspend_power_down(void) { -#ifdef BACKLIGHT_ENABLE -    backlight_set(0); -#endif - -#ifdef LED_MATRIX_ENABLE -    led_matrix_task(); -#endif -#ifdef RGB_MATRIX_ENABLE -    rgb_matrix_task(); -#endif - -    // Turn off LED indicators -    uint8_t leds_off = 0; -#if defined(BACKLIGHT_CAPS_LOCK) && defined(BACKLIGHT_ENABLE) -    if (is_backlight_enabled()) { -        // Don't try to turn off Caps Lock indicator as it is backlight and backlight is already off -        leds_off |= (1 << USB_LED_CAPS_LOCK); -    } -#endif -    led_set(leds_off); - -    // TODO: figure out what to power down and how -    // shouldn't power down TPM/FTM if we want a breathing LED -    // also shouldn't power down USB -#if defined(RGBLIGHT_SLEEP) && defined(RGBLIGHT_ENABLE) -    rgblight_suspend(); -#endif - -#if defined(LED_MATRIX_ENABLE) -    led_matrix_set_suspend_state(true); -#endif -#if defined(RGB_MATRIX_ENABLE) -    rgb_matrix_set_suspend_state(true); -#endif -#ifdef AUDIO_ENABLE -    stop_all_notes(); -#endif /* AUDIO_ENABLE */ - -    suspend_power_down_kb(); +    suspend_power_down_quantum();      // on AVR, this enables the watchdog for 15ms (max), and goes to      // SLEEP_MODE_PWR_DOWN @@ -151,19 +83,6 @@ void suspend_wakeup_init(void) {      host_system_send(0);      host_consumer_send(0);  #endif /* EXTRAKEY_ENABLE */ -#ifdef BACKLIGHT_ENABLE -    backlight_init(); -#endif /* BACKLIGHT_ENABLE */ -    led_set(host_keyboard_leds()); -#if defined(RGBLIGHT_SLEEP) && defined(RGBLIGHT_ENABLE) -    rgblight_wakeup(); -#endif -#if defined(LED_MATRIX_ENABLE) -    led_matrix_set_suspend_state(false); -#endif -#if defined(RGB_MATRIX_ENABLE) -    rgb_matrix_set_suspend_state(false); -#endif -    suspend_wakeup_init_kb(); +    suspend_wakeup_init_quantum();  } diff --git a/tmk_core/common/suspend.h b/tmk_core/common/suspend.h index 95845e4b63..081735f90e 100644 --- a/tmk_core/common/suspend.h +++ b/tmk_core/common/suspend.h @@ -10,8 +10,10 @@ void suspend_wakeup_init(void);  void suspend_wakeup_init_user(void);  void suspend_wakeup_init_kb(void); +void suspend_wakeup_init_quantum(void);  void suspend_power_down_user(void);  void suspend_power_down_kb(void); +void suspend_power_down_quantum(void);  #ifndef USB_SUSPEND_WAKEUP_DELAY  #    define USB_SUSPEND_WAKEUP_DELAY 0 diff --git a/tmk_core/protocol/usb_hid/parser.h b/tmk_core/protocol/usb_hid/parser.h index 036281fa66..ba35b7af5a 100644 --- a/tmk_core/protocol/usb_hid/parser.h +++ b/tmk_core/protocol/usb_hid/parser.h @@ -1,5 +1,4 @@ -#ifndef PARSER_H -#define PARSER_H +#pragma once  #include "hid.h"  #include "report.h" @@ -11,5 +10,3 @@ public:      uint16_t time_stamp;      virtual void Parse(HID *hid, bool is_rpt_id, uint8_t len, uint8_t *buf);  }; - -#endif diff --git a/tmk_core/protocol/usb_hid/usb_hid.h b/tmk_core/protocol/usb_hid/usb_hid.h index 083b68d1f5..5cb5f5d035 100644 --- a/tmk_core/protocol/usb_hid/usb_hid.h +++ b/tmk_core/protocol/usb_hid/usb_hid.h @@ -1,10 +1,6 @@ -#ifndef USB_HID_H -#define USB_HID_H +#pragma once  #include "report.h" -  extern report_keyboard_t usb_hid_keyboard_report;  extern uint16_t usb_hid_time_stamp; - -#endif | 
