diff options
| author | alex-ong <the.onga@gmail.com> | 2019-01-26 17:38:52 +1100 |
|---|---|---|
| committer | alex-ong <the.onga@gmail.com> | 2019-01-26 17:38:52 +1100 |
| commit | 574fc6444bf48d10317c72bc6a5c61f7e46938a3 (patch) | |
| tree | 04bc9d579919447822ba6d30d8a9f4ba60321c09 /tmk_core | |
| parent | 4d8733591f30a299d6ac99165c834162d2c08fd1 (diff) | |
| download | qmk_firmware-574fc6444bf48d10317c72bc6a5c61f7e46938a3.tar.gz qmk_firmware-574fc6444bf48d10317c72bc6a5c61f7e46938a3.zip | |
Whitespace cleanup.
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common.mk | 2 | ||||
| -rw-r--r-- | tmk_core/common/keyboard.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tmk_core/common.mk b/tmk_core/common.mk index 335a36cfe..063115acb 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | COMMON_DIR = common | 1 | COMMON_DIR = common |
| 2 | |||
| 3 | ifeq ($(PLATFORM),AVR) | 2 | ifeq ($(PLATFORM),AVR) |
| 4 | PLATFORM_COMMON_DIR = $(COMMON_DIR)/avr | 3 | PLATFORM_COMMON_DIR = $(COMMON_DIR)/avr |
| 5 | else ifeq ($(PLATFORM),CHIBIOS) | 4 | else ifeq ($(PLATFORM),CHIBIOS) |
| @@ -62,6 +61,7 @@ ifeq ($(PLATFORM),TEST) | |||
| 62 | endif | 61 | endif |
| 63 | 62 | ||
| 64 | 63 | ||
| 64 | |||
| 65 | # Option modules | 65 | # Option modules |
| 66 | BOOTMAGIC_ENABLE ?= no | 66 | BOOTMAGIC_ENABLE ?= no |
| 67 | VALID_MAGIC_TYPES := yes full lite | 67 | VALID_MAGIC_TYPES := yes full lite |
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c index d22300116..25be28d02 100644 --- a/tmk_core/common/keyboard.c +++ b/tmk_core/common/keyboard.c | |||
| @@ -163,7 +163,7 @@ bool is_keyboard_master(void) { | |||
| 163 | */ | 163 | */ |
| 164 | void keyboard_init(void) { | 164 | void keyboard_init(void) { |
| 165 | timer_init(); | 165 | timer_init(); |
| 166 | matrix_init(); | 166 | matrix_init(); |
| 167 | #ifdef QWIIC_ENABLE | 167 | #ifdef QWIIC_ENABLE |
| 168 | qwiic_init(); | 168 | qwiic_init(); |
| 169 | #endif | 169 | #endif |
| @@ -223,7 +223,7 @@ void keyboard_task(void) | |||
| 223 | uint8_t keys_processed = 0; | 223 | uint8_t keys_processed = 0; |
| 224 | #endif | 224 | #endif |
| 225 | 225 | ||
| 226 | matrix_scan(); | 226 | matrix_scan(); |
| 227 | 227 | ||
| 228 | if (is_keyboard_master()) { | 228 | if (is_keyboard_master()) { |
| 229 | for (uint8_t r = 0; r < MATRIX_ROWS; r++) { | 229 | for (uint8_t r = 0; r < MATRIX_ROWS; r++) { |
| @@ -231,7 +231,7 @@ void keyboard_task(void) | |||
| 231 | matrix_change = matrix_row ^ matrix_prev[r]; | 231 | matrix_change = matrix_row ^ matrix_prev[r]; |
| 232 | if (matrix_change) { | 232 | if (matrix_change) { |
| 233 | #ifdef MATRIX_HAS_GHOST | 233 | #ifdef MATRIX_HAS_GHOST |
| 234 | if (has_ghost_in_row(r, matrix_row)) continue; | 234 | if (has_ghost_in_row(r, matrix_row)) { continue; } |
| 235 | #endif | 235 | #endif |
| 236 | if (debug_matrix) matrix_print(); | 236 | if (debug_matrix) matrix_print(); |
| 237 | for (uint8_t c = 0; c < MATRIX_COLS; c++) { | 237 | for (uint8_t c = 0; c < MATRIX_COLS; c++) { |
