summaryrefslogtreecommitdiff
path: root/keyboards/h0oni
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/h0oni')
-rw-r--r--keyboards/h0oni/deskpad/config.h17
-rw-r--r--keyboards/h0oni/deskpad/deskpad.c2
-rw-r--r--keyboards/h0oni/deskpad/deskpad.h28
-rw-r--r--keyboards/h0oni/deskpad/info.json26
-rw-r--r--keyboards/h0oni/hotduck/config.h19
-rw-r--r--keyboards/h0oni/hotduck/hotduck.c18
-rw-r--r--keyboards/h0oni/hotduck/hotduck.h37
-rw-r--r--keyboards/h0oni/hotduck/info.json162
8 files changed, 106 insertions, 203 deletions
diff --git a/keyboards/h0oni/deskpad/config.h b/keyboards/h0oni/deskpad/config.h
index ec6c3b733d..ddcf0ebe4a 100644
--- a/keyboards/h0oni/deskpad/config.h
+++ b/keyboards/h0oni/deskpad/config.h
@@ -16,23 +16,6 @@
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D7, C6 }
-#define MATRIX_COL_PINS { D0, D4, D1}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/h0oni/deskpad/deskpad.c b/keyboards/h0oni/deskpad/deskpad.c
index d93a9df900..0f22eda152 100644
--- a/keyboards/h0oni/deskpad/deskpad.c
+++ b/keyboards/h0oni/deskpad/deskpad.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "deskpad.h"
+#include "quantum.h"
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/h0oni/deskpad/deskpad.h b/keyboards/h0oni/deskpad/deskpad.h
deleted file mode 100644
index 4c0936f8bf..0000000000
--- a/keyboards/h0oni/deskpad/deskpad.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 Hydrogen BD <support@hgenbd.com>
- *
- * 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_all( \
- K00, K01, K02, K10, K11, K12\
-) { \
- { K00, K01, K02 },\
- { K10, K11, K12 } \
-}
-
-
diff --git a/keyboards/h0oni/deskpad/info.json b/keyboards/h0oni/deskpad/info.json
index 2c553313c8..96a23f7f61 100644
--- a/keyboards/h0oni/deskpad/info.json
+++ b/keyboards/h0oni/deskpad/info.json
@@ -1,13 +1,18 @@
{
- "keyboard_name": "Deskpad",
+ "keyboard_name": "Deskpad",
"manufacturer": "Hydrogen",
- "url": "",
- "maintainer": "Hydrogen BD",
+ "url": "",
+ "maintainer": "Hydrogen BD",
"usb": {
"vid": "0x4D53",
"pid": "0x4450",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D0", "D4", "D1"],
+ "rows": ["D7", "C6"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D2", "pin_b": "D3"}
@@ -18,12 +23,15 @@
"debounce": 3,
"layouts": {
"LAYOUT_all": {
- "layout": [{"label":"k1", "x":0, "y":0},
- {"label":"k2", "x":1, "y":0},
- {"label":"k3", "x":2, "y":0},
- {"label":"k4", "x":3, "y":0},
- {"label":"k5", "x":4, "y":0},
- {"label":"k6", "x":6, "y":0}]
+ "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": 3, "y": 0},
+ {"matrix": [1, 1], "x": 4, "y": 0},
+
+ {"matrix": [1, 2], "x": 6, "y": 0}
+ ]
}
}
}
diff --git a/keyboards/h0oni/hotduck/config.h b/keyboards/h0oni/hotduck/config.h
index b7c2287300..9891423e3f 100644
--- a/keyboards/h0oni/hotduck/config.h
+++ b/keyboards/h0oni/hotduck/config.h
@@ -16,27 +16,8 @@
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B6, B2, B3, B1, F7, F6, F5 }
-#define MATRIX_COL_PINS { B5, B4, E6, D7, C6, D4, D0, D1, D2, D3}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* RGB Underglow
- * F4 PIN for pre-soldered WS2812 LEDs
*/
-#define RGB_DI_PIN F4
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/h0oni/hotduck/hotduck.c b/keyboards/h0oni/hotduck/hotduck.c
deleted file mode 100644
index a251fb8987..0000000000
--- a/keyboards/h0oni/hotduck/hotduck.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 Md Mashur Shalehin, aka h0oni <mashursakib1920@gmail.com>
- *
- * 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 "hotduck.h"
-
diff --git a/keyboards/h0oni/hotduck/hotduck.h b/keyboards/h0oni/hotduck/hotduck.h
deleted file mode 100644
index 2cc36a0aa8..0000000000
--- a/keyboards/h0oni/hotduck/hotduck.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2021 Md Mashur Shalehin, aka h0oni <mashursakib1920@gmail.com>
- *
- * 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_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K19, K59, K58, K57, K69, K68, K67,\
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K29, K39, K49, K56, K55, K66, K65, K64,\
- K20, K21, K22, K23, K24, K25, K35, K26, K27, K28, K38, K54, K53,\
- K30, K31, K32, K33, K34, K44, K45, K46, K36, K37, K48, K52, K63,\
- K40, K41, K42, K43, K47, K50, K51, K60, K61, K62\
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09}, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39 }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49 }, \
- { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59 }, \
- { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69 } \
-}
-
-
diff --git a/keyboards/h0oni/hotduck/info.json b/keyboards/h0oni/hotduck/info.json
index 6ca8cfcde7..6e8e2e6144 100644
--- a/keyboards/h0oni/hotduck/info.json
+++ b/keyboards/h0oni/hotduck/info.json
@@ -1,91 +1,105 @@
{
- "keyboard_name": "hotDuck",
+ "keyboard_name": "hotDuck",
"manufacturer": "h0oni",
- "url": "",
- "maintainer": "h0oni",
+ "url": "",
+ "maintainer": "h0oni",
"usb": {
"vid": "0x4D53",
"pid": "0x6844",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"],
+ "rows": ["B6", "B2", "B3", "B1", "F7", "F6", "F5"]
+ },
+ "diode_direction": "COL2ROW",
+ "ws2812": {
+ "pin": "F4"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_all": {
- "layout": [{"label":"Esc", "x":0, "y":0},
- {"label":"!", "x":1, "y":0},
- {"label":"@", "x":2, "y":0},
- {"label":"#", "x":3, "y":0},
- {"label":"$", "x":4, "y":0},
- {"label":"%", "x":5, "y":0},
- {"label":"^", "x":6, "y":0},
- {"label":"&", "x":7, "y":0},
- {"label":"*", "x":8, "y":0},
- {"label":"(", "x":9, "y":0},
- {"label":")", "x":10, "y":0},
- {"label":"_", "x":11, "y":0},
- {"label":"+", "x":12, "y":0},
- {"label":"Bksp", "x":13, "y":0, "w":2},
- {"label":"Menu", "x":15.25, "y":0},
- {"label":"Home", "x":16.25, "y":0},
- {"label":"PgUp", "x":17.25, "y":0},
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [1, 9], "x": 10, "y": 0},
+ {"matrix": [5, 9], "x": 11, "y": 0},
+ {"matrix": [5, 8], "x": 12, "y": 0},
+ {"matrix": [5, 7], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [6, 9], "x": 15.25, "y": 0},
+ {"matrix": [6, 8], "x": 16.25, "y": 0},
+ {"matrix": [6, 7], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [2, 9], "x": 9.5, "y": 1},
+ {"matrix": [3, 9], "x": 10.5, "y": 1},
+ {"matrix": [4, 9], "x": 11.5, "y": 1},
+ {"matrix": [5, 6], "x": 12.5, "y": 1},
+ {"matrix": [5, 5], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [6, 6], "x": 15.25, "y": 1},
+ {"matrix": [6, 5], "x": 16.25, "y": 1},
+ {"matrix": [6, 4], "x": 17.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [3, 5], "x": 6.75, "y": 2},
+ {"matrix": [2, 6], "x": 7.75, "y": 2},
+ {"matrix": [2, 7], "x": 8.75, "y": 2},
+ {"matrix": [2, 8], "x": 9.75, "y": 2},
+ {"matrix": [3, 8], "x": 10.75, "y": 2},
+ {"matrix": [5, 4], "x": 11.75, "y": 2},
+ {"matrix": [5, 3], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [4, 4], "x": 6.25, "y": 3},
+ {"matrix": [4, 5], "x": 7.25, "y": 3},
+ {"matrix": [4, 6], "x": 8.25, "y": 3},
+ {"matrix": [3, 6], "x": 9.25, "y": 3},
+ {"matrix": [3, 7], "x": 10.25, "y": 3},
+ {"matrix": [4, 8], "x": 11.25, "y": 3},
+ {"matrix": [5, 2], "x": 12.25, "y": 3, "w": 2.75},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":6.5, "y":1},
- {"label":"U", "x":7.5, "y":1},
- {"label":"I", "x":8.5, "y":1},
- {"label":"O", "x":9.5, "y":1},
- {"label":"P", "x":10.5, "y":1},
- {"label":"{", "x":11.5, "y":1},
- {"label":"}", "x":12.5, "y":1},
- {"label":"|", "x":13.5, "y":1, "w":1.5},
- {"label":"Del", "x":15.25, "y":1},
- {"label":"End", "x":16.25, "y":1},
- {"label":"PgDn", "x":17.25, "y":1},
+ {"matrix": [6, 3], "x": 16.25, "y": 3},
- {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
- {"label":"A", "x":1.75, "y":2},
- {"label":"S", "x":2.75, "y":2},
- {"label":"D", "x":3.75, "y":2},
- {"label":"F", "x":4.75, "y":2},
- {"label":"G", "x":5.75, "y":2},
- {"label":"H", "x":6.75, "y":2},
- {"label":"J", "x":7.75, "y":2},
- {"label":"K", "x":8.75, "y":2},
- {"label":"L", "x":9.75, "y":2},
- {"label":":", "x":10.75, "y":2},
- {"label":"\"", "x":11.75, "y":2},
- {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-
- {"label":"Shift", "x":0, "y":3, "w":2.25},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":7.25, "y":3},
- {"label":"M", "x":8.25, "y":3},
- {"label":"<", "x":9.25, "y":3},
- {"label":">", "x":10.25, "y":3},
- {"label":"?", "x":11.25, "y":3},
- {"label":"Shift", "x":12.25, "y":3,"w":2.75},
- {"label":"\u2191", "x":16.25, "y":3},
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 7], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [5, 0], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [5, 1], "x": 12.5, "y": 4, "w": 1.25},
- {"label":"Ctrl", "x":0, "y":4, "w":1.25},
- {"label":"Alt", "x":1.25, "y":4, "w":1.25},
- {"label":"Win", "x":2.5, "y":4, "w":1.25},
- {"x":3.75, "y":4, "w":6.25},
- {"label":"Win", "x":10, "y":4, "w":1.25},
- {"label":"Alt", "x":11.25, "y":4, "w":1.25},
- {"label":"Ctrl", "x":12.5, "y":4, "w":1.25},
- {"label":"\u2190", "x":15.25, "y":4},
- {"label":"\u2193", "x":16.25, "y":4},
- {"label":"\u2192", "x":17.25, "y":4}]
+ {"matrix": [6, 0], "x": 15.25, "y": 4},
+ {"matrix": [6, 1], "x": 16.25, "y": 4},
+ {"matrix": [6, 2], "x": 17.25, "y": 4}
+ ]
}
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 08:25:42 +0000