Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity

Port DEBUG_MATRIX_SCAN_RATE to core (#7029)

Browse source 
* 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
This commit is contained in:
Joel Challis 2019-10-15 13:32:52 +01:00 • committed by GitHub
commit cc5edb9eeb
Failed to generate hash of commit
14 changed files with 25 additions and 324 deletions
Download patch file Download diff file Expand all files Collapse all files

24
keyboards/handwired/dactyl/matrix.c
View file

@ -76,11 +76,6 @@ uint8_t expander_status;
uint8_t expander_input_pin_mask;
bool i2c_initialized = false;
#ifdef DEBUG_MATRIX_SCAN_RATE
uint32_t matrix_timer;
uint32_t matrix_scan_count;
#endif
#define ROW_SHIFTER ((matrix_row_t)1)
__attribute__ ((weak))
@ -129,11 +124,6 @@ void matrix_init(void)
matrix_debouncing[i] = 0;
}
#ifdef DEBUG_MATRIX_SCAN_RATE
matrix_timer = timer_read32();
matrix_scan_count = 0;
#endif
matrix_init_quantum();
}
@ -236,20 +226,6 @@ uint8_t matrix_scan(void)
}
}
#ifdef DEBUG_MATRIX_SCAN_RATE
matrix_scan_count++;
uint32_t timer_now = timer_read32();
if (TIMER_DIFF_32(timer_now, matrix_timer)>1000) {
print("matrix scan frequency: ");
pdec(matrix_scan_count);
print("\n");
matrix_timer = timer_now;
matrix_scan_count = 0;
}
#endif
#if (DIODE_DIRECTION == COL2ROW)
for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) {
# if (DEBOUNCE > 0)

35
keyboards/handwired/frenchdev/matrix.c
View file

@ -35,9 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "util.h"
#include "matrix.h"
#include "frenchdev.h"
#ifdef DEBUG_MATRIX_SCAN_RATE
#include "timer.h"
#endif
/*
* This constant define not debouncing time in msecs, but amount of matrix
@ -66,12 +63,6 @@ static void select_row(uint8_t row);
static uint8_t mcp23018_reset_loop;
#ifdef DEBUG_MATRIX_SCAN_RATE
uint32_t matrix_timer;
uint32_t matrix_scan_count;
#endif
__attribute__ ((weak))
void matrix_init_user(void) {}
@ -120,13 +111,7 @@ void matrix_init(void)
matrix_debouncing[i] = 0;
}
#ifdef DEBUG_MATRIX_SCAN_RATE
matrix_timer = timer_read32();
matrix_scan_count = 0;
#endif
matrix_init_quantum();
}
void matrix_power_up(void) {
@ -140,12 +125,6 @@ void matrix_power_up(void) {
matrix[i] = 0;
matrix_debouncing[i] = 0;
}
#ifdef DEBUG_MATRIX_SCAN_RATE
matrix_timer = timer_read32();
matrix_scan_count = 0;
#endif
}
uint8_t matrix_scan(void)
@ -165,20 +144,6 @@ uint8_t matrix_scan(void)
}
}
#ifdef DEBUG_MATRIX_SCAN_RATE
matrix_scan_count++;
uint32_t timer_now = timer_read32();
if (TIMER_DIFF_32(timer_now, matrix_timer)>1000) {
print("matrix scan frequency: ");
pdec(matrix_scan_count);
print("\n");
matrix_timer = timer_now;
matrix_scan_count = 0;
}
#endif
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
select_row(i);
wait_us(30); // without this wait read unstable value.

12
keyboards/handwired/xealous/matrix.c
View file

@ -30,18 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "pro_micro.h"
#include "config.h"
#include "timer.h"
#ifdef DEBUG_MATRIX_SCAN_RATE
#include "matrix_scanrate.h"
#endif
void matrix_scan_user(void)
{
#ifdef DEBUG_MATRIX_SCAN_RATE
matrix_check_scan_rate();
matrix_time_between_scans();
#endif
}
// Copy this code to split_common/matrix.c,
// and call it instead of the unoptimized col_reader. Scan-rate jumps from 1200->1920

39
keyboards/handwired/xealous/matrix_scanrate.c
View file

@ -1,39 +0,0 @@
#include <stdint.h>
#include <stdbool.h>
#include <avr/io.h>
#include "wait.h"
#include "print.h"
#include "debug.h"
#include "util.h"
#include "matrix.h"
#include "timer.h"
#ifdef CONSOLE_ENABLE
static uint16_t matrix_scan_count = 0;
static uint32_t matrix_timer = 0;
void matrix_check_scan_rate(void) {
matrix_scan_count++;
if (matrix_scan_count > 1000) {
uint32_t timer_now = timer_read32();
uint16_t ms_per_thousand = TIMER_DIFF_32(timer_now, matrix_timer);
uint16_t rate_per_second = 1000000UL / ms_per_thousand;
print("scan_rate: ");
pdec(rate_per_second);
print("\n");
matrix_timer = timer_now;
matrix_scan_count = 0;
}
}
static uint32_t last_scan_time = 0;
void matrix_time_between_scans(void) {
if (timer_elapsed(last_scan_time) > 1)
{
print(">1ms elapsed since last scan: ");
pdec(timer_elapsed(last_scan_time));
print("\n");
}
last_scan_time = timer_read();
}
#endif

4
keyboards/handwired/xealous/matrix_scanrate.h
View file

@ -1,4 +0,0 @@
__attribute__((weak))
void matrix_check_scan_rate(void) {}
__attribute__((weak))
void matrix_time_between_scans(void) {}

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

@ -1,4 +1,4 @@
SRC += matrix_scanrate.c matrix.c
SRC += matrix.c
# MCU name
MCU = atmega32u4