Adding USB Support for dive computers (#2)

Co-authored-by: Sebastian Schneider <sese.tailor@gmx.net>
DiveNote · Feb 28, 2024 · 13b5dd1 · 13b5dd1
1 parent 385bd8d
commit 13b5dd1
Show file tree

Hide file tree

Showing 200 changed files with 1,126 additions and 289 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,9 @@
 [submodule "src/libdivecomputer"]
 	path = src/libdivecomputer
 	url = https://github.com/libdivecomputer/libdivecomputer.git
+[submodule "src/hidapi"]
+	path = src/hidapi
+	url = https://github.com/libusb/hidapi.git
+[submodule "src/libusb"]
+	path = src/libusb
+	url = https://github.com/libusb/libusb.git
diff --git a/README.md b/README.md
@@ -17,6 +17,14 @@ This plugin automatically spawns its own isolate for communication with the dive
 
 Please refer to the example app for a minimalistic example usage.
 
+# macOS
+
+This plugin supports USB and Serial connection on macOS. On macOS you need to make sure the app has access to the USB connection granted. To do so add the following snippet to info.plist and make sure you grant USB access in xcode via `Signing & Capabilities -> Hardware -> USB`.
+```
+<key>NSUSBPeripheralUsageDescription</key>
+<string>Your explanation here</string>
+```
+
 ---
 
 ### Acknowledgements

diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt
@@ -20,6 +20,8 @@ add_library(dive_computer SHARED
   "../src/libdivecomputer/src/timer.c"
   "../src/libdivecomputer/src/parser.c"
   "../src/libdivecomputer/src/serial_posix.c"
+  "../src/libdivecomputer/src/usb.c"
+  "../src/libdivecomputer/src/usbhid.c"
 
   "../src/libdivecomputer/src/atomics_cobalt.c"
   "../src/libdivecomputer/src/atomics_cobalt_parser.c"

diff --git a/example/macos/Podfile.lock b/example/macos/Podfile.lock
@@ -14,9 +14,9 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral
 
 SPEC CHECKSUMS:
-  dive_computer: d73377c895d5cc0bdb48eb85667b314cf47841d9
+  dive_computer: e512b5b2b343092ee9551c845b8f84ad38a019c7
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
 
 PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.15.2
diff --git a/example/macos/Runner.xcodeproj/project.pbxproj b/example/macos/Runner.xcodeproj/project.pbxproj
@@ -29,8 +29,8 @@
 		33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
 		33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
 		CDF727C5C51DE46A62037ED3 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8833DC8D350DF77B2F889694 /* Pods_RunnerTests.framework */; };
-		D85A387C2B49ED9F0078351E /* libdivecomputer.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D85A387B2B49ED9F0078351E /* libdivecomputer.0.dylib */; settings = {ATTRIBUTES = (Weak, ); }; };
-		D85A387D2B49EDA50078351E /* libdivecomputer.0.dylib in Bundle Framework */ = {isa = PBXBuildFile; fileRef = D85A387B2B49ED9F0078351E /* libdivecomputer.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		D85A387C2B49ED9F0078351E /* (null) in Frameworks */ = {isa = PBXBuildFile; settings = {ATTRIBUTES = (Weak, ); }; };
+		D85A387D2B49EDA50078351E /* (null) in Bundle Framework */ = {isa = PBXBuildFile; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -57,7 +57,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				D85A387D2B49EDA50078351E /* libdivecomputer.0.dylib in Bundle Framework */,
+				D85A387D2B49EDA50078351E /* (null) in Bundle Framework */,
 			);
 			name = "Bundle Framework";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -107,7 +107,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				262E412DF37AA4627DE9CE94 /* Pods_Runner.framework in Frameworks */,
-				D85A387C2B49ED9F0078351E /* libdivecomputer.0.dylib in Frameworks */,
+				D85A387C2B49ED9F0078351E /* (null) in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -205,7 +205,6 @@
 		D73912EC22F37F3D000D13A0 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				D85A387B2B49ED9F0078351E /* libdivecomputer.0.dylib */,
 				866168B11938ECFE46CFB139 /* Pods_Runner.framework */,
 				8833DC8D350DF77B2F889694 /* Pods_RunnerTests.framework */,
 			);
