aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@embedded.pro>2018-02-26 10:01:50 +0100
committerJoel Bodenmann <joel@embedded.pro>2018-02-26 10:01:50 +0100
commit14786e97b618b8bc2a0ff1c732d45288fe550e33 (patch)
treec49c978fc1db277a272edd0f83611f43dcbbbc9f
parentd9eaba249f7314b5946cfff19c3ba64215babb27 (diff)
downloaduGFX-14786e97b618b8bc2a0ff1c732d45288fe550e33.tar.gz
uGFX-14786e97b618b8bc2a0ff1c732d45288fe550e33.tar.bz2
uGFX-14786e97b618b8bc2a0ff1c732d45288fe550e33.zip
Fixing issue in RTX5/CMSIS2 port
-rw-r--r--changelog.txt1
-rw-r--r--src/gos/gos_cmsis2.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.txt b/changelog.txt
index 26eb8be7..5578e9b6 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -10,6 +10,7 @@ FIX: Fixed compiler error in ST7735 driver
FIX: Added support for negative baseline_x in fonts
FIX: Fixed some word wrapping issues
FIX: Fixed drawing of 3x3 pixel boxes
+FIX: Fixed issue in RTX5/CMSIS2 port which resulted in hanging delays/threads
*** Release 2.8 ***
diff --git a/src/gos/gos_cmsis2.h b/src/gos/gos_cmsis2.h
index 8a54491b..bd8c9042 100644
--- a/src/gos/gos_cmsis2.h
+++ b/src/gos/gos_cmsis2.h
@@ -61,7 +61,7 @@ extern "C" {
#define gfxExit() os_error(0)
#define gfxHalt(msg) os_error(1)
-#define gfxSystemTicks() osKernelGetSysTimerCount()
+#define gfxSystemTicks() osKernelGetTickCount()
#define gfxMillisecondsToTicks(ms) (1000*(ms)/osKernelGetTickFreq())
#define gfxSystemLock() osKernelLock()
#define gfxSystemUnlock() osKernelUnlock()