From 5ea7283159c7004cd3096534e5b7ebd8d477fc50 Mon Sep 17 00:00:00 2001 From: jack Date: Tue, 22 Apr 2025 21:06:17 -0600 Subject: [PATCH] Fix `boardsource/beiwagon` RGB Matrix coordinates (#25018) --- keyboards/boardsource/beiwagon/keyboard.json | 36 ++++++++--------- .../beiwagon/keymaps/default/keymap.c | 40 ------------------- .../beiwagon/keymaps/default/keymap.json | 19 +++++++++ 3 files changed, 37 insertions(+), 58 deletions(-) delete mode 100644 keyboards/boardsource/beiwagon/keymaps/default/keymap.c create mode 100644 keyboards/boardsource/beiwagon/keymaps/default/keymap.json diff --git a/keyboards/boardsource/beiwagon/keyboard.json b/keyboards/boardsource/beiwagon/keyboard.json index 39a9006b85c..0bfa159a8ae 100644 --- a/keyboards/boardsource/beiwagon/keyboard.json +++ b/keyboards/boardsource/beiwagon/keyboard.json @@ -61,24 +61,24 @@ }, "driver": "ws2812", "layout": [ - {"flags": 2, "x": 16, "y": 38}, - {"flags": 2, "x": 16, "y": 113}, - {"flags": 2, "x": 16, "y": 188}, - {"flags": 2, "x": 48, "y": 38}, - {"flags": 2, "x": 48, "y": 113}, - {"flags": 2, "x": 48, "y": 188}, - {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0}, - {"flags": 4, "matrix": [0, 1], "x": 32, "y": 0}, - {"flags": 4, "matrix": [0, 2], "x": 64, "y": 0}, - {"flags": 4, "matrix": [1, 0], "x": 0, "y": 75}, - {"flags": 4, "matrix": [1, 1], "x": 32, "y": 75}, - {"flags": 4, "matrix": [1, 2], "x": 64, "y": 75}, - {"flags": 4, "matrix": [2, 0], "x": 0, "y": 150}, - {"flags": 4, "matrix": [2, 1], "x": 32, "y": 150}, - {"flags": 4, "matrix": [2, 2], "x": 64, "y": 150}, - {"flags": 4, "matrix": [3, 0], "x": 0, "y": 224}, - {"flags": 4, "matrix": [3, 1], "x": 32, "y": 224}, - {"flags": 4, "matrix": [3, 2], "x": 64, "y": 224} + {"x": 200, "y": 11, "flags": 2}, + {"x": 200, "y": 32, "flags": 2}, + {"x": 200, "y": 52, "flags": 2}, + {"x": 24, "y": 52, "flags": 2}, + {"x": 24, "y": 32, "flags": 2}, + {"x": 24, "y": 11, "flags": 2}, + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [0, 1], "x": 112, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 224, "y": 0, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 21, "flags": 4}, + {"matrix": [1, 1], "x": 112, "y": 21, "flags": 4}, + {"matrix": [1, 2], "x": 224, "y": 21, "flags": 4}, + {"matrix": [2, 0], "x": 0, "y": 42, "flags": 4}, + {"matrix": [2, 1], "x": 112, "y": 42, "flags": 4}, + {"matrix": [2, 2], "x": 224, "y": 42, "flags": 4}, + {"matrix": [3, 0], "x": 0, "y": 64, "flags": 4}, + {"matrix": [3, 1], "x": 112, "y": 64, "flags": 4}, + {"matrix": [3, 2], "x": 224, "y": 64, "flags": 4} ] }, "layouts": { diff --git a/keyboards/boardsource/beiwagon/keymaps/default/keymap.c b/keyboards/boardsource/beiwagon/keymaps/default/keymap.c deleted file mode 100644 index 4f799550e1c..00000000000 --- a/keyboards/boardsource/beiwagon/keymaps/default/keymap.c +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2022 Boardsource - * - * 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 . - */ - -#include QMK_KEYBOARD_H - -enum layers { - _MAIN, - _RAISE -}; - -#define LOWER MO(_LOWER) -#define RAISE MO(_RAISE) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_MAIN] = LAYOUT( - KC_7, KC_8, KC_9, - KC_4, KC_5, KC_6, - KC_1, KC_2, KC_3, - KC_0, KC_PENT,RAISE - ), - [_RAISE] = LAYOUT( - KC_7, KC_8, RM_TOGG, - KC_4, KC_5, RM_NEXT, - KC_1, KC_2, KC_3, - KC_0, KC_PENT,_______ - ) -}; diff --git a/keyboards/boardsource/beiwagon/keymaps/default/keymap.json b/keyboards/boardsource/beiwagon/keymaps/default/keymap.json new file mode 100644 index 00000000000..b6ba14a0764 --- /dev/null +++ b/keyboards/boardsource/beiwagon/keymaps/default/keymap.json @@ -0,0 +1,19 @@ +{ + "keyboard": "boardsource/beiwagon", + "keymap": "default", + "layout": "LAYOUT", + "layers": [ + [ + "KC_7", "KC_8", "KC_9", + "KC_4", "KC_5", "KC_6", + "KC_1", "KC_2", "KC_3", + "KC_0", "KC_PENT", "MO(1)" + ], + [ + "QK_BOOT", "_______", "RM_TOGG", + "_______", "_______", "RM_NEXT", + "_______", "_______", "_______", + "_______", "_______", "_______" + ] + ] +}