From 8d0555e205a593a658c4e6d458eeda2d8f7995aa Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Sat, 29 Aug 2020 15:41:09 -0400
Subject: [PATCH] reducing autotest mess

---
 firmware/controllers/algo/rusefi_enums.h           | 10 +++++-----
 java_console/autotest/src/com/rusefi/AutoTest.java | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h
index 4bdfc6da90..26d12b1848 100644
--- a/firmware/controllers/algo/rusefi_enums.h
+++ b/firmware/controllers/algo/rusefi_enums.h
@@ -29,7 +29,7 @@
  * http://rusefi.com/wiki/index.php?title=Manual:Engine_Type
  */
 typedef enum {
-	DEFAULT_FRANKENSO = 0,
+	DEFAULT_FRANKENSO = ET_DEFAULT_FRANKENSO,
 	AUDI_AAN = 1,
 	/**
 	 * 1995 Dodge Neon
@@ -66,7 +66,7 @@ typedef enum {
 
 	MRE_MIATA_NB2_ETB = 13,
 
-	FORD_ESCORT_GT = 14,
+	FORD_ESCORT_GT = ET_FORD_ESCORT_GT,
 
 	MRE_MIATA_NB2_MAF = ET_MRE_MIATA_NB2_MAF,
 
@@ -103,14 +103,14 @@ typedef enum {
 
 	MAZDA_626 = 28,
 
-	SACHS = 29,
+	SACHS = ET_SACHS,
 
 	// LED physical order set for older test fixtures
 	MRE_BOARD_OLD_TEST = 30,
 
 	MRE_BOARD_NEW_TEST = 31,
 
-	VW_ABA = 32,
+	VW_ABA = ET_VW_ABA,
 
 	DODGE_STRATUS = 33,
 
@@ -126,7 +126,7 @@ typedef enum {
 
 	LADA_KALINA = 39,
 
-	BMW_M73_F = 40,
+	BMW_M73_F = ET_BMW_M73_F,
 
 	// Frankenso board
 	MIATA_NA6_MAP = ET_FRANKENSO_MIATA_NA6,
diff --git a/java_console/autotest/src/com/rusefi/AutoTest.java b/java_console/autotest/src/com/rusefi/AutoTest.java
index e29a0f0eb4..b7193ee07d 100644
--- a/java_console/autotest/src/com/rusefi/AutoTest.java
+++ b/java_console/autotest/src/com/rusefi/AutoTest.java
@@ -70,14 +70,14 @@ public class AutoTest extends BaseTest {
     };
 
     private void testVW_60_2() {
-        setEngineType(32);
+        setEngineType(ET_VW_ABA);
         changeRpm(900);
         // first let's get to expected RPM
         assertRpmDoesNotJump(20000, 15, 30, FAIL, commandQueue);
     }
 
     private void testV12() {
-        setEngineType(40);
+        setEngineType(ET_BMW_M73_F);
         changeRpm(700);
         // first let's get to expected RPM
         assertRpmDoesNotJump(15000, 15, 30, FAIL, commandQueue);
@@ -99,7 +99,7 @@ public class AutoTest extends BaseTest {
     }
 
     private void testCustomEngine() {
-        setEngineType(0);
+        setEngineType(ET_DEFAULT_FRANKENSO);
         sendCommand("set_toothed_wheel 4 0");
 //        sendCommand("enable trigger_only_front");
 //        changeRpm(100);
@@ -120,7 +120,7 @@ public class AutoTest extends BaseTest {
     }
 
     private void testSachs() {
-        setEngineType(29);
+        setEngineType(ET_SACHS);
 //        String msg = "BMW";
         changeRpm(1200);
         // todo: add more content
@@ -161,7 +161,7 @@ public class AutoTest extends BaseTest {
     }
 
     private void test2003DodgeNeon() {
-        setEngineType(46);
+        setEngineType(ET_DODGE_NEON_2003_CRANK);
         sendCommand("set wwaeTau 0");
         sendCommand("set wwaeBeta 0");
         sendCommand("set mock_map_voltage 1");
@@ -227,7 +227,7 @@ public class AutoTest extends BaseTest {
     }
 
     private void testMazdaProtege() {
-        setEngineType(14);
+        setEngineType(ET_FORD_ESCORT_GT);
         EngineChart chart;
         sendCommand("set mock_vbatt_voltage 1.395");
         changeRpm(200);