summaryrefslogtreecommitdiff
path: root/nuttx/configs/mikroe-stm32f4/src
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-08-07 18:00:38 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-08-07 18:00:38 -0600
commitf4f8030be0af79250de05d323106dd34a5e7dc85 (patch)
treeac6ac62508e391422efee525bc3c438206e31259 /nuttx/configs/mikroe-stm32f4/src
parentf39ae5a8b656f320d99f391972e8b81a8c2d52fd (diff)
downloadnuttx-f4f8030be0af79250de05d323106dd34a5e7dc85.tar.gz
nuttx-f4f8030be0af79250de05d323106dd34a5e7dc85.tar.bz2
nuttx-f4f8030be0af79250de05d323106dd34a5e7dc85.zip
Change all time conversions. Yech. New timer units in microseconds breaks all existing logic that used milliseconds in the conversions. Something likely got broken doing this, probably because I confused a MSEC2TICK conversion with a TICK2MSEC conversion. Also, the tickless OS no appears fully functional and passes the OS test on the simulator with no errors
Diffstat (limited to 'nuttx/configs/mikroe-stm32f4/src')
-rw-r--r--nuttx/configs/mikroe-stm32f4/src/up_touchscreen.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/configs/mikroe-stm32f4/src/up_touchscreen.c b/nuttx/configs/mikroe-stm32f4/src/up_touchscreen.c
index 095168c89..52edd65de 100644
--- a/nuttx/configs/mikroe-stm32f4/src/up_touchscreen.c
+++ b/nuttx/configs/mikroe-stm32f4/src/up_touchscreen.c
@@ -156,11 +156,11 @@
/* Delays ***************************************************************************/
/* All values will be increased by one system timer tick (probably 10MS). */
-#define TC_PENUP_POLL_TICKS (70 / MSEC_PER_TICK) /* IDLE polling rate: 100 MSec */
-#define TC_PENDOWN_POLL_TICKS (40 / MSEC_PER_TICK) /* Active polling rate: 60 MSec */
-#define TC_DEBOUNCE_TICKS (16 / MSEC_PER_TICK) /* Delay before re-sampling: 30 MSec */
-#define TC_SAMPLE_TICKS (4 / MSEC_PER_TICK) /* Delay for A/D sampling: 4 MSec */
-#define TC_SETTLE_TICKS (10 / MSEC_PER_TICK) /* Delay for A/D settling: 4 MSec */
+#define TC_PENUP_POLL_TICKS MSEC2TICK(70) /* IDLE polling rate: 70 MSec */
+#define TC_PENDOWN_POLL_TICKS MSEC2TICK(40) /* Active polling rate: 40 MSec */
+#define TC_DEBOUNCE_TICKS MSEC2TICK(16) /* Delay before re-sampling: 16 MSec */
+#define TC_SAMPLE_TICKS MSEC2TICK(4) /* Delay for A/D sampling: 4 MSec */
+#define TC_SETTLE_TICKS MSECT2TICK(10) /* Delay for A/D settling: 10 MSec */
#define TC_RESAMPLE_TICKS TC_SAMPLE_TICKS
/************************************************************************************