summaryrefslogtreecommitdiff
path: root/keyboards/recompile_keys/nomu30
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/recompile_keys/nomu30')
-rw-r--r--keyboards/recompile_keys/nomu30/info.json192
-rw-r--r--keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h3
-rw-r--r--keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h3
-rw-r--r--keyboards/recompile_keys/nomu30/nomu30.c16
-rw-r--r--keyboards/recompile_keys/nomu30/nomu30.h34
-rw-r--r--keyboards/recompile_keys/nomu30/rev1/config.h34
-rw-r--r--keyboards/recompile_keys/nomu30/rev1/info.json5
-rw-r--r--keyboards/recompile_keys/nomu30/rev1/rev1.c17
-rw-r--r--keyboards/recompile_keys/nomu30/rev1/rev1.h19
-rw-r--r--keyboards/recompile_keys/nomu30/rev2/config.h16
-rw-r--r--keyboards/recompile_keys/nomu30/rev2/info.json5
-rw-r--r--keyboards/recompile_keys/nomu30/rev2/rev2.c17
-rw-r--r--keyboards/recompile_keys/nomu30/rev2/rev2.h19
13 files changed, 45 insertions, 335 deletions
diff --git a/keyboards/recompile_keys/nomu30/info.json b/keyboards/recompile_keys/nomu30/info.json
index 7fa6be0d39..3753b3cb12 100644
--- a/keyboards/recompile_keys/nomu30/info.json
+++ b/keyboards/recompile_keys/nomu30/info.json
@@ -14,165 +14,39 @@
"layouts": {
"LAYOUT": {
"layout": [
- {
- "label": "Q",
- "x": 0.5,
- "y": 0
- },
- {
- "label": "W",
- "x": 1.5,
- "y": 0
- },
- {
- "label": "E",
- "x": 2.5,
- "y": 0
- },
- {
- "label": "R",
- "x": 3.5,
- "y": 0
- },
- {
- "label": "T",
- "x": 4.5,
- "y": 0
- },
- {
- "label": "Y",
- "x": 5.5,
- "y": 0
- },
- {
- "label": "U",
- "x": 6.5,
- "y": 0
- },
- {
- "label": "I",
- "x": 7.5,
- "y": 0
- },
- {
- "label": "O",
- "x": 8.5,
- "y": 0
- },
- {
- "label": "P",
- "x": 9.5,
- "y": 0
- },
- {
- "label": "Del",
- "x": 10.5,
- "y": 0
- },
- {
- "label": "|",
- "x": 0,
- "y": 1
- },
- {
- "label": "A",
- "x": 1,
- "y": 1
- },
- {
- "label": "S",
- "x": 2,
- "y": 1
- },
- {
- "label": "D",
- "x": 3,
- "y": 1
- },
- {
- "label": "F",
- "x": 4,
- "y": 1
- },
- {
- "label": "G",
- "x": 5,
- "y": 1
- },
- {
- "label": "H",
- "x": 6,
- "y": 1
- },
- {
- "label": "J",
- "x": 7,
- "y": 1
- },
- {
- "label": "K",
- "x": 8,
- "y": 1
- },
- {
- "label": "L",
- "x": 9,
- "y": 1
- },
- {
- "label": "Enter",
- "x": 10.25,
- "y": 1,
- "w": 1.25,
- "h": 2
- },
- {
- "label": "Control",
- "x": 0,
- "y": 2,
- "w": 1.5
- },
- {
- "label": "Z",
- "x": 1.5,
- "y": 2
- },
- {
- "label": "X",
- "x": 2.5,
- "y": 2
- },
- {
- "label": "C",
- "x": 3.5,
- "y": 2
- },
- {
- "label": "V",
- "x": 4.5,
- "y": 2
- },
- {
- "label": "B",
- "x": 5.5,
- "y": 2
- },
- {
- "label": "N",
- "x": 6.5,
- "y": 2
- },
- {
- "label": "M",
- "x": 7.5,
- "y": 2
- },
- {
- "label": "Shift",
- "x": 8.5,
- "y": 2,
- "w": 1.75
- }
+ {"matrix": [0, 1], "x": 0.5, "y": 0},
+ {"matrix": [0, 2], "x": 1.5, "y": 0},
+ {"matrix": [0, 3], "x": 2.5, "y": 0},
+ {"matrix": [0, 4], "x": 3.5, "y": 0},
+ {"matrix": [0, 5], "x": 4.5, "y": 0},
+ {"matrix": [0, 6], "x": 5.5, "y": 0},
+ {"matrix": [0, 7], "x": 6.5, "y": 0},
+ {"matrix": [0, 8], "x": 7.5, "y": 0},
+ {"matrix": [0, 9], "x": 8.5, "y": 0},
+ {"matrix": [0, 10], "x": 9.5, "y": 0},
+ {"matrix": [0, 11], "x": 10.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "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},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2, "w": 1.75}
]
}
}
diff --git a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h
index 8861dc5396..e7ca3c1760 100644
--- a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h
+++ b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// place overrides here
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_LAYER_TERM 150 // Custom LT Tapping term
#define TAPPING_TERM_PER_KEY
@@ -59,7 +58,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// LED Setting: if you have KUMO you can use RGBLIGHT_ENABLE = yes
#ifdef RGBLIGHT_ENABLE
- #define RGB_DI_PIN B5
+ #define WS2812_DI_PIN B5
#define RGBLIGHT_TIMER
#define RGBLED_NUM 6
diff --git a/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h b/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h
index 8861dc5396..e7ca3c1760 100644
--- a/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h
+++ b/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// place overrides here
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_LAYER_TERM 150 // Custom LT Tapping term
#define TAPPING_TERM_PER_KEY
@@ -59,7 +58,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// LED Setting: if you have KUMO you can use RGBLIGHT_ENABLE = yes
#ifdef RGBLIGHT_ENABLE
- #define RGB_DI_PIN B5
+ #define WS2812_DI_PIN B5
#define RGBLIGHT_TIMER
#define RGBLED_NUM 6
diff --git a/keyboards/recompile_keys/nomu30/nomu30.c b/keyboards/recompile_keys/nomu30/nomu30.c
deleted file mode 100644
index 37a8614c11..0000000000
--- a/keyboards/recompile_keys/nomu30/nomu30.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Naoto Takai
- *
- * 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 "nomu30.h"
diff --git a/keyboards/recompile_keys/nomu30/nomu30.h b/keyboards/recompile_keys/nomu30/nomu30.h
deleted file mode 100644
index 964eb2a65f..0000000000
--- a/keyboards/recompile_keys/nomu30/nomu30.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019 Naoto Takai
- *
- * 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"
-#ifdef KEYBOARD_recompile_keys_nomu30_rev1
- #include "rev1.h"
-#elif KEYBOARD_recompile_keys_nomu30_rev2
- #include "rev2.h"
-#endif
-
-#define LAYOUT( \
- K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208 \
-) \
-{ \
- { KC_NO, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, KC_NO }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, KC_NO, KC_NO, KC_NO }, \
-}
diff --git a/keyboards/recompile_keys/nomu30/rev1/config.h b/keyboards/recompile_keys/nomu30/rev1/config.h
deleted file mode 100644
index e9ef483924..0000000000
--- a/keyboards/recompile_keys/nomu30/rev1/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2019 Naoto Takai
-
-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
- *
- * 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 { D1, D0, D4 }
-#define MATRIX_COL_PINS { C6, D7, E6, B4, F4, F5, F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/recompile_keys/nomu30/rev1/info.json b/keyboards/recompile_keys/nomu30/rev1/info.json
index 4369a04103..815f200cd8 100644
--- a/keyboards/recompile_keys/nomu30/rev1/info.json
+++ b/keyboards/recompile_keys/nomu30/rev1/info.json
@@ -1,4 +1,9 @@
{
+ "matrix_pins": {
+ "cols": ["C6", "D7", "E6", "B4", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D1", "D0", "D4"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina"
}
diff --git a/keyboards/recompile_keys/nomu30/rev1/rev1.c b/keyboards/recompile_keys/nomu30/rev1/rev1.c
deleted file mode 100644
index 8adf9859f8..0000000000
--- a/keyboards/recompile_keys/nomu30/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Naoto Takai
- *
- * 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 "rev1.h"
diff --git a/keyboards/recompile_keys/nomu30/rev1/rev1.h b/keyboards/recompile_keys/nomu30/rev1/rev1.h
deleted file mode 100644
index fa161f267e..0000000000
--- a/keyboards/recompile_keys/nomu30/rev1/rev1.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Naoto Takai
- *
- * 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"
diff --git a/keyboards/recompile_keys/nomu30/rev2/config.h b/keyboards/recompile_keys/nomu30/rev2/config.h
index ef4d48e163..ff4630d838 100644
--- a/keyboards/recompile_keys/nomu30/rev2/config.h
+++ b/keyboards/recompile_keys/nomu30/rev2/config.h
@@ -17,22 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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 { B2, B1, B0 }
-#define MATRIX_COL_PINS { C4, C5, C6, C7, B7, B6, B5, B4, B3, D5, D4, D3 }
-
-/* COL2ROW, 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/recompile_keys/nomu30/rev2/info.json b/keyboards/recompile_keys/nomu30/rev2/info.json
index dd190d18ee..70730415a5 100644
--- a/keyboards/recompile_keys/nomu30/rev2/info.json
+++ b/keyboards/recompile_keys/nomu30/rev2/info.json
@@ -1,4 +1,9 @@
{
+ "matrix_pins": {
+ "cols": ["C4", "C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "D5", "D4", "D3"],
+ "rows": ["B2", "B1", "B0"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u2",
"bootloader": "atmel-dfu"
}
diff --git a/keyboards/recompile_keys/nomu30/rev2/rev2.c b/keyboards/recompile_keys/nomu30/rev2/rev2.c
deleted file mode 100644
index 5eabb33ac6..0000000000
--- a/keyboards/recompile_keys/nomu30/rev2/rev2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Naoto Takai
- *
- * 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 "rev2.h"
diff --git a/keyboards/recompile_keys/nomu30/rev2/rev2.h b/keyboards/recompile_keys/nomu30/rev2/rev2.h
deleted file mode 100644
index fa161f267e..0000000000
--- a/keyboards/recompile_keys/nomu30/rev2/rev2.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 Naoto Takai
- *
- * 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"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 00:13:15 +0000