diff options
author | dbroqua <dbroqua@mousur.org> | 2016-12-17 22:25:21 +0100 |
---|---|---|
committer | dbroqua <dbroqua@mousur.org> | 2016-12-17 22:25:21 +0100 |
commit | df50bee5a88cacbd1f5fab98b26c2068646b61c0 (patch) | |
tree | 60a59d80c173055788e66b7e9dd79aaad7b27df6 /keyboards/infinity60 | |
parent | 46b93f02d570c0bb66410cb8d9af2451d5453635 (diff) | |
parent | 13c4080a1d77cb1dfdf48df8a42e78b9dc483912 (diff) | |
download | qmk_firmware-df50bee5a88cacbd1f5fab98b26c2068646b61c0.tar.gz qmk_firmware-df50bee5a88cacbd1f5fab98b26c2068646b61c0.tar.xz |
Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware
Diffstat (limited to 'keyboards/infinity60')
-rw-r--r-- | keyboards/infinity60/chconf.h | 2 | ||||
-rw-r--r-- | keyboards/infinity60/matrix.c | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/keyboards/infinity60/chconf.h b/keyboards/infinity60/chconf.h index 43c845739..d9114ec85 100644 --- a/keyboards/infinity60/chconf.h +++ b/keyboards/infinity60/chconf.h @@ -48,7 +48,7 @@ * @details Frequency of the system timer that drives the system ticks. This * setting also defines the system tick time unit. */ -#define CH_CFG_ST_FREQUENCY 1000 +#define CH_CFG_ST_FREQUENCY 100000 /** * @brief Time delta constant for the tick-less mode. diff --git a/keyboards/infinity60/matrix.c b/keyboards/infinity60/matrix.c index 62c165aa5..d2f185288 100644 --- a/keyboards/infinity60/matrix.c +++ b/keyboards/infinity60/matrix.c @@ -96,7 +96,12 @@ uint8_t matrix_scan(void) } #endif - wait_us(1); // need wait to settle pin state + // need wait to settle pin state + // if you wait too short, or have a too high update rate + // the keyboard might freeze, or there might not be enough + // processing power to update the LCD screen properly. + // 20us, or two ticks at 100000Hz seems to be OK + wait_us(20); // read col data data = (palReadPort(GPIOD)>>1); |