From 6d7259a12bbdbf5bdda949f8f492413b288d19a5 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Fri, 21 Feb 2025 20:30:51 -0500 Subject: [PATCH] magic constant only:uaefi --- .../com/rusefi/maintenance/OutputChannelsHelper.java | 2 +- .../main/java/com/rusefi/maintenance/TuneUploader.java | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/java_console/ui/src/main/java/com/rusefi/maintenance/OutputChannelsHelper.java b/java_console/ui/src/main/java/com/rusefi/maintenance/OutputChannelsHelper.java index 082dfc1d91..850ecac26c 100644 --- a/java_console/ui/src/main/java/com/rusefi/maintenance/OutputChannelsHelper.java +++ b/java_console/ui/src/main/java/com/rusefi/maintenance/OutputChannelsHelper.java @@ -48,7 +48,7 @@ public class OutputChannelsHelper { mcuSerial.set(PanamaHelper.getMcuSerial(mcuSerialField)); }); if (binaryProtocol.requestOutputChannels()) { - callbacks.logLine(String.format("`MCUSERIAL` is %d", mcuSerial.get())); + callbacks.logLine(String.format(PanamaHelper.MCUSERIAL + " is %d", mcuSerial.get())); return Optional.of(mcuSerial.get()); } else { callbacks.logLine("Failed to request output channels..."); diff --git a/java_console/ui/src/main/java/com/rusefi/maintenance/TuneUploader.java b/java_console/ui/src/main/java/com/rusefi/maintenance/TuneUploader.java index fc8303e180..18df3fa2d1 100644 --- a/java_console/ui/src/main/java/com/rusefi/maintenance/TuneUploader.java +++ b/java_console/ui/src/main/java/com/rusefi/maintenance/TuneUploader.java @@ -1,11 +1,10 @@ package com.rusefi.maintenance; -import com.opensr5.ini.field.IniField; import com.rusefi.SerialPortScanner; import com.rusefi.binaryprotocol.BinaryProtocolLocalCache; -import com.rusefi.config.generated.TsOutputs; import com.rusefi.io.UpdateOperationCallbacks; import com.rusefi.panama.PanamaClient; +import com.rusefi.panama.PanamaHelper; import com.rusefi.ui.basic.InstanceNameEditor; import java.io.File; @@ -47,7 +46,7 @@ public enum TuneUploader { final Optional receivedMcuSerial = OutputChannelsHelper.readMcuSerial(ecuPort, callbacks); if (!receivedMcuSerial.isPresent()) { - callbacks.logLine("Failed to read `MCUSERIAL` output channel - please update firmware first!"); + callbacks.logLine("Failed to read " + PanamaHelper.MCUSERIAL + " output channel - please update firmware first!"); return false; } final int mcuSerial = receivedMcuSerial.get(); @@ -59,7 +58,7 @@ public enum TuneUploader { mcuSerial )) { callbacks.logLine(String.format( - "File `%s` is successfully uploaded to `%s` for `%s` (MCUSERIAL=%d)", + "File `%s` is successfully uploaded to `%s` for `%s` (" + PanamaHelper.MCUSERIAL + "=%d)", calibrationsToUploadFileName, panamaUrl, instanceName, @@ -68,7 +67,7 @@ public enum TuneUploader { result = true; } else { callbacks.logLine(String.format( - "Failed to upload file `%s` to `%s` for `%s` (MCUSERIAL=%d)", + "Failed to upload file `%s` to `%s` for `%s` (" + PanamaHelper.MCUSERIAL + "=%d)", calibrationsToUploadFileName, panamaUrl, instanceName,