diff options
| author | Damien <Dbroqua@users.noreply.github.com> | 2016-12-09 19:44:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-09 19:44:03 +0100 |
| commit | 13c4080a1d77cb1dfdf48df8a42e78b9dc483912 (patch) | |
| tree | 66fd988d98a32e1437fbc6cb80bee03c056722a7 /keyboards/infinity60 | |
| parent | a849bdc5811b2bb69df8e3b0948c8e81c0dfa9d4 (diff) | |
| parent | 985a091a739c99736d5b17de5161831488dbc219 (diff) | |
Merge pull request #13 from jackhumbert/master
Merged from qmk
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); |