From 0ec64f500772b78d90f0ceccc539f2b08f86abf9 Mon Sep 17 00:00:00 2001 From: tarabrina_n Date: Tue, 29 Nov 2022 17:02:38 +0300 Subject: [PATCH 1/3] Changes in FreeRTOS includes in K1921BK01T_UART. #71964 --- .../K1921BK01T_UART/resources/firmware/src/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/urpc/builder/firmware/K1921BK01T_UART/resources/firmware/src/main.c b/urpc/builder/firmware/K1921BK01T_UART/resources/firmware/src/main.c index 6add8f7..a10bab2 100644 --- a/urpc/builder/firmware/K1921BK01T_UART/resources/firmware/src/main.c +++ b/urpc/builder/firmware/K1921BK01T_UART/resources/firmware/src/main.c @@ -16,16 +16,16 @@ #include "niietcm4_rcc.h" #include "tty.h" +// FreeRTOS files +#include "FreeRTOS.h" +#include "task.h" + #ifdef DEBUG #include // For printf(...) #define LIFEBUOY_PORT NT_GPIOF #define LIFEBUOY_PIN GPIO_Pin_7 - // FreeRTOS files - #include "FreeRTOS.h" - #include "task.h" - static inline void Lifebuoy(void); #endif // DEBUG From b98a7a5780253075163f9e97283d350a2f825763 Mon Sep 17 00:00:00 2001 From: tarabrina_n Date: Wed, 30 Nov 2022 12:41:23 +0300 Subject: [PATCH 2/3] Changes in forming CMakeLists for debugger for using with system with qt5 as well. #71964 --- urpc/builder/debugger/debugger.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/urpc/builder/debugger/debugger.py b/urpc/builder/debugger/debugger.py index 642b605..e8a1cef 100644 --- a/urpc/builder/debugger/debugger.py +++ b/urpc/builder/debugger/debugger.py @@ -66,15 +66,17 @@ def build_cmake_lists(self) -> str: else() # Detect QT version find_package(Qt4 QUIET) - find_package(Qt5Widgets QUIET) if(${{Qt4_FOUND}}) message("Qt4 will be used") set (USE_QT5 FALSE) - elseif(${{Qt5Widgets_FOUND}}) - message("Qt5 will be used") - set (USE_QT5 TRUE) else() - message(FATAL_ERROR "No Qt4/Qt5 found") + find_package(Qt5Widgets QUIET) + if(${{Qt5Widgets_FOUND}}) + message("Qt5 will be used") + set (USE_QT5 TRUE) + else() + message(FATAL_ERROR "No Qt4/Qt5 found") + endif() endif() endif() From 09f4cbaf9faad2109f5737515634452e365f808a Mon Sep 17 00:00:00 2001 From: tarabrina_n Date: Wed, 30 Nov 2022 13:07:27 +0300 Subject: [PATCH 3/3] Version increment. --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index 5c00a82..ee21002 100644 --- a/version.py +++ b/version.py @@ -8,7 +8,7 @@ BUILDER_VERSION_MAJOR = 0 BUILDER_VERSION_MINOR = 10 -BUILDER_VERSION_BUGFIX = 18 +BUILDER_VERSION_BUGFIX = 19 BUILDER_VERSION_SUFFIX = ""