Skip to content

Commit 13b5dd1

Browse files
Adding USB Support for dive computers (#2)
Co-authored-by: Sebastian Schneider <[email protected]>
1 parent 385bd8d commit 13b5dd1

File tree

200 files changed

+1126
-289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

200 files changed

+1126
-289
lines changed

.gitmodules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
[submodule "src/libdivecomputer"]
22
path = src/libdivecomputer
33
url = https://github.com/libdivecomputer/libdivecomputer.git
4+
[submodule "src/hidapi"]
5+
path = src/hidapi
6+
url = https://github.com/libusb/hidapi.git
7+
[submodule "src/libusb"]
8+
path = src/libusb
9+
url = https://github.com/libusb/libusb.git

README.md

Lines changed: 8 additions & 0 deletions

android/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ add_library(dive_computer SHARED
2020
"../src/libdivecomputer/src/timer.c"
2121
"../src/libdivecomputer/src/parser.c"
2222
"../src/libdivecomputer/src/serial_posix.c"
23+
"../src/libdivecomputer/src/usb.c"
24+
"../src/libdivecomputer/src/usbhid.c"
2325

2426
"../src/libdivecomputer/src/atomics_cobalt.c"
2527
"../src/libdivecomputer/src/atomics_cobalt_parser.c"

example/macos/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ EXTERNAL SOURCES:
1414
:path: Flutter/ephemeral
1515

1616
SPEC CHECKSUMS:
17-
dive_computer: d73377c895d5cc0bdb48eb85667b314cf47841d9
17+
dive_computer: e512b5b2b343092ee9551c845b8f84ad38a019c7
1818
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
1919

2020
PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367
2121

22-
COCOAPODS: 1.14.3
22+
COCOAPODS: 1.15.2

example/macos/Runner.xcodeproj/project.pbxproj

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
3030
33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
3131
CDF727C5C51DE46A62037ED3 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8833DC8D350DF77B2F889694 /* Pods_RunnerTests.framework */; };
32-
D85A387C2B49ED9F0078351E /* libdivecomputer.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D85A387B2B49ED9F0078351E /* libdivecomputer.0.dylib */; settings = {ATTRIBUTES = (Weak, ); }; };
33-
D85A387D2B49EDA50078351E /* libdivecomputer.0.dylib in Bundle Framework */ = {isa = PBXBuildFile; fileRef = D85A387B2B49ED9F0078351E /* libdivecomputer.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
32+
D85A387C2B49ED9F0078351E /* (null) in Frameworks */ = {isa = PBXBuildFile; settings = {ATTRIBUTES = (Weak, ); }; };
33+
D85A387D2B49EDA50078351E /* (null) in Bundle Framework */ = {isa = PBXBuildFile; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
3434
/* End PBXBuildFile section */
3535

3636
/* Begin PBXContainerItemProxy section */
@@ -57,7 +57,7 @@
5757
dstPath = "";
5858
dstSubfolderSpec = 10;
5959
files = (
60-
D85A387D2B49EDA50078351E /* libdivecomputer.0.dylib in Bundle Framework */,
60+
D85A387D2B49EDA50078351E /* (null) in Bundle Framework */,
6161
);
6262
name = "Bundle Framework";
6363
runOnlyForDeploymentPostprocessing = 0;
@@ -107,7 +107,7 @@
107107
buildActionMask = 2147483647;
108108
files = (
109109
262E412DF37AA4627DE9CE94 /* Pods_Runner.framework in Frameworks */,
110-
D85A387C2B49ED9F0078351E /* libdivecomputer.0.dylib in Frameworks */,
110+
D85A387C2B49ED9F0078351E /* (null) in Frameworks */,
111111
);
112112
runOnlyForDeploymentPostprocessing = 0;
113113
};
@@ -205,7 +205,6 @@
205205
D73912EC22F37F3D000D13A0 /* Frameworks */ = {
206206
isa = PBXGroup;
207207
children = (
208-
D85A387B2B49ED9F0078351E /* libdivecomputer.0.dylib */,
209208
866168B11938ECFE46CFB139 /* Pods_Runner.framework */,
210209
8833DC8D350DF77B2F889694 /* Pods_RunnerTests.framework */,
211210
);
@@ -574,6 +573,7 @@
574573
CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
575574
CODE_SIGN_STYLE = Automatic;
576575
COMBINE_HIDPI_IMAGES = YES;
576+
DEVELOPMENT_TEAM = "";
577577
INFOPLIST_FILE = Runner/Info.plist;
578578
LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
579579
LIBRARY_SEARCH_PATHS = (
@@ -703,6 +703,7 @@
703703
CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
704704
CODE_SIGN_STYLE = Automatic;
705705
COMBINE_HIDPI_IMAGES = YES;
706+
DEVELOPMENT_TEAM = "";
706707
INFOPLIST_FILE = Runner/Info.plist;
707708
LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
708709
LIBRARY_SEARCH_PATHS = (
@@ -726,6 +727,7 @@
726727
CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements;
727728
CODE_SIGN_STYLE = Automatic;
728729
COMBINE_HIDPI_IMAGES = YES;
730+
DEVELOPMENT_TEAM = "";
729731
INFOPLIST_FILE = Runner/Info.plist;
730732
LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
731733
LIBRARY_SEARCH_PATHS = (

example/macos/Runner/DebugProfile.entitlements

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
<true/>
77
<key>com.apple.security.cs.allow-jit</key>
88
<true/>
9+
<key>com.apple.security.device.usb</key>
10+
<true/>
911
<key>com.apple.security.network.server</key>
1012
<true/>
1113
</dict>

example/macos/Runner/Info.plist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,7 @@
2828
<string>MainMenu</string>
2929
<key>NSPrincipalClass</key>
3030
<string>NSApplication</string>
31+
<key>NSUSBPeripheralUsageDescription</key>
32+
<string>Your explanation here</string>
3133
</dict>
3234
</plist>

example/macos/Runner/Release.entitlements

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@
44
<dict>
55
<key>com.apple.security.app-sandbox</key>
66
<true/>
7+
<key>com.apple.security.device.usb</key>
8+
<true/>
79
</dict>
810
</plist>

ffigen.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ headers:
1111
- 'src/libdivecomputer/include/libdivecomputer/iterator.h'
1212
- 'src/libdivecomputer/include/libdivecomputer/serial.h'
1313
- 'src/libdivecomputer/include/libdivecomputer/parser.h'
14+
- 'src/libdivecomputer/include/libdivecomputer/usb.h'
15+
- 'src/libdivecomputer/include/libdivecomputer/usbhid.h'
1416
preamble: |
1517
// ignore_for_file: always_specify_types, unused_field, unused_element
1618
// ignore_for_file: camel_case_types

ios/Classes/array.c

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)