mirror of https://github.com/rusefi/rusefi-1.git
refactoring: extracting magic constant
This commit is contained in:
parent
092d2438d8
commit
2f04e75b7c
|
@ -1504,6 +1504,8 @@
|
||||||
#define primeInjFalloffTemperature_offset_hex 5ce
|
#define primeInjFalloffTemperature_offset_hex 5ce
|
||||||
#define primingSquirtDurationMs_offset 96
|
#define primingSquirtDurationMs_offset 96
|
||||||
#define primingSquirtDurationMs_offset_hex 60
|
#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 RPM_1_BYTE_PACKING_MULT 50
|
||||||
#define rpmHardLimit_offset 416
|
#define rpmHardLimit_offset 416
|
||||||
#define rpmHardLimit_offset_hex 1a0
|
#define rpmHardLimit_offset_hex 1a0
|
||||||
|
|
|
@ -99,7 +99,7 @@ void WaveChart::reset() {
|
||||||
counter = 0;
|
counter = 0;
|
||||||
startTimeNt = 0;
|
startTimeNt = 0;
|
||||||
collectingData = false;
|
collectingData = false;
|
||||||
appendPrintf(&logging, "wave_chart%s", DELIMETER);
|
appendPrintf(&logging, "%s%s", PROTOCOL_ENGINE_SNIFFER, DELIMETER);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WaveChart::startDataCollection() {
|
void WaveChart::startDataCollection() {
|
||||||
|
|
|
@ -62,7 +62,7 @@ void scAddData(float angle, float value) {
|
||||||
pendingData = true;
|
pendingData = true;
|
||||||
resetLogging(&scLogging);
|
resetLogging(&scLogging);
|
||||||
// message header
|
// message header
|
||||||
appendPrintf(&scLogging, "analog_chart%s", DELIMETER);
|
appendPrintf(&scLogging, "%s%s", PROTOCOL_ANALOG_CHART, DELIMETER);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (remainingSize(&scLogging) > 100) {
|
if (remainingSize(&scLogging) > 100) {
|
||||||
|
|
|
@ -1224,6 +1224,9 @@ end_struct
|
||||||
#define GAUGE_NAME_DEBUG_I5 "debug i5"
|
#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_NAME_DWELL_DUTY "dwell: coil duty cycle"
|
||||||
|
|
||||||
#define GAUGE_COIL_DWELL_TIME "dwell: coil charge time"
|
#define GAUGE_COIL_DWELL_TIME "dwell: coil charge time"
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package com.rusefi;
|
package com.rusefi;
|
||||||
|
|
||||||
import com.opensr5.Logger;
|
import com.opensr5.Logger;
|
||||||
|
import com.rusefi.config.generated.Fields;
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
||||||
import java.io.FileReader;
|
import java.io.FileReader;
|
||||||
|
@ -14,7 +15,7 @@ import java.io.IOException;
|
||||||
*/
|
*/
|
||||||
public class AverageAnglesUtil {
|
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 + ",";
|
public static final String ANALOG_CHART = KEY + ",";
|
||||||
|
|
||||||
private static int currentRpm = -1;
|
private static int currentRpm = -1;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package com.rusefi.config.generated;
|
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.*;
|
import com.rusefi.config.*;
|
||||||
|
|
||||||
|
@ -983,6 +983,8 @@ public class Fields {
|
||||||
public static final int primeInjFalloffTemperature_offset = 1486;
|
public static final int primeInjFalloffTemperature_offset = 1486;
|
||||||
public static final int primingSquirtDurationMs_offset = 96;
|
public static final int primingSquirtDurationMs_offset = 96;
|
||||||
public static final int primingSquirtDurationMs_offset_hex = 60;
|
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 RPM_1_BYTE_PACKING_MULT = 50;
|
||||||
public static final int rpmHardLimit_offset = 416;
|
public static final int rpmHardLimit_offset = 416;
|
||||||
public static final int runningLedPin_offset = 1833;
|
public static final int runningLedPin_offset = 1833;
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
package com.rusefi.waves;
|
package com.rusefi.waves;
|
||||||
|
|
||||||
|
import com.rusefi.config.generated.Fields;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
@ -16,7 +17,7 @@ import java.util.List;
|
||||||
* @see SensorSnifferPane
|
* @see SensorSnifferPane
|
||||||
*/
|
*/
|
||||||
public class EngineReport implements TimeAxisTranslator {
|
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)));
|
public static final EngineReport MOCK = new EngineReport(Collections.singletonList(new UpDown(0, -1, 1, -1)));
|
||||||
/**
|
/**
|
||||||
* number of ChibiOS systicks per ms
|
* number of ChibiOS systicks per ms
|
||||||
|
|
Loading…
Reference in New Issue