aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2018-12-17 09:41:41 +0200
committerShlomo Hecht <shlomo@twine-s.com>2018-12-17 09:41:41 +0200
commit9562ca15079cdbf2bcfd11c8c8def4a8e4573a78 (patch)
tree480bb5f4a49a398d789197006e66ca76d78ff007 /Software/Embedded_SW/Embedded
parentfc23da7f3510cce58308841eefb96d59868317ff (diff)
parentd8d1128887089087578286f37561dc8942726ba4 (diff)
downloadTango-9562ca15079cdbf2bcfd11c8c8def4a8e4573a78.tar.gz
Tango-9562ca15079cdbf2bcfd11c8c8def4a8e4573a78.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded')
-rw-r--r--Software/Embedded_SW/Embedded/delay.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/delay.c b/Software/Embedded_SW/Embedded/delay.c
index 99605fb2e..046acab43 100644
--- a/Software/Embedded_SW/Embedded/delay.c
+++ b/Software/Embedded_SW/Embedded/delay.c
@@ -10,21 +10,24 @@
#include <stdint.h>
#include <stdbool.h>
#include "driverlib/sysctl.h"
+#include "Include.h"
+
+
void delayms(uint32_t ui32ms)
{
-
+ //SysCtlClockGet();
// 1 clock cycle = 1 / SysCtlClockGet() second
// 1 SysCtlDelay = 3 clock cycle = 3 / SysCtlClockGet() second
// 1 second = SysCtlClockGet() / 3
// 0.001 second = 1 ms = SysCtlClockGet() / 3 / 1000
- SysCtlDelay(ui32ms * (SysCtlClockGet() / 3 / 1000));
+ SysCtlDelay(ui32ms * (SYS_CLK_FREQ / 3 / 1000));
}
void delayUs(uint32_t ui32Us)
{
- SysCtlDelay(ui32Us * (SysCtlClockGet() / 3 / 1000000));
+ SysCtlDelay(ui32Us * (SYS_CLK_FREQ / 3 / 1000000));
}