summaryrefslogtreecommitdiff
path: root/keyboards/handwired/myskeeb
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/handwired/myskeeb')
-rw-r--r--keyboards/handwired/myskeeb/config.h12
-rw-r--r--keyboards/handwired/myskeeb/info.json142
-rw-r--r--keyboards/handwired/myskeeb/keymaps/default/keymap.c10
-rw-r--r--keyboards/handwired/myskeeb/myskeeb.c1
-rw-r--r--keyboards/handwired/myskeeb/myskeeb.h24
-rw-r--r--keyboards/handwired/myskeeb/rules.mk6
6 files changed, 79 insertions, 116 deletions
diff --git a/keyboards/handwired/myskeeb/config.h b/keyboards/handwired/myskeeb/config.h
index 06e8782290..b88e3f0d48 100644
--- a/keyboards/handwired/myskeeb/config.h
+++ b/keyboards/handwired/myskeeb/config.h
@@ -1,11 +1,5 @@
#pragma once
-#include "config_common.h"
-
-// Key Matrix Size //
-// Rows are Doubled-up
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 7
// Wiring of Each Half
#define DIODE_DIRECTION COL2ROW
@@ -15,7 +9,6 @@
// Comunication and Split Detection
-#define SOFT_SERIAL_PIN D3
#define SELECT_SOFT_SERIAL_SPEED 1
#define SPLIT_USB_DETECT
#define EE_HANDS
@@ -31,8 +24,3 @@
// Tap Dance
#define TAPPING_TERM 200
-
-// Other
-
-#define DEBOUNCE 0
-
diff --git a/keyboards/handwired/myskeeb/info.json b/keyboards/handwired/myskeeb/info.json
index 8aff23d617..750645d6f4 100644
--- a/keyboards/handwired/myskeeb/info.json
+++ b/keyboards/handwired/myskeeb/info.json
@@ -8,88 +8,94 @@
"pid": "0x6060",
"device_version": "1.0.0"
},
+ "split": {
+ "soft_serial_pin": "D3"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "debounce": 0,
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":1, "w":1.5},
- {"x":1.5, "y":0.75},
- {"x":2.5, "y":0.25},
- {"x":3.5, "y":0},
- {"x":4.5, "y":0.25},
- {"x":5.5, "y":0.75},
- {"x":6.5, "y":1},
+ {"x":0, "y":1, "w":1.5, "matrix": [0, 0]},
+ {"x":1.5, "y":0.75, "matrix": [0, 1]},
+ {"x":2.5, "y":0.25, "matrix": [0, 2]},
+ {"x":3.5, "y":0, "matrix": [0, 3]},
+ {"x":4.5, "y":0.25, "matrix": [0, 4]},
+ {"x":5.5, "y":0.75, "matrix": [0, 5]},
+ {"x":6.5, "y":1, "matrix": [0, 6]},
- {"x":9.5, "y":1},
- {"x":10.5, "y":0.75},
- {"x":11.5, "y":0.25},
- {"x":12.5, "y":0},
- {"x":13.5, "y":0.25},
- {"x":14.5, "y":0.75},
- {"x":15.5, "y":1, "w":1.5},
+ {"x":9.5, "y":1, "matrix": [5, 0]},
+ {"x":10.5, "y":0.75, "matrix": [5, 1]},
+ {"x":11.5, "y":0.25, "matrix": [5, 2]},
+ {"x":12.5, "y":0, "matrix": [5, 3]},
+ {"x":13.5, "y":0.25, "matrix": [5, 4]},
+ {"x":14.5, "y":0.75, "matrix": [5, 5]},
+ {"x":15.5, "y":1, "w":1.5, "matrix": [5, 6]},
- {"x":0, "y":2, "w":1.5},
- {"x":1.5, "y":1.75},
- {"x":2.5, "y":1.25},
- {"x":3.5, "y":1},
- {"x":4.5, "y":1.25},
- {"x":5.5, "y":1.75},
- {"x":6.5, "y":2, "h":1.5},
+ {"x":0, "y":2, "w":1.5, "matrix": [1, 0]},
+ {"x":1.5, "y":1.75, "matrix": [1, 1]},
+ {"x":2.5, "y":1.25, "matrix": [1, 2]},
+ {"x":3.5, "y":1, "matrix": [1, 3]},
+ {"x":4.5, "y":1.25, "matrix": [1, 4]},
+ {"x":5.5, "y":1.75, "matrix": [1, 5]},
+ {"x":6.5, "y":2, "h":1.5, "matrix": [1, 6]},
- {"x":9.5, "y":2, "h":1.5},
- {"x":10.5, "y":1.75},
- {"x":11.5, "y":1.25},
- {"x":12.5, "y":1},
- {"x":13.5, "y":1.25},
- {"x":14.5, "y":1.75},
- {"x":15.5, "y":2, "w":1.5},
+ {"x":9.5, "y":2, "h":1.5, "matrix": [6, 0]},
+ {"x":10.5, "y":1.75, "matrix": [6, 1]},
+ {"x":11.5, "y":1.25, "matrix": [6, 2]},
+ {"x":12.5, "y":1, "matrix": [6, 3]},
+ {"x":13.5, "y":1.25, "matrix": [6, 4]},
+ {"x":14.5, "y":1.75, "matrix": [6, 5]},
+ {"x":15.5, "y":2, "w":1.5, "matrix": [6, 6]},
- {"x":0, "y":3, "w":1.5},
- {"x":1.5, "y":2.75},
- {"x":2.5, "y":2.25},
- {"x":3.5, "y":2},
- {"x":4.5, "y":2.25},
- {"x":5.5, "y":2.75},
+ {"x":0, "y":3, "w":1.5, "matrix": [2, 0]},
+ {"x":1.5, "y":2.75, "matrix": [2, 1]},
+ {"x":2.5, "y":2.25, "matrix": [2, 2]},
+ {"x":3.5, "y":2, "matrix": [2, 3]},
+ {"x":4.5, "y":2.25, "matrix": [2, 4]},
+ {"x":5.5, "y":2.75, "matrix": [2, 5]},
- {"x":10.5, "y":2.75},
- {"x":11.5, "y":2.25},
- {"x":12.5, "y":2},
- {"x":13.5, "y":2.25},
- {"x":14.5, "y":2.75},
- {"x":15.5, "y":3, "w":1.5},
+ {"x":10.5, "y":2.75, "matrix": [7, 1]},
+ {"x":11.5, "y":2.25, "matrix": [7, 2]},
+ {"x":12.5, "y":2, "matrix": [7, 3]},
+ {"x":13.5, "y":2.25, "matrix": [7, 4]},
+ {"x":14.5, "y":2.75, "matrix": [7, 5]},
+ {"x":15.5, "y":3, "w":1.5, "matrix": [7, 6]},
- {"x":0, "y":4, "w":1.5},
- {"x":1.5, "y":3.75},
- {"x":2.5, "y":3.25},
- {"x":3.5, "y":3},
- {"x":4.5, "y":3.25},
- {"x":5.5, "y":3.75},
- {"x":6.5, "y":3.5, "h":1.5},
+ {"x":0, "y":4, "w":1.5, "matrix": [3, 0]},
+ {"x":1.5, "y":3.75, "matrix": [3, 1]},
+ {"x":2.5, "y":3.25, "matrix": [3, 2]},
+ {"x":3.5, "y":3, "matrix": [3, 3]},
+ {"x":4.5, "y":3.25, "matrix": [3, 4]},
+ {"x":5.5, "y":3.75, "matrix": [3, 5]},
+ {"x":6.5, "y":3.5, "h":1.5, "matrix": [3, 6]},
- {"x":9.5, "y":3.5, "h":1.5},
- {"x":10.5, "y":3.75},
- {"x":11.5, "y":3.25},
- {"x":12.5, "y":3},
- {"x":13.5, "y":3.25},
- {"x":14.5, "y":3.75},
- {"x":15.5, "y":4, "w":1.5},
+ {"x":9.5, "y":3.5, "h":1.5, "matrix": [8, 0]},
+ {"x":10.5, "y":3.75, "matrix": [8, 1]},
+ {"x":11.5, "y":3.25, "matrix": [8, 2]},
+ {"x":12.5, "y":3, "matrix": [8, 3]},
+ {"x":13.5, "y":3.25, "matrix": [8, 4]},
+ {"x":14.5, "y":3.75, "matrix": [8, 5]},
+ {"x":15.5, "y":4, "w":1.5, "matrix": [8, 6]},
- {"x":0.25, "y":5},
- {"x":1.5, "y":4.75},
- {"x":2.5, "y":4.25},
- {"x":3.5, "y":4},
+ {"x":0.25, "y":5, "matrix": [4, 0]},
+ {"x":1.5, "y":4.75, "matrix": [4, 1]},
+ {"x":2.5, "y":4.25, "matrix": [4, 2]},
+ {"x":3.5, "y":4, "matrix": [4, 3]},
- {"x":5, "y":6},
- {"x":6, "y":5.5, "h":2},
- {"x":7, "y":5.5, "h":2},
+ {"x":5, "y":6, "matrix": [4, 4]},
+ {"x":6, "y":5.5, "h":2, "matrix": [4, 5]},
+ {"x":7, "y":5.5, "h":2, "matrix": [4, 6]},
- {"x":9, "y":5.5, "h":2},
- {"x":10, "y":5.5, "h":2},
- {"x":11, "y":6},
+ {"x":9, "y":5.5, "h":2, "matrix": [9, 0]},
+ {"x":10, "y":5.5, "h":2, "matrix": [9, 1]},
+ {"x":11, "y":6, "matrix": [9, 2]},
- {"x":12.5, "y":4},
- {"x":13.5, "y":4.25},
- {"x":14.5, "y":4.75},
- {"x":15.75, "y":5}
+ {"x":12.5, "y":4, "matrix": [9, 3]},
+ {"x":13.5, "y":4.25, "matrix": [9, 4]},
+ {"x":14.5, "y":4.75, "matrix": [9, 5]},
+ {"x":15.75, "y":5, "matrix": [9, 6]}
]
}
}
diff --git a/keyboards/handwired/myskeeb/keymaps/default/keymap.c b/keyboards/handwired/myskeeb/keymaps/default/keymap.c
index ee0ead3664..d3a8ba20e8 100644
--- a/keyboards/handwired/myskeeb/keymaps/default/keymap.c
+++ b/keyboards/handwired/myskeeb/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ enum {
};
// Tap Dance Functions
-void tri_open(qk_tap_dance_state_t *state, void *user_data) {
+void tri_open(tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
tap_code16(KC_LPRN);
} else if (state->count == 2) {
@@ -22,7 +22,7 @@ void tri_open(qk_tap_dance_state_t *state, void *user_data) {
}
}
-void tri_close(qk_tap_dance_state_t *state, void *user_data) {
+void tri_close(tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
tap_code16(KC_RPRN);
} else if (state->count == 2) {
@@ -32,7 +32,7 @@ void tri_close(qk_tap_dance_state_t *state, void *user_data) {
}
}
-void dquote(qk_tap_dance_state_t *state, void *user_data) {
+void dquote(tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
if (state->interrupted)
tap_code(KC_QUOT);
@@ -44,7 +44,7 @@ void dquote(qk_tap_dance_state_t *state, void *user_data) {
}
}
-void tilded(qk_tap_dance_state_t *state, void *user_data) {
+void tilded(tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
if (state->interrupted)
tap_code16(KC_TILD);
@@ -55,7 +55,7 @@ void tilded(qk_tap_dance_state_t *state, void *user_data) {
}
}
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[OP_QT] = ACTION_TAP_DANCE_FN(tri_open),
[CL_QT] = ACTION_TAP_DANCE_FN(tri_close),
[TD_DQ] = ACTION_TAP_DANCE_FN(dquote),
diff --git a/keyboards/handwired/myskeeb/myskeeb.c b/keyboards/handwired/myskeeb/myskeeb.c
deleted file mode 100644
index 00f6e329e1..0000000000
--- a/keyboards/handwired/myskeeb/myskeeb.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "myskeeb.h"
diff --git a/keyboards/handwired/myskeeb/myskeeb.h b/keyboards/handwired/myskeeb/myskeeb.h
deleted file mode 100644
index 208258b77b..0000000000
--- a/keyboards/handwired/myskeeb/myskeeb.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
- L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { L10, L11, L12, L13, L14, L15, L16 }, \
- { L20, L21, L22, L23, L24, L25, XXX }, \
- { L30, L31, L32, L33, L34, L35, L36 }, \
- { L40, L41, L42, L43, L44, L45, L46 }, \
- { R00, R01, R02, R03, R04, R05, R06 }, \
- { R10, R11, R12, R13, R14, R15, R16 }, \
- { XXX, R21, R22, R23, R24, R25, R26 }, \
- { R30, R31, R32, R33, R34, R35, R36 }, \
- { R40, R41, R42, R43, R44, R45, R46 } \
- }
-
diff --git a/keyboards/handwired/myskeeb/rules.mk b/keyboards/handwired/myskeeb/rules.mk
index d694be736f..a67d345674 100644
--- a/keyboards/handwired/myskeeb/rules.mk
+++ b/keyboards/handwired/myskeeb/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
# Build Options
# change yes to no to disable
#
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 01:05:09 +0000