summaryrefslogtreecommitdiff
path: root/keyboards/doodboard
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/doodboard')
-rw-r--r--keyboards/doodboard/duckboard/config.h11
-rw-r--r--keyboards/doodboard/duckboard/duckboard.c17
-rw-r--r--keyboards/doodboard/duckboard/duckboard.h33
-rw-r--r--keyboards/doodboard/duckboard/info.json46
-rw-r--r--keyboards/doodboard/duckboard_r2/config.h11
-rw-r--r--keyboards/doodboard/duckboard_r2/duckboard_r2.c17
-rw-r--r--keyboards/doodboard/duckboard_r2/duckboard_r2.h33
-rw-r--r--keyboards/doodboard/duckboard_r2/info.json52
8 files changed, 57 insertions, 163 deletions
diff --git a/keyboards/doodboard/duckboard/config.h b/keyboards/doodboard/duckboard/config.h
index d4617a8786..a73678faf2 100644
--- a/keyboards/doodboard/duckboard/config.h
+++ b/keyboards/doodboard/duckboard/config.h
@@ -16,20 +16,9 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F7, B1, B3, B2, B6 }
-
/* media key slowdown for windows */
#define TAP_CODE_DELAY 20
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 8 // Number of LEDs
#endif
diff --git a/keyboards/doodboard/duckboard/duckboard.c b/keyboards/doodboard/duckboard/duckboard.c
deleted file mode 100644
index 853e105ceb..0000000000
--- a/keyboards/doodboard/duckboard/duckboard.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020-2021 doodboard
- *
- * 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 "duckboard.h"
diff --git a/keyboards/doodboard/duckboard/duckboard.h b/keyboards/doodboard/duckboard/duckboard.h
deleted file mode 100644
index c98c9a703a..0000000000
--- a/keyboards/doodboard/duckboard/duckboard.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2020-2021 doodboard
- *
- * 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 LAYOUT( \
- K01, K02, K03, K04, \
- K11, K12, K13, \
- K21, K22, K23, K24, \
- K31, K32, K33, \
- K40, K41, K42, K43, K44 \
-) { \
- { KC_NO, K01, K02, K03, K04 }, \
- { KC_NO, K11, K12, K13, KC_NO }, \
- { KC_NO, K21, K22, K23, K24 }, \
- { KC_NO, K31, K32, K33, KC_NO }, \
- { K40, K41, K42, K43, K44 } \
-}
diff --git a/keyboards/doodboard/duckboard/info.json b/keyboards/doodboard/duckboard/info.json
index f2ee7bb80a..367a9b7d72 100644
--- a/keyboards/doodboard/duckboard/info.json
+++ b/keyboards/doodboard/duckboard/info.json
@@ -8,39 +8,47 @@
"pid": "0xFF44",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F7", "B1", "B3", "B2", "B6"],
+ "rows": ["C6", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F5", "pin_b": "F6", "resolution": 2}
]
},
+ "ws2812": {
+ "pin": "D3"
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- { "x": 1, "y": 0 },
- { "x": 2, "y": 0 },
- { "x": 3, "y": 0 },
- { "x": 4, "y": 0 },
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
- { "x": 1, "y": 1 },
- { "x": 2, "y": 1 },
- { "x": 3, "y": 1 },
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
- { "x": 1, "y": 2 },
- { "x": 2, "y": 2 },
- { "x": 3, "y": 2 },
- { "x": 4, "y": 1, "h": 2 },
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 1, "h": 2},
- { "x": 1, "y": 3 },
- { "x": 2, "y": 3 },
- { "x": 3, "y": 3 },
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
- { "x": 0, "y": 4 },
- { "x": 1, "y": 4 },
- { "x": 2, "y": 4 },
- { "x": 3, "y": 4 },
- { "x": 4, "y": 3, "h": 2 }
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 3, "h": 2}
]
}
}
diff --git a/keyboards/doodboard/duckboard_r2/config.h b/keyboards/doodboard/duckboard_r2/config.h
index d4617a8786..a73678faf2 100644
--- a/keyboards/doodboard/duckboard_r2/config.h
+++ b/keyboards/doodboard/duckboard_r2/config.h
@@ -16,20 +16,9 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F7, B1, B3, B2, B6 }
-
/* media key slowdown for windows */
#define TAP_CODE_DELAY 20
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 8 // Number of LEDs
#endif
diff --git a/keyboards/doodboard/duckboard_r2/duckboard_r2.c b/keyboards/doodboard/duckboard_r2/duckboard_r2.c
deleted file mode 100644
index 095544b9e3..0000000000
--- a/keyboards/doodboard/duckboard_r2/duckboard_r2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020-2021 doodboard
- *
- * 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 "duckboard_r2.h"
diff --git a/keyboards/doodboard/duckboard_r2/duckboard_r2.h b/keyboards/doodboard/duckboard_r2/duckboard_r2.h
deleted file mode 100644
index 1f3c462da8..0000000000
--- a/keyboards/doodboard/duckboard_r2/duckboard_r2.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2020-2021 doodboard
- *
- * 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 LAYOUT( \
- K01, K02, K03, K04, \
- K11, K12, K13, K14, \
- K21, K22, K23, K24, \
- K30, K31, K32, K33, K34, \
- K40, K41, K42, K43, K44 \
-) { \
- { KC_NO, K01, K02, K03, K04 }, \
- { KC_NO, K11, K12, K13, K14 }, \
- { KC_NO, K21, K22, K23, K24 }, \
- { K30, K31, K32, K33, K34 }, \
- { K40, K41, K42, K43, K44 } \
-}
diff --git a/keyboards/doodboard/duckboard_r2/info.json b/keyboards/doodboard/duckboard_r2/info.json
index b2de93f477..00d0fc6452 100644
--- a/keyboards/doodboard/duckboard_r2/info.json
+++ b/keyboards/doodboard/duckboard_r2/info.json
@@ -8,11 +8,19 @@
"pid": "0x6462",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F7", "B1", "B3", "B2", "B6"],
+ "rows": ["C6", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F6", "pin_b": "F5", "resolution": 2}
]
},
+ "ws2812": {
+ "pin": "D3"
+ },
"bootmagic": {
"matrix": [0, 1]
},
@@ -21,32 +29,32 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "x": 1, "y": 0 },
- { "x": 2, "y": 0 },
- { "x": 3, "y": 0 },
- { "x": 4, "y": 0 },
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
- { "x": 1, "y": 1 },
- { "x": 2, "y": 1 },
- { "x": 3, "y": 1 },
- { "x": 4, "y": 1 },
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
- { "x": 1, "y": 2 },
- { "x": 2, "y": 2 },
- { "x": 3, "y": 2 },
- { "x": 4, "y": 2 },
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
- { "x": 0, "y": 3 },
- { "x": 1, "y": 3 },
- { "x": 2, "y": 3 },
- { "x": 3, "y": 3 },
- { "x": 4, "y": 3 },
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
- { "x": 0, "y": 4 },
- { "x": 1, "y": 4 },
- { "x": 2, "y": 4 },
- { "x": 3, "y": 4 },
- { "x": 4, "y": 4 }
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4}
]
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-04 10:06:14 +0000