diff --git a/firmware/config/boards/hellen/uaefi121/shared_io.resources/shared_io.properties b/firmware/config/boards/hellen/uaefi121/shared_io.resources/shared_io.properties index 211a2f2379..7741386c09 100644 --- a/firmware/config/boards/hellen/uaefi121/shared_io.resources/shared_io.properties +++ b/firmware/config/boards/hellen/uaefi121/shared_io.resources/shared_io.properties @@ -1,2 +1,2 @@ auto_update_root_url=https://rusefi.com/build_server -WHITELABEL=rusEFI +signature_white_label=rusEFI diff --git a/firmware/gen_signature.sh b/firmware/gen_signature.sh index d410526d1a..33d80fede5 100755 --- a/firmware/gen_signature.sh +++ b/firmware/gen_signature.sh @@ -30,11 +30,11 @@ else echo "! Current branch is: $branchname" >> ${TEMP_FILE} fi -if [ -z "${WHITELABEL}" ]; then -WHITELABEL=rusEFI +if [ -z "${signature_white_label}" ]; then +signature_white_label=rusEFI fi -echo "#define TS_SIGNATURE \"${WHITELABEL} $branchname.$date.${SHORT_BOARD_NAME}.@@SIGNATURE_HASH@@\"" >> ${TEMP_FILE} +echo "#define TS_SIGNATURE \"${signature_white_label} $branchname.$date.${SHORT_BOARD_NAME}.@@SIGNATURE_HASH@@\"" >> ${TEMP_FILE} # We will generate the signature in a temp file, then only use it if it has changed. # This is to avoid updating the timestamp of the signature file, which would cause the configs to regenerate when they don't need to. diff --git a/java_console/io/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java b/java_console/io/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java index 99364fac4f..03fa7289dd 100644 --- a/java_console/io/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java +++ b/java_console/io/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java @@ -65,8 +65,8 @@ public class SerialAutoChecker { private static boolean isSignatureWithValidPrefix(String signature) { if (signature.startsWith(Fields.PROTOCOL_SIGNATURE_PREFIX)) return true; - String whitelabel = ConnectionAndMeta.getWhitelabel(); - return whitelabel != null && signature.startsWith(whitelabel + " "); + String signatureWhiteLabel = ConnectionAndMeta.getSignatureWhiteLabel(); + return signatureWhiteLabel != null && signature.startsWith(signatureWhiteLabel + " "); } public void openAndCheckResponse(PortDetector.DetectorMode mode, AtomicReference result, Function callback) { diff --git a/java_console/shared_io/src/main/java/com/rusefi/core/net/ConnectionAndMeta.java b/java_console/shared_io/src/main/java/com/rusefi/core/net/ConnectionAndMeta.java index 0282cf670f..da3bc650ae 100644 --- a/java_console/shared_io/src/main/java/com/rusefi/core/net/ConnectionAndMeta.java +++ b/java_console/shared_io/src/main/java/com/rusefi/core/net/ConnectionAndMeta.java @@ -33,10 +33,10 @@ public class ConnectionAndMeta { return result; } - public static String getWhitelabel() { - String whitelabel = getProperties().getProperty("WHITELABEL"); - whitelabel = whitelabel == null ? null : whitelabel.trim(); - return whitelabel; + public static String getSignatureWhiteLabel() { + String signatureWhiteLabel = getProperties().getProperty("signature_white_label"); + signatureWhiteLabel = signatureWhiteLabel == null ? null : signatureWhiteLabel.trim(); + return signatureWhiteLabel; } private static Properties getProperties() throws RuntimeException {