From 6917f03313c22d3157dd1c53044118e335e0c410 Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Sat, 20 Apr 2024 13:37:22 -0400
Subject: [PATCH] EPIC: Improve toolset for default tune canned tune generation
 #4871

only: bugfix: curve changes were ignored
---
 .../main/java/com/rusefi/tools/tune/TuneCanTool.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/java_tools/tune-tools/src/main/java/com/rusefi/tools/tune/TuneCanTool.java b/java_tools/tune-tools/src/main/java/com/rusefi/tools/tune/TuneCanTool.java
index 58c1b73c6d..b0f7165bec 100644
--- a/java_tools/tune-tools/src/main/java/com/rusefi/tools/tune/TuneCanTool.java
+++ b/java_tools/tune-tools/src/main/java/com/rusefi/tools/tune/TuneCanTool.java
@@ -254,9 +254,11 @@ public class TuneCanTool implements TuneCanToolConstants {
                     }
                     log.info("Handling table " + fieldName + " with " + cf.autoscaleSpecPair());
 
+                    String customContent = tableData.getCsourceMethod(parentReference, methodNamePrefix);
                     if (defaultTuneFileName != null) {
                         TableData defaultTableData = TableData.readTable(defaultTuneFileName, fieldName, ini);
-                        if (defaultTableData.getCsourceMethod(parentReference, methodNamePrefix).equals(tableData.getCsourceMethod(parentReference, methodNamePrefix))) {
+                        String defaultContent = defaultTableData.getCsourceMethod(parentReference, methodNamePrefix);
+                        if (defaultContent.equals(customContent)) {
                             log.info("Table " + fieldName + " matches default content");
                             continue;
                         }
@@ -264,7 +266,7 @@ public class TuneCanTool implements TuneCanToolConstants {
                     log.info("Custom content in table " + fieldName);
 
 
-                    methods.append(tableData.getCsourceMethod(parentReference, methodNamePrefix));
+                    methods.append(customContent);
                     invokeMethods.append(tableData.getCinvokeMethod(methodNamePrefix));
                     continue;
                 }
@@ -273,16 +275,18 @@ public class TuneCanTool implements TuneCanToolConstants {
                 if (data == null)
                     continue;
 
+                String customContent = data.getCsourceMethod(parentReference, methodNamePrefix);
                 if (defaultTuneFileName != null) {
                     CurveData defaultCurveData = CurveData.valueOf(defaultTuneFileName, fieldName, ini);
-                    if (defaultCurveData.getCinvokeMethod(methodNamePrefix).equals(data.getCinvokeMethod(methodNamePrefix))) {
+                    String defaultContent = defaultCurveData.getCsourceMethod(parentReference, methodNamePrefix);
+                    if (defaultContent.equals(customContent)) {
                         log.info("Curve " + fieldName + " matches default content");
                         continue;
                     }
                 }
                 log.info("Custom content in curve " + fieldName);
 
-                methods.append(data.getCsourceMethod(parentReference, methodNamePrefix));
+                methods.append(customContent);
                 invokeMethods.append(data.getCinvokeMethod(methodNamePrefix));
 
                 continue;