summaryrefslogtreecommitdiff
path: root/keyboards/infinity60
diff options
context:
space:
mode:
authorlucwastiaux2016-12-10 12:49:47 +0800
committerlucwastiaux2016-12-10 12:49:47 +0800
commit9240f27ba909aece233bda59e4ec15f7666fdece (patch)
tree7b6e2b05a0722734e4739dd7b52817d82fae51c6 /keyboards/infinity60
parentdc4c8875ba2b961deb5d9712f422b00ce7c90979 (diff)
parent985a091a739c99736d5b17de5161831488dbc219 (diff)
Merge remote-tracking branch 'upstream/master'
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);