@@ -574,6 +573,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
 				LIBRARY_SEARCH_PATHS = (
@@ -703,6 +703,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
 				LIBRARY_SEARCH_PATHS = (
@@ -726,6 +727,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
 				LIBRARY_SEARCH_PATHS = (

diff --git a/example/macos/Runner/DebugProfile.entitlements b/example/macos/Runner/DebugProfile.entitlements
@@ -6,6 +6,8 @@
 	<true/>
 	<key>com.apple.security.cs.allow-jit</key>
 	<true/>
+	<key>com.apple.security.device.usb</key>
+	<true/>
 	<key>com.apple.security.network.server</key>
 	<true/>
 </dict>

diff --git a/example/macos/Runner/Info.plist b/example/macos/Runner/Info.plist
@@ -28,5 +28,7 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>NSUSBPeripheralUsageDescription</key>
+	<string>Your explanation here</string>
 </dict>
 </plist>
diff --git a/example/macos/Runner/Release.entitlements b/example/macos/Runner/Release.entitlements
@@ -4,5 +4,7 @@
 <dict>
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
+	<key>com.apple.security.device.usb</key>
+	<true/>
 </dict>
 </plist>
diff --git a/ffigen.yaml b/ffigen.yaml
@@ -11,6 +11,8 @@ headers:
     - 'src/libdivecomputer/include/libdivecomputer/iterator.h'
     - 'src/libdivecomputer/include/libdivecomputer/serial.h'
     - 'src/libdivecomputer/include/libdivecomputer/parser.h'
+    - 'src/libdivecomputer/include/libdivecomputer/usb.h'
+    - 'src/libdivecomputer/include/libdivecomputer/usbhid.h'
 preamble: |
   // ignore_for_file: always_specify_types, unused_field, unused_element
   // ignore_for_file: camel_case_types

diff --git a/ios/Classes/array.c b/ios/Classes/array.c
diff --git a/ios/Classes/atomics_cobalt.c b/ios/Classes/atomics_cobalt.c
diff --git a/ios/Classes/atomics_cobalt_parser.c b/ios/Classes/atomics_cobalt_parser.c
diff --git a/ios/Classes/citizen_aqualand.c b/ios/Classes/citizen_aqualand.c
diff --git a/ios/Classes/citizen_aqualand_parser.c b/ios/Classes/citizen_aqualand_parser.c
diff --git a/ios/Classes/cochran_commander.c b/ios/Classes/cochran_commander.c
diff --git a/ios/Classes/cochran_commander_parser.c b/ios/Classes/cochran_commander_parser.c
diff --git a/ios/Classes/cressi_ady_parser.c b/ios/Classes/cressi_ady_parser.c
diff --git a/ios/Classes/cressi_edy.c b/ios/Classes/cressi_edy.c
diff --git a/ios/Classes/cressi_goa.c b/ios/Classes/cressi_goa.c
diff --git a/ios/Classes/cressi_goa_parser.c b/ios/Classes/cressi_goa_parser.c
diff --git a/ios/Classes/cressi_leonardo.c b/ios/Classes/cressi_leonardo.c
diff --git a/ios/Classes/cressi_leonardo_parser.c b/ios/Classes/cressi_leonardo_parser.c
diff --git a/ios/Classes/deepblu_cosmiq.c b/ios/Classes/deepblu_cosmiq.c
diff --git a/ios/Classes/deepblu_cosmiq_parser.c b/ios/Classes/deepblu_cosmiq_parser.c
diff --git a/ios/Classes/deepsix_excursion.c b/ios/Classes/deepsix_excursion.c
diff --git a/ios/Classes/deepsix_excursion_parser.c b/ios/Classes/deepsix_excursion_parser.c
diff --git a/ios/Classes/dive_computer.c b/ios/Classes/dive_computer.c
diff --git a/ios/Classes/diverite_nitekq.c b/ios/Classes/diverite_nitekq.c
diff --git a/ios/Classes/diverite_nitekq_parser.c b/ios/Classes/diverite_nitekq_parser.c
diff --git a/ios/Classes/divesoft_freedom.c b/ios/Classes/divesoft_freedom.c
diff --git a/ios/Classes/divesoft_freedom_parser.c b/ios/Classes/divesoft_freedom_parser.c
diff --git a/ios/Classes/divesystem_idive.c b/ios/Classes/divesystem_idive.c
diff --git a/ios/Classes/divesystem_idive_parser.c b/ios/Classes/divesystem_idive_parser.c
diff --git a/ios/Classes/hdlc.c b/ios/Classes/hdlc.c
diff --git a/ios/Classes/hw_frog.c b/ios/Classes/hw_frog.c
diff --git a/ios/Classes/hw_ostc.c b/ios/Classes/hw_ostc.c
diff --git a/ios/Classes/hw_ostc3.c b/ios/Classes/hw_ostc3.c
diff --git a/ios/Classes/hw_ostc_parser.c b/ios/Classes/hw_ostc_parser.c
diff --git a/ios/Classes/ihex.c b/ios/Classes/ihex.c
diff --git a/ios/Classes/liquivision_lynx.c b/ios/Classes/liquivision_lynx.c
diff --git a/ios/Classes/liquivision_lynx_parser.c b/ios/Classes/liquivision_lynx_parser.c
diff --git a/ios/Classes/mares_common.c b/ios/Classes/mares_common.c
diff --git a/ios/Classes/mares_darwin.c b/ios/Classes/mares_darwin.c
diff --git a/ios/Classes/mares_darwin_parser.c b/ios/Classes/mares_darwin_parser.c
diff --git a/ios/Classes/mares_iconhd.c b/ios/Classes/mares_iconhd.c
diff --git a/ios/Classes/mares_iconhd_parser.c b/ios/Classes/mares_iconhd_parser.c
diff --git a/ios/Classes/mares_nemo.c b/ios/Classes/mares_nemo.c
diff --git a/ios/Classes/mares_nemo_parser.c b/ios/Classes/mares_nemo_parser.c
diff --git a/ios/Classes/mares_puck.c b/ios/Classes/mares_puck.c
diff --git a/ios/Classes/mclean_extreme.c b/ios/Classes/mclean_extreme.c
diff --git a/ios/Classes/mclean_extreme_parser.c b/ios/Classes/mclean_extreme_parser.c
diff --git a/ios/Classes/oceanic_atom2.c b/ios/Classes/oceanic_atom2.c
diff --git a/ios/Classes/oceanic_atom2_parser.c b/ios/Classes/oceanic_atom2_parser.c
diff --git a/ios/Classes/oceanic_common.c b/ios/Classes/oceanic_common.c
diff --git a/ios/Classes/oceanic_veo250.c b/ios/Classes/oceanic_veo250.c
diff --git a/ios/Classes/oceanic_veo250_parser.c b/ios/Classes/oceanic_veo250_parser.c
diff --git a/ios/Classes/oceans_s1.c b/ios/Classes/oceans_s1.c
diff --git a/ios/Classes/oceans_s1_common.c b/ios/Classes/oceans_s1_common.c
diff --git a/ios/Classes/oceans_s1_parser.c b/ios/Classes/oceans_s1_parser.c
diff --git a/ios/Classes/ocenic_vtpro.c b/ios/Classes/ocenic_vtpro.c
diff --git a/ios/Classes/ocenic_vtpro_parser.c b/ios/Classes/ocenic_vtpro_parser.c
diff --git a/ios/Classes/reefnet_sensus.c b/ios/Classes/reefnet_sensus.c
diff --git a/ios/Classes/reefnet_sensus_parser.c b/ios/Classes/reefnet_sensus_parser.c
diff --git a/ios/Classes/reefnet_sensuspro.c b/ios/Classes/reefnet_sensuspro.c
diff --git a/ios/Classes/reefnet_sensuspro_parser.c b/ios/Classes/reefnet_sensuspro_parser.c
diff --git a/ios/Classes/reefnet_sensusultra.c b/ios/Classes/reefnet_sensusultra.c
diff --git a/ios/Classes/reefnet_sensusultra_parser.c b/ios/Classes/reefnet_sensusultra_parser.c
diff --git a/ios/Classes/seac_screen.c b/ios/Classes/seac_screen.c
diff --git a/ios/Classes/seac_screen_parser.c b/ios/Classes/seac_screen_parser.c
diff --git a/ios/Classes/serial_posix.c b/ios/Classes/serial_posix.c
diff --git a/ios/Classes/shearwater_common.c b/ios/Classes/shearwater_common.c
diff --git a/ios/Classes/shearwater_petrel.c b/ios/Classes/shearwater_petrel.c
diff --git a/ios/Classes/shearwater_predator.c b/ios/Classes/shearwater_predator.c
diff --git a/ios/Classes/shearwater_predator_parser.c b/ios/Classes/shearwater_predator_parser.c
diff --git a/ios/Classes/sporasub_sp2.c b/ios/Classes/sporasub_sp2.c
diff --git a/ios/Classes/sporasub_sp2_parser.c b/ios/Classes/sporasub_sp2_parser.c
diff --git a/ios/Classes/suunto_common.c b/ios/Classes/suunto_common.c
diff --git a/ios/Classes/suunto_common2.c b/ios/Classes/suunto_common2.c
diff --git a/ios/Classes/suunto_d9.c b/ios/Classes/suunto_d9.c
diff --git a/ios/Classes/suunto_d9_parser.c b/ios/Classes/suunto_d9_parser.c
diff --git a/ios/Classes/suunto_eon.c b/ios/Classes/suunto_eon.c
diff --git a/ios/Classes/suunto_eon_parser.c b/ios/Classes/suunto_eon_parser.c
diff --git a/ios/Classes/suunto_eonsteel.c b/ios/Classes/suunto_eonsteel.c
diff --git a/ios/Classes/suunto_eonsteel_parser.c b/ios/Classes/suunto_eonsteel_parser.c
diff --git a/ios/Classes/suunto_solution.c b/ios/Classes/suunto_solution.c
diff --git a/ios/Classes/suunto_solution_parser.c b/ios/Classes/suunto_solution_parser.c
diff --git a/ios/Classes/suunto_vyper.c b/ios/Classes/suunto_vyper.c
diff --git a/ios/Classes/suunto_vyper2.c b/ios/Classes/suunto_vyper2.c
diff --git a/ios/Classes/suunto_vyper_parser.c b/ios/Classes/suunto_vyper_parser.c
diff --git a/ios/Classes/tecdiving_divecomputereu.c b/ios/Classes/tecdiving_divecomputereu.c