naiping/np64: 64_ansi Community Layout support and codebase touch-up (#14264)

author: James Young <18669334+noroadsleft@users.noreply.github.com> 2021-09-02 03:50:44 +0000
committer: GitHub <noreply@github.com> 2021-09-01 20:50:44 -0700
commit: c1e5c920a9929a0434edca537e6c58aed294668c (patch)
tree: 484fe5423a63f975a64fb9efd62dc6c29760d421
parent: b55154fb0ad40d895ccc11bb09498f026e0c0773 (diff)
download: qmk_firmware-c1e5c920a9929a0434edca537e6c58aed294668c.tar.gz
qmk_firmware-c1e5c920a9929a0434edca537e6c58aed294668c.zip
8 files changed, 110 insertions, 91 deletions
diff --git a/keyboards/naiping/np64/config.h b/keyboards/naiping/np64/config.h
index f2eb83a9a..ee4bdb867 100644
--- a/keyboards/naiping/np64/config.h
+++ b/keyboards/naiping/np64/config.h
@@ -1,18 +1,18 @@
 /* Copyright 2021 Weirdo
-  * 
+  *
-  * This program is free software: you can redistribute it and/or modify 
+  * 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 
+  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or 
+  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version. 
+  * (at your option) any later version.
-  * 
+  *
-  * This program is distributed in the hope that it will be useful, 
+  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details. 
+  * GNU General Public License for more details.
-  * 
+  *
-  * You should have received a copy of the GNU General Public License 
+  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */ 
+  */
 #pragma once
 #include "config_common.h"
diff --git a/keyboards/naiping/np64/info.json b/keyboards/naiping/np64/info.json
index 853ffcbcc..22b9408f6 100644
--- a/keyboards/naiping/np64/info.json
+++ b/keyboards/naiping/np64/info.json
@@ -4,8 +4,11 @@
    "maintainer": "qmk",
    "width": 15,
    "height": 5,
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_64_ansi"
+    },
    "layouts": {
-        "LAYOUT": {
+        "LAYOUT_64_ansi": {
            "layout": [
                {"label":"K00", "x":0, "y":0},
                {"label":"K01", "x":1, "y":0},
@@ -21,6 +24,7 @@
                {"label":"K0B", "x":11, "y":0},
                {"label":"K0C", "x":12, "y":0},
                {"label":"K0E", "x":13, "y":0, "w":2},
                {"label":"K10", "x":0, "y":1, "w":1.5},
                {"label":"K12", "x":1.5, "y":1},
                {"label":"K13", "x":2.5, "y":1},
@@ -35,6 +39,7 @@
                {"label":"K1C", "x":11.5, "y":1},
                {"label":"K1D", "x":12.5, "y":1},
                {"label":"K1E", "x":13.5, "y":1, "w":1.5},
                {"label":"K20", "x":0, "y":2, "w":1.75},
                {"label":"K22", "x":1.75, "y":2},
                {"label":"K23", "x":2.75, "y":2},
@@ -48,6 +53,7 @@
                {"label":"K2B", "x":10.75, "y":2},
                {"label":"K2C", "x":11.75, "y":2},
                {"label":"K2E", "x":12.75, "y":2, "w":2.25},
                {"label":"K30", "x":0, "y":3, "w":2},
                {"label":"K32", "x":2, "y":3},
                {"label":"K33", "x":3, "y":3},
@@ -62,6 +68,7 @@
                {"label":"K3C", "x":12, "y":3},
                {"label":"K3D", "x":13, "y":3},
                {"label":"K3E", "x":14, "y":3},
                {"label":"K40", "x":0, "y":4, "w":1.25},
                {"label":"K41", "x":1.25, "y":4, "w":1.25},
                {"label":"K42", "x":2.5, "y":4, "w":1.25},
diff --git a/keyboards/naiping/np64/keymaps/default/keymap.c b/keyboards/naiping/np64/keymaps/default/keymap.c
index 18a40b45b..25f72fe66 100644
--- a/keyboards/naiping/np64/keymaps/default/keymap.c
+++ b/keyboards/naiping/np64/keymaps/default/keymap.c
@@ -1,18 +1,18 @@
 /* Copyright 2021 Weirdo
-  * 
+  *
-  * This program is free software: you can redistribute it and/or modify 
+  * 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 
+  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or 
+  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version. 
+  * (at your option) any later version.
-  * 
+  *
-  * This program is distributed in the hope that it will be useful, 
+  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details. 
+  * GNU General Public License for more details.
-  * 
+  *
-  * You should have received a copy of the GNU General Public License 
+  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */ 
+  */
 #include QMK_KEYBOARD_H
@@ -23,16 +23,19 @@ enum layer_names {
 };
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-        [_BASE] = LAYOUT(KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,  KC_5,  KC_6,     KC_7,     KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,             KC_BSPC,
+    [_BASE] = LAYOUT_64_ansi(
-                         KC_TAB,           KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,     KC_Y,     KC_U,  KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,
-                         KC_CAPS,          KC_A,    KC_S,    KC_D,  KC_F,  KC_G,     KC_H,     KC_J,  KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT, 
+        KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-                         KC_LSFT,          KC_Z,    KC_X,    KC_C,  KC_V,  KC_B,     KC_N,     KC_M,  KC_COMMA, KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_DEL,
+        KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-                         KC_LCTL, KC_LWIN, KC_LALT,                        KC_SPACE,                            KC_RALT,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RIGHT),
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_DEL,
+        KC_LCTL, KC_LWIN, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT_64_ansi(
-        [_FN] = LAYOUT(KC_GRV,  KC_F1,   KC_F2,     KC_F3,   KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,             KC_DEL,
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_DEL,
-                       KC_TRNS,          KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                       KC_TRNS,          KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS, 
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-                       KC_TRNS,          KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                       KC_TRNS, KC_TRNS, KC_TRNS,                                KC_SPACE,                               KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),  //
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_SPC,                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
 };
diff --git a/keyboards/naiping/np64/keymaps/via/keymap.c b/keyboards/naiping/np64/keymaps/via/keymap.c
index 01d0cba54..7afa15e73 100644
--- a/keyboards/naiping/np64/keymaps/via/keymap.c
+++ b/keyboards/naiping/np64/keymaps/via/keymap.c
@@ -1,18 +1,18 @@
 /* Copyright 2021 Weirdo
-  * 
+  *
-  * This program is free software: you can redistribute it and/or modify 
+  * 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 
+  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or 
+  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version. 
+  * (at your option) any later version.
-  * 
+  *
-  * This program is distributed in the hope that it will be useful, 
+  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details. 
+  * GNU General Public License for more details.
-  * 
+  *
-  * You should have received a copy of the GNU General Public License 
+  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */ 
+  */
 #include QMK_KEYBOARD_H
@@ -20,28 +20,35 @@
 enum layer_names { _BASE, _FN ,_FN1 ,_FN2 };
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-        [_BASE] = LAYOUT(KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,  KC_5,  KC_6,     KC_7,     KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,             KC_BSPC,
+    [_BASE] = LAYOUT_64_ansi(
-                         KC_TAB,           KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,     KC_Y,     KC_U,  KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,
-                         KC_CAPS,          KC_A,    KC_S,    KC_D,  KC_F,  KC_G,     KC_H,     KC_J,  KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT, 
+        KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-                         KC_LSFT,          KC_Z,    KC_X,    KC_C,  KC_V,  KC_B,     KC_N,     KC_M,  KC_COMMA, KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_DEL,
+        KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-                         KC_LCTL, KC_LWIN, KC_LALT,                        KC_SPACE,                            KC_RALT,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RIGHT),
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_DEL,
+        KC_LCTL, KC_LWIN, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT_64_ansi(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_DEL,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_SPC,                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
-        [_FN] = LAYOUT(KC_GRV,  KC_F1,   KC_F2,     KC_F3,   KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,             KC_DEL,
+    [_FN1] = LAYOUT_64_ansi(
-                       KC_TRNS,          KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-                       KC_TRNS,          KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS, 
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                       KC_TRNS,          KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-                       KC_TRNS, KC_TRNS, KC_TRNS,                                KC_SPACE,                               KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),  //
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_SPC,                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
-        [_FN1] = LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+    [_FN2] = LAYOUT_64_ansi(
-                        KC_TRNS,          KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-                        KC_TRNS,          KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS, 
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                        KC_TRNS,          KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-                        KC_TRNS, KC_TRNS, KC_TRNS,                                KC_SPACE,                               KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_SPC,                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-        [_FN2] = LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+    ),
-                        KC_TRNS,          KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-                        KC_TRNS,          KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS, 
-                        KC_TRNS,          KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-                        KC_TRNS, KC_TRNS, KC_TRNS,                                KC_SPACE,                               KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
 };
diff --git a/keyboards/naiping/np64/np64.c b/keyboards/naiping/np64/np64.c
index c5602d55f..ee4c08cd3 100644
--- a/keyboards/naiping/np64/np64.c
+++ b/keyboards/naiping/np64/np64.c
@@ -1,16 +1,16 @@
  /* Copyright 2021 Weirdo
-  * 
+  *
-  * This program is free software: you can redistribute it and/or modify 
+  * 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 
+  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or 
+  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version. 
+  * (at your option) any later version.
-  * 
+  *
-  * This program is distributed in the hope that it will be useful, 
+  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details. 
+  * GNU General Public License for more details.
-  * 
+  *
-  * You should have received a copy of the GNU General Public License 
+  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */ 
+  */
 #include "np64.h"
diff --git a/keyboards/naiping/np64/np64.h b/keyboards/naiping/np64/np64.h
index a85471222..c2277aa20 100644
--- a/keyboards/naiping/np64/np64.h
+++ b/keyboards/naiping/np64/np64.h
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "quantum.h"
-#define LAYOUT( \
+#define LAYOUT_64_ansi( \
  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,      K2E, \
diff --git a/keyboards/naiping/np64/readme.md b/keyboards/naiping/np64/readme.md
index 03b16c4bc..8e85d79de 100644
--- a/keyboards/naiping/np64/readme.md
+++ b/keyboards/naiping/np64/readme.md
@@ -4,7 +4,7 @@
 A 60% keyboard based on STM32f303
-* Keyboard Maintainer:  [Weirdo](https://weirdo-f.github.io)(https://github.com/1248314361)
+* Keyboard Maintainer:  [Weirdo](https://github.com/weirdo-f) (https://weirdo-f.github.io)
 * Hardware Supported: NP_64
 * Hardware Availability: Not yet
diff --git a/keyboards/naiping/np64/rules.mk b/keyboards/naiping/np64/rules.mk
index c8646b2f9..ff74d6312 100644
--- a/keyboards/naiping/np64/rules.mk
+++ b/keyboards/naiping/np64/rules.mk
@@ -21,3 +21,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
+LAYOUTS = 64_ansi
author	James Young <18669334+noroadsleft@users.noreply.github.com>	2021-09-02 03:50:44 +0000
committer	GitHub <noreply@github.com>	2021-09-01 20:50:44 -0700
commit	c1e5c920a9929a0434edca537e6c58aed294668c (patch)
tree	484fe5423a63f975a64fb9efd62dc6c29760d421
parent	b55154fb0ad40d895ccc11bb09498f026e0c0773 (diff)
download	qmk_firmware-c1e5c920a9929a0434edca537e6c58aed294668c.tar.gz qmk_firmware-c1e5c920a9929a0434edca537e6c58aed294668c.zip

diff --git a/keyboards/naiping/np64/config.h b/keyboards/naiping/np64/config.h index f2eb83a9a..ee4bdb867 100644 --- a/keyboards/naiping/np64/config.h +++ b/keyboards/naiping/np64/config.h
@@ -1,18 +1,18 @@
1	/* Copyright 2021 Weirdo	1	/* Copyright 2021 Weirdo
2	*	2	*
3	* This program is free software: you can redistribute it and/or modify	3	* This program is free software: you can redistribute it and/or modify
4	* it under the terms of the GNU General Public License as published by	4	* it under the terms of the GNU General Public License as published by
5	* the Free Software Foundation, either version 2 of the License, or	5	* the Free Software Foundation, either version 2 of the License, or
6	* (at your option) any later version.	6	* (at your option) any later version.
7	*	7	*
8	* This program is distributed in the hope that it will be useful,	8	* This program is distributed in the hope that it will be useful,
9	* but WITHOUT ANY WARRANTY; without even the implied warranty of	9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11	* GNU General Public License for more details.	11	* GNU General Public License for more details.
12	*	12	*
13	* You should have received a copy of the GNU General Public License	13	* You should have received a copy of the GNU General Public License
14	* along with this program. If not, see <http://www.gnu.org/licenses/>.	14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
15	*/	15	*/
16	#pragma once	16	#pragma once
17	#include "config_common.h"	17	#include "config_common.h"
18		18


diff --git a/keyboards/naiping/np64/info.json b/keyboards/naiping/np64/info.json index 853ffcbcc..22b9408f6 100644 --- a/keyboards/naiping/np64/info.json +++ b/keyboards/naiping/np64/info.json
@@ -4,8 +4,11 @@
4	"maintainer": "qmk",	4	"maintainer": "qmk",
5	"width": 15,	5	"width": 15,
6	"height": 5,	6	"height": 5,
		7	"layout_aliases": {
		8	"LAYOUT": "LAYOUT_64_ansi"
		9	},
7	"layouts": {	10	"layouts": {
8	"LAYOUT": {	11	"LAYOUT_64_ansi": {
9	"layout": [	12	"layout": [
10	{"label":"K00", "x":0, "y":0},	13	{"label":"K00", "x":0, "y":0},
11	{"label":"K01", "x":1, "y":0},	14	{"label":"K01", "x":1, "y":0},
@@ -21,6 +24,7 @@
21	{"label":"K0B", "x":11, "y":0},	24	{"label":"K0B", "x":11, "y":0},
22	{"label":"K0C", "x":12, "y":0},	25	{"label":"K0C", "x":12, "y":0},
23	{"label":"K0E", "x":13, "y":0, "w":2},	26	{"label":"K0E", "x":13, "y":0, "w":2},
		27
24	{"label":"K10", "x":0, "y":1, "w":1.5},	28	{"label":"K10", "x":0, "y":1, "w":1.5},
25	{"label":"K12", "x":1.5, "y":1},	29	{"label":"K12", "x":1.5, "y":1},
26	{"label":"K13", "x":2.5, "y":1},	30	{"label":"K13", "x":2.5, "y":1},
@@ -35,6 +39,7 @@
35	{"label":"K1C", "x":11.5, "y":1},	39	{"label":"K1C", "x":11.5, "y":1},
36	{"label":"K1D", "x":12.5, "y":1},	40	{"label":"K1D", "x":12.5, "y":1},
37	{"label":"K1E", "x":13.5, "y":1, "w":1.5},	41	{"label":"K1E", "x":13.5, "y":1, "w":1.5},
		42
38	{"label":"K20", "x":0, "y":2, "w":1.75},	43	{"label":"K20", "x":0, "y":2, "w":1.75},
39	{"label":"K22", "x":1.75, "y":2},	44	{"label":"K22", "x":1.75, "y":2},
40	{"label":"K23", "x":2.75, "y":2},	45	{"label":"K23", "x":2.75, "y":2},
@@ -48,6 +53,7 @@
48	{"label":"K2B", "x":10.75, "y":2},	53	{"label":"K2B", "x":10.75, "y":2},
49	{"label":"K2C", "x":11.75, "y":2},	54	{"label":"K2C", "x":11.75, "y":2},
50	{"label":"K2E", "x":12.75, "y":2, "w":2.25},	55	{"label":"K2E", "x":12.75, "y":2, "w":2.25},
		56
51	{"label":"K30", "x":0, "y":3, "w":2},	57	{"label":"K30", "x":0, "y":3, "w":2},
52	{"label":"K32", "x":2, "y":3},	58	{"label":"K32", "x":2, "y":3},
53	{"label":"K33", "x":3, "y":3},	59	{"label":"K33", "x":3, "y":3},
@@ -62,6 +68,7 @@
62	{"label":"K3C", "x":12, "y":3},	68	{"label":"K3C", "x":12, "y":3},
63	{"label":"K3D", "x":13, "y":3},	69	{"label":"K3D", "x":13, "y":3},
64	{"label":"K3E", "x":14, "y":3},	70	{"label":"K3E", "x":14, "y":3},
		71
65	{"label":"K40", "x":0, "y":4, "w":1.25},	72	{"label":"K40", "x":0, "y":4, "w":1.25},
66	{"label":"K41", "x":1.25, "y":4, "w":1.25},	73	{"label":"K41", "x":1.25, "y":4, "w":1.25},
67	{"label":"K42", "x":2.5, "y":4, "w":1.25},	74	{"label":"K42", "x":2.5, "y":4, "w":1.25},


diff --git a/keyboards/naiping/np64/keymaps/default/keymap.c b/keyboards/naiping/np64/keymaps/default/keymap.c index 18a40b45b..25f72fe66 100644 --- a/keyboards/naiping/np64/keymaps/default/keymap.c +++ b/keyboards/naiping/np64/keymaps/default/keymap.c
@@ -1,18 +1,18 @@
1	/* Copyright 2021 Weirdo	1	/* Copyright 2021 Weirdo
2	*	2	*
3	* This program is free software: you can redistribute it and/or modify	3	* This program is free software: you can redistribute it and/or modify
4	* it under the terms of the GNU General Public License as published by	4	* it under the terms of the GNU General Public License as published by
5	* the Free Software Foundation, either version 2 of the License, or	5	* the Free Software Foundation, either version 2 of the License, or
6	* (at your option) any later version.	6	* (at your option) any later version.
7	*	7	*
8	* This program is distributed in the hope that it will be useful,	8	* This program is distributed in the hope that it will be useful,
9	* but WITHOUT ANY WARRANTY; without even the implied warranty of	9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11	* GNU General Public License for more details.	11	* GNU General Public License for more details.
12	*	12	*
13	* You should have received a copy of the GNU General Public License	13	* You should have received a copy of the GNU General Public License
14	* along with this program. If not, see <http://www.gnu.org/licenses/>.	14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
15	*/	15	*/
16	#include QMK_KEYBOARD_H	16	#include QMK_KEYBOARD_H
17		17
18		18
@@ -23,16 +23,19 @@ enum layer_names {
23	};	23	};
24		24
25	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	25	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
26	[_BASE] = LAYOUT(KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,	26	[_BASE] = LAYOUT_64_ansi(
27	KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,	27	KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
28	KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,	28	KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
29	KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL,	29	KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
30	KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),	30	KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL,
		31	KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
		32	),
31		33
32		34	[_FN] = LAYOUT_64_ansi(
33	[_FN] = LAYOUT(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,	35	KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
34	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	36	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
35	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	37	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
36	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	38	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
37	KC_TRNS, KC_TRNS, KC_TRNS, KC_SPACE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), //	39	KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
		40	),
38	};	41	};


diff --git a/keyboards/naiping/np64/keymaps/via/keymap.c b/keyboards/naiping/np64/keymaps/via/keymap.c index 01d0cba54..7afa15e73 100644 --- a/keyboards/naiping/np64/keymaps/via/keymap.c +++ b/keyboards/naiping/np64/keymaps/via/keymap.c
@@ -1,18 +1,18 @@
1	/* Copyright 2021 Weirdo	1	/* Copyright 2021 Weirdo
2	*	2	*
3	* This program is free software: you can redistribute it and/or modify	3	* This program is free software: you can redistribute it and/or modify
4	* it under the terms of the GNU General Public License as published by	4	* it under the terms of the GNU General Public License as published by
5	* the Free Software Foundation, either version 2 of the License, or	5	* the Free Software Foundation, either version 2 of the License, or
6	* (at your option) any later version.	6	* (at your option) any later version.
7	*	7	*
8	* This program is distributed in the hope that it will be useful,	8	* This program is distributed in the hope that it will be useful,
9	* but WITHOUT ANY WARRANTY; without even the implied warranty of	9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11	* GNU General Public License for more details.	11	* GNU General Public License for more details.
12	*	12	*
13	* You should have received a copy of the GNU General Public License	13	* You should have received a copy of the GNU General Public License
14	* along with this program. If not, see <http://www.gnu.org/licenses/>.	14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
15	*/	15	*/
16	#include QMK_KEYBOARD_H	16	#include QMK_KEYBOARD_H
17		17
18		18
@@ -20,28 +20,35 @@
20	enum layer_names { _BASE, _FN ,_FN1 ,_FN2 };	20	enum layer_names { _BASE, _FN ,_FN1 ,_FN2 };
21		21
22	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	22	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
23	[_BASE] = LAYOUT(KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,	23	[_BASE] = LAYOUT_64_ansi(
24	KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,	24	KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
25	KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,	25	KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
26	KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL,	26	KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
27	KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),	27	KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL,
		28	KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
		29	),
28		30
		31	[_FN] = LAYOUT_64_ansi(
		32	KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
		33	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
		34	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
		35	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
		36	KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
		37	),
29		38
30	[_FN] = LAYOUT(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,	39	[_FN1] = LAYOUT_64_ansi(
31	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	40	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
32	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	41	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
33	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	42	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
34	KC_TRNS, KC_TRNS, KC_TRNS, KC_SPACE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), //	43	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
		44	KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
		45	),
35		46
36	[_FN1] = LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	47	[_FN2] = LAYOUT_64_ansi(
37	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	48	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
38	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	49	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
39	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	50	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
40	KC_TRNS, KC_TRNS, KC_TRNS, KC_SPACE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),	51	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
41		52	KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
42	[_FN2] = LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	53	),
43	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
44	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
45	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
46	KC_TRNS, KC_TRNS, KC_TRNS, KC_SPACE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
47	};	54	};


diff --git a/keyboards/naiping/np64/np64.c b/keyboards/naiping/np64/np64.c index c5602d55f..ee4c08cd3 100644 --- a/keyboards/naiping/np64/np64.c +++ b/keyboards/naiping/np64/np64.c
@@ -1,16 +1,16 @@
1	/* Copyright 2021 Weirdo	1	/* Copyright 2021 Weirdo
2	*	2	*
3	* This program is free software: you can redistribute it and/or modify	3	* This program is free software: you can redistribute it and/or modify
4	* it under the terms of the GNU General Public License as published by	4	* it under the terms of the GNU General Public License as published by
5	* the Free Software Foundation, either version 2 of the License, or	5	* the Free Software Foundation, either version 2 of the License, or
6	* (at your option) any later version.	6	* (at your option) any later version.
7	*	7	*
8	* This program is distributed in the hope that it will be useful,	8	* This program is distributed in the hope that it will be useful,
9	* but WITHOUT ANY WARRANTY; without even the implied warranty of	9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11	* GNU General Public License for more details.	11	* GNU General Public License for more details.
12	*	12	*
13	* You should have received a copy of the GNU General Public License	13	* You should have received a copy of the GNU General Public License
14	* along with this program. If not, see <http://www.gnu.org/licenses/>.	14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
15	*/	15	*/
16	#include "np64.h"	16	#include "np64.h"


diff --git a/keyboards/naiping/np64/np64.h b/keyboards/naiping/np64/np64.h index a85471222..c2277aa20 100644 --- a/keyboards/naiping/np64/np64.h +++ b/keyboards/naiping/np64/np64.h
@@ -16,7 +16,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
16	#include "quantum.h"	16	#include "quantum.h"
17		17
18		18
19	#define LAYOUT( \	19	#define LAYOUT_64_ansi( \
20	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \	20	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \
21	K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \	21	K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
22	K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \	22	K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \


diff --git a/keyboards/naiping/np64/readme.md b/keyboards/naiping/np64/readme.md index 03b16c4bc..8e85d79de 100644 --- a/keyboards/naiping/np64/readme.md +++ b/keyboards/naiping/np64/readme.md
@@ -4,7 +4,7 @@
4		4
5	A 60% keyboard based on STM32f303	5	A 60% keyboard based on STM32f303
6		6
7	* Keyboard Maintainer: [Weirdo](https://weirdo-f.github.io)(https://github.com/1248314361)	7	* Keyboard Maintainer: [Weirdo](https://github.com/weirdo-f) (https://weirdo-f.github.io)
8	* Hardware Supported: NP_64	8	* Hardware Supported: NP_64
9	* Hardware Availability: Not yet	9	* Hardware Availability: Not yet
10		10


diff --git a/keyboards/naiping/np64/rules.mk b/keyboards/naiping/np64/rules.mk index c8646b2f9..ff74d6312 100644 --- a/keyboards/naiping/np64/rules.mk +++ b/keyboards/naiping/np64/rules.mk
@@ -21,3 +21,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
21	RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow	21	RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
22	BLUETOOTH_ENABLE = no # Enable Bluetooth	22	BLUETOOTH_ENABLE = no # Enable Bluetooth
23	AUDIO_ENABLE = no # Audio output	23	AUDIO_ENABLE = no # Audio output
		24
		25	LAYOUTS = 64_ansi