aboutsummaryrefslogtreecommitdiff
path: root/keyboards/primekb/meridian
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/primekb/meridian')
-rw-r--r--keyboards/primekb/meridian/info.json9
-rw-r--r--keyboards/primekb/meridian/keymaps/default/keymap.c2
-rw-r--r--keyboards/primekb/meridian/keymaps/via/keymap.c2
-rw-r--r--keyboards/primekb/meridian/ktr1010/keyboard.json (renamed from keyboards/primekb/meridian/ktr1010/info.json)0
-rw-r--r--keyboards/primekb/meridian/ktr1010/rules.mk0
-rw-r--r--keyboards/primekb/meridian/meridian.c4
-rw-r--r--keyboards/primekb/meridian/rules.mk13
-rw-r--r--keyboards/primekb/meridian/ws2812/keyboard.json (renamed from keyboards/primekb/meridian/ws2812/info.json)0
-rw-r--r--keyboards/primekb/meridian/ws2812/rules.mk0
9 files changed, 13 insertions, 17 deletions
diff --git a/keyboards/primekb/meridian/info.json b/keyboards/primekb/meridian/info.json
index e5192d6c49..1e62489211 100644
--- a/keyboards/primekb/meridian/info.json
+++ b/keyboards/primekb/meridian/info.json
@@ -8,6 +8,15 @@
"pid": "0x004D",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B11", "B10", "B2", "B1", "B0", "A7", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"],
"rows": ["A6", "A5", "A4", "A3", "A2"]
diff --git a/keyboards/primekb/meridian/keymaps/default/keymap.c b/keyboards/primekb/meridian/keymaps/default/keymap.c
index 6dfe00c87f..c5f467d01c 100644
--- a/keyboards/primekb/meridian/keymaps/default/keymap.c
+++ b/keyboards/primekb/meridian/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_RALT, KC_RGUI, KC_RGUI, KC_RCTL
),
[1] = LAYOUT_split_bs_rshift(
- QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC,
+ QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC,
_______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,
_______, KC_HOME, KC_PGDN, KC_END, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______,
diff --git a/keyboards/primekb/meridian/keymaps/via/keymap.c b/keyboards/primekb/meridian/keymaps/via/keymap.c
index 9d3113a831..bcbac63a0e 100644
--- a/keyboards/primekb/meridian/keymaps/via/keymap.c
+++ b/keyboards/primekb/meridian/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_RALT, KC_RGUI, KC_RGUI, KC_RCTL
),
[1] = LAYOUT_split_bs_rshift(
- QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC,
+ QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_BSPC,
_______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,
_______, KC_HOME, KC_PGDN, KC_END, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______,
diff --git a/keyboards/primekb/meridian/ktr1010/info.json b/keyboards/primekb/meridian/ktr1010/keyboard.json
index a9a9362ec9..a9a9362ec9 100644
--- a/keyboards/primekb/meridian/ktr1010/info.json
+++ b/keyboards/primekb/meridian/ktr1010/keyboard.json
diff --git a/keyboards/primekb/meridian/ktr1010/rules.mk b/keyboards/primekb/meridian/ktr1010/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/primekb/meridian/ktr1010/rules.mk
+++ /dev/null
diff --git a/keyboards/primekb/meridian/meridian.c b/keyboards/primekb/meridian/meridian.c
index c2f740dd14..585769e462 100644
--- a/keyboards/primekb/meridian/meridian.c
+++ b/keyboards/primekb/meridian/meridian.c
@@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//Initialize B12 for in-switch caps lock
void keyboard_pre_init_kb(void){
- setPinOutput(B12);
+ gpio_set_pin_output(B12);
keyboard_pre_init_user();
}
@@ -35,7 +35,7 @@ void keyboard_post_init_user(void) {
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if (res) {
- // writePin(B12, !led_state.caps_lock); //Un-comment this line to enable in-switch capslock indicator
+ // gpio_write_pin(B12, !led_state.caps_lock); //Un-comment this line to enable in-switch capslock indicator
if (led_state.caps_lock) {
rgblight_setrgb_at(0, 255, 0, 0); //green
} else {
diff --git a/keyboards/primekb/meridian/rules.mk b/keyboards/primekb/meridian/rules.mk
index 6d34cadbf7..585a04ad28 100644
--- a/keyboards/primekb/meridian/rules.mk
+++ b/keyboards/primekb/meridian/rules.mk
@@ -1,14 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
DEFAULT_FOLDER = primekb/meridian/ktr1010
diff --git a/keyboards/primekb/meridian/ws2812/info.json b/keyboards/primekb/meridian/ws2812/keyboard.json
index 4299d367c2..4299d367c2 100644
--- a/keyboards/primekb/meridian/ws2812/info.json
+++ b/keyboards/primekb/meridian/ws2812/keyboard.json
diff --git a/keyboards/primekb/meridian/ws2812/rules.mk b/keyboards/primekb/meridian/ws2812/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/primekb/meridian/ws2812/rules.mk
+++ /dev/null