Skip to content

Commit 824b050

Browse files
author
MATOBA Akihiro
committed
use bootmagic_lite instead of bootmagic_full
1 parent e0e2144 commit 824b050

4 files changed

Lines changed: 45 additions & 12 deletions

File tree

firmware/keyboards/braille/keymaps/default/config.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,3 @@
2020

2121
#define TAPPING_TERM 200
2222
#define PERMISSIVE_HOLD
23-
24-
// bootmagic keys
25-
26-
#define BOOTMAGIC_KEY_SALT KC_J
27-
#define BOOTMAGIC_KEY_DEBUG_ENABLE KC_K
28-
#define BOOTMAGIC_KEY_BOOTLOADER KC_L
29-
#define BOOTMAGIC_KEY_DEFAULT_LAYER_0 KC_D
30-
#define BOOTMAGIC_KEY_DEFAULT_LAYER_1 KC_F
31-
#define BOOTMAGIC_KEY_DEFAULT_LAYER_2 KC_S

firmware/keyboards/braille/keymaps/default/keymap.c

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright 2020 MATOBA Akihiro
1+
/* Copyright 2020,2021 MATOBA Akihiro
22
*
33
* This program is free software: you can redistribute it and/or modify
44
* it under the terms of the GNU General Public License as published by
@@ -73,3 +73,45 @@ void matrix_scan_user(void) {
7373
combo_pressed_flags = 0;
7474
}
7575
}
76+
77+
#define DEBOUNCE 5
78+
79+
void bootmagic_lite(void) {
80+
matrix_scan();
81+
wait_ms(DEBOUNCE * 2);
82+
matrix_scan();
83+
84+
int row0 = matrix_get_row(0);
85+
// int row1 = matrix_get_row(1);
86+
int row2 = matrix_get_row(2);
87+
int row3 = matrix_get_row(3);
88+
89+
// row3+col5(K105) is pressed, enter bootmagic
90+
if (!(row3 & (1 << 5)))
91+
return;
92+
93+
// ported from old adda5d77707 firmware\qmk_firmware\tmk_core\common\bootmagic.c
94+
/* default layer */
95+
uint8_t default_layer = 0;
96+
if(row0 & (1 << 1)) { // row0+col1(K001) is pressed, set default layer as 0
97+
default_layer |= (1 << 0);
98+
}
99+
if(row0 & (1 << 2)) { // row1+col2(K102) is pressed, set default layer as 1
100+
default_layer |= (1 << 1);
101+
}
102+
if(row0 & (1 << 0)) { // row0+col0(K000) is pressed, set default layer as 2
103+
default_layer |= (1 << 2);
104+
}
105+
if (default_layer) {
106+
eeconfig_update_default_layer(default_layer);
107+
default_layer_set((layer_state_t)default_layer);
108+
} else {
109+
default_layer = eeconfig_read_default_layer();
110+
default_layer_set((layer_state_t)default_layer);
111+
}
112+
113+
// Jump to bootloader.
114+
if(row2 & (1 << 7)) { // row2+col7(K007) is pressed, Jump to bootloader
115+
bootloader_jump();
116+
}
117+
}

firmware/keyboards/braille/rules.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
1414
# Build Options
1515
# change yes to no to disable
1616
#
17-
BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
17+
BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
1818
MOUSEKEY_ENABLE = no # Mouse keys
1919
EXTRAKEY_ENABLE = no # Audio control and System control
2020
CONSOLE_ENABLE = yes # Console for debug

firmware/qmk_firmware

Submodule qmk_firmware updated 22422 files

0 commit comments

Comments
 (0)