From 364c06d939134184838579d4e73880f8c2f83419 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 5 Apr 2023 15:46:59 +1000 Subject: Move small macropad-ish layouts to data driven (#20341) --- keyboards/keyhive/navi10/rev3/info.json | 21 +++++++++++++++++++- keyboards/keyhive/navi10/rev3/rev3.c | 2 +- keyboards/keyhive/navi10/rev3/rev3.h | 34 --------------------------------- 3 files changed, 21 insertions(+), 36 deletions(-) delete mode 100644 keyboards/keyhive/navi10/rev3/rev3.h (limited to 'keyboards/keyhive/navi10/rev3') diff --git a/keyboards/keyhive/navi10/rev3/info.json b/keyboards/keyhive/navi10/rev3/info.json index 704ca05e91..82df44e866 100644 --- a/keyboards/keyhive/navi10/rev3/info.json +++ b/keyboards/keyhive/navi10/rev3/info.json @@ -8,5 +8,24 @@ }, "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + + {"matrix": [2, 1], "x": 1, "y": 3}, + + {"matrix": [3, 0], "x": 0, "y": 4}, + {"matrix": [3, 1], "x": 1, "y": 4}, + {"matrix": [3, 2], "x": 2, "y": 4} + ] + } + } } diff --git a/keyboards/keyhive/navi10/rev3/rev3.c b/keyboards/keyhive/navi10/rev3/rev3.c index 2b0355aa36..1eefa5cd91 100644 --- a/keyboards/keyhive/navi10/rev3/rev3.c +++ b/keyboards/keyhive/navi10/rev3/rev3.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "rev3.h" +#include "quantum.h" void matrix_init_kb(void) { // put your keyboard start-up code here diff --git a/keyboards/keyhive/navi10/rev3/rev3.h b/keyboards/keyhive/navi10/rev3/rev3.h deleted file mode 100644 index b162d14425..0000000000 --- a/keyboards/keyhive/navi10/rev3/rev3.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2019 Ethan Durrant (emdarcher) - * - * 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 . - */ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k0, k1, k2, \ - k3, k4, k5, \ - \ - k6, \ - k7, k8, k9 \ -) \ -{ \ - {k0, k1, k2}, \ - {k3, k4, k5}, \ - {KC_NO, k6, KC_NO}, \ - {k7, k8, k9}, \ -} - - -- cgit v1.2.3