From 193dd8bf83308716699dff5d2d4ed2415dc90c1e Mon Sep 17 00:00:00 2001
From: TheJackiMonster <thejackimonster@gmail.com>
Date: Thu, 7 Sep 2023 23:30:42 +0200
Subject: [PATCH] Update submodules usage

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
---
 .gitmodules                  |  7 +++++--
 interface_lib/CMakeLists.txt | 12 ++++++------
 interface_lib/modules/Fusion |  2 +-
 interface_lib/modules/hidapi |  1 +
 interface_lib/src/device3.c  |  2 +-
 5 files changed, 14 insertions(+), 10 deletions(-)
 create mode 160000 interface_lib/modules/hidapi

diff --git a/.gitmodules b/.gitmodules
index 56682d2..8696ec6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
-[submodule "modules/Fusion"]
+[submodule "interface_lib/modules/Fusion"]
 	path = interface_lib/modules/Fusion
-	url = https://github.com/TheJackiMonster/Fusion.git
+	url = https://github.com/xioTechnologies/Fusion.git
+[submodule "interface_lib/modules/hidapi"]
+	path = interface_lib/modules/hidapi
+	url = https://github.com/libusb/hidapi.git
diff --git a/interface_lib/CMakeLists.txt b/interface_lib/CMakeLists.txt
index c787c1f..5acbb29 100644
--- a/interface_lib/CMakeLists.txt
+++ b/interface_lib/CMakeLists.txt
@@ -3,12 +3,10 @@ project(nrealAirLibrary C)
 
 set(CMAKE_C_STANDARD 17)
 
-find_package(hidapi REQUIRED)
-find_package(json-c REQUIRED)
+find_package(json-c REQUIRED CONFIG)
 
+add_subdirectory(modules/hidapi)
 add_subdirectory(modules/Fusion/Fusion)
-set(FUSION_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/modules/Fusion)
-set(FUSION_LIBRARY Fusion)
 
 add_library(
 		nrealAirLibrary
@@ -22,11 +20,13 @@ target_include_directories(nrealAirLibrary
 )
 
 target_include_directories(nrealAirLibrary
-		SYSTEM BEFORE PRIVATE ${FUSION_INCLUDE_DIR}
+		SYSTEM BEFORE PRIVATE 
+		${CMAKE_CURRENT_SOURCE_DIR}/modules/hidapi
+		${CMAKE_CURRENT_SOURCE_DIR}/modules/Fusion
 )
 
 target_link_libraries(nrealAirLibrary
-		hidapi::hidapi json-c::json-c ${FUSION_LIBRARY} m
+		hidapi::hidapi json-c::json-c Fusion m
 )
 
 set(NRA_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include PARENT_SCOPE)
diff --git a/interface_lib/modules/Fusion b/interface_lib/modules/Fusion
index f69fd25..0fd6785 160000
--- a/interface_lib/modules/Fusion
+++ b/interface_lib/modules/Fusion
@@ -1 +1 @@
-Subproject commit f69fd25df008ca11e709579fea4b784537f8911e
+Subproject commit 0fd6785d3e3e2f8c358603db47ff5dadc0e338af
diff --git a/interface_lib/modules/hidapi b/interface_lib/modules/hidapi
new file mode 160000
index 0000000..c19ae12
--- /dev/null
+++ b/interface_lib/modules/hidapi
@@ -0,0 +1 @@
+Subproject commit c19ae126d8856b55af34d64ee11641920475961c
diff --git a/interface_lib/src/device3.c b/interface_lib/src/device3.c
index 8a7334a..8f6ee65 100644
--- a/interface_lib/src/device3.c
+++ b/interface_lib/src/device3.c
@@ -306,7 +306,7 @@ device3_type* device3_open(device3_event_callback callback) {
 			.gain = 0.5f,
 			.accelerationRejection = 10.0f,
 			.magneticRejection = 20.0f,
-			.rejectionTimeout = 5 * SAMPLE_RATE, /* 5 seconds */
+			.recoveryTriggerPeriod = 5 * SAMPLE_RATE, /* 5 seconds */
 	};
 	
 	FusionAhrsSetSettings((FusionAhrs*) device->ahrs, &settings);