diff options
| author |  xyverz <xyverz@gmail.com> | 2016-11-16 22:36:36 -0800 |
|---|---|---|
| committer | xyverz <xyverz@gmail.com> | 2016-11-16 22:36:36 -0800 |
| commit | b493f6a4ed14e74c268ae3d7a07577591fe71cc7 (patch) | |
| tree | 0da986aa45733b08c6b8c379658abd5e0a1fb8a7 /keyboards/infinity60 | |
| parent | 8dd422ffe1a84416dd4a8d38878979f5b7bbd51b (diff) | |
| parent | c38b3e3be93a8b4f520212117b6498a288d67751 (diff) | |
| download | qmk_firmware-b493f6a4ed14e74c268ae3d7a07577591fe71cc7.tar.gz | |
Merge remote-tracking branch 'upstream/master'
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); |