Skip to content

Commit

Permalink
Whitespace cleanup.
Browse files Browse the repository at this point in the history
  • Loading branch information
alex-ong committed Jan 26, 2019
1 parent 4d87335 commit 574fc64
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 19 deletions.
4 changes: 0 additions & 4 deletions common_features.mk
Original file line number Diff line number Diff line change
Expand Up @@ -249,15 +249,11 @@ endif

include $(DRIVER_PATH)/qwiic/qwiic.mk


QUANTUM_SRC:= \
$(QUANTUM_DIR)/quantum.c \
$(QUANTUM_DIR)/keymap_common.c \
$(QUANTUM_DIR)/keycode_config.c




# Include the standard or split matrix code if needed
ifneq ($(strip $(CUSTOM_MATRIX)), yes)
ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
Expand Down
17 changes: 7 additions & 10 deletions docs/feature_debounce_algo.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

```
ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
# Do nothing, debouncing is inside matrix.c inside split_common
else ifeq ($(strip $(DEBOUNCE_ALGO)), manual)
ifeq ($(strip $(DEBOUNCE_ALGO)), manual)
# Do nothing. do your debouncing in matrix.c
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)
TMK_COMMON_SRC += $(DEBOUNCE)/debounce_eager_pk.c
QUANTUM_SRC += $(DEBOUNCE)/debounce_eager_pk.c
else ifeq ($(strip $(CUSTOM_MATRIX)), yes)
# Do nothing. Custom matrix code.
else # default algorithm
TMK_COMMON_SRC += $(DEBOUNCE)/debounce_sym_g.c
QUANTUM_SRC += $(DEBOUNCE)/debounce_sym_g.c
endif
```

Expand All @@ -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. |
| 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 |
| 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**:
If ```SPLIT_KEYBOARD = YES``` is defined, the algorithm inside split_common will be used.
A future pull request will fix this to use the debounce.c code.
**Regarding split keyboards**:
The debounce code is compatible with split keyboards.

# Use your own debouncing code
* Set ```DEBOUNCE_ALGO = manual```.
Expand Down
2 changes: 1 addition & 1 deletion keyboards/handwired/xealous/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ SUBPROJECT_rev1 = yes
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend

CUSTOM_MATRIX = no
CUSTOM_DEBOUNCE = yes
DEBOUNCE_ALGO = manual

LAYOUTS = split60

Expand Down
2 changes: 1 addition & 1 deletion tmk_core/common.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
COMMON_DIR = common

ifeq ($(PLATFORM),AVR)
PLATFORM_COMMON_DIR = $(COMMON_DIR)/avr
else ifeq ($(PLATFORM),CHIBIOS)
Expand Down Expand Up @@ -62,6 +61,7 @@ ifeq ($(PLATFORM),TEST)
endif



# Option modules
BOOTMAGIC_ENABLE ?= no
VALID_MAGIC_TYPES := yes full lite
Expand Down
6 changes: 3 additions & 3 deletions tmk_core/common/keyboard.c
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ bool is_keyboard_master(void) {
*/
void keyboard_init(void) {
timer_init();
matrix_init();
matrix_init();
#ifdef QWIIC_ENABLE
qwiic_init();
#endif
Expand Down Expand Up @@ -223,15 +223,15 @@ void keyboard_task(void)
uint8_t keys_processed = 0;
#endif

matrix_scan();
matrix_scan();

if (is_keyboard_master()) {
for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
matrix_row = matrix_get_row(r);
matrix_change = matrix_row ^ matrix_prev[r];
if (matrix_change) {
#ifdef MATRIX_HAS_GHOST
if (has_ghost_in_row(r, matrix_row)) continue;
if (has_ghost_in_row(r, matrix_row)) { continue; }
#endif
if (debug_matrix) matrix_print();
for (uint8_t c = 0; c < MATRIX_COLS; c++) {
Expand Down

0 comments on commit 574fc64

Please sign in to comment.