summaryrefslogtreecommitdiff
path: root/keyboards/peej/rosaline
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/peej/rosaline')
-rw-r--r--keyboards/peej/rosaline/config.h10
-rw-r--r--keyboards/peej/rosaline/ortho/info.json128
-rw-r--r--keyboards/peej/rosaline/ortho/ortho.h57
-rw-r--r--keyboards/peej/rosaline/rosaline.c2
-rw-r--r--keyboards/peej/rosaline/rosaline.h30
-rw-r--r--keyboards/peej/rosaline/staggered/info.json5
-rw-r--r--keyboards/peej/rosaline/staggered/staggered.h7
7 files changed, 80 insertions, 159 deletions
diff --git a/keyboards/peej/rosaline/config.h b/keyboards/peej/rosaline/config.h
index 0bd9a069d0..18505def82 100644
--- a/keyboards/peej/rosaline/config.h
+++ b/keyboards/peej/rosaline/config.h
@@ -16,11 +16,7 @@
#pragma once
-
-#define MATRIX_ROW_PINS { C0, B5, B4, B3, B2, B1, C3, D5 }
-#define MATRIX_COL_PINS { B0, D7, D6, C2, D4, D1, D0, C1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define USB_MAX_POWER_CONSUMPTION 100
+
+#define LED1 C5
+#define LED2 C4
diff --git a/keyboards/peej/rosaline/ortho/info.json b/keyboards/peej/rosaline/ortho/info.json
index 2be28d4ef6..c175aafb42 100644
--- a/keyboards/peej/rosaline/ortho/info.json
+++ b/keyboards/peej/rosaline/ortho/info.json
@@ -8,71 +8,79 @@
"pid": "0x0003",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"],
+ "rows": ["C0", "B5", "B4", "B3", "B2", "B1", "C3", "D5"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega328p",
"bootloader": "usbasploader",
"layouts": {
"LAYOUT_ortho_4x15": {
"layout": [
- { "x": 0, "y": 0 },
- { "x": 1, "y": 0 },
- { "x": 2, "y": 0 },
- { "x": 3, "y": 0 },
- { "x": 4, "y": 0 },
- { "x": 5, "y": 0 },
- { "x": 6, "y": 0 },
- { "x": 7, "y": 0 },
- { "x": 8, "y": 0 },
- { "x": 9, "y": 0 },
- { "x": 10, "y": 0 },
- { "x": 11, "y": 0 },
- { "x": 12, "y": 0 },
- { "x": 13, "y": 0 },
- { "x": 14, "y": 0 },
- { "x": 0, "y": 1 },
- { "x": 1, "y": 1 },
- { "x": 2, "y": 1 },
- { "x": 3, "y": 1 },
- { "x": 4, "y": 1 },
- { "x": 5, "y": 1 },
- { "x": 6, "y": 1 },
- { "x": 7, "y": 1 },
- { "x": 8, "y": 1 },
- { "x": 9, "y": 1 },
- { "x": 10, "y": 1 },
- { "x": 11, "y": 1 },
- { "x": 12, "y": 1 },
- { "x": 13, "y": 1 },
- { "x": 14, "y": 1 },
- { "x": 0, "y": 2 },
- { "x": 1, "y": 2 },
- { "x": 2, "y": 2 },
- { "x": 3, "y": 2 },
- { "x": 4, "y": 2 },
- { "x": 5, "y": 2 },
- { "x": 6, "y": 2 },
- { "x": 7, "y": 2 },
- { "x": 8, "y": 2 },
- { "x": 9, "y": 2 },
- { "x": 10, "y": 2 },
- { "x": 11, "y": 2 },
- { "x": 12, "y": 2 },
- { "x": 13, "y": 2 },
- { "x": 14, "y": 2 },
- { "x": 0, "y": 3 },
- { "x": 1, "y": 3 },
- { "x": 2, "y": 3 },
- { "x": 3, "y": 3 },
- { "x": 4, "y": 3 },
- { "x": 5, "y": 3 },
- { "x": 6, "y": 3 },
- { "x": 7, "y": 3 },
- { "x": 8, "y": 3 },
- { "x": 9, "y": 3 },
- { "x": 10, "y": 3 },
- { "x": 11, "y": 3 },
- { "x": 12, "y": 3 },
- { "x": 13, "y": 3 },
- { "x": 14, "y": 3 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [4, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [4, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [4, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [4, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [4, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [4, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [4, 6], "x": 13, "y": 0},
+ {"matrix": [0, 7], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [5, 0], "x": 1, "y": 1},
+ {"matrix": [1, 1], "x": 2, "y": 1},
+ {"matrix": [5, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [5, 2], "x": 5, "y": 1},
+ {"matrix": [1, 3], "x": 6, "y": 1},
+ {"matrix": [5, 3], "x": 7, "y": 1},
+ {"matrix": [1, 4], "x": 8, "y": 1},
+ {"matrix": [5, 4], "x": 9, "y": 1},
+ {"matrix": [1, 5], "x": 10, "y": 1},
+ {"matrix": [5, 5], "x": 11, "y": 1},
+ {"matrix": [1, 6], "x": 12, "y": 1},
+ {"matrix": [5, 6], "x": 13, "y": 1},
+ {"matrix": [1, 7], "x": 14, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [6, 0], "x": 1, "y": 2},
+ {"matrix": [2, 1], "x": 2, "y": 2},
+ {"matrix": [6, 1], "x": 3, "y": 2},
+ {"matrix": [2, 2], "x": 4, "y": 2},
+ {"matrix": [6, 2], "x": 5, "y": 2},
+ {"matrix": [2, 3], "x": 6, "y": 2},
+ {"matrix": [6, 3], "x": 7, "y": 2},
+ {"matrix": [2, 4], "x": 8, "y": 2},
+ {"matrix": [6, 4], "x": 9, "y": 2},
+ {"matrix": [2, 5], "x": 10, "y": 2},
+ {"matrix": [6, 5], "x": 11, "y": 2},
+ {"matrix": [2, 6], "x": 12, "y": 2},
+ {"matrix": [6, 6], "x": 13, "y": 2},
+ {"matrix": [2, 7], "x": 14, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [7, 0], "x": 1, "y": 3},
+ {"matrix": [3, 1], "x": 2, "y": 3},
+ {"matrix": [7, 1], "x": 3, "y": 3},
+ {"matrix": [3, 2], "x": 4, "y": 3},
+ {"matrix": [7, 2], "x": 5, "y": 3},
+ {"matrix": [3, 3], "x": 6, "y": 3},
+ {"matrix": [7, 3], "x": 7, "y": 3},
+ {"matrix": [3, 4], "x": 8, "y": 3},
+ {"matrix": [7, 4], "x": 9, "y": 3},
+ {"matrix": [3, 5], "x": 10, "y": 3},
+ {"matrix": [7, 5], "x": 11, "y": 3},
+ {"matrix": [3, 6], "x": 12, "y": 3},
+ {"matrix": [7, 6], "x": 13, "y": 3},
+ {"matrix": [3, 7], "x": 14, "y": 3}
]
}
}
diff --git a/keyboards/peej/rosaline/ortho/ortho.h b/keyboards/peej/rosaline/ortho/ortho.h
deleted file mode 100644
index b3287784c3..0000000000
--- a/keyboards/peej/rosaline/ortho/ortho.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2021 Paul James
- *
- * 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 "rosaline.h"
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │40 │01 │41 │02 │42 │03 │43 │04 │44 │05 │45 │06 │46 │07 │
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │10 │50 │11 │51 │12 │52 │13 │53 │14 │54 │15 │55 │16 │56 │17 │
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │20 │60 │21 │61 │22 │62 │23 │63 │24 │64 │25 │65 │26 │66 │27 │
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │30 │70 │31 │71 │32 │72 │33 │73 │34 │74 │35 │75 │36 │76 │37 │
- * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
- * ┌───────────────────────────┐
- * │73 │ 7u Space
- * └───────────────────────────┘
- * ┌───────┐ ┌───────┐
- * 2u Left │32 │ │35 │ 2u Right
- * └───────┘ └───────┘
- */
-
-#define LAYOUT_ortho_4x15( \
- k00, k40, k01, k41, k02, k42, k03, k43, k04, k44, k05, k45, k06, k46, k07, \
- k10, k50, k11, k51, k12, k52, k13, k53, k14, k54, k15, k55, k16, k56, k17, \
- k20, k60, k21, k61, k22, k62, k23, k63, k24, k64, k25, k65, k26, k66, k27, \
- k30, k70, k31, k71, k32, k72, k33, k73, k34, k74, k35, k75, k36, k76, k37 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07 }, \
- { k10, k11, k12, k13, k14, k15, k16, k17 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27 }, \
- { k30, k31, k32, k33, k34, k35, k36, k37 }, \
- { k40, k41, k42, k43, k44, k45, k46, XXX }, \
- { k50, k51, k52, k53, k54, k55, k56, XXX }, \
- { k60, k61, k62, k63, k64, k65, k66, XXX }, \
- { k70, k71, k72, k73, k74, k75, k76, XXX } \
-}
-
-#define LED1 C5
-#define LED2 C4
diff --git a/keyboards/peej/rosaline/rosaline.c b/keyboards/peej/rosaline/rosaline.c
index 57141e8064..df0594da44 100644
--- a/keyboards/peej/rosaline/rosaline.c
+++ b/keyboards/peej/rosaline/rosaline.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "rosaline.h"
+#include "quantum.h"
bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
writePin(LED1, record->event.pressed);
diff --git a/keyboards/peej/rosaline/rosaline.h b/keyboards/peej/rosaline/rosaline.h
deleted file mode 100644
index 22125f3188..0000000000
--- a/keyboards/peej/rosaline/rosaline.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2021 Paul James
- *
- * 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 XXX KC_NO
-
-#if defined(KEYBOARD_peej_rosaline_staggered)
- #include "staggered.h"
-#elif defined(KEYBOARD_peej_rosaline_ortho)
- #include "ortho.h"
-#endif
-
-#define LED1 C5
-#define LED2 C4
diff --git a/keyboards/peej/rosaline/staggered/info.json b/keyboards/peej/rosaline/staggered/info.json
index f37e073fbd..f110f0e325 100644
--- a/keyboards/peej/rosaline/staggered/info.json
+++ b/keyboards/peej/rosaline/staggered/info.json
@@ -8,6 +8,11 @@
"pid": "0x0003",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"],
+ "rows": ["C0", "B5", "B4", "B3", "B2", "B1", "C3", "D5"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega328p",
"bootloader": "usbasploader",
"layout_aliases": {
diff --git a/keyboards/peej/rosaline/staggered/staggered.h b/keyboards/peej/rosaline/staggered/staggered.h
index cc2703c834..98186320a5 100644
--- a/keyboards/peej/rosaline/staggered/staggered.h
+++ b/keyboards/peej/rosaline/staggered/staggered.h
@@ -16,7 +16,7 @@
#pragma once
-#include "rosaline.h"
+#include "quantum.h"
/*
* ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
@@ -36,6 +36,8 @@
* └──────────┴───┴────────┴───┘
*/
+#define XXX KC_NO
+
#define LAYOUT_all( \
k00, k10, k01, k02, k12, k03, k13, k04, k14, k05, k06, k16, k07, k17, \
k20, k11, k21, k22, k32, k23, k33, k24, k15, k25, k26, k36, k27, \
@@ -52,6 +54,3 @@
{ XXX, XXX, XXX, XXX, XXX, k65, k66, k67 }, \
{ XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
}
-
-#define LED1 C5
-#define LED2 C4
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-03 19:15:26 +0000