andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

now we can update firmware if ECU is switched manually to DFU mode (by pressing `PROG` and `RST` buttons) 

closes #6791
This commit is contained in:
kifir 2024-09-20 01:34:32 +03:00 committed by rusEFI LLC
parent 8906dee3df
commit 8536ed7ca6
1 changed files with 75 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
java_console/ui/src/main/java/com/rusefi/ui/basic/BasicStartupFrame.java
View File

@ -133,58 +133,62 @@ public class BasicStartupFrame {
}
private void updateUpdateFirmwareJob(final AvailableHardware currentHardware) {
final Set<SerialPortScanner.SerialPortType> portTypesToUpdateFirmware = (isObfuscated ?
Set.of(
SerialPortScanner.SerialPortType.EcuWithOpenblt,
SerialPortScanner.SerialPortType.OpenBlt
) :
Set.of(
SerialPortScanner.SerialPortType.Ecu,
SerialPortScanner.SerialPortType.EcuWithOpenblt
)
);
final List<SerialPortScanner.PortResult> portsToUpdateFirmware = currentHardware.getKnownPorts(
portTypesToUpdateFirmware
);
if (currentHardware.isDfuFound()) {
setUpdateFirmwareJob(new JobParameters(DFU_MANUAL, null));
} else {
final Set<SerialPortScanner.SerialPortType> portTypesToUpdateFirmware = (isObfuscated ?
Set.of(
SerialPortScanner.SerialPortType.EcuWithOpenblt,
SerialPortScanner.SerialPortType.OpenBlt
) :
Set.of(
SerialPortScanner.SerialPortType.Ecu,
SerialPortScanner.SerialPortType.EcuWithOpenblt
)
);
final List<SerialPortScanner.PortResult> portsToUpdateFirmware = currentHardware.getKnownPorts(
portTypesToUpdateFirmware
);
switch (portsToUpdateFirmware.size()) {
case 0: {
resetUpdateFirmwareJob("ECU not found");
break;
}
case 1: {
final SerialPortScanner.PortResult portToUpdateFirmware = portsToUpdateFirmware.get(0);
JobType jobType = null;
if (isObfuscated) {
final SerialPortScanner.SerialPortType portType = portToUpdateFirmware.type;
switch (portType) {
case EcuWithOpenblt: {
jobType = OPENBLT_AUTO;
break;
}
case OpenBlt: {
jobType = OPENBLT_MANUAL;
break;
}
default: {
log.error(String.format("Unexpected port type: %s", portType));
break;
}
}
} else {
jobType = DFU_AUTO;
switch (portsToUpdateFirmware.size()) {
case 0: {
resetUpdateFirmwareJob("ECU not found");
break;
}
case 1: {
final SerialPortScanner.PortResult portToUpdateFirmware = portsToUpdateFirmware.get(0);
JobType jobType = null;
if (isObfuscated) {
final SerialPortScanner.SerialPortType portType = portToUpdateFirmware.type;
switch (portType) {
case EcuWithOpenblt: {
jobType = OPENBLT_AUTO;
break;
}
case OpenBlt: {
jobType = OPENBLT_MANUAL;
break;
}
default: {
log.error(String.format("Unexpected port type: %s", portType));
break;
}
}
} else {
jobType = DFU_AUTO;
}
setUpdateFirmwareJob(new JobParameters(jobType, portToUpdateFirmware));
break;
}
default: {
resetUpdateFirmwareJob(String.format(
"Multiple ECUs found on: %s",
portsToUpdateFirmware.stream()
.map(portResult -> portResult.port)
.collect(Collectors.joining(", "))
));
break;
}
setUpdateFirmwareJob(new JobParameters(jobType, portToUpdateFirmware));
break;
}
default: {
resetUpdateFirmwareJob(String.format(
"Multiple ECUs found on: %s",
portsToUpdateFirmware.stream()
.map(portResult -> portResult.port)
.collect(Collectors.joining(", "))
));
break;
}
}
}
@ -193,21 +197,27 @@ public class BasicStartupFrame {
updateFirmwareJob = Optional.of(jobParams);
hideStatusMessage();
updateFirmwareButton.setEnabled(true);
if (isObfuscated) {
final JobType jobType = jobParams.jobType;
switch (jobType) {
case OPENBLT_AUTO: {
updateFirmwareButton.setText("Auto Update Firmware");
break;
}
case OPENBLT_MANUAL: {
updateFirmwareButton.setText("Blt Update Firmware");
break;
}
default: {
log.error(String.format("Unexpected job type: %s", jobType));
break;
}
final JobType jobType = jobParams.jobType;
switch (jobType) {
case OPENBLT_AUTO: {
updateFirmwareButton.setText("Auto Update Firmware");
break;
}
case OPENBLT_MANUAL: {
updateFirmwareButton.setText("Blt Update Firmware");
break;
}
case DFU_AUTO: {
updateFirmwareButton.setText("Update Firmware");
break;
}
case DFU_MANUAL: {
updateFirmwareButton.setText("Update Firmware via DFU");
break;
}
default: {
log.error(String.format("Unexpected job type: %s", jobType));
break;
}
}
}