Merge branch 'dev-0.10' into dev-0.11

# Conflicts: # version.py
EPC-MSU · Jan 26, 2023 · 56ce505 · 56ce505
2 parents 9cbcc0d + 09f4cba
commit 56ce505
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git 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()
 

diff --git 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 <stdio.h>  // 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