`atreus`: misc cleanups (#24010)

keyboards/atreus/astar_mirrored/config.h

@@ -1,19 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define PCBDOWN 1

keyboards/atreus/atreus.h

@@ -1,51 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "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.
-// In the PCBDOWN case we need to swap the middle two keys: k35 and k36.
-#if defined(PCBDOWN)
-#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, k3a, k3b \
-) \
-{ \
-	{ k00, k01, k02, k03, k04, KC_NO, k05, k06, k07, k08, k09 }, \
-	{ k10, k11, k12, k13, k14, KC_NO, k15, k16, k17, k18, k19 }, \
-	{ k20, k21, k22, k23, k24, k36,   k25, k26, k27, k28, k29 }, \
-	{ k30, k31, k32, k33, k34, k35,   k37, k38, k39, k3a, k3b } \
-}
-#else
-#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, k3a, k3b \
-) \
-{ \
-	{ 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, k35, k25, k26, k27, k28, k29 }, \
-	{ k30, k31, k32, k33, k34, k36, k37, k38, k39, k3a, k3b } \
-}
-#endif

keyboards/atreus/feather/config.h

@@ -1,19 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define OUTPUT_AUTO_ENABLE

keyboards/atreus/info.json

@@ -23,58 +23,114 @@
       "resync": true
     }
   },
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_pcb_up"
+  },
   "layouts": {
-    "LAYOUT": {
+    "LAYOUT_pcb_up": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0.6},
+        {"matrix": [0, 1], "x": 1, "y": 0.35},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0.35},
+        {"matrix": [0, 4], "x": 4, "y": 0.7},
+
+        {"matrix": [0, 6], "x": 8, "y": 0.7},
+        {"matrix": [0, 7], "x": 9, "y": 0.35},
+        {"matrix": [0, 8], "x": 10, "y": 0},
+        {"matrix": [0, 9], "x": 11, "y": 0.35},
+        {"matrix": [0, 10], "x": 12, "y": 0.6},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.6},
+        {"matrix": [1, 1], "x": 1, "y": 1.35},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1.35},
+        {"matrix": [1, 4], "x": 4, "y": 1.7},
+
+        {"matrix": [1, 6], "x": 8, "y": 1.7},
+        {"matrix": [1, 7], "x": 9, "y": 1.35},
+        {"matrix": [1, 8], "x": 10, "y": 1},
+        {"matrix": [1, 9], "x": 11, "y": 1.35},
+        {"matrix": [1, 10], "x": 12, "y": 1.6},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.6},
+        {"matrix": [2, 1], "x": 1, "y": 2.35},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2.35},
+        {"matrix": [2, 4], "x": 4, "y": 2.7},
+
+        {"matrix": [2, 6], "x": 8, "y": 2.7},
+        {"matrix": [2, 7], "x": 9, "y": 2.35},
+        {"matrix": [2, 8], "x": 10, "y": 2},
+        {"matrix": [2, 9], "x": 11, "y": 2.35},
+        {"matrix": [2, 10], "x": 12, "y": 2.6},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.6},
+        {"matrix": [3, 1], "x": 1, "y": 3.35},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3.35},
+        {"matrix": [3, 4], "x": 4, "y": 3.7},
+        {"matrix": [2, 5], "x": 5, "y": 2.95, "h": 1.5},
+
+        {"matrix": [3, 5], "x": 7, "y": 2.95, "h": 1.5},
+        {"matrix": [3, 6], "x": 8, "y": 3.7},
+        {"matrix": [3, 7], "x": 9, "y": 3.35},
+        {"matrix": [3, 8], "x": 10, "y": 3},
+        {"matrix": [3, 9], "x": 11, "y": 3.35},
+        {"matrix": [3, 10], "x": 12, "y": 3.6}
+      ]
+    },
+    "LAYOUT_pcb_down": {
       "layout": [
-        {"x": 0, "y": 0.6},
-        {"x": 1, "y": 0.35},
-        {"x": 2, "y": 0},
-        {"x": 3, "y": 0.35},
-        {"x": 4, "y": 0.7},
+        {"matrix": [0, 0], "x": 0, "y": 0.6},
+        {"matrix": [0, 1], "x": 1, "y": 0.35},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0.35},
+        {"matrix": [0, 4], "x": 4, "y": 0.7},
 
-        {"x": 8, "y": 0.7},
-        {"x": 9, "y": 0.35},
-        {"x": 10, "y": 0},
-        {"x": 11, "y": 0.35},
-        {"x": 12, "y": 0.6},
+        {"matrix": [0, 6], "x": 8, "y": 0.7},
+        {"matrix": [0, 7], "x": 9, "y": 0.35},
+        {"matrix": [0, 8], "x": 10, "y": 0},
+        {"matrix": [0, 9], "x": 11, "y": 0.35},
+        {"matrix": [0, 10], "x": 12, "y": 0.6},
 
-        {"x": 0, "y": 1.6},
-        {"x": 1, "y": 1.35},
-        {"x": 2, "y": 1},
-        {"x": 3, "y": 1.35},
-        {"x": 4, "y": 1.7},
+        {"matrix": [1, 0], "x": 0, "y": 1.6},
+        {"matrix": [1, 1], "x": 1, "y": 1.35},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1.35},
+        {"matrix": [1, 4], "x": 4, "y": 1.7},
 
