aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/infinity60
diff options
context:
space:
mode:
authorGravatar Jack Humbert <jack.humb@gmail.com>2016-11-21 19:18:47 -0500
committerGravatar Jack Humbert <jack.humb@gmail.com>2016-11-21 19:18:47 -0500
commit27ebacb15d39046713bd87e06c1157b1ffab6aaf (patch)
tree5a60417af07d3ff8798e371db210dd32ef10d332 /keyboards/infinity60
parentc1037b1dc060d14a09a59f697fefe2b5b91bf373 (diff)
parent3b990c08dcc0e57875e9220a5e6371f60679c7ae (diff)
downloadqmk_firmware-27ebacb15d39046713bd87e06c1157b1ffab6aaf.tar.gz
merging lets_split
Diffstat (limited to 'keyboards/infinity60')
-rw-r--r--keyboards/infinity60/chconf.h2
-rw-r--r--keyboards/infinity60/matrix.c7
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);