From 1067fcc4b5e369ff265eda4c606e85c31fe2baad Mon Sep 17 00:00:00 2001 From: Mark Date: Tue, 19 Dec 2023 12:04:38 -0800 Subject: [PATCH] Updated to QMK 0.23.1 --- docker/qmk_cli | 2 +- docker/qmk_firmware | 2 +- keyboards/betalupi_ergodox/config.h | 6 ++---- keyboards/betalupi_ergodox/features/beta_rawhid.h | 2 ++ keyboards/betalupi_ergodox/features/leader/leader.c | 2 +- .../keymaps/default/layers/definitions/main.h | 4 ++-- .../betalupi_ergodox/keymaps/default/layers/layers.c | 1 - .../betalupi_ergodox/keymaps/default/parts/tapdance.c | 8 ++++---- keyboards/betalupi_ergodox/rules.mk | 4 ++-- 9 files changed, 15 insertions(+), 16 deletions(-) diff --git a/docker/qmk_cli b/docker/qmk_cli index bb00940..aecd02e 160000 --- a/docker/qmk_cli +++ b/docker/qmk_cli @@ -1 +1 @@ -Subproject commit bb0094063183e31ce6a2d7a8ef73a00f67d89f1a +Subproject commit aecd02e850e060189dc0545b62a07ace835a805c diff --git a/docker/qmk_firmware b/docker/qmk_firmware index b56c0fa..0f341df 160000 --- a/docker/qmk_firmware +++ b/docker/qmk_firmware @@ -1 +1 @@ -Subproject commit b56c0fa67484b965f7efdbcc46e2e7c2571e367a +Subproject commit 0f341dfdd3e6de3c0a137dae8bbe2223e817c901 diff --git a/keyboards/betalupi_ergodox/config.h b/keyboards/betalupi_ergodox/config.h index bf0fbe9..4663650 100644 --- a/keyboards/betalupi_ergodox/config.h +++ b/keyboards/betalupi_ergodox/config.h @@ -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 diff --git a/keyboards/betalupi_ergodox/features/beta_rawhid.h b/keyboards/betalupi_ergodox/features/beta_rawhid.h index a4afd81..4c41538 100644 --- a/keyboards/betalupi_ergodox/features/beta_rawhid.h +++ b/keyboards/betalupi_ergodox/features/beta_rawhid.h @@ -1,6 +1,8 @@ #pragma once #include "raw_hid.h" +#define RAW_EPSIZE 32 + void raw_hid_receive(uint8_t *data, uint8_t length); diff --git a/keyboards/betalupi_ergodox/features/leader/leader.c b/keyboards/betalupi_ergodox/features/leader/leader.c index e7dfe01..dd6d5df 100644 --- a/keyboards/betalupi_ergodox/features/leader/leader.c +++ b/keyboards/betalupi_ergodox/features/leader/leader.c @@ -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(); diff --git a/keyboards/betalupi_ergodox/keymaps/default/layers/definitions/main.h b/keyboards/betalupi_ergodox/keymaps/default/layers/definitions/main.h index e7e6135..88d6875 100644 --- a/keyboards/betalupi_ergodox/keymaps/default/layers/definitions/main.h +++ b/keyboards/betalupi_ergodox/keymaps/default/layers/definitions/main.h @@ -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),\ \ diff --git a/keyboards/betalupi_ergodox/keymaps/default/layers/layers.c b/keyboards/betalupi_ergodox/keymaps/default/layers/layers.c index 942f87d..657583d 100644 --- a/keyboards/betalupi_ergodox/keymaps/default/layers/layers.c +++ b/keyboards/betalupi_ergodox/keymaps/default/layers/layers.c @@ -1,4 +1,3 @@ -#include "keymap.h" #include "extra_mappings.h" #define LAYER_INCLUDE_FILE "definitions/layers.inc" diff --git a/keyboards/betalupi_ergodox/keymaps/default/parts/tapdance.c b/keyboards/betalupi_ergodox/keymaps/default/parts/tapdance.c index 07baa66..9a57d6c 100644 --- a/keyboards/betalupi_ergodox/keymaps/default/parts/tapdance.c +++ b/keyboards/betalupi_ergodox/keymaps/default/parts/tapdance.c @@ -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), diff --git a/keyboards/betalupi_ergodox/rules.mk b/keyboards/betalupi_ergodox/rules.mk index c25153c..5ab4030 100644 --- a/keyboards/betalupi_ergodox/rules.mk +++ b/keyboards/betalupi_ergodox/rules.mk @@ -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 \ No newline at end of file +RGBLIGHT_DRIVER = ws2812 \ No newline at end of file