diff options
| author | Priyadi Iman Nurcahyo <priyadi@priyadi.net> | 2016-11-26 13:31:17 +0700 |
|---|---|---|
| committer | Priyadi Iman Nurcahyo <priyadi@priyadi.net> | 2016-11-26 13:31:17 +0700 |
| commit | b5511b9a8aa3827279fc132ecf3e5dd9c9c07668 (patch) | |
| tree | e902e8f6dfc67272a98bfbbba0f77b7830bb8604 /keyboards/infinity60 | |
| parent | 4b0d16cd7bdcd41cffb17a7b6eed7cb44beaef34 (diff) | |
| parent | bf23ac96f62be1cb36d414e76599523af3caf00f (diff) | |
Merge branch 'master' into promethium
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 43c845739a..d9114ec858 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 62c165aa53..d2f1852885 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); |