mirrors/qmk_userspace
Watch
1
0
Fork
You've already forked qmk_userspace
 1
mirror of https://github.com/qmk/qmk_userspace.git synced 2026-07-25 03:03:36 -04:00
Code Issues Projects Releases Packages Wiki Activity

more bugfixes

Browse source
This commit is contained in:
Jenn Sears 2026-06-24 17:57:46 -04:00
commit d917d27cef
5 changed files with 15 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

3
keyboards/boardsource/unicorne/keymaps/unicorne_choc/keymap.c
View file

@ -274,7 +274,8 @@ bool oled_task_user(void) {
break; break;
} }
} else { } else {
oled_write_raw(logo, sizeof(logo)); // oled_write_raw(logo, sizeof(logo));
oled_write_raw_P(bs_logo_img, sizeof(bs_logo_img));
} }
return false; return false;
} }

6
keyboards/boardsource/unicorne/keymaps/unicorne_mx/keymap.c
View file

@ -271,7 +271,8 @@ layer_state_t layer_state_set_user(layer_state_t state) {
rgb_matrix_sethsv(HSV_RED); rgb_matrix_sethsv(HSV_RED);
break; break;
case _SPCHRS: case _SPCHRS:
rgb_matrix_set_color(i, HSV_YELLOW); // rgb_matrix_set_color(i, HSV_YELLOW);
rgb_matrix_sethsv(HSV_YELLOW);
break; break;
} }
return state; return state;
@ -310,7 +311,8 @@ bool oled_task_user(void) {
oled_write_ln_P(PSTR("Undefined"), false); oled_write_ln_P(PSTR("Undefined"), false);
} }
} else { } else {
oled_write_raw(logo, sizeof(logo)); // oled_write_raw(logo, sizeof(logo));
oled_write_raw_P(bs_logo_img, sizeof(bs_logo_img));
} }
return false; return false;
} }

15
keyboards/planck/rev7/keymaps/default/config.h
View file

@ -16,29 +16,20 @@
#pragma once #pragma once
// Customized by markstos
#define TAPPING_TERM 200 #define TAPPING_TERM 200
#define TAPPING_TERM_PER_KEY #define TAPPING_TERM_PER_KEY
// used for Tapping Term on thumb keys
#define TAPPING_TERM_THUMB 125 #define TAPPING_TERM_THUMB 125
// If you press a dual-role key, press another key, and then release the
// dual-role key, all within the tapping term, by default the dual-role key
// will perform its tap action. If the HOLD_ON_OTHER_KEY_PRESS option is
// enabled, the dual-role key will perform its hold action instead.
#define HOLD_ON_OTHER_KEY_PRESS #define HOLD_ON_OTHER_KEY_PRESS
// markstos: prevent keydown and keyup from firing on different layers
#define PREVENT_STUCK_MODIFER #define PREVENT_STUCK_MODIFER
// When enabled, typing a mod-tap plus second within term will register as the mod-combo
// Ref: https://beta.docs.qmk.fm/using-qmk/software-features/tap_hold#permissive-hold
#define PERMISSIVE_HOLD #define PERMISSIVE_HOLD
#define COMBO_COUNT 3 #define COMBO_ENABLE
#define COMBO_COUNT 1
// Set the COMBO_TERM so low that I won't type the keys one after each other during normal typing.
// They would have be held together intentionally to trigger this.
#define COMBO_TERM 40 #define COMBO_TERM 40
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE

27
keyboards/planck/rev7/keymaps/default/keymap.c
View file

@ -1,19 +1,3 @@
/* Copyright 2015-2023 Jack Humbert
*
* 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 QMK_KEYBOARD_H #include QMK_KEYBOARD_H
enum planck_layers { _QWERTY, _COLEMAK, _COLEMAKDH, _DVORAK, _LOWER, _RAISE, _FUNC, _PLOVER, _ADJUST }; enum planck_layers { _QWERTY, _COLEMAK, _COLEMAKDH, _DVORAK, _LOWER, _RAISE, _FUNC, _PLOVER, _ADJUST };
@ -23,22 +7,19 @@ enum planck_keycodes { QWERTY = SAFE_RANGE, COLEMAK, COLEMAKDH, DVORAK, PLOVER,
enum combos { enum combos {
JK_ESC JK_ESC
}; };
const uint16_t PROGMEM jk_combo[] = {KC_J, KC_K, COMBO_END}; const uint16_t PROGMEM jk_combo[] = {KC_J, KC_K, COMBO_END};
combo_t key_combos[COMBO_COUNT] = { combo_t key_combos[COMBO_COUNT] = {
// For Vim, put Escape on the home row
[JK_ESC] = COMBO(jk_combo, KC_ESC), [JK_ESC] = COMBO(jk_combo, KC_ESC),
}; };
// Tap Dance declarations enum tapdances {
enum {
TD_SPC_ENT, TD_SPC_ENT,
}; };
// Tap Dance definitions qk_tap_dance_action_t tap_dance_actions[] = {
tap_dance_action_t tap_dance_actions[] = {
// Tap once for Space, twice for Enter Lock
[TD_SPC_ENT] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_ENT), [TD_SPC_ENT] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_ENT),
}; };
@ -46,7 +27,6 @@ tap_dance_action_t tap_dance_actions[] = {
#define LOWER MO(_LOWER) #define LOWER MO(_LOWER)
#define RAISE MO(_RAISE) #define RAISE MO(_RAISE)
// For _QWERTY layer
#define OSL_FUN OSL(_FUNC) #define OSL_FUN OSL(_FUNC)
#define LOW_TAB LT(_LOWER, KC_TAB) #define LOW_TAB LT(_LOWER, KC_TAB)
#define RSE_BSP LT(_RAISE, KC_BSPC) #define RSE_BSP LT(_RAISE, KC_BSPC)
@ -56,7 +36,6 @@ tap_dance_action_t tap_dance_actions[] = {
#define OSM_CTL OSM(MOD_LCTL) #define OSM_CTL OSM(MOD_LCTL)
#define OSM_GUI OSM(MOD_LGUI) #define OSM_GUI OSM(MOD_LGUI)
// For _LOWER layer
#define ALT_TAB LALT(KC_TAB) #define ALT_TAB LALT(KC_TAB)
/* clang-format off */ /* clang-format off */

13
keyboards/planck/rev7/keymaps/default/rules.mk
View file

@ -1,15 +1,8 @@
# COMBO_ENABLE = yes
DEFERRED_EXEC_ENABLE = yes DEFERRED_EXEC_ENABLE = yes
# markstos: smaller file size, little down-side
LINK_TIME_OPTIMIZATION_ENABLE = yes LINK_TIME_OPTIMIZATION_ENABLE = yes
# markstos: for combos!
COMBO_ENABLE = yes
TAP_DANCE_ENABLE = yes TAP_DANCE_ENABLE = yes
EXTRAKEY_ENABLE = yes EXTRAKEY_ENABLE = yes
#BOOTMAGIC_ENABLE = yes
CONSOLE_ENABLE = yes CONSOLE_ENABLE = no
COMMAND_ENABLE = no COMMAND_ENABLE = no
#ENCODER_ENABLE = no
#RGB_MATRIX_ENABLE = yes
#VIA_ENABLE = no