summaryrefslogtreecommitdiff
path: root/keyboards/yatara
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/yatara')
-rw-r--r--keyboards/yatara/drink_me/config.h28
-rw-r--r--keyboards/yatara/drink_me/drink_me.c17
-rw-r--r--keyboards/yatara/drink_me/drink_me.h25
-rw-r--r--keyboards/yatara/drink_me/info.json31
-rw-r--r--keyboards/yatara/drink_me/keymaps/queen/keymap.c10
-rw-r--r--keyboards/yatara/drink_me/rules.mk6
6 files changed, 16 insertions, 101 deletions
diff --git a/keyboards/yatara/drink_me/config.h b/keyboards/yatara/drink_me/config.h
deleted file mode 100644
index 51d03c58e2..0000000000
--- a/keyboards/yatara/drink_me/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2020 Yatara
- *
- * 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 "config_common.h"
-
-/* Key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 4
-
-/* Pinout */
-#define DIRECT_PINS { \
- {B4, B5, B6, B7} \
-}
diff --git a/keyboards/yatara/drink_me/drink_me.c b/keyboards/yatara/drink_me/drink_me.c
deleted file mode 100644
index d5cac311ae..0000000000
--- a/keyboards/yatara/drink_me/drink_me.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Yatara
- *
- * 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 "drink_me.h"
diff --git a/keyboards/yatara/drink_me/drink_me.h b/keyboards/yatara/drink_me/drink_me.h
deleted file mode 100644
index 9ed6dbf2ea..0000000000
--- a/keyboards/yatara/drink_me/drink_me.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2020 Yatara
- *
- * 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( \
- K00, K01, K02, K03 \
-) { \
- { K00, K01, K02, K03 } \
-}
diff --git a/keyboards/yatara/drink_me/info.json b/keyboards/yatara/drink_me/info.json
index bb6f3de695..78838f143a 100644
--- a/keyboards/yatara/drink_me/info.json
+++ b/keyboards/yatara/drink_me/info.json
@@ -8,29 +8,20 @@
"pid": "0x1470",
"device_version": "0.0.1"
},
+ "processor": "atmega32u2",
+ "bootloader": "atmel-dfu",
+ "matrix_pins": {
+ "direct": [
+ ["B4", "B5", "B6", "B7"]
+ ]
+ },
"layouts": {
"LAYOUT": {
"layout": [
- {
- "label": "K0",
- "x": 0,
- "y": 0
- },
- {
- "label": "K1",
- "x": 1,
- "y": 0
- },
- {
- "label": "K2",
- "x": 2,
- "y": 0
- },
- {
- "label": "K3",
- "x": 3,
- "y": 0
- }
+ {"x": 0, "y": 0, "matrix": [0, 0]},
+ {"x": 1, "y": 0, "matrix": [0, 1]},
+ {"x": 2, "y": 0, "matrix": [0, 2]},
+ {"x": 3, "y": 0, "matrix": [0, 3]}
]
}
}
diff --git a/keyboards/yatara/drink_me/keymaps/queen/keymap.c b/keyboards/yatara/drink_me/keymaps/queen/keymap.c
index 2d99b38663..806dae3fcd 100644
--- a/keyboards/yatara/drink_me/keymaps/queen/keymap.c
+++ b/keyboards/yatara/drink_me/keymaps/queen/keymap.c
@@ -9,7 +9,7 @@ enum td_keys {
};
-void td_spade_lnx (qk_tap_dance_state_t *state, void *user_data) {
+void td_spade_lnx (tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
register_unicode(0x2660); // ♠
} else {
@@ -19,7 +19,7 @@ void td_spade_lnx (qk_tap_dance_state_t *state, void *user_data) {
}
-void td_diamond_osx (qk_tap_dance_state_t *state, void *user_data) {
+void td_diamond_osx (tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
register_unicode(0x2666); // ♦
} else {
@@ -29,7 +29,7 @@ void td_diamond_osx (qk_tap_dance_state_t *state, void *user_data) {
}
-void td_club_win (qk_tap_dance_state_t *state, void *user_data) {
+void td_club_win (tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
register_unicode(0x2663); // ♣
} else {
@@ -39,7 +39,7 @@ void td_club_win (qk_tap_dance_state_t *state, void *user_data) {
}
-void td_heart_winc (qk_tap_dance_state_t *state, void *user_data) {
+void td_heart_winc (tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
register_unicode(0x2665); // ♥
} else {
@@ -49,7 +49,7 @@ void td_heart_winc (qk_tap_dance_state_t *state, void *user_data) {
}
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[TD_K0] = ACTION_TAP_DANCE_FN(td_spade_lnx),
[TD_K1] = ACTION_TAP_DANCE_FN(td_diamond_osx),
[TD_K2] = ACTION_TAP_DANCE_FN(td_club_win),
diff --git a/keyboards/yatara/drink_me/rules.mk b/keyboards/yatara/drink_me/rules.mk
index 6dc87e01cb..29f6808ed5 100644
--- a/keyboards/yatara/drink_me/rules.mk
+++ b/keyboards/yatara/drink_me/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u2
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#