Skip to content

Commit 40dcf8d

Browse files
committed
ugh fix i hope
Signed-off-by: Jade Turner <spacey-sooty@proton.me>
1 parent e052524 commit 40dcf8d

File tree

348 files changed

+39967
-39966
lines changed

Some content is hidden

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

348 files changed

+39967
-39966
lines changed

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ spotless {
6666
}
6767
toggleOffOn()
6868
googleJavaFormat()
69+
leadingSpacesToTabs(2)
6970
leadingTabsToSpaces(4)
7071
removeUnusedImports()
7172
trimTrailingWhitespace()

photon-core/src/main/java/org/photonvision/common/LoadJNI.java

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -23,37 +23,37 @@
2323
import org.photonvision.jni.LibraryLoader;
2424

2525
public class LoadJNI {
26-
private static HashMap<JNITypes, Boolean> loadedMap = new HashMap<>();
26+
private static HashMap<JNITypes, Boolean> loadedMap = new HashMap<>();
2727

28-
public enum JNITypes {
29-
RUBIK_DETECTOR("tensorflowlite", "tensorflowlite_c", "external_delegate", "rubik_jni"),
30-
RKNN_DETECTOR("rga", "rknnrt", "rknn_jni"),
31-
MRCAL("mrcal_jni"),
32-
LIBCAMERA("photonlibcamera");
28+
public enum JNITypes {
29+
RUBIK_DETECTOR("tensorflowlite", "tensorflowlite_c", "external_delegate", "rubik_jni"),
30+
RKNN_DETECTOR("rga", "rknnrt", "rknn_jni"),
31+
MRCAL("mrcal_jni"),
32+
LIBCAMERA("photonlibcamera");
3333

34-
public final String[] libraries;
34+
public final String[] libraries;
3535

36-
JNITypes(String... libraries) {
37-
this.libraries = libraries;
36+
JNITypes(String... libraries) {
37+
this.libraries = libraries;
38+
}
3839
}
39-
}
4040

41-
public static synchronized void forceLoad(JNITypes type) throws IOException {
42-
loadLibraries();
41+
public static synchronized void forceLoad(JNITypes type) throws IOException {
42+
loadLibraries();
4343

44-
if (loadedMap.getOrDefault(type, false)) {
45-
return;
46-
}
44+
if (loadedMap.getOrDefault(type, false)) {
45+
return;
46+
}
4747

48-
CombinedRuntimeLoader.loadLibraries(LoadJNI.class, type.libraries);
49-
loadedMap.put(type, true);
50-
}
48+
CombinedRuntimeLoader.loadLibraries(LoadJNI.class, type.libraries);
49+
loadedMap.put(type, true);
50+
}
5151

52-
public static boolean loadLibraries() {
53-
return LibraryLoader.loadWpiLibraries() && LibraryLoader.loadTargeting();
54-
}
52+
public static boolean loadLibraries() {
53+
return LibraryLoader.loadWpiLibraries() && LibraryLoader.loadTargeting();
54+
}
5555

56-
public static boolean hasLoaded(JNITypes t) {
57-
return loadedMap.getOrDefault(t, false);
58-
}
56+
public static boolean hasLoaded(JNITypes t) {
57+
return loadedMap.getOrDefault(t, false);
58+
}
5959
}

photon-core/src/main/java/org/photonvision/common/ProgramStatus.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package org.photonvision.common;
1919

2020
public enum ProgramStatus {
21-
UHOH,
22-
RUNNING,
23-
RUNNING_NT
21+
UHOH,
22+
RUNNING,
23+
RUNNING_NT
2424
}

0 commit comments

Comments
 (0)