UnrealXR/nrealAirLinuxDriver
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update submodules usage

Browse source 
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
This commit is contained in:
TheJackiMonster 2023-09-07 23:30:42 +02:00
parent 5e9d4d036b
commit 193dd8bf83
No known key found for this signature in database
GPG key ID: D850A5F772E880F9
5 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.gitmodules vendored
View file

@ -1,3 +1,6 @@
[submodule "modules/Fusion"] [submodule "interface_lib/modules/Fusion"]
path = 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

12
interface_lib/CMakeLists.txt
View file

@ -3,12 +3,10 @@ project(nrealAirLibrary C)
set(CMAKE_C_STANDARD 17) set(CMAKE_C_STANDARD 17)
find_package(hidapi REQUIRED) find_package(json-c REQUIRED CONFIG)
find_package(json-c REQUIRED)
add_subdirectory(modules/hidapi)
add_subdirectory(modules/Fusion/Fusion) add_subdirectory(modules/Fusion/Fusion)
set(FUSION_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/modules/Fusion)
set(FUSION_LIBRARY Fusion)
add_library( add_library(
nrealAirLibrary nrealAirLibrary
@ -22,11 +20,13 @@ target_include_directories(nrealAirLibrary
) )
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 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) set(NRA_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include PARENT_SCOPE)

2
interface_lib/modules/Fusion

@ -1 +1 @@
Subproject commit f69fd25df008ca11e709579fea4b784537f8911e Subproject commit 0fd6785d3e3e2f8c358603db47ff5dadc0e338af

1
interface_lib/modules/hidapi Submodule

@ -0,0 +1 @@
Subproject commit c19ae126d8856b55af34d64ee11641920475961c

2
interface_lib/src/device3.c
View file

@ -306,7 +306,7 @@ device3_type* device3_open(device3_event_callback callback) {
.gain = 0.5f, .gain = 0.5f,
.accelerationRejection = 10.0f, .accelerationRejection = 10.0f,
.magneticRejection = 20.0f, .magneticRejection = 20.0f,
.rejectionTimeout = 5 * SAMPLE_RATE, /* 5 seconds */ .recoveryTriggerPeriod = 5 * SAMPLE_RATE, /* 5 seconds */
}; };
FusionAhrsSetSettings((FusionAhrs*) device->ahrs, &settings); FusionAhrsSetSettings((FusionAhrs*) device->ahrs, &settings);