summaryrefslogtreecommitdiff
path: root/keyboards/nullbitsco
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-12 13:42:51 +1000
committerGitHub <noreply@github.com>2023-04-12 13:42:51 +1000
commit5bd68e3695a82ff504c358c33445b4530c2a327f (patch)
tree10b245757dcb4f2c3c07796671ed8d284e5f5d6f /keyboards/nullbitsco
parent941e159a28f1bdbdd913654c4f9a14291f8d5299 (diff)
Move single `LAYOUT`s to data driven (#20365)
Diffstat (limited to 'keyboards/nullbitsco')
-rw-r--r--keyboards/nullbitsco/tidbit/info.json41
-rw-r--r--keyboards/nullbitsco/tidbit/keymaps/default/keymap.c10
-rw-r--r--keyboards/nullbitsco/tidbit/keymaps/oled/keymap.c30
-rw-r--r--keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/keymap.c30
-rw-r--r--keyboards/nullbitsco/tidbit/keymaps/via/keymap.c30
-rw-r--r--keyboards/nullbitsco/tidbit/tidbit.c4
-rw-r--r--keyboards/nullbitsco/tidbit/tidbit.h37
7 files changed, 89 insertions, 93 deletions
diff --git a/keyboards/nullbitsco/tidbit/info.json b/keyboards/nullbitsco/tidbit/info.json
index e2e060aef0..0ed0a5e7b8 100644
--- a/keyboards/nullbitsco/tidbit/info.json
+++ b/keyboards/nullbitsco/tidbit/info.json
@@ -28,11 +28,42 @@
28 "layouts": { 28 "layouts": {
29 "LAYOUT": { 29 "LAYOUT": {
30 "layout": [ 30 "layout": [
31 {"label":"/", "x":3.25, "y":0}, {"label":"*", "x":4.25, "y":0}, {"label":"-", "x":5.25, "y":0}, 31 {"matrix": [0, 3], "x": 3.25, "y": 0},
32 {"label":"Enc 1", "x":0, "y":1}, {"label":"Enc 1", "x":1, "y":1}, {"label":"7", "x":2.25, "y":1}, {"label":"8", "x":3.25, "y":1}, {"label":"9", "x":4.25, "y":1}, {"label":"+", "x":5.25, "y":1}, 32 {"matrix": [0, 4], "x": 4.25, "y": 0},
33 {"label":"Enc 2", "x":0, "y":2}, {"label":"Enc 2", "x":1, "y":2}, {"label":"4", "x":2.25, "y":2}, {"label":"5", "x":3.25, "y":2}, {"label":"6", "x":4.25, "y":2}, {"label":"+", "x":5.25, "y":2}, 33 {"matrix": [0, 5], "x": 5.25, "y": 0},
34 {"label":"Enc 3", "x":0, "y":3}, {"label":"Enc 3", "x":1, "y":3}, {"label":"1", "x":2.25, "y":3}, {"label":"2", "x":3.25, "y":3}, {"label":"3", "x":4.25, "y":3}, {"label":"Enter", "x":5.25, "y":3}, 34
35 {"label":"Enc 4", "x":0, "y":4}, {"label":"Enc 4", "x":1, "y":4}, {"label":"0", "x":2.25, "y":4}, {"label":"0", "x":3.25, "y":4}, {"label":".", "x":4.25, "y":4}, {"label":"Enter", "x":5.25, "y":4}] 35 {"matrix": [1, 0], "x": 0, "y": 1},
36 {"matrix": [1, 1], "x": 1, "y": 1},
37
38 {"matrix": [1, 2], "x": 2.25, "y": 1},
39 {"matrix": [1, 3], "x": 3.25, "y": 1},
40 {"matrix": [1, 4], "x": 4.25, "y": 1},
41 {"matrix": [1, 5], "x": 5.25, "y": 1},
42
43 {"matrix": [2, 0], "x": 0, "y": 2},
44 {"matrix": [2, 1], "x": 1, "y": 2},
45
46 {"matrix": [2, 2], "x": 2.25, "y": 2},
47 {"matrix": [2, 3], "x": 3.25, "y": 2},
48 {"matrix": [2, 4], "x": 4.25, "y": 2},
49 {"matrix": [2, 5], "x": 5.25, "y": 2},
50
51 {"matrix": [3, 0], "x": 0, "y": 3},
52 {"matrix": [3, 1], "x": 1, "y": 3},
53
54 {"matrix": [3, 2], "x": 2.25, "y": 3},
55 {"matrix": [3, 3], "x": 3.25, "y": 3},
56 {"matrix": [3, 4], "x": 4.25, "y": 3},
57 {"matrix": [3, 5], "x": 5.25, "y": 3},
58
59 {"matrix": [4, 0], "x": 0, "y": 4},
60 {"matrix": [4, 1], "x": 1, "y": 4},
61
62 {"matrix": [4, 2], "x": 2.25, "y": 4},
63 {"matrix": [4, 3], "x": 3.25, "y": 4},
64 {"matrix": [4, 4], "x": 4.25, "y": 4},
65 {"matrix": [4, 5], "x": 5.25, "y": 4}
66 ]
36 } 67 }
37 } 68 }
38} 69}
diff --git a/keyboards/nullbitsco/tidbit/keymaps/default/keymap.c b/keyboards/nullbitsco/tidbit/keymaps/default/keymap.c
index 995aff8d69..6cd9f48c94 100644
--- a/keyboards/nullbitsco/tidbit/keymaps/default/keymap.c
+++ b/keyboards/nullbitsco/tidbit/keymaps/default/keymap.c
@@ -31,10 +31,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
31 ), 31 ),
32 32
33 [_FUNC] = LAYOUT( 33 [_FUNC] = LAYOUT(
34 ___, ___, ___, 34 _______, _______, _______,
35 ___, ___, ___, ___, ___, ___, 35 _______, _______, _______, _______, _______, _______,
36 ___, ___, ___, ___, ___, ___, 36 _______, _______, _______, _______, _______, _______,
37 ___, ___, ___, ___, ___, ___, 37 _______, _______, _______, _______, _______, _______,
38 ___, ___, ___, ___, ___, ___ 38 _______, _______, _______, _______, _______, _______
39 ), 39 ),
40}; 40};
diff --git a/keyboards/nullbitsco/tidbit/keymaps/oled/keymap.c b/keyboards/nullbitsco/tidbit/keymaps/oled/keymap.c
index 3fbfb638ec..2555026534 100644
--- a/keyboards/nullbitsco/tidbit/keymaps/oled/keymap.c
+++ b/keyboards/nullbitsco/tidbit/keymaps/oled/keymap.c
@@ -33,26 +33,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
33 ), 33 ),
34 34
35 [_VIA1] = LAYOUT( 35 [_VIA1] = LAYOUT(
36 ___, ___, ___, 36 _______, _______, _______,
37 ___, ___, ___, ___, ___, ___, 37 _______, _______, _______, _______, _______, _______,
38 ___, ___, ___, ___, ___, ___, 38 _______, _______, _______, _______, _______, _______,
39 ___, ___, ___, ___, ___, ___, 39 _______, _______, _______, _______, _______, _______,
40 ___, ___, ___, ___, ___, ___ 40 _______, _______, _______, _______, _______, _______
41 ), 41 ),
42 42
43 [_VIA2] = LAYOUT( 43 [_VIA2] = LAYOUT(
44 ___, ___, ___, 44 _______, _______, _______,
45 ___, ___, ___, ___, ___, ___, 45 _______, _______, _______, _______, _______, _______,
46 ___, ___, ___, ___, ___, ___, 46 _______, _______, _______, _______, _______, _______,
47 ___, ___, ___, ___, ___, ___, 47 _______, _______, _______, _______, _______, _______,
48 ___, ___, ___, ___, ___, ___ 48 _______, _______, _______, _______, _______, _______
49 ), 49 ),
50 50
51 [_VIA3] = LAYOUT( 51 [_VIA3] = LAYOUT(
52 ___, ___, ___, 52 _______, _______, _______,
53 ___, ___, ___, ___, ___, ___, 53 _______, _______, _______, _______, _______, _______,
54 ___, ___, ___, ___, ___, ___, 54 _______, _______, _______, _______, _______, _______,
55 ___, ___, ___, ___, ___, ___, 55 _______, _______, _______, _______, _______, _______,
56 ___, ___, ___, ___, ___, ___ 56 _______, _______, _______, _______, _______, _______
57 ), 57 ),
58}; 58};
diff --git a/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/keymap.c b/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/keymap.c
index cfe97e30a3..32306ef9d6 100644
--- a/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/keymap.c
+++ b/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/keymap.c
@@ -33,27 +33,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
33 ), 33 ),
34 34
35 [_LAY1] = LAYOUT( 35 [_LAY1] = LAYOUT(
36 ___, ___, ___, 36 _______, _______, _______,
37 ___, ___, ___, ___, ___, ___, 37 _______, _______, _______, _______, _______, _______,
38 ___, ___, ___, ___, ___, ___, 38 _______, _______, _______, _______, _______, _______,
39 ___, ___, ___, ___, ___, ___, 39 _______, _______, _______, _______, _______, _______,
40 ___, ___, ___, ___, ___, ___ 40 _______, _______, _______, _______, _______, _______
41 ), 41 ),
42 42
43 [_LAY2] = LAYOUT( 43 [_LAY2] = LAYOUT(
44 ___, ___, ___, 44 _______, _______, _______,
45 ___, ___, ___, ___, ___, ___, 45 _______, _______, _______, _______, _______, _______,
46 ___, ___, ___, ___, ___, ___, 46 _______, _______, _______, _______, _______, _______,
47 ___, ___, ___, ___, ___, ___, 47 _______, _______, _______, _______, _______, _______,
48 ___, ___, ___, ___, ___, ___ 48 _______, _______, _______, _______, _______, _______
49 ), 49 ),
50 50
51 [_LAY3] = LAYOUT( 51 [_LAY3] = LAYOUT(
52 ___, ___, ___, 52 _______, _______, _______,
53 ___, ___, ___, ___, ___, ___, 53 _______, _______, _______, _______, _______, _______,
54 ___, ___, ___, ___, ___, ___, 54 _______, _______, _______, _______, _______, _______,
55 ___, ___, ___, ___, ___, ___, 55 _______, _______, _______, _______, _______, _______,
56 ___, ___, ___, ___, ___, ___ 56 _______, _______, _______, _______, _______, _______
57 ), 57 ),
58}; 58};
59 59
diff --git a/keyboards/nullbitsco/tidbit/keymaps/via/keymap.c b/keyboards/nullbitsco/tidbit/keymaps/via/keymap.c
index ad3e18075c..895b02c292 100644
--- a/keyboards/nullbitsco/tidbit/keymaps/via/keymap.c
+++ b/keyboards/nullbitsco/tidbit/keymaps/via/keymap.c
@@ -33,27 +33,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
33 ), 33 ),
34 34
35 [_VIA1] = LAYOUT( 35 [_VIA1] = LAYOUT(
36 ___, ___, ___, 36 _______, _______, _______,
37 ___, ___, ___, ___, ___, ___, 37 _______, _______, _______, _______, _______, _______,
38 ___, ___, ___, ___, ___, ___, 38 _______, _______, _______, _______, _______, _______,
39 ___, ___, ___, ___, ___, ___, 39 _______, _______, _______, _______, _______, _______,
40 ___, ___, ___, ___, ___, ___ 40 _______, _______, _______, _______, _______, _______
41 ), 41 ),
42 42
43 [_VIA2] = LAYOUT( 43 [_VIA2] = LAYOUT(
44 ___, ___, ___, 44 _______, _______, _______,
45 ___, ___, ___, ___, ___, ___, 45 _______, _______, _______, _______, _______, _______,
46 ___, ___, ___, ___, ___, ___, 46 _______, _______, _______, _______, _______, _______,
47 ___, ___, ___, ___, ___, ___, 47 _______, _______, _______, _______, _______, _______,
48 ___, ___, ___, ___, ___, ___ 48 _______, _______, _______, _______, _______, _______
49 ), 49 ),
50 50
51 [_VIA3] = LAYOUT( 51 [_VIA3] = LAYOUT(
52 ___, ___, ___, 52 _______, _______, _______,
53 ___, ___, ___, ___, ___, ___, 53 _______, _______, _______, _______, _______, _______,
54 ___, ___, ___, ___, ___, ___, 54 _______, _______, _______, _______, _______, _______,
55 ___, ___, ___, ___, ___, ___, 55 _______, _______, _______, _______, _______, _______,
56 ___, ___, ___, ___, ___, ___ 56 _______, _______, _______, _______, _______, _______
57 ), 57 ),
58}; 58};
59 59
diff --git a/keyboards/nullbitsco/tidbit/tidbit.c b/keyboards/nullbitsco/tidbit/tidbit.c
index d07ba12651..eea5a5d54c 100644
--- a/keyboards/nullbitsco/tidbit/tidbit.c
+++ b/keyboards/nullbitsco/tidbit/tidbit.c
@@ -14,7 +14,9 @@
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 16
17#include "tidbit.h" 17#include "quantum.h"
18#include "common/remote_kb.h"
19#include "common/bitc_led.h"
18 20
19typedef struct PACKED { 21typedef struct PACKED {
20 uint8_t r; 22 uint8_t r;
diff --git a/keyboards/nullbitsco/tidbit/tidbit.h b/keyboards/nullbitsco/tidbit/tidbit.h
deleted file mode 100644
index e4e80107e3..0000000000
--- a/keyboards/nullbitsco/tidbit/tidbit.h
+++ /dev/null
@@ -1,37 +0,0 @@
1/* Copyright 2021 Jay Greco
2 *
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
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
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/>.
15 */
16#pragma once
17
18#define ___ KC_NO
19
20#include "quantum.h"
21#include "common/remote_kb.h"
22#include "common/bitc_led.h"
23
24#define LAYOUT( \
25 K01, K02, K03, \
26 E1CCW, E1CW, K10, K11, K12, K13, \
27 E2CCW, E2CW, K20, K21, K22, K23, \
28 E3CCW, E3CW, K30, K31, K32, K33, \
29 E4CCW, E4CW, K40, K41, K42, K43 \
30) \
31{ \
32 { ___, ___, ___, K01, K02, K03 }, \
33 { E1CCW, E1CW, K10, K11, K12, K13 }, \
34 { E2CCW, E2CW, K20, K21, K22, K23 }, \
35 { E3CCW, E3CW, K30, K31, K32, K33 }, \
36 { E4CCW, E4CW, K40, K41, K42, K43 } \
37}
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 07:12:51 +0000