From 2f04e75b7cd8b06d6677488e1ad9bbefaf000b9f Mon Sep 17 00:00:00 2001 From: rusefi Date: Fri, 5 Jul 2019 19:40:12 -0400 Subject: [PATCH] refactoring: extracting magic constant --- firmware/controllers/generated/rusefi_generated.h | 2 ++ firmware/development/engine_sniffer.cpp | 2 +- firmware/development/sensor_chart.cpp | 2 +- firmware/integration/rusefi_config.txt | 3 +++ java_console/models/src/com/rusefi/AverageAnglesUtil.java | 3 ++- .../models/src/com/rusefi/config/generated/Fields.java | 4 +++- java_console/models/src/com/rusefi/waves/EngineReport.java | 3 ++- 7 files changed, 14 insertions(+), 5 deletions(-) diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index b282e533e6..7a4933b5ab 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1504,6 +1504,8 @@ #define primeInjFalloffTemperature_offset_hex 5ce #define primingSquirtDurationMs_offset 96 #define primingSquirtDurationMs_offset_hex 60 +#define PROTOCOL_ANALOG_CHART "analog_chart" +#define PROTOCOL_ENGINE_SNIFFER "wave_chart" #define RPM_1_BYTE_PACKING_MULT 50 #define rpmHardLimit_offset 416 #define rpmHardLimit_offset_hex 1a0 diff --git a/firmware/development/engine_sniffer.cpp b/firmware/development/engine_sniffer.cpp index cf755efdac..26d414b19c 100644 --- a/firmware/development/engine_sniffer.cpp +++ b/firmware/development/engine_sniffer.cpp @@ -99,7 +99,7 @@ void WaveChart::reset() { counter = 0; startTimeNt = 0; collectingData = false; - appendPrintf(&logging, "wave_chart%s", DELIMETER); + appendPrintf(&logging, "%s%s", PROTOCOL_ENGINE_SNIFFER, DELIMETER); } void WaveChart::startDataCollection() { diff --git a/firmware/development/sensor_chart.cpp b/firmware/development/sensor_chart.cpp index f67449c513..9ec3552653 100644 --- a/firmware/development/sensor_chart.cpp +++ b/firmware/development/sensor_chart.cpp @@ -62,7 +62,7 @@ void scAddData(float angle, float value) { pendingData = true; resetLogging(&scLogging); // message header - appendPrintf(&scLogging, "analog_chart%s", DELIMETER); + appendPrintf(&scLogging, "%s%s", PROTOCOL_ANALOG_CHART, DELIMETER); } if (remainingSize(&scLogging) > 100) { diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 154a57a00b..7c1deb8ac2 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1224,6 +1224,9 @@ end_struct #define GAUGE_NAME_DEBUG_I5 "debug i5" +#define PROTOCOL_ANALOG_CHART "analog_chart" +#define PROTOCOL_ENGINE_SNIFFER "wave_chart" + #define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle" #define GAUGE_COIL_DWELL_TIME "dwell: coil charge time" diff --git a/java_console/models/src/com/rusefi/AverageAnglesUtil.java b/java_console/models/src/com/rusefi/AverageAnglesUtil.java index 6d48024376..c17521f9ad 100644 --- a/java_console/models/src/com/rusefi/AverageAnglesUtil.java +++ b/java_console/models/src/com/rusefi/AverageAnglesUtil.java @@ -1,6 +1,7 @@ package com.rusefi; import com.opensr5.Logger; +import com.rusefi.config.generated.Fields; import java.io.BufferedReader; import java.io.FileReader; @@ -14,7 +15,7 @@ import java.io.IOException; */ public class AverageAnglesUtil { - public static final String KEY = "analog_chart"; + public static final String KEY = Fields.PROTOCOL_ANALOG_CHART; public static final String ANALOG_CHART = KEY + ","; private static int currentRpm = -1; diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index fc8c93b12f..af6960a10e 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Mon Jul 01 12:45:02 EDT 2019 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jul 05 19:36:12 EDT 2019 import com.rusefi.config.*; @@ -983,6 +983,8 @@ public class Fields { public static final int primeInjFalloffTemperature_offset = 1486; public static final int primingSquirtDurationMs_offset = 96; public static final int primingSquirtDurationMs_offset_hex = 60; + public static final String PROTOCOL_ANALOG_CHART = "analog_chart"; + public static final String PROTOCOL_ENGINE_SNIFFER = "wave_chart"; public static final int RPM_1_BYTE_PACKING_MULT = 50; public static final int rpmHardLimit_offset = 416; public static final int runningLedPin_offset = 1833; diff --git a/java_console/models/src/com/rusefi/waves/EngineReport.java b/java_console/models/src/com/rusefi/waves/EngineReport.java index a8de1c45e9..0e42c92190 100644 --- a/java_console/models/src/com/rusefi/waves/EngineReport.java +++ b/java_console/models/src/com/rusefi/waves/EngineReport.java @@ -1,5 +1,6 @@ package com.rusefi.waves; +import com.rusefi.config.generated.Fields; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; @@ -16,7 +17,7 @@ import java.util.List; * @see SensorSnifferPane */ public class EngineReport implements TimeAxisTranslator { - public static final String ENGINE_CHART = "wave_chart"; + public static final String ENGINE_CHART = Fields.PROTOCOL_ENGINE_SNIFFER; public static final EngineReport MOCK = new EngineReport(Collections.singletonList(new UpDown(0, -1, 1, -1))); /** * number of ChibiOS systicks per ms