_/qmk_firmware
1
0
Fork 0
Code Releases Activity

Whitespace cleanup.

Browse source
This commit is contained in:
alex-ong 2019-01-26 17:38:52 +11:00
parent 4d8733591f
commit 574fc6444b
5 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common_features.mk
View file

@ -249,15 +249,11 @@ endif
include $(DRIVER_PATH)/qwiic/qwiic.mk include $(DRIVER_PATH)/qwiic/qwiic.mk
QUANTUM_SRC:= \ QUANTUM_SRC:= \
$(QUANTUM_DIR)/quantum.c \ $(QUANTUM_DIR)/quantum.c \
$(QUANTUM_DIR)/keymap_common.c \ $(QUANTUM_DIR)/keymap_common.c \
$(QUANTUM_DIR)/keycode_config.c $(QUANTUM_DIR)/keycode_config.c
# Include the standard or split matrix code if needed # Include the standard or split matrix code if needed
ifneq ($(strip $(CUSTOM_MATRIX)), yes) ifneq ($(strip $(CUSTOM_MATRIX)), yes)
ifeq ($(strip $(SPLIT_KEYBOARD)), yes) ifeq ($(strip $(SPLIT_KEYBOARD)), yes)

17
docs/feature_debounce_algo.md
View file

@ -7,18 +7,16 @@ The underlying debounce algorithm is determined by which matrix.c file you are u
The logic for which debounce method called is below. It checks various defines that you have set in rules.mk The logic for which debounce method called is below. It checks various defines that you have set in rules.mk
``` ```
ifeq ($(strip $(SPLIT_KEYBOARD)), yes) ifeq ($(strip $(DEBOUNCE_ALGO)), manual)
# Do nothing, debouncing is inside matrix.c inside split_common
else ifeq ($(strip $(DEBOUNCE_ALGO)), manual)
# Do nothing. do your debouncing in matrix.c # Do nothing. do your debouncing in matrix.c
else ifeq ($(strip $(DEBOUNCE_ALGO)), sym_g) else ifeq ($(strip $(DEBOUNCE_ALGO)), sym_g)
TMK_COMMON_SRC += $(DEBOUNCE)/debounce_sym_g.c QUANTUM_SRC += $(DEBOUNCE)/debounce_sym_g.c
else ifeq ($(strip $(DEBOUNCE_ALGO)), eager_pk) else ifeq ($(strip $(DEBOUNCE_ALGO)), eager_pk)
TMK_COMMON_SRC += $(DEBOUNCE)/debounce_eager_pk.c QUANTUM_SRC += $(DEBOUNCE)/debounce_eager_pk.c
else ifeq ($(strip $(CUSTOM_MATRIX)), yes) else ifeq ($(strip $(CUSTOM_MATRIX)), yes)
# Do nothing. Custom matrix code. # Do nothing. Custom matrix code.
else # default algorithm else # default algorithm
TMK_COMMON_SRC += $(DEBOUNCE)/debounce_sym_g.c QUANTUM_SRC += $(DEBOUNCE)/debounce_sym_g.c
endif endif
``` ```
@ -32,11 +30,10 @@ The following is for keyboards where ```SPLIT_KEYBOARD``` is **not** defined as
| sym_g / eager_pk | Not defined | You are using the included matrix.c and debounce.c | Nothing. Chosen debounce method used. | | sym_g / eager_pk | Not defined | You are using the included matrix.c and debounce.c | Nothing. Chosen debounce method used. |
| Not defined | YES | You have your own matrix.c, and your own debounce | Write the fully debounced matrix into matrix.c's matrix | | Not defined | YES | You have your own matrix.c, and your own debounce | Write the fully debounced matrix into matrix.c's matrix |
| manual | YES | Same as above | same as above | | manual | YES | Same as above | same as above |
| sym_g/ eager_pk | YES | You are using your own matrix.c, but included debounce | Write the raw matrix values into matrix.c's matrix | | sym_g / eager_pk | YES | You are using your own matrix.c, but included debounce | Write the raw matrix values into matrix.c's matrix |
**Note**: **Regarding split keyboards**:
If ```SPLIT_KEYBOARD = YES``` is defined, the algorithm inside split_common will be used. The debounce code is compatible with split keyboards.
A future pull request will fix this to use the debounce.c code.
# Use your own debouncing code # Use your own debouncing code
* Set ```DEBOUNCE_ALGO = manual```. * Set ```DEBOUNCE_ALGO = manual```.

2
keyboards/handwired/xealous/rules.mk
View file

@ -68,7 +68,7 @@ SUBPROJECT_rev1 = yes
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
CUSTOM_MATRIX = no CUSTOM_MATRIX = no
CUSTOM_DEBOUNCE = yes DEBOUNCE_ALGO = manual
LAYOUTS = split60 LAYOUTS = split60

2
tmk_core/common.mk
View file

@ -1,5 +1,4 @@
COMMON_DIR = common COMMON_DIR = common
ifeq ($(PLATFORM),AVR) ifeq ($(PLATFORM),AVR)
PLATFORM_COMMON_DIR = $(COMMON_DIR)/avr PLATFORM_COMMON_DIR = $(COMMON_DIR)/avr
else ifeq ($(PLATFORM),CHIBIOS) else ifeq ($(PLATFORM),CHIBIOS)
@ -62,6 +61,7 @@ ifeq ($(PLATFORM),TEST)
endif endif
# Option modules # Option modules
BOOTMAGIC_ENABLE ?= no BOOTMAGIC_ENABLE ?= no
VALID_MAGIC_TYPES := yes full lite VALID_MAGIC_TYPES := yes full lite

6
tmk_core/common/keyboard.c
View file

@ -163,7 +163,7 @@ bool is_keyboard_master(void) {
*/ */
void keyboard_init(void) { void keyboard_init(void) {
timer_init(); timer_init();
matrix_init(); matrix_init();
#ifdef QWIIC_ENABLE #ifdef QWIIC_ENABLE
qwiic_init(); qwiic_init();
#endif #endif
@ -223,7 +223,7 @@ void keyboard_task(void)
uint8_t keys_processed = 0; uint8_t keys_processed = 0;
#endif #endif
matrix_scan(); matrix_scan();
if (is_keyboard_master()) { if (is_keyboard_master()) {
for (uint8_t r = 0; r < MATRIX_ROWS; r++) { for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
@ -231,7 +231,7 @@ void keyboard_task(void)
matrix_change = matrix_row ^ matrix_prev[r]; matrix_change = matrix_row ^ matrix_prev[r];
if (matrix_change) { if (matrix_change) {
#ifdef MATRIX_HAS_GHOST #ifdef MATRIX_HAS_GHOST
if (has_ghost_in_row(r, matrix_row)) continue; if (has_ghost_in_row(r, matrix_row)) { continue; }
#endif #endif
if (debug_matrix) matrix_print(); if (debug_matrix) matrix_print();
for (uint8_t c = 0; c < MATRIX_COLS; c++) { for (uint8_t c = 0; c < MATRIX_COLS; c++) {