FOME-Tech
/
fome-fw
mirror of https://github.com/FOME-Tech/fome-fw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

handle macos serial port prefix snafu

This commit is contained in:
Matthew Kennedy 2023-11-04 00:20:50 -07:00
parent 98c4546a7c
commit 6e1a10a509
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
java_console/ui/src/main/java/com/rusefi/maintenance/OpenbltJni.java
View File

@ -47,7 +47,24 @@ public final class OpenbltJni {
System.loadLibrary("openblt_jni");
}
public static native void flashSerial(String filename, String serialPort, OpenbltCallbacks callbacks);
public static native void flashCan(String filename, OpenbltCallbacks callbacks);
public static native void stop(OpenbltCallbacks callbacks);
public static void flashSerial(String filename, String serialPort, OpenbltCallbacks callbacks) {
// On non-Windows, prepend "/dev/" to the serial port name if it's missing
if (!OS_NAME.contains("win") && !serialPort.startsWith("/dev/")) {
serialPort = "/dev/" + serialPort;
}
flashSerialImpl(filename, serialPort, callbacks);
}
public static void flashCan(String filename, OpenbltCallbacks callbacks) {
flashCanNative(filename, callbacks);
}
public static void stop(OpenbltCallbacks callbacks) {
stopNative(callbacks);
}
private static native void flashSerialImpl(String filename, String serialPort, OpenbltCallbacks callbacks);
private static native void flashCanNative(String filename, OpenbltCallbacks callbacks);
private static native void stopNative(OpenbltCallbacks callbacks);
}

6
misc/libopenblt_jni/openblt_jni.cpp
View File

@ -253,7 +253,7 @@ static bool program(JNIEnv* env, jobject jCallbacks) {
return true;
}
extern "C" JNIEXPORT void JNICALL Java_com_rusefi_maintenance_OpenbltJni_flashSerial(JNIEnv* env, jobject, jstring jFirmwareFile, jstring jSerialPort, jobject jCallbacks) {
extern "C" JNIEXPORT void JNICALL Java_com_rusefi_maintenance_OpenbltJni_flashSerialNative(JNIEnv* env, jobject, jstring jFirmwareFile, jstring jSerialPort, jobject jCallbacks) {
if (!loadFirmware(env, jFirmwareFile, jCallbacks)) {
return;
}
@ -271,7 +271,7 @@ extern "C" JNIEXPORT void JNICALL Java_com_rusefi_maintenance_OpenbltJni_flashSe
}
}
extern "C" JNIEXPORT void JNICALL Java_com_rusefi_maintenance_OpenbltJni_flashCan(JNIEnv * env, jobject, jstring jFirmwareFile, jobject jCallbacks) {
extern "C" JNIEXPORT void JNICALL Java_com_rusefi_maintenance_OpenbltJni_flashCanNative(JNIEnv * env, jobject, jstring jFirmwareFile, jobject jCallbacks) {
if (!loadFirmware(env, jFirmwareFile, jCallbacks)) {
return;
}
@ -289,7 +289,7 @@ extern "C" JNIEXPORT void JNICALL Java_com_rusefi_maintenance_OpenbltJni_flashCa
}
}
extern "C" JNIEXPORT void JNICALL Java_com_rusefi_maintenance_OpenbltJni_stop(JNIEnv* env, jobject, jobject jCallbacks) {
extern "C" JNIEXPORT void JNICALL Java_com_rusefi_maintenance_OpenbltJni_stopNative(JNIEnv* env, jobject, jobject jCallbacks) {
Callbacks cb(env, jCallbacks, "Cleanup", false);
BltSessionStop();