diff options
| author | Joel Challis <git@zvecr.com> | 2019-10-15 13:32:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-15 13:32:52 +0100 |
| commit | cc5edb9eeb2d30400dee278a6f20991389f68afe (patch) | |
| tree | 4fb8bdd3ec143345a787474f46add0f53ce782f7 /keyboards/handwired/xealous | |
| parent | e1de0d74a6f6c4bdc762b32fb78e449aed0fcecb (diff) | |
| download | qmk_firmware-cc5edb9eeb2d30400dee278a6f20991389f68afe.tar.gz qmk_firmware-cc5edb9eeb2d30400dee278a6f20991389f68afe.zip | |
Port DEBUG_MATRIX_SCAN_RATE to core (#7029)
* Port DEBUG_MATRIX_SCAN_RATE to core
* Remove duplicate DEBUG_MATRIX_SCAN_RATE implementations
* Remove duplicate DEBUG_MATRIX_SCAN_RATE implementation from handwired/xealous
* Add console logic from ergodox_ez
Diffstat (limited to 'keyboards/handwired/xealous')
| -rw-r--r-- | keyboards/handwired/xealous/matrix.c | 12 | ||||
| -rw-r--r-- | keyboards/handwired/xealous/matrix_scanrate.c | 39 | ||||
| -rw-r--r-- | keyboards/handwired/xealous/matrix_scanrate.h | 4 | ||||
| -rw-r--r-- | keyboards/handwired/xealous/rules.mk | 2 |
4 files changed, 1 insertions, 56 deletions
diff --git a/keyboards/handwired/xealous/matrix.c b/keyboards/handwired/xealous/matrix.c index e2d219939..6d43db4d9 100644 --- a/keyboards/handwired/xealous/matrix.c +++ b/keyboards/handwired/xealous/matrix.c | |||
| @@ -30,18 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 30 | #include "pro_micro.h" | 30 | #include "pro_micro.h" |
| 31 | #include "config.h" | 31 | #include "config.h" |
| 32 | #include "timer.h" | 32 | #include "timer.h" |
| 33 | #ifdef DEBUG_MATRIX_SCAN_RATE | ||
| 34 | #include "matrix_scanrate.h" | ||
| 35 | #endif | ||
| 36 | |||
| 37 | void matrix_scan_user(void) | ||
| 38 | { | ||
| 39 | #ifdef DEBUG_MATRIX_SCAN_RATE | ||
| 40 | matrix_check_scan_rate(); | ||
| 41 | matrix_time_between_scans(); | ||
| 42 | #endif | ||
| 43 | |||
| 44 | } | ||
| 45 | 33 | ||
| 46 | // Copy this code to split_common/matrix.c, | 34 | // Copy this code to split_common/matrix.c, |
| 47 | // and call it instead of the unoptimized col_reader. Scan-rate jumps from 1200->1920 | 35 | // and call it instead of the unoptimized col_reader. Scan-rate jumps from 1200->1920 |
diff --git a/keyboards/handwired/xealous/matrix_scanrate.c b/keyboards/handwired/xealous/matrix_scanrate.c deleted file mode 100644 index f2c7cbe6e..000000000 --- a/keyboards/handwired/xealous/matrix_scanrate.c +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | #include <stdint.h> | ||
| 2 | #include <stdbool.h> | ||
| 3 | #include <avr/io.h> | ||
| 4 | #include "wait.h" | ||
| 5 | #include "print.h" | ||
| 6 | #include "debug.h" | ||
| 7 | #include "util.h" | ||
| 8 | #include "matrix.h" | ||
| 9 | #include "timer.h" | ||
| 10 | |||
| 11 | #ifdef CONSOLE_ENABLE | ||
| 12 | static uint16_t matrix_scan_count = 0; | ||
| 13 | static uint32_t matrix_timer = 0; | ||
| 14 | void matrix_check_scan_rate(void) { | ||
| 15 | matrix_scan_count++; | ||
| 16 | if (matrix_scan_count > 1000) { | ||
| 17 | uint32_t timer_now = timer_read32(); | ||
| 18 | uint16_t ms_per_thousand = TIMER_DIFF_32(timer_now, matrix_timer); | ||
| 19 | uint16_t rate_per_second = 1000000UL / ms_per_thousand; | ||
| 20 | print("scan_rate: "); | ||
| 21 | pdec(rate_per_second); | ||
| 22 | print("\n"); | ||
| 23 | matrix_timer = timer_now; | ||
| 24 | matrix_scan_count = 0; | ||
| 25 | } | ||
| 26 | } | ||
| 27 | |||
| 28 | static uint32_t last_scan_time = 0; | ||
| 29 | void matrix_time_between_scans(void) { | ||
| 30 | if (timer_elapsed(last_scan_time) > 1) | ||
| 31 | { | ||
| 32 | print(">1ms elapsed since last scan: "); | ||
| 33 | pdec(timer_elapsed(last_scan_time)); | ||
| 34 | print("\n"); | ||
| 35 | } | ||
| 36 | last_scan_time = timer_read(); | ||
| 37 | |||
| 38 | } | ||
| 39 | #endif | ||
diff --git a/keyboards/handwired/xealous/matrix_scanrate.h b/keyboards/handwired/xealous/matrix_scanrate.h deleted file mode 100644 index 18d56cd5b..000000000 --- a/keyboards/handwired/xealous/matrix_scanrate.h +++ /dev/null | |||
| @@ -1,4 +0,0 @@ | |||
| 1 | __attribute__((weak)) | ||
| 2 | void matrix_check_scan_rate(void) {} | ||
| 3 | __attribute__((weak)) | ||
| 4 | void matrix_time_between_scans(void) {} | ||
diff --git a/keyboards/handwired/xealous/rules.mk b/keyboards/handwired/xealous/rules.mk index ef3357982..adbbf1e10 100644 --- a/keyboards/handwired/xealous/rules.mk +++ b/keyboards/handwired/xealous/rules.mk | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | SRC += matrix_scanrate.c matrix.c | 1 | SRC += matrix.c |
| 2 | 2 | ||
| 3 | # MCU name | 3 | # MCU name |
| 4 | MCU = atmega32u4 | 4 | MCU = atmega32u4 |
