rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reducing confusion

This commit is contained in:
rusefi 2020-06-21 22:12:06 -04:00
parent e4799d7153
commit 3be3a6635e
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/controllers/algo/rusefi_enums.h
View File

@ -126,7 +126,7 @@ typedef enum {
BMW_M73_F = 40,
// Frankenso board
MIATA_NA6_MAP = 41,
MIATA_NA6_MAP = ET_FRANKENSO_MIATA_NA6,
ZIL_130 = 42,
@ -141,7 +141,7 @@ typedef enum {
/**
* proper NB2 setup, 2003 red test mule car
*/
MAZDA_MIATA_2003 = 47,
MAZDA_MIATA_2003 = ET_FRANKENSO_MIATA_NB2,
HONDA_ACCORD_1_24_SHIFTED = 48,
@ -172,7 +172,7 @@ typedef enum {
MAZDA_MIATA_NA8 = 56,
// see also MIATA_NA6_MAP = 41
MIATA_NA6_VAF = 57,
MIATA_NA6_VAF = ET_FRANKENSO_MIATA_NA6_VAF,
ETB_BENCH_ENGINE = 58,

2
firmware/integration/rusefi_config.txt
View File

@ -1637,6 +1637,8 @@ end_struct
#define ET_MRE_MIATA_NA6 12
#define ET_MRE_MIATA_NB2_MAF 15
#define ET_MRE_OLD_TEST_BOARD 30
#define ET_MRE_NEW_TEST_BOARD 31
#define ET_FRANKENSO_MIATA_NA6 41
#define ET_FRANKENSO_MIATA_NB2 47
#define ET_FRANKENSO_MIATA_NA6_VAF 57

12
java_console/ui/src/main/java/com/rusefi/PresetsPane.java
View File

@ -14,9 +14,6 @@ import java.awt.event.ActionListener;
public class PresetsPane {
// see rusefi_enums.h
private static final int MRE_BOARD_TEST = 30;
private static final int MIATA_NA6_MAP = 41;
private static final int MIATA_NA6_VAF = 57;
private static final int MAZDA_MIATA_2003 = 47;
private static final int TEST_V_12 = 49;
private static final int ETB_BENCH = 58;
private static final int MINIMAL_PINS = 99;
@ -24,10 +21,11 @@ public class PresetsPane {
private JPanel content = new JPanel(new GridLayout(2, 4));
public PresetsPane() {
content.add(new SetEngineTypeCommandControl("Miata NA6 Stage 0", "engines/miata_na.png", MIATA_NA6_VAF).getContent());
content.add(new SetEngineTypeCommandControl("Miata NA6 Stage 1", "engines/miata_na.png", MIATA_NA6_MAP).getContent());
content.add(new SetEngineTypeCommandControl("Miata NB2", "engines/miata_nb.png", MAZDA_MIATA_2003).getContent());
content.add(new SetEngineTypeCommandControl("Frankenso V12", "engines/v12", TEST_V_12).getContent());
content.add(new SetEngineTypeCommandControl("Frankenso Miata NA6 Stage 0", "/engines/miata_na.png", Fields.ET_FRANKENSO_MIATA_NA6_VAF).getContent());
content.add(new SetEngineTypeCommandControl("Frankenso Miata NA6 Stage 1", "/engines/miata_na.png", Fields.ET_FRANKENSO_MIATA_NA6).getContent());
content.add(new SetEngineTypeCommandControl("Frankenso Miata NB2", "/engines/miata_nb.png", Fields.ET_FRANKENSO_MIATA_NB2).getContent());
content.add(new SetEngineTypeCommandControl("MRE Miata NB2 MAF", "engines/miata_nb.png", Fields.ET_MRE_MIATA_NB2_MAF).getContent());
content.add(new SetEngineTypeCommandControl("Frankenso V12", "/engines/v12", TEST_V_12).getContent());
content.add(new SetEngineTypeCommandControl("ETB bench", "", ETB_BENCH).getContent());
content.add(new SetEngineTypeCommandControl("Minimal", "", MINIMAL_PINS).getContent());
content.add(new SetEngineTypeCommandControl("MRE test", "", MRE_BOARD_TEST).getContent());