From 14786e97b618b8bc2a0ff1c732d45288fe550e33 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Mon, 26 Feb 2018 10:01:50 +0100 Subject: [PATCH] Fixing issue in RTX5/CMSIS2 port --- changelog.txt | 1 + src/gos/gos_cmsis2.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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()