Merge pull request #97 from spikeyamk/devel

Devel

Author: spikeyamk

Diff for: .gitmodules

@@ -4,9 +4,6 @@
 [submodule "deps/trielo"]
 	path = deps/trielo
 	url = https://github.com/spikeyamk/trielo
-[submodule "deps/ubitint"]
-	path = deps/ubitint
-	url = https://www.github.com/spikeyamk/ubitint
 [submodule "deps/3rdparty/pfr"]
 	path = deps/3rdparty/pfr
 	url = https://github.com/boostorg/pfr.git
@@ -28,15 +25,12 @@
 [submodule "docs/max31865/STM32F334_MAX31865"]
 	path = docs/max31865/STM32F334_MAX31865
 	url = https://github.com/Vishi100/STM32F334_MAX31865
-[submodule "admin/deps/3rdparty/serial"]
-	path = admin/deps/3rdparty/serial
-	url = https://github.com/yan9a/serial
-[submodule "admin/deps/3rdparty/json"]
-	path = admin/deps/3rdparty/json
-	url = https://github.com/nlohmann/json
 [submodule "docs/sht31/stm32-hal-sht3x"]
 	path = docs/sht31/stm32-hal-sht3x
 	url = https://github.com/henriheimann/stm32-hal-sht3x.git
 [submodule "docs/sht31/SHT31-STM32"]
 	path = docs/sht31/SHT31-STM32
-	url = https://github.com/trung-pham-dinh/SHT31-STM32.git
+	url = https://github.com/trung-pham-dinh/SHT31-STM32.git
+[submodule "deps/bitint"]
+	path = deps/bitint
+	url = https://www.github.com/spikeyamk/bitint

Diff for: CMakeLists.txt

@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.22 FATAL_ERROR)
-set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/cmake/gcc-arm-none-eabi.cmake")
+
+set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/cmake/gcc-arm-none-eabi.cmake)
 
 option(ENABLE_TESTS "Enable building of tests" OFF)
 if(ENABLE_TESTS)
@@ -11,31 +12,23 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
 project(${CMAKE_PROJECT_NAME} C CXX ASM)
 message("Project name: ${CMAKE_PROJECT_NAME}, build type: ${CMAKE_BUILD_TYPE}")
 
-# Set C and C++ standards
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD_REQUIRED ON)
 set(CMAKE_C_EXTENSIONS ON)
 set(CMAKE_CXX_STANDARD 23)
 
-# Add dependencies and subdirectories
-add_subdirectory("common")
-add_subdirectory("deps")
-add_subdirectory("src")
-
-# Apply stricter warnings for Debug builds
-if(CMAKE_BUILD_TYPE MATCHES "Debug")
-    if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-        target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -Wall -Wextra -Wpedantic)
-    elseif(MSVC)
-        target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE /W4)
-    endif()
-endif()
+add_subdirectory(common)
+add_subdirectory(deps)
+add_subdirectory(src)
+
+set(STM32_PROGRAMMER_CLI STM32_Programmer_CLI)
+include(${CMAKE_CURRENT_LIST_DIR}/cmake/flash_targets.cmake)
 
 find_package(Doxygen)
 
 if(DOXYGEN_FOUND)
     include("cmake/enable_doxygen.cmake")
     enable_doxygen()
-else ()
+else()
     message(WARNING "Doxygen not found. Documentation will not be generated.")
-endif ()
+endif()

Diff for: admin/.gitignore

@@ -1,16 +1,30 @@
 cmake_minimum_required(VERSION 3.28 FATAL_ERROR)
-project("admin" C CXX)
-set(CMAKE_C_STANDARD 11)
-set(CMAKE_CXX_STANDARD 20)
+project(admin CXX)
+set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 enable_testing()
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../deps/3rdparty/pfr pfr)
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../deps/3rdparty/sml sml)
+
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+find_package(Qt6 REQUIRED COMPONENTS
+    Core
+    Charts
+    Gui
+    SerialPort
+    Widgets
+)
+
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../deps/trielo trielo)
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../deps/bitint bitint)
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../deps/3rdparty/pfr pfr)
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../deps/serde serde)
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../deps/3rdparty/sml sml)
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../common common)
-add_subdirectory("deps")
-add_subdirectory("src")
+add_subdirectory(deps)
+add_subdirectory(src)
 
 if(CMAKE_BUILD_TYPE MATCHES "Debug")
     if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
@@ -23,8 +37,8 @@ endif()
 find_package(Doxygen)
 
 if(DOXYGEN_FOUND)
-    include("${CMAKE_CURRENT_LIST_DIR}/../cmake/enable_doxygen.cmake")
+    include("cmake/enable_doxygen.cmake")
     enable_doxygen()
-else ()
+else()
     message(WARNING "Doxygen not found. Documentation will not be generated.")
-endif ()
+endif()

Diff for: admin/CMakeLists.txt

@@ -1,3 +0,0 @@
-add_subdirectory(json)
-add_library(serial INTERFACE)
-target_include_directories(serial INTERFACE serial)

Diff for: admin_mock/cmake/enable_doxygen.cmake renamed to admin/cmake/enable_doxygen.cmake

@@ -1 +1 @@
-add_subdirectory("3rdparty")
+add_subdirectory(3rdparty)

Diff for: admin/deps/3rdparty/CMakeLists.txt

@@ -1,2 +1,22 @@
-add_subdirectory(app)
-add_subdirectory(decoder)
+add_executable(${CMAKE_PROJECT_NAME}
+    main.cpp
+    chart_widget.cpp
+    dialog.cpp
+    to_json.cpp
+    transceiver.cpp
+)
+
+target_link_libraries(${CMAKE_PROJECT_NAME}
+    magic
+    sml
+    trielo
+    bitint
+    sens::max31865_regs
+    sens::sht31_regs
+
+    Qt6::Core
+    Qt6::Charts
+    Qt6::Gui
+    Qt6::SerialPort
+    Qt6::Widgets
+)