-        {"x": 8, "y": 1.7},
-        {"x": 9, "y": 1.35},
-        {"x": 10, "y": 1},
-        {"x": 11, "y": 1.35},
-        {"x": 12, "y": 1.6},
+        {"matrix": [1, 6], "x": 8, "y": 1.7},
+        {"matrix": [1, 7], "x": 9, "y": 1.35},
+        {"matrix": [1, 8], "x": 10, "y": 1},
+        {"matrix": [1, 9], "x": 11, "y": 1.35},
+        {"matrix": [1, 10], "x": 12, "y": 1.6},
 
-        {"x": 0, "y": 2.6},
-        {"x": 1, "y": 2.35},
-        {"x": 2, "y": 2},
-        {"x": 3, "y": 2.35},
-        {"x": 4, "y": 2.7},
+        {"matrix": [2, 0], "x": 0, "y": 2.6},
+        {"matrix": [2, 1], "x": 1, "y": 2.35},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2.35},
+        {"matrix": [2, 4], "x": 4, "y": 2.7},
 
-        {"x": 8, "y": 2.7},
-        {"x": 9, "y": 2.35},
-        {"x": 10, "y": 2},
-        {"x": 11, "y": 2.35},
-        {"x": 12, "y": 2.6},
+        {"matrix": [2, 6], "x": 8, "y": 2.7},
+        {"matrix": [2, 7], "x": 9, "y": 2.35},
+        {"matrix": [2, 8], "x": 10, "y": 2},
+        {"matrix": [2, 9], "x": 11, "y": 2.35},
+        {"matrix": [2, 10], "x": 12, "y": 2.6},
 
-        {"x": 0, "y": 3.6},
-        {"x": 1, "y": 3.35},
-        {"x": 2, "y": 3},
-        {"x": 3, "y": 3.35},
-        {"x": 4, "y": 3.7},
-        {"x": 5, "y": 2.95, "h": 1.5},
+        {"matrix": [3, 0], "x": 0, "y": 3.6},
+        {"matrix": [3, 1], "x": 1, "y": 3.35},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3.35},
+        {"matrix": [3, 4], "x": 4, "y": 3.7},
+        {"matrix": [3, 5], "x": 5, "y": 2.95, "h": 1.5},
 
-        {"x": 7, "y": 2.95, "h": 1.5},
-        {"x": 8, "y": 3.7},
-        {"x": 9, "y": 3.35},
-        {"x": 10, "y": 3},
-        {"x": 11, "y": 3.35},
-        {"x": 12, "y": 3.6}
+        {"matrix": [2, 5], "x": 7, "y": 2.95, "h": 1.5},
+        {"matrix": [3, 6], "x": 8, "y": 3.7},
+        {"matrix": [3, 7], "x": 9, "y": 3.35},
+        {"matrix": [3, 8], "x": 10, "y": 3},
+        {"matrix": [3, 9], "x": 11, "y": 3.35},
+        {"matrix": [3, 10], "x": 12, "y": 3.6}
       ]
     }
   }

keyboards/atreus/keymaps/default/keymap.c

@@ -12,7 +12,7 @@
 #define _LW 2
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QW] = LAYOUT( /* Qwerty */
+  [_QW] = LAYOUT_pcb_up( /* Qwerty */
     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P    ,
     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN ,
     KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH ,
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *  [       ]      (     )    &        ||       `     1     2     3    \
    * lower  insert super shift bksp ctrl || alt space   fn    .     0    =
    */
-  [_RS] = LAYOUT( /* [> RAISE <] */
+  [_RS] = LAYOUT_pcb_up( /* [> RAISE <] */
     KC_EXLM, KC_AT,   KC_UP,   KC_LCBR, KC_RCBR,                   KC_PGUP, KC_7,    KC_8,   KC_9, KC_ASTR ,
     KC_HASH, KC_LEFT, KC_DOWN, KC_RGHT, KC_DLR,                    KC_PGDN, KC_4,    KC_5,   KC_6, KC_PLUS ,
     KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, KC_AMPR,                   KC_GRV,  KC_1,    KC_2,   KC_3, KC_BSLS ,
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *       volup             reset      ||             F1    F2    F3   F12
    *       voldn  super shift bksp ctrl || alt space   L0  prtsc scroll pause
    */
-  [_LW] = LAYOUT( /* [> LOWER <] */
+  [_LW] = LAYOUT_pcb_up( /* [> LOWER <] */
     KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10  ,
     KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,                   KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11  ,
     KC_NO,   KC_VOLU, KC_NO,   KC_NO,   QK_BOOT,                   KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F12  ,

keyboards/atreus/keymaps/via/keymap.c

@@ -27,7 +27,7 @@ enum custom_layers {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QW] = LAYOUT( /* Qwerty */
+  [_QW] = LAYOUT_pcb_up( /* Qwerty */
     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P    ,
     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN ,
     KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH ,
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *  [       ]      (     )    &        ||       `     1     2     3    \
    * lower  insert super shift bksp ctrl || alt space   fn    .     0    =
    */
-  [_RS] = LAYOUT( /* [> RAISE <] */
+  [_RS] = LAYOUT_pcb_up( /* [> RAISE <] */
     KC_EXLM, KC_AT,   KC_UP,   KC_LCBR, KC_RCBR,                   KC_PGUP, KC_7,    KC_8,   KC_9, KC_ASTR ,
     KC_HASH, KC_LEFT, KC_DOWN, KC_RGHT, KC_DLR,                    KC_PGDN, KC_4,    KC_5,   KC_6, KC_PLUS ,
     KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, KC_AMPR,                   KC_GRV,  KC_1,    KC_2,   KC_3, KC_BSLS ,
@@ -51,13 +51,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *       volup             reset      ||             F1    F2    F3   F12
    *       voldn  super shift bksp ctrl || alt space   L0  prtsc scroll pause
    */
-  [_LW] = LAYOUT( /* [> LOWER <] */
+  [_LW] = LAYOUT_pcb_up( /* [> LOWER <] */
     KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10  ,
     KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,                   KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11  ,
     KC_NO,   KC_VOLU, KC_NO,   KC_NO,   QK_BOOT,                   KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F12  ,
     KC_NO,   KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  TO(_QW), KC_PSCR, KC_SCRL, KC_PAUS ),
 
-  [_EM] = LAYOUT( /* [> EMPTY <] */
+  [_EM] = LAYOUT_pcb_up( /* [> EMPTY <] */
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS  ,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS  ,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS  ,

keyboards/atreus/keymaps/workman/config.h

@@ -1,3 +1,2 @@
 #define TAPPING_TOGGLE 1
 #define ONESHOT_TAP_TOGGLE 1
-#define PCBDOWN 1

keyboards/atreus/keymaps/workman/keymap.c

@@ -25,7 +25,7 @@ enum custom_keycodes {
    */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QW] = LAYOUT( /* Workman */
+  [_QW] = LAYOUT_pcb_down( /* Workman */
     KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,                      KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN,
     KC_A,    KC_S,    KC_H,    KC_T,    KC_G,                      KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,
     KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,                      KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_SLSH,
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * menu    caps   <      >     del       ||       _                    0      =
    */
 
-  [_RS] = LAYOUT( /* [> RAISE <] */
+  [_RS] = LAYOUT_pcb_down( /* [> RAISE <] */
     KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE,                   KC_MINS, KC_7,    KC_8,    KC_9, KC_ASTR,
     KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_GRV,                    KC_DOT,  KC_4,    KC_5,    KC_6, KC_PLUS,
     KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD,                   KC_AMPR, KC_1,    KC_2,    KC_3, KC_BSLS,
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *                                       ||        –                    ¨    reset
    */
 
-  [_LW] = LAYOUT( /* [> LOWER <] */
+  [_LW] = LAYOUT_pcb_down( /* [> LOWER <] */
     KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   KC_VOLU, KC_F7,   KC_F8,   KC_F9,   KC_F10,
     KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,                   KC_VOLD, KC_F4,   KC_F5,   KC_F6,   KC_F11,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_MUTE, KC_F1,   KC_F2,   KC_F3,   KC_F12,

keyboards/atreus/promicro/keyboard.json

@@ -4,6 +4,5 @@
         "rows": ["F4", "B2", "B4", "B5"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "development_board": "promicro"
 }