summaryrefslogtreecommitdiff
path: root/keyboards/ungodly
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ungodly')
-rw-r--r--keyboards/ungodly/launch_pad/config.h11
-rw-r--r--keyboards/ungodly/launch_pad/info.json51
-rw-r--r--keyboards/ungodly/launch_pad/launch_pad.c2
-rw-r--r--keyboards/ungodly/launch_pad/launch_pad.h70
-rw-r--r--keyboards/ungodly/launch_pad/rules.mk1
-rw-r--r--keyboards/ungodly/nines/nines.c34
6 files changed, 32 insertions, 137 deletions
diff --git a/keyboards/ungodly/launch_pad/config.h b/keyboards/ungodly/launch_pad/config.h
index dc63dc77bd..9c6459abbd 100644
--- a/keyboards/ungodly/launch_pad/config.h
+++ b/keyboards/ungodly/launch_pad/config.h
@@ -15,22 +15,11 @@
*/
#pragma once
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS \
- { D4, D6, D7, B4, B5 }
-#define MATRIX_COL_PINS \
- { B0, B1, B2, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Midi Slider */
#define SLIDER_PIN F6
#define MIDI_ADVANCED
/* RGB Matrix configuration */
-#define RGB_DI_PIN F7
#ifdef RGB_MATRIX_ENABLE
# define RGBLED_NUM 22
# define RGB_MATRIX_LED_COUNT RGBLED_NUM
diff --git a/keyboards/ungodly/launch_pad/info.json b/keyboards/ungodly/launch_pad/info.json
index a6e12f3374..97f3d10407 100644
--- a/keyboards/ungodly/launch_pad/info.json
+++ b/keyboards/ungodly/launch_pad/info.json
@@ -8,6 +8,17 @@
"pid": "0x4C50",
"device_version": "99.9.9"
},
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["B0", "B1", "B2", "B3"],
+ "rows": ["D4", "D6", "D7", "B4", "B5"]
+ },
+ "ws2812": {
+ "pin": "F7"
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "C6", "pin_b": "B6", "resolution": 2}
@@ -18,30 +29,30 @@
"layouts": {
"LAYOUT_ortho_5x4": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
+ {"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},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
+ {"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},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "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},
- {"x":0, "y":4},
- {"x":1, "y":4},
- {"x":2, "y":4},
- {"x":3, "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}
]
}
}
diff --git a/keyboards/ungodly/launch_pad/launch_pad.c b/keyboards/ungodly/launch_pad/launch_pad.c
index e5ec112f9b..9803d8674f 100644
--- a/keyboards/ungodly/launch_pad/launch_pad.c
+++ b/keyboards/ungodly/launch_pad/launch_pad.c
@@ -13,7 +13,7 @@
* 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 "launch_pad.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/ungodly/launch_pad/launch_pad.h b/keyboards/ungodly/launch_pad/launch_pad.h
deleted file mode 100644
index 7a7815f34f..0000000000
--- a/keyboards/ungodly/launch_pad/launch_pad.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright 2020 Ungodly Design <hello@ungodly.design>
- *
- * 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"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-/* 4x5 numpad matrix layout
- * ,-------------------.
- * | 00 | 01 | 02 | 03 |
- * |----|----|----|----|
- * | 10 | 11 | 12 | 13 |
- * |----|----|----|----|
- * | 20 | 21 | 22 | 23 |
- * |----|----|----|----|
- * | 30 | 31 | 32 | 33 |
- * |----|----|----|----|
- * | 40 | 41 | 42 | 43 |
- * `-------------------'
- */
-
- /* Numpad matrix layout
- * ,-------------------.
- * | 00 | 01 | 02 | 03 |
- * |----|----|----|----|
- * | 10 | 11 | 12 | 13 |
- * |----|----|----|----|
- * | 20 | 21 | 22 | 23 |
- * |----|----|----|----|
- * | 30 | 31 | 32 | |
- * |----|----|----| 33 |
- * | 41 | 42 | |
- * `-------------------'
- */
-
-#define LAYOUT_ortho_5x4( \
- k00, k01, k02, k03, \
- k10, k11, k12, k13, \
- k20, k21, k22, k23, \
- k30, k31, k32, k33, \
- k40, k41, k42, k43 \
-) \
-{ \
- {k00, k01, k02, k03}, \
- {k10, k11, k12, k13}, \
- {k20, k21, k22, k23}, \
- {k30, k31, k32, k33}, \
- {k40, k41, k42, k43} \
-}
diff --git a/keyboards/ungodly/launch_pad/rules.mk b/keyboards/ungodly/launch_pad/rules.mk
index 1177444e3e..5b696a9b07 100644
--- a/keyboards/ungodly/launch_pad/rules.mk
+++ b/keyboards/ungodly/launch_pad/rules.mk
@@ -15,7 +15,6 @@ OLED_ENABLE = yes
OLED_DRIVER = SSD1306
ENCODER_ENABLE = yes
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
SPACE_CADET_ENABLE = no
MAGIC_ENABLE = no
GRAVE_ESC_ENABLE = no
diff --git a/keyboards/ungodly/nines/nines.c b/keyboards/ungodly/nines/nines.c
deleted file mode 100644
index bfb3bb889d..0000000000
--- a/keyboards/ungodly/nines/nines.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2020 Ungodly Design <hello@ungodly.design>
- *
- * 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 "quantum.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
- if (!encoder_update_user(index, clockwise)) return false;
- if (index == 0) { /* Left encoder */
- if (clockwise) {
- tap_code(KC_VOLU);
- } else {
- tap_code(KC_VOLD);
- }
- } else if (index == 1) { /* Right encoder */
- if (clockwise) {
- tap_code(KC_VOLU);
- } else {
- tap_code(KC_VOLD);
- }
- }
- return true;
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 05:11:52 +0000