summaryrefslogtreecommitdiffstats
path: root/keyboards/7c8/framework
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/7c8/framework')
-rw-r--r--keyboards/7c8/framework/config.h2
-rw-r--r--keyboards/7c8/framework/info.json2
-rw-r--r--keyboards/7c8/framework/keymaps/steven/keymap.c55
-rw-r--r--keyboards/7c8/framework/rules.mk6
4 files changed, 26 insertions, 39 deletions
diff --git a/keyboards/7c8/framework/config.h b/keyboards/7c8/framework/config.h
index 5ed43862cc..4519e6391c 100644
--- a/keyboards/7c8/framework/config.h
+++ b/keyboards/7c8/framework/config.h
@@ -15,7 +15,6 @@
*/
#pragma once
-#include "config_common.h"
#define MATRIX_ROWS 10
#define MATRIX_COLS 6
@@ -28,7 +27,6 @@
#define ENCODER_RESOLUTION 4
#define TAP_CODE_DELAY 16
#define DIODE_DIRECTION COL2ROW
-#define DEBOUNCE 5
#define LEADER_TIMEOUT 250
#define LEADER_PER_KEY_TIMING 150
diff --git a/keyboards/7c8/framework/info.json b/keyboards/7c8/framework/info.json
index 1a2c0b300b..a9871f7745 100644
--- a/keyboards/7c8/framework/info.json
+++ b/keyboards/7c8/framework/info.json
@@ -8,6 +8,8 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "processor": "atmega328p",
+ "bootloader": "usbasploader",
"layouts": {
"LAYOUT_ortho_5x12": {
"layout": [
diff --git a/keyboards/7c8/framework/keymaps/steven/keymap.c b/keyboards/7c8/framework/keymaps/steven/keymap.c
index f39be10c2d..5cba63e0fa 100644
--- a/keyboards/7c8/framework/keymaps/steven/keymap.c
+++ b/keyboards/7c8/framework/keymaps/steven/keymap.c
@@ -78,42 +78,35 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
-LEADER_EXTERNS();
-
-void matrix_scan_user(void) {
- LEADER_DICTIONARY() {
- leading = false;
- leader_end();
-
- // qq, alt+f4 close window
- SEQ_TWO_KEYS(KC_Q, KC_Q) {
- tap_code16(A(KC_F4));
- }
+void leader_end_user(void) {
+ // qq, alt+f4 close window
+ if (leader_sequence_two_keys(KC_Q, KC_Q)) {
+ tap_code16(A(KC_F4));
+ }
- // ee, open explorer
- SEQ_TWO_KEYS(KC_E, KC_E) {
- tap_code16(G(KC_E));
- }
+ // ee, open explorer
+ if (leader_sequence_two_keys(KC_E, KC_E)) {
+ tap_code16(G(KC_E));
+ }
- // rr, windows run prompt
- SEQ_TWO_KEYS(KC_R, KC_R) {
- tap_code16(G(KC_R));
- }
+ // rr, windows run prompt
+ if (leader_sequence_two_keys(KC_R, KC_R)) {
+ tap_code16(G(KC_R));
+ }
- // ww, maximize window
- SEQ_TWO_KEYS(KC_W, KC_W) {
- tap_code16(G(KC_UP));
- }
+ // ww, maximize window
+ if (leader_sequence_two_keys(KC_W, KC_W)) {
+ tap_code16(G(KC_UP));
+ }
- // ss, minimize window
- SEQ_TWO_KEYS(KC_S, KC_S) {
- tap_code16(G(KC_DOWN));
- }
+ // ss, minimize window
+ if (leader_sequence_two_keys(KC_S, KC_S)) {
+ tap_code16(G(KC_DOWN));
+ }
- // <space><space>, toggle desktop
- SEQ_TWO_KEYS(KC_SPC, KC_SPC) {
- tap_code16(G(KC_D));
- }
+ // <space><space>, toggle desktop
+ if (leader_sequence_two_keys(KC_SPC, KC_SPC)) {
+ tap_code16(G(KC_D));
}
}
diff --git a/keyboards/7c8/framework/rules.mk b/keyboards/7c8/framework/rules.mk
index 797b8072ca..8e856a5336 100644
--- a/keyboards/7c8/framework/rules.mk
+++ b/keyboards/7c8/framework/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega328p
-
-# Bootloader selection
-BOOTLOADER = usbasploader
-
# Build Options
# change yes to no to disable
#