summaryrefslogtreecommitdiff
path: root/keyboards/cozykeys/bloomer
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/cozykeys/bloomer')
-rw-r--r--keyboards/cozykeys/bloomer/bloomer.c17
-rw-r--r--keyboards/cozykeys/bloomer/bloomer.h23
-rw-r--r--keyboards/cozykeys/bloomer/v2/config.h24
-rw-r--r--keyboards/cozykeys/bloomer/v2/info.json11
-rw-r--r--keyboards/cozykeys/bloomer/v2/v2.c17
-rw-r--r--keyboards/cozykeys/bloomer/v3/config.h24
-rw-r--r--keyboards/cozykeys/bloomer/v3/info.json11
-rw-r--r--keyboards/cozykeys/bloomer/v3/v3.c17
8 files changed, 16 insertions, 128 deletions
diff --git a/keyboards/cozykeys/bloomer/bloomer.c b/keyboards/cozykeys/bloomer/bloomer.c
deleted file mode 100644
index b8612504b1..0000000000
--- a/keyboards/cozykeys/bloomer/bloomer.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2021 Paul Ewing
-
-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/>.
-*/
-#include "bloomer.h"
diff --git a/keyboards/cozykeys/bloomer/bloomer.h b/keyboards/cozykeys/bloomer/bloomer.h
deleted file mode 100644
index f85b80889f..0000000000
--- a/keyboards/cozykeys/bloomer/bloomer.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2021 Paul Ewing
-
-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
-
-#if defined(KEYBOARD_cozykeys_bloomer_v2)
- #include "v2.h"
-#elif defined(KEYBOARD_cozykeys_bloomer_v3)
- #include "v3.h"
-#endif
diff --git a/keyboards/cozykeys/bloomer/v2/config.h b/keyboards/cozykeys/bloomer/v2/config.h
deleted file mode 100644
index 214d5d549b..0000000000
--- a/keyboards/cozykeys/bloomer/v2/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 Paul Ewing
-
-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
-
-
-// Keyboard Matrix Assignments
-#define MATRIX_ROW_PINS { D0, D1, D3, D2, D4, B2 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B1, B4, C6, E6, B5, B6, B7, D6, C7 }
-#define DIODE_DIRECTION COL2ROW
-
diff --git a/keyboards/cozykeys/bloomer/v2/info.json b/keyboards/cozykeys/bloomer/v2/info.json
index e1963db040..daa2e87807 100644
--- a/keyboards/cozykeys/bloomer/v2/info.json
+++ b/keyboards/cozykeys/bloomer/v2/info.json
@@ -2,12 +2,17 @@
"usb": {
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B4", "C6", "E6", "B5", "B6", "B7", "D6", "C7"],
+ "rows": ["D0", "D1", "D3", "D2", "D4", "B2"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "k00", "x": 0.868, "y": 0.0, "r": 10 },
+ { "label": "k00", "x": 0.868, "y": 0, "r": 10 },
{ "label": "k01", "x": 1.853, "y": 0.174, "r": 10 },
{ "label": "k02", "x": 2.856, "y": 0.244, "r": 10 },
{ "label": "k03", "x": 3.896, "y": 0.107, "r": 10 },
@@ -21,7 +26,7 @@
{ "label": "k11", "x": 12.166, "y": 0.107, "r": -10 },
{ "label": "k12", "x": 13.196, "y": 0.192, "r": -10 },
{ "label": "k13", "x": 14.208, "y": 0.174, "r": -10 },
- { "label": "k14", "x": 15.193, "y": 0.0, "r": -10 },
+ { "label": "k14", "x": 15.193, "y": 0, "r": -10 },
{ "label": "k15", "x": 0.695, "y": 0.985, "r": 10 },
{ "label": "k16", "x": 1.679, "y": 1.158, "r": 10 },
{ "label": "k17", "x": 2.682, "y": 1.229, "r": 10 },
@@ -79,7 +84,7 @@
{ "label": "k69", "x": 13.891, "y": 4.131, "r": -10 },
{ "label": "k70", "x": 14.903, "y": 4.113, "r": -10 },
{ "label": "k71", "x": 15.888, "y": 3.939, "r": -10 },
- { "label": "k72", "x": 0.0, "y": 4.924, "r": 10 },
+ { "label": "k72", "x": 0, "y": 4.924, "r": 10 },
{ "label": "k73", "x": 0.985, "y": 5.098, "r": 10 },
{ "label": "k74", "x": 1.988, "y": 5.168, "r": 10 },
{ "label": "k75", "x": 3.027, "y": 5.031, "r": 10 },
diff --git a/keyboards/cozykeys/bloomer/v2/v2.c b/keyboards/cozykeys/bloomer/v2/v2.c
deleted file mode 100644
index 47dd093734..0000000000
--- a/keyboards/cozykeys/bloomer/v2/v2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2021 Paul Ewing
-
-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/>.
-*/
-#include "v2.h"
diff --git a/keyboards/cozykeys/bloomer/v3/config.h b/keyboards/cozykeys/bloomer/v3/config.h
deleted file mode 100644
index 214d5d549b..0000000000
--- a/keyboards/cozykeys/bloomer/v3/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 Paul Ewing
-
-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
-
-
-// Keyboard Matrix Assignments
-#define MATRIX_ROW_PINS { D0, D1, D3, D2, D4, B2 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B1, B4, C6, E6, B5, B6, B7, D6, C7 }
-#define DIODE_DIRECTION COL2ROW
-
diff --git a/keyboards/cozykeys/bloomer/v3/info.json b/keyboards/cozykeys/bloomer/v3/info.json
index 8540b0878e..a7ceb820c8 100644
--- a/keyboards/cozykeys/bloomer/v3/info.json
+++ b/keyboards/cozykeys/bloomer/v3/info.json
@@ -2,12 +2,17 @@
"usb": {
"device_version": "0.0.3"
},
+ "matrix_pins": {
+ "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B4", "C6", "E6", "B5", "B6", "B7", "D6", "C7"],
+ "rows": ["D0", "D1", "D3", "D2", "D4", "B2"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "k00", "x": 0.868, "y": 0.0, "r": 10 },
+ { "label": "k00", "x": 0.868, "y": 0, "r": 10 },
{ "label": "k01", "x": 1.853, "y": 0.174, "r": 10 },
{ "label": "k02", "x": 2.856, "y": 0.244, "r": 10 },
{ "label": "k03", "x": 3.896, "y": 0.107, "r": 10 },
@@ -18,7 +23,7 @@
{ "label": "k08", "x": 12.376, "y": 0.107, "r": -10 },
{ "label": "k09", "x": 13.406, "y": 0.192, "r": -10 },
{ "label": "k10", "x": 14.418, "y": 0.174, "r": -10 },
- { "label": "k11", "x": 15.403, "y": 0.0, "r": -10 },
+ { "label": "k11", "x": 15.403, "y": 0, "r": -10 },
{ "label": "k12", "x": 0.695, "y": 0.985, "r": 10 },
{ "label": "k13", "x": 1.679, "y": 1.158, "r": 10 },
{ "label": "k14", "x": 2.682, "y": 1.229, "r": 10 },
@@ -80,7 +85,7 @@
{ "label": "k70", "x": 14.101, "y": 4.131, "r": -10 },
{ "label": "k71", "x": 15.113, "y": 4.113, "r": -10 },
{ "label": "k72", "x": 16.098, "y": 3.939, "r": -10 },
- { "label": "k73", "x": 0.0, "y": 4.924, "r": 10 },
+ { "label": "k73", "x": 0, "y": 4.924, "r": 10 },
{ "label": "k74", "x": 0.985, "y": 5.098, "r": 10 },
{ "label": "k75", "x": 1.988, "y": 5.168, "r": 10 },
{ "label": "k76", "x": 3.027, "y": 5.031, "r": 10 },
diff --git a/keyboards/cozykeys/bloomer/v3/v3.c b/keyboards/cozykeys/bloomer/v3/v3.c
deleted file mode 100644
index 080cacd791..0000000000
--- a/keyboards/cozykeys/bloomer/v3/v3.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2021 Paul Ewing
-
-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/>.
-*/
-#include "v3.h"