Mark
/
QMK
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Updated to QMK 0.23.1

master
Mark 2023-12-19 12:04:38 -08:00
parent 7cb29a6bba
commit 1067fcc4b5
No known key found for this signature in database
GPG Key ID: B4DF96450FAAD9F2
9 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/qmk_cli

@ -1 +1 @@
Subproject commit bb0094063183e31ce6a2d7a8ef73a00f67d89f1a
Subproject commit aecd02e850e060189dc0545b62a07ace835a805c

2
docker/qmk_firmware

@ -1 +1 @@
Subproject commit b56c0fa67484b965f7efdbcc46e2e7c2571e367a
Subproject commit 0f341dfdd3e6de3c0a137dae8bbe2223e817c901

6
keyboards/betalupi_ergodox/config.h
View File

@ -1,6 +1,4 @@
#pragma once
#include "config_common.h"
// USB parameters
@ -50,7 +48,7 @@
// with keys that convert to other keys on hold
// (z becomes ctrl when you hold it, and when this option isn't
// enabled, z rapidly followed by x actually sends Ctrl-x)
#define IGNORE_MOD_TAP_INTERRUPT
//#define IGNORE_MOD_TAP_INTERRUPT
#define MOUSEKEY_INTERVAL 20
#define MOUSEKEY_DELAY 0
@ -71,7 +69,7 @@
// RGBLight (Underglow) config
#define RGBLED_NUM 8
#define RGB_DI_PIN D7
#define WS2812_DI_PIN D7
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 16

2
keyboards/betalupi_ergodox/features/beta_rawhid.h
View File

@ -1,6 +1,8 @@
#pragma once
#include "raw_hid.h"
#define RAW_EPSIZE 32
void raw_hid_receive(uint8_t *data, uint8_t length);

2
keyboards/betalupi_ergodox/features/leader/leader.c
View File

@ -43,7 +43,7 @@ void beta_qk_leader_check() {
beta_leader_change = false;
if (
beta_leader_sequence[beta_leader_sequence_size - 1] == (KC_LEAD)
beta_leader_sequence[beta_leader_sequence_size - 1] == (QK_LEAD)
) {
beta_leading = false;
beta_leader_end();

4
keyboards/betalupi_ergodox/keymaps/default/layers/definitions/main.h
View File

@ -10,7 +10,7 @@
#ifdef BETA_LAYER_KEYS
#define BETA_LAYER_CONTEXT_DATA LAYOUT_ergodox(\
KC_ESCAPE, KC_1, KC_2, KC_3, KC_4, KC_5, TO(LAYER_NUMBERS),\
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LEAD, \
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, QK_LEAD, \
KC_DELETE, KC_A, KC_S, KC_D, KC_F, KC_G,\
KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LALT,\
OSL(LAYER_DESKTOP), KC_NO, KC_NO, KC_LSFT, MO(LAYER_ARROWS),\
@ -22,7 +22,7 @@
\
KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0, LGUI(KC_TAB),\
KC_NO, KC_Y, KC_U, KC_I, KC_O, KC_NO, KC_NO,\
KC_H, KC_J, KC_K, MO(LAYER_SYMBOLS), KC_L, KC_LEAD,\
KC_H, KC_J, KC_K, MO(LAYER_SYMBOLS), KC_L, QK_LEAD,\
KC_NO, KC_N, KC_M, KC_P, KC_NO, KC_NO, KC_NO,\
KC_RIGHT, KC_NO, KC_NO, KC_NO, LGUI(KC_SPACE),\
\

1
keyboards/betalupi_ergodox/keymaps/default/layers/layers.c
View File

@ -1,4 +1,3 @@
#include "keymap.h"
#include "extra_mappings.h"
#define LAYER_INCLUDE_FILE "definitions/layers.inc"

8
keyboards/betalupi_ergodox/keymaps/default/parts/tapdance.c
View File

@ -1,4 +1,4 @@
void td_screenshot(qk_tap_dance_state_t *state, void *user_data) {
void td_screenshot(tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
tap_code16(KC_PSCR);
} else if (state->count == 2) {
@ -10,7 +10,7 @@ void td_screenshot(qk_tap_dance_state_t *state, void *user_data) {
}
}
void td_ocr(qk_tap_dance_state_t *state, void *user_data) {
void td_ocr(tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
tap_code16(LCTL(KC_PSCR));
} else if (state->count == 2) {
@ -20,7 +20,7 @@ void td_ocr(qk_tap_dance_state_t *state, void *user_data) {
}
}
void td_wmlayout(qk_tap_dance_state_t *state, void *user_data) {
void td_wmlayout(tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
tap_code16(LGUI(KC_COMMA));
} else if (state->count == 2) {
@ -30,7 +30,7 @@ void td_wmlayout(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_WMLAYOUT] = ACTION_TAP_DANCE_FN(td_wmlayout),
[TD_SCREENSHOT] = ACTION_TAP_DANCE_FN(td_screenshot),
[TD_OCR] = ACTION_TAP_DANCE_FN(td_ocr),

4
keyboards/betalupi_ergodox/rules.mk
View File

@ -62,6 +62,6 @@ RGB_MATRIX_CUSTOM_KB = yes
# FROM glow dir
RGB_MATRIX_ENABLE = yes
RGB_MATRIX_DRIVER = IS31FL3731
RGB_MATRIX_DRIVER = is31fl3731
RGBLIGHT_ENABLE = yes
RGBLIGHT_DRIVER = WS2812
RGBLIGHT_DRIVER = ws2812