Display HID devices in UI

src/common/CMakeLists.txt

@@ -34,6 +34,7 @@ set(COMMON_SRC
         ${CMAKE_CURRENT_LIST_DIR}/text_logger.cpp
         ${CMAKE_CURRENT_LIST_DIR}/toml_utils.cpp
         ${CMAKE_CURRENT_LIST_DIR}/utils.cpp
+        hid_device_data.h
 )
 
 # Build static library

src/common/hid_device_data.h

@@ -0,0 +1,44 @@
+//---------------------------------------------------------------------------------------------------------------------
+//   XMidiCtrl - MIDI Controller plugin for X-Plane
+//
+//   Copyright (c) 2021-2024 Marco Auer
+//
+//   XMidiCtrl is free software: you can redistribute it and/or modify it under the terms of the
+//   GNU Affero General Public License as published by the Free Software Foundation, either version 3
+//   of the License, or (at your option) any later version.
+//
+//   XMidiCtrl is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+//   the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License along with XMidiCtrl.
+//   If not, see <https://www.gnu.org/licenses/>.
+//---------------------------------------------------------------------------------------------------------------------
+
+#ifndef XMC_HID_DEVICE_DATA_H
+#define XMC_HID_DEVICE_DATA_H
+
+// Standard
+#include <string>
+
+namespace xmidictrl {
+
+//---------------------------------------------------------------------------------------------------------------------
+//   TYPES
+//---------------------------------------------------------------------------------------------------------------------
+
+struct hid_device_data {
+	std::string manufacturer_string;
+	std::string product_string;
+
+	unsigned short vendor_id;
+	unsigned short product_id;
+
+	wchar_t* serial_no;
+
+	int usb_interface_no;
+};
+
+} // Namespace xmidictrl
+
+#endif // HID_DEVICE_DATA_H

src/env-xplane/imgui_window.cpp

@@ -33,6 +33,9 @@
 #include "IconsFontAwesome6.h"
 #include "fa-solid-900.inc"
 
+#include "IconsFontAwesome6Brands.h"
+#include "fa-brands-400.inc"
+
 // X-Plane SDK
 #include <XPLMGraphics.h>
 
@@ -97,6 +100,19 @@ imgui_window::imgui_window(text_logger& in_log,
                                                     &config,
                                                     icon_ranges.Data))
             in_log.warn("Error loading 'Font Awesome' for Dear ImGui");
+
+		// Brands
+		static ImVector<ImWchar> icon_ranges_brands;
+		ImFontGlyphRangesBuilder builder_brands;
+		builder_brands.AddText(ICON_FA_USB);
+		builder_brands.BuildRanges(&icon_ranges_brands);
+
+		if (!s_font->AddFontFromMemoryCompressedTTF(fa_brands_400_compressed_data,
+													fa_brands_400_compressed_size,
+													IMGUI_FONT_SIZE,
+													&config,
+													icon_ranges_brands.Data))
+			in_log.warn("Error loading 'Font Awesome Brands' for Dear ImGui");
     }
 
     // check if a font atlas was supplied

src/plugin/CMakeLists.txt

@@ -36,15 +36,15 @@ if (WIN32)
                 target_link_libraries(${PROJECT_NAME} mingw_stdthreads)
         endif()
         if (MSVC)
-                target_link_libraries(${PROJECT_NAME} toml11 fmt::fmt-header-only rtmidi winmm xpsdk imgui)
+                target_link_libraries(${PROJECT_NAME} toml11 fmt::fmt-header-only rtmidi hidapi::hidapi winmm xpsdk imgui)
                 include(GenerateExportHeader)
                 generate_export_header(${PROJECT_NAME})
                 add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
                         COMMAND ${CMAKE_COMMAND} -E copy_if_different
                         $<TARGET_FILE:${PROJECT_NAME}> "${PROJECT_SOURCE_DIR}/package/${PROJECT_NAME}/win_x64/$<TARGET_FILE_NAME:${PROJECT_NAME}>"
                 )
         else()
-                target_link_libraries(${PROJECT_NAME} -s -static -static-libgcc -static-libstdc++ toml11 fmt::fmt-header-only rtmidi winmm xpsdk imgui)
+                target_link_libraries(${PROJECT_NAME} -s -static -static-libgcc -static-libstdc++ toml11 fmt::fmt-header-only rtmidi hidapi::hidapi winmm xpsdk imgui)
                 set_target_properties(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/package/${PROJECT_NAME}/win_x64")
         endif()
 elseif (APPLE)
@@ -56,7 +56,7 @@ elseif (APPLE)
         find_library(OpenGL_LIBRARY OpenGL REQUIRED)
         # Link OS X core system libraries.
         target_link_libraries(${PROJECT_NAME} ${CORE_FOUNDATION_LIBRARY} ${Cocoa_LIBRARY} ${Security_LIBRARY} ${GSS_LIBRARY} ${OpenGL_LIBRARY})
-        target_link_libraries(${PROJECT_NAME} toml11 fmt::fmt-header-only rtmidi xpsdk imgui)
+        target_link_libraries(${PROJECT_NAME} toml11 fmt::fmt-header-only rtmidi hidapi::hidapi xpsdk imgui)
         target_link_options(${PROJECT_NAME} PRIVATE "-Wl,-no_weak_imports")
 
         # Restrict set of symbols exported from the plugin to the ones required by XPLM:
@@ -65,7 +65,7 @@ elseif (APPLE)
 elseif (UNIX)
         message("Build for Linux Platform")
         set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/package/${PROJECT_NAME}/lin_64")
-        target_link_libraries(${PROJECT_NAME} -static-libgcc -static-libstdc++ -fPIC toml11 fmt::fmt-header-only rtmidi xpsdk imgui)
+        target_link_libraries(${PROJECT_NAME} -static-libgcc -static-libstdc++ -fPIC toml11 fmt::fmt-header-only rtmidi hidapi::hidapi xpsdk imgui)
         set_target_properties(${PROJECT_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/package/${PROJECT_NAME}/lin_x64")
 endif ()