Auto-generated configs and docs

2020-06-28 14:03:26 +00:00 · 2020-06-28 14:03:26 +00:00 · 7829ff0f26
parent aaef8a865c
commit 7829ff0f26
53 changed files with 29944 additions and 36 deletions
--- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h
+++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h
@ -1,4 +1,4 @@
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sat Jun 27 22:18:44 EDT 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Jun 28 14:03:24 UTC 2020
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@ -3522,4 +3522,4 @@ typedef struct persistent_config_s persistent_config_s;

 #endif
 // end
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sat Jun 27 22:18:44 EDT 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Jun 28 14:03:24 UTC 2020
--- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
+++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
@ -1,5 +1,5 @@
 //
-// was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt
+// was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt
 //

 #define absoluteFuelPressure_offset 76
--- a/firmware/controllers/generated/engine_configuration_generated_structures.h
+++ b/firmware/controllers/generated/engine_configuration_generated_structures.h
@ -1,4 +1,4 @@
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 27 22:18:29 EDT 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 28 14:03:17 UTC 2020
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@ -3522,4 +3522,4 @@ typedef struct persistent_config_s persistent_config_s;

 #endif
 // end
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 27 22:18:29 EDT 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 28 14:03:17 UTC 2020
--- a/firmware/controllers/generated/engine_state_generated.h
+++ b/firmware/controllers/generated/engine_state_generated.h
@ -1,4 +1,4 @@
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/engine_state.txt Fri Apr 10 12:53:32 EDT 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/engine_state.txt Sun Jun 28 14:03:25 UTC 2020
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #ifndef CONTROLLERS_GENERATED_ENGINE_STATE_GENERATED_H
@ -430,4 +430,4 @@ typedef struct engine_state2_s engine_state2_s;

 #endif
 // end
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/engine_state.txt Fri Apr 10 12:53:32 EDT 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/engine_state.txt Sun Jun 28 14:03:25 UTC 2020
--- a/firmware/controllers/generated/fsio_enums_generated.def
+++ b/firmware/controllers/generated/fsio_enums_generated.def
@ -1,4 +1,4 @@
-// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Jun 01 07:18:30 EDT 2020
+// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 28 14:03:17 UTC 2020

 // by class com.rusefi.output.FileFsioSettingsConsumer
 	FSIO_SETTING_FANONTEMPERATURE = 1000,
--- a/firmware/controllers/generated/fsio_getters.def
+++ b/firmware/controllers/generated/fsio_getters.def
@ -1,4 +1,4 @@
-// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Jun 01 07:18:30 EDT 2020
+// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 28 14:03:17 UTC 2020

 // by class com.rusefi.output.FileFsioSettingsConsumer
 	case FSIO_SETTING_FANONTEMPERATURE:
--- a/firmware/controllers/generated/fsio_names.def
+++ b/firmware/controllers/generated/fsio_names.def
@ -1,4 +1,4 @@
-// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Jun 01 07:18:30 EDT 2020
+// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 28 14:03:17 UTC 2020

 // by class com.rusefi.output.FileFsioSettingsConsumer
 static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature");
--- a/firmware/controllers/generated/fsio_strings.def
+++ b/firmware/controllers/generated/fsio_strings.def
@ -1,4 +1,4 @@
-// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Mon Jun 01 07:18:30 EDT 2020
+// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 28 14:03:17 UTC 2020

 // by class com.rusefi.output.FileFsioSettingsConsumer
 	case FSIO_SETTING_FANONTEMPERATURE:
--- a/firmware/controllers/generated/pid_state_generated.h
+++ b/firmware/controllers/generated/pid_state_generated.h
@ -1,4 +1,4 @@
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/pid_state.txt Sun Sep 01 19:07:42 EDT 2019
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/pid_state.txt Sun Jun 28 14:03:25 UTC 2020
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #ifndef CONTROLLERS_GENERATED_PID_STATE_GENERATED_H
@ -45,4 +45,4 @@ typedef struct pid_state_s pid_state_s;

 #endif
 // end
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/pid_state.txt Sun Sep 01 19:07:42 EDT 2019
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/pid_state.txt Sun Jun 28 14:03:25 UTC 2020
--- a/firmware/controllers/generated/trigger_central_generated.h
+++ b/firmware/controllers/generated/trigger_central_generated.h
@ -1,4 +1,4 @@
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/trigger_central.txt Fri Apr 10 12:53:33 EDT 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/trigger_central.txt Sun Jun 28 14:03:25 UTC 2020
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #ifndef CONTROLLERS_GENERATED_TRIGGER_CENTRAL_GENERATED_H
@ -32,4 +32,4 @@ typedef struct trigger_central_s trigger_central_s;

 #endif
 // end
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/trigger_central.txt Fri Apr 10 12:53:33 EDT 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/trigger_central.txt Sun Jun 28 14:03:25 UTC 2020
--- a/firmware/controllers/generated/trigger_state_generated.h
+++ b/firmware/controllers/generated/trigger_state_generated.h
@ -1,4 +1,4 @@
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/trigger_state.txt Tue Sep 03 19:14:16 EDT 2019
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/trigger_state.txt Sun Jun 28 14:03:25 UTC 2020
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #ifndef CONTROLLERS_GENERATED_TRIGGER_STATE_GENERATED_H
@ -17,4 +17,4 @@ typedef struct trigger_state_s trigger_state_s;

 #endif
 // end
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/trigger_state.txt Tue Sep 03 19:14:16 EDT 2019
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/trigger_state.txt Sun Jun 28 14:03:25 UTC 2020
--- a/firmware/controllers/generated/wall_fuel_generated.h
+++ b/firmware/controllers/generated/wall_fuel_generated.h
@ -1,4 +1,4 @@
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/wall_fuel.txt Sat Aug 31 23:11:37 EDT 2019
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/wall_fuel_state.txt Sun Jun 28 14:03:25 UTC 2020
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #ifndef CONTROLLERS_GENERATED_WALL_FUEL_GENERATED_H
@ -23,4 +23,4 @@ typedef struct wall_fuel_state wall_fuel_state;

 #endif
 // end
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/wall_fuel.txt Sat Aug 31 23:11:37 EDT 2019
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/wall_fuel_state.txt Sun Jun 28 14:03:25 UTC 2020
--- a/firmware/tunerstudio/cache/firing_order.h
+++ b/firmware/tunerstudio/cache/firing_order.h
@ -0,0 +1,69 @@
+/*
+ * @file firing_order.h
+ *
+ * See also FiringOrderTSLogic.java
+ *
+ * @date Jul 20, 2016
+ * @author Andrey Belomutskiy, (c) 2012-2020
+ */
+
+#include "rusefi_enums.h"
+
+#pragma once
+
+typedef enum {
+	FO_1 = 0,
+
+	// 2 cylinder
+	FO_1_2 = 8,
+
+	// 3 cylinder
+	FO_1_2_3 = 10,
+	FO_1_3_2 = 24,
+
+	// 4 cylinder
+	FO_1_3_4_2 = 1, // typical inline 4
+	FO_1_2_4_3 = 2,
+	FO_1_3_2_4 = 3, // for example horizontally opposed engine
+	FO_1_4_3_2 = 17, // for example VW aircooled boxer engine
+
+	// 5 cylinder
+	FO_1_2_4_5_3 = 6,
+
+	// 6 cylinder
+	FO_1_5_3_6_2_4 = 4,
+	FO_1_4_2_5_3_6 = 7,
+	FO_1_2_3_4_5_6 = 9,
+	FO_1_6_3_2_5_4 = 13, // EG33
+
+	// todo: one day we shall support 7 cylinder radial, probably not before one actually approaches us
+
+	// 8 cylinder
+	FO_1_8_4_3_6_5_7_2 = 5,
+	FO_1_8_7_2_6_5_4_3 = 11,
+	FO_1_5_4_2_6_3_7_8 = 12,
+	FO_1_2_7_8_4_5_6_3 = 19,
+	FO_1_3_7_2_6_5_4_8 = 20, // Ford 5.0 HO and 351W
+
+	// 9 cylinder - for instance radial :)
+	// PS: Matt says that 9cyl is actually 1-3-5-7-9-2-4-6-8 or 1-8-6-4-2-9-7-5-3 for reverse rotation
+	FO_1_2_3_4_5_6_7_8_9 = 21,
+
+	// 10 cylinder
+	FO_1_10_9_4_3_6_5_8_7_2 = 14, // dodge and viper ram v10
+
+	// 12 cylinder
+	FO_1_7_5_11_3_9_6_12_2_8_4_10 = 15, // bmw M70 & M73 etc
+	FO_1_7_4_10_2_8_6_12_3_9_5_11 = 16, // lamborghini, typical rusEfi use-case
+	FO_1_12_5_8_3_10_6_7_2_11_4_9 = 18, // VAG W12
+	FO_1_2_3_4_5_6_7_8_9_10_11_12 = 23, // mostly for hardware testing purposes
+
+
+	// 16 cylinder
+	// unfortunately not supported by default firmware because INJECTION_PIN_COUNT=IGNITION_PIN_COUNT=12 by default
+	FO_1_14_9_4_7_12_15_6_13_8_3_16_11_2_5_10 = 22, // WR16
+
+	// max used = 24
+
+	Force_4b_firing_order = ENUM_32_BITS,
+} firing_order_e;
--- a/firmware/tunerstudio/cache/frankenso/firing_order.h
+++ b/firmware/tunerstudio/cache/frankenso/firing_order.h
@ -0,0 +1,69 @@
+/*
+ * @file firing_order.h
+ *
+ * See also FiringOrderTSLogic.java
+ *
+ * @date Jul 20, 2016
+ * @author Andrey Belomutskiy, (c) 2012-2020
+ */
+
+#include "rusefi_enums.h"
+
+#pragma once
+
+typedef enum {
+	FO_1 = 0,
+
+	// 2 cylinder
+	FO_1_2 = 8,
+
+	// 3 cylinder
+	FO_1_2_3 = 10,
+	FO_1_3_2 = 24,
+
+	// 4 cylinder
+	FO_1_3_4_2 = 1, // typical inline 4
+	FO_1_2_4_3 = 2,
+	FO_1_3_2_4 = 3, // for example horizontally opposed engine
+	FO_1_4_3_2 = 17, // for example VW aircooled boxer engine
+
+	// 5 cylinder
+	FO_1_2_4_5_3 = 6,
+
+	// 6 cylinder
+	FO_1_5_3_6_2_4 = 4,
+	FO_1_4_2_5_3_6 = 7,
+	FO_1_2_3_4_5_6 = 9,
+	FO_1_6_3_2_5_4 = 13, // EG33
+
+	// todo: one day we shall support 7 cylinder radial, probably not before one actually approaches us
+
+	// 8 cylinder
+	FO_1_8_4_3_6_5_7_2 = 5,
+	FO_1_8_7_2_6_5_4_3 = 11,
+	FO_1_5_4_2_6_3_7_8 = 12,
+	FO_1_2_7_8_4_5_6_3 = 19,
+	FO_1_3_7_2_6_5_4_8 = 20, // Ford 5.0 HO and 351W
+
+	// 9 cylinder - for instance radial :)
+	// PS: Matt says that 9cyl is actually 1-3-5-7-9-2-4-6-8 or 1-8-6-4-2-9-7-5-3 for reverse rotation
+	FO_1_2_3_4_5_6_7_8_9 = 21,
+
+	// 10 cylinder
+	FO_1_10_9_4_3_6_5_8_7_2 = 14, // dodge and viper ram v10
+
+	// 12 cylinder
+	FO_1_7_5_11_3_9_6_12_2_8_4_10 = 15, // bmw M70 & M73 etc
+	FO_1_7_4_10_2_8_6_12_3_9_5_11 = 16, // lamborghini, typical rusEfi use-case
+	FO_1_12_5_8_3_10_6_7_2_11_4_9 = 18, // VAG W12
+	FO_1_2_3_4_5_6_7_8_9_10_11_12 = 23, // mostly for hardware testing purposes
+
+
+	// 16 cylinder
+	// unfortunately not supported by default firmware because INJECTION_PIN_COUNT=IGNITION_PIN_COUNT=12 by default
+	FO_1_14_9_4_7_12_15_6_13_8_3_16_11_2_5_10 = 22, // WR16
+
+	// max used = 24
+
+	Force_4b_firing_order = ENUM_32_BITS,
+} firing_order_e;
--- a/firmware/tunerstudio/cache/frankenso/frankenso_prefix.txt
+++ b/firmware/tunerstudio/cache/frankenso/frankenso_prefix.txt
@ -0,0 +1,2 @@
+ #define output_pin_e_enum "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Injector 3Z","Injector 3Y","Injector 3W","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Coil 1H","INVALID","Coil 1F","INVALID","INVALID","INVALID","Injector 2M","INVALID","INVALID","INVALID","INVALID","INVALID","Injector 3U","INVALID","Injector 3X","INVALID","Injector 2N","Coil 1O","Coil 1P","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Injector 3V","Injector 3S","Injector 3T","Injector 2O","Injector 2P","INVALID","Coil 1L","INVALID","Coil 1I","INVALID","Coil 1M","INVALID","Coil 1G","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
+ #define adc_channel_e_enum "Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E","NONE"
--- a/firmware/tunerstudio/cache/frankenso/prepend.txt
+++ b/firmware/tunerstudio/cache/frankenso/prepend.txt
@ -0,0 +1 @@
+
--- a/firmware/tunerstudio/cache/frankenso/rusefi.input
+++ b/firmware/tunerstudio/cache/frankenso/rusefi.input
--- a/firmware/tunerstudio/cache/frankenso/rusefi_config.txt
+++ b/firmware/tunerstudio/cache/frankenso/rusefi_config.txt
--- a/firmware/tunerstudio/cache/kinetis/firing_order.h
+++ b/firmware/tunerstudio/cache/kinetis/firing_order.h
@ -0,0 +1,69 @@
+/*
+ * @file firing_order.h
+ *
+ * See also FiringOrderTSLogic.java
+ *
+ * @date Jul 20, 2016
+ * @author Andrey Belomutskiy, (c) 2012-2020
+ */
+
+#include "rusefi_enums.h"
+
+#pragma once
+
+typedef enum {
+	FO_1 = 0,
+
+	// 2 cylinder
+	FO_1_2 = 8,
+
+	// 3 cylinder
+	FO_1_2_3 = 10,
+	FO_1_3_2 = 24,
+
+	// 4 cylinder
+	FO_1_3_4_2 = 1, // typical inline 4
+	FO_1_2_4_3 = 2,
+	FO_1_3_2_4 = 3, // for example horizontally opposed engine
+	FO_1_4_3_2 = 17, // for example VW aircooled boxer engine
+
+	// 5 cylinder
+	FO_1_2_4_5_3 = 6,
+
+	// 6 cylinder
+	FO_1_5_3_6_2_4 = 4,
+	FO_1_4_2_5_3_6 = 7,
+	FO_1_2_3_4_5_6 = 9,
+	FO_1_6_3_2_5_4 = 13, // EG33
+
+	// todo: one day we shall support 7 cylinder radial, probably not before one actually approaches us
+
+	// 8 cylinder
+	FO_1_8_4_3_6_5_7_2 = 5,
+	FO_1_8_7_2_6_5_4_3 = 11,
+	FO_1_5_4_2_6_3_7_8 = 12,
+	FO_1_2_7_8_4_5_6_3 = 19,
+	FO_1_3_7_2_6_5_4_8 = 20, // Ford 5.0 HO and 351W
+
+	// 9 cylinder - for instance radial :)
+	// PS: Matt says that 9cyl is actually 1-3-5-7-9-2-4-6-8 or 1-8-6-4-2-9-7-5-3 for reverse rotation
+	FO_1_2_3_4_5_6_7_8_9 = 21,
+
+	// 10 cylinder
+	FO_1_10_9_4_3_6_5_8_7_2 = 14, // dodge and viper ram v10
+
+	// 12 cylinder
+	FO_1_7_5_11_3_9_6_12_2_8_4_10 = 15, // bmw M70 & M73 etc
+	FO_1_7_4_10_2_8_6_12_3_9_5_11 = 16, // lamborghini, typical rusEfi use-case
+	FO_1_12_5_8_3_10_6_7_2_11_4_9 = 18, // VAG W12
+	FO_1_2_3_4_5_6_7_8_9_10_11_12 = 23, // mostly for hardware testing purposes
+
+
+	// 16 cylinder
+	// unfortunately not supported by default firmware because INJECTION_PIN_COUNT=IGNITION_PIN_COUNT=12 by default
+	FO_1_14_9_4_7_12_15_6_13_8_3_16_11_2_5_10 = 22, // WR16
+
+	// max used = 24
+
+	Force_4b_firing_order = ENUM_32_BITS,
+} firing_order_e;
--- a/firmware/tunerstudio/cache/kinetis/rusefi.input
+++ b/firmware/tunerstudio/cache/kinetis/rusefi.input
--- a/firmware/tunerstudio/cache/kinetis/rusefi_config.txt
+++ b/firmware/tunerstudio/cache/kinetis/rusefi_config.txt
--- a/firmware/tunerstudio/cache/kinetis/rusefi_config_kinetis.txt
+++ b/firmware/tunerstudio/cache/kinetis/rusefi_config_kinetis.txt
@ -0,0 +1,15 @@
+
+! see "integration/rusefi_config.txt" for more details
+
+! all these #defines are in priority over the "default" values in rusefi_config.txt
+
+! see firmware/config/boards/kinetis/rusefi_hw_enums.h
+#define brain_pin_e_enum        "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16"
+
+! Based on Kinetis KE1xF pinout (64-pin package)
+#define brain_input_pin_e_enum  "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13",  "N/A",  "N/A",  "N/A",  "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A",  "N/A",  "N/A", "PB12", "PB13",  "N/A",  "N/A",  "N/A",  "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9",  "N/A",  "N/A",  "N/A",  "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A",  "N/A",  "N/A",  "N/A",  "N/A",  "N/A", "PD15", "PD16",  "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11",  "N/A",  "N/A",  "N/A",  "N/A",  "N/A",  "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"
+#define switch_input_pin_e_enum "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13",  "N/A",  "N/A",  "N/A",  "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A",  "N/A",  "N/A", "PB12", "PB13",  "N/A",  "N/A",  "N/A",  "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9",  "N/A",  "N/A",  "N/A",  "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A",  "N/A",  "N/A",  "N/A",  "N/A",  "N/A", "PD15", "PD16",  "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11",  "N/A",  "N/A",  "N/A",  "N/A",  "N/A",  "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"
+#define output_pin_e_enum       "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13",  "N/A",  "N/A",  "N/A",  "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A",  "N/A",  "N/A", "PB12", "PB13",  "N/A",  "N/A",  "N/A",  "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9",  "N/A",  "N/A",  "N/A",  "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A",  "N/A",  "N/A",  "N/A",  "N/A",  "N/A", "PD15", "PD16",  "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11",  "N/A",  "N/A",  "N/A",  "N/A",  "N/A",  "N/A", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16"
+#define adc_channel_e_enum      "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
+
+#define ts_show_trigger_comparator true
--- a/firmware/tunerstudio/cache/microrusefi/firing_order.h
+++ b/firmware/tunerstudio/cache/microrusefi/firing_order.h
@ -0,0 +1,69 @@
+/*
+ * @file firing_order.h
+ *
+ * See also FiringOrderTSLogic.java
+ *
+ * @date Jul 20, 2016
+ * @author Andrey Belomutskiy, (c) 2012-2020
+ */
+
+#include "rusefi_enums.h"
+
+#pragma once
+
+typedef enum {
+	FO_1 = 0,
+
+	// 2 cylinder
+	FO_1_2 = 8,
+
+	// 3 cylinder
+	FO_1_2_3 = 10,
+	FO_1_3_2 = 24,
+
+	// 4 cylinder
+	FO_1_3_4_2 = 1, // typical inline 4
+	FO_1_2_4_3 = 2,
+	FO_1_3_2_4 = 3, // for example horizontally opposed engine
+	FO_1_4_3_2 = 17, // for example VW aircooled boxer engine
+
+	// 5 cylinder
+	FO_1_2_4_5_3 = 6,
+
+	// 6 cylinder
+	FO_1_5_3_6_2_4 = 4,
+	FO_1_4_2_5_3_6 = 7,
+	FO_1_2_3_4_5_6 = 9,
+	FO_1_6_3_2_5_4 = 13, // EG33
+
+	// todo: one day we shall support 7 cylinder radial, probably not before one actually approaches us
+
+	// 8 cylinder
+	FO_1_8_4_3_6_5_7_2 = 5,
+	FO_1_8_7_2_6_5_4_3 = 11,
+	FO_1_5_4_2_6_3_7_8 = 12,
+	FO_1_2_7_8_4_5_6_3 = 19,
+	FO_1_3_7_2_6_5_4_8 = 20, // Ford 5.0 HO and 351W
+
+	// 9 cylinder - for instance radial :)
+	// PS: Matt says that 9cyl is actually 1-3-5-7-9-2-4-6-8 or 1-8-6-4-2-9-7-5-3 for reverse rotation
+	FO_1_2_3_4_5_6_7_8_9 = 21,
+
+	// 10 cylinder
+	FO_1_10_9_4_3_6_5_8_7_2 = 14, // dodge and viper ram v10
+
+	// 12 cylinder
+	FO_1_7_5_11_3_9_6_12_2_8_4_10 = 15, // bmw M70 & M73 etc
+	FO_1_7_4_10_2_8_6_12_3_9_5_11 = 16, // lamborghini, typical rusEfi use-case
+	FO_1_12_5_8_3_10_6_7_2_11_4_9 = 18, // VAG W12
+	FO_1_2_3_4_5_6_7_8_9_10_11_12 = 23, // mostly for hardware testing purposes
+
+
+	// 16 cylinder
+	// unfortunately not supported by default firmware because INJECTION_PIN_COUNT=IGNITION_PIN_COUNT=12 by default
+	FO_1_14_9_4_7_12_15_6_13_8_3_16_11_2_5_10 = 22, // WR16
+
+	// max used = 24
+
+	Force_4b_firing_order = ENUM_32_BITS,
+} firing_order_e;
--- a/firmware/tunerstudio/cache/microrusefi/microrusefi_prefix.txt
+++ b/firmware/tunerstudio/cache/microrusefi/microrusefi_prefix.txt
@ -0,0 +1,4 @@
+ #define output_pin_e_enum "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PA15","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PB8","AUX J2 PB9","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PC12","INVALID","INVALID","INVALID","INVALID","12 - Ignition 4","11 - Ignition 3","10 - Ignition 2","9 - Ignition 1","INVALID","13 - GP Out 6","14 - GP Out 5","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","35 - GP Out 1","7 - Lowside 1","3 - Lowside 2","42 - Injector 4","41 - Injector 3","38 - Injector 2","37 - Injector 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","34 - GP Out 2","33 - GP Out 3","43 - GP Out 4","INVALID","INVALID","INVALID"
+ #define adc_channel_e_enum "18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8","40 - AN volt 9","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7","NONE"
+ #define brain_input_pin_e_enum "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","25 - Hall Cam","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","45 - VR/Hall Crank","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
+ #define switch_input_pin_e_enum "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Brake Switch","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Clutch Switch","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
--- a/firmware/tunerstudio/cache/microrusefi/prepend.txt
+++ b/firmware/tunerstudio/cache/microrusefi/prepend.txt
@ -0,0 +1,22 @@
+#define ts_show_hip9011 false
+#define ts_show_cj125 false
+
+//Jokeri says it's better with full pinout just in case
+//#define ts_show_full_pinout false
+
+#define ts_show_lcd false
+#define ts_show_joystick false
+#define ts_show_egt false
+#define ts_show_gps false
+#define ts_show_etb_pins false
+#define ts_show_analog_divider false
+#define ts_show_spi true
+#define ts_show_sd_card true
+#define ts_show_can_pins false
+#define ts_show_tunerstudio_port false
+#define ts_show_main_relay false
+#define ts_show_main_relay_microRusEFI_message true
+
+#define show_test_presets false
+#define show_Frankenso_presets false
+#define show_Proteus_presets false
--- a/firmware/tunerstudio/cache/microrusefi/rusefi.input
+++ b/firmware/tunerstudio/cache/microrusefi/rusefi.input
--- a/firmware/tunerstudio/cache/microrusefi/rusefi_config.txt
+++ b/firmware/tunerstudio/cache/microrusefi/rusefi_config.txt
--- a/firmware/tunerstudio/cache/prometheus/firing_order.h
+++ b/firmware/tunerstudio/cache/prometheus/firing_order.h
@ -0,0 +1,69 @@
+/*
+ * @file firing_order.h
+ *
+ * See also FiringOrderTSLogic.java
+ *
+ * @date Jul 20, 2016
+ * @author Andrey Belomutskiy, (c) 2012-2020
+ */
+
+#include "rusefi_enums.h"
+
+#pragma once
+
+typedef enum {
+	FO_1 = 0,
+
+	// 2 cylinder
+	FO_1_2 = 8,
+
+	// 3 cylinder
+	FO_1_2_3 = 10,
+	FO_1_3_2 = 24,
+
+	// 4 cylinder
+	FO_1_3_4_2 = 1, // typical inline 4
+	FO_1_2_4_3 = 2,
+	FO_1_3_2_4 = 3, // for example horizontally opposed engine
+	FO_1_4_3_2 = 17, // for example VW aircooled boxer engine
+
+	// 5 cylinder
+	FO_1_2_4_5_3 = 6,
+
+	// 6 cylinder
+	FO_1_5_3_6_2_4 = 4,
+	FO_1_4_2_5_3_6 = 7,
+	FO_1_2_3_4_5_6 = 9,
+	FO_1_6_3_2_5_4 = 13, // EG33
+
+	// todo: one day we shall support 7 cylinder radial, probably not before one actually approaches us
+
+	// 8 cylinder
+	FO_1_8_4_3_6_5_7_2 = 5,
+	FO_1_8_7_2_6_5_4_3 = 11,
+	FO_1_5_4_2_6_3_7_8 = 12,
+	FO_1_2_7_8_4_5_6_3 = 19,
+	FO_1_3_7_2_6_5_4_8 = 20, // Ford 5.0 HO and 351W
+
+	// 9 cylinder - for instance radial :)
+	// PS: Matt says that 9cyl is actually 1-3-5-7-9-2-4-6-8 or 1-8-6-4-2-9-7-5-3 for reverse rotation
+	FO_1_2_3_4_5_6_7_8_9 = 21,
+
+	// 10 cylinder
+	FO_1_10_9_4_3_6_5_8_7_2 = 14, // dodge and viper ram v10
+
+	// 12 cylinder
+	FO_1_7_5_11_3_9_6_12_2_8_4_10 = 15, // bmw M70 & M73 etc
+	FO_1_7_4_10_2_8_6_12_3_9_5_11 = 16, // lamborghini, typical rusEfi use-case
+	FO_1_12_5_8_3_10_6_7_2_11_4_9 = 18, // VAG W12
+	FO_1_2_3_4_5_6_7_8_9_10_11_12 = 23, // mostly for hardware testing purposes
+
+
+	// 16 cylinder
+	// unfortunately not supported by default firmware because INJECTION_PIN_COUNT=IGNITION_PIN_COUNT=12 by default
+	FO_1_14_9_4_7_12_15_6_13_8_3_16_11_2_5_10 = 22, // WR16
+
+	// max used = 24
+
+	Force_4b_firing_order = ENUM_32_BITS,
+} firing_order_e;
--- a/firmware/tunerstudio/cache/prometheus/prepend.txt
+++ b/firmware/tunerstudio/cache/prometheus/prepend.txt
@ -0,0 +1,4 @@
+! https://github.com/andreika-git/prometheus/raw/master/hardware/prometheus-wiring-diagram.pdf
+
+#define ts_show_hip9011 false
+#define ts_show_etb false
--- a/firmware/tunerstudio/cache/prometheus/prometheus_prefix.txt
+++ b/firmware/tunerstudio/cache/prometheus/prometheus_prefix.txt
@ -0,0 +1,2 @@
+ #define output_pin_e_enum "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Injector 3Z","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
+ #define adc_channel_e_enum "Analog 3O","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","NONE"
--- a/firmware/tunerstudio/cache/prometheus/rusefi.input
+++ b/firmware/tunerstudio/cache/prometheus/rusefi.input
--- a/firmware/tunerstudio/cache/prometheus/rusefi_config.txt
+++ b/firmware/tunerstudio/cache/prometheus/rusefi_config.txt
--- a/firmware/tunerstudio/cache/proteus/firing_order.h
+++ b/firmware/tunerstudio/cache/proteus/firing_order.h
@ -0,0 +1,69 @@
+/*
+ * @file firing_order.h
+ *
+ * See also FiringOrderTSLogic.java
+ *
+ * @date Jul 20, 2016
+ * @author Andrey Belomutskiy, (c) 2012-2020
+ */
+
+#include "rusefi_enums.h"
+
+#pragma once
+
+typedef enum {
+	FO_1 = 0,
+
+	// 2 cylinder
+	FO_1_2 = 8,
+
+	// 3 cylinder
+	FO_1_2_3 = 10,
+	FO_1_3_2 = 24,
+
+	// 4 cylinder
+	FO_1_3_4_2 = 1, // typical inline 4
+	FO_1_2_4_3 = 2,
+	FO_1_3_2_4 = 3, // for example horizontally opposed engine
+	FO_1_4_3_2 = 17, // for example VW aircooled boxer engine
+
+	// 5 cylinder
+	FO_1_2_4_5_3 = 6,
+
+	// 6 cylinder
+	FO_1_5_3_6_2_4 = 4,
+	FO_1_4_2_5_3_6 = 7,
+	FO_1_2_3_4_5_6 = 9,
+	FO_1_6_3_2_5_4 = 13, // EG33
+
+	// todo: one day we shall support 7 cylinder radial, probably not before one actually approaches us
+
+	// 8 cylinder
+	FO_1_8_4_3_6_5_7_2 = 5,
+	FO_1_8_7_2_6_5_4_3 = 11,
+	FO_1_5_4_2_6_3_7_8 = 12,
+	FO_1_2_7_8_4_5_6_3 = 19,
+	FO_1_3_7_2_6_5_4_8 = 20, // Ford 5.0 HO and 351W
+
+	// 9 cylinder - for instance radial :)
+	// PS: Matt says that 9cyl is actually 1-3-5-7-9-2-4-6-8 or 1-8-6-4-2-9-7-5-3 for reverse rotation
+	FO_1_2_3_4_5_6_7_8_9 = 21,
+
+	// 10 cylinder
+	FO_1_10_9_4_3_6_5_8_7_2 = 14, // dodge and viper ram v10
+
+	// 12 cylinder
+	FO_1_7_5_11_3_9_6_12_2_8_4_10 = 15, // bmw M70 & M73 etc
+	FO_1_7_4_10_2_8_6_12_3_9_5_11 = 16, // lamborghini, typical rusEfi use-case
+	FO_1_12_5_8_3_10_6_7_2_11_4_9 = 18, // VAG W12
+	FO_1_2_3_4_5_6_7_8_9_10_11_12 = 23, // mostly for hardware testing purposes
+
+
+	// 16 cylinder
+	// unfortunately not supported by default firmware because INJECTION_PIN_COUNT=IGNITION_PIN_COUNT=12 by default
+	FO_1_14_9_4_7_12_15_6_13_8_3_16_11_2_5_10 = 22, // WR16
+
+	// max used = 24
+
+	Force_4b_firing_order = ENUM_32_BITS,
+} firing_order_e;
--- a/firmware/tunerstudio/cache/proteus/prepend.txt
+++ b/firmware/tunerstudio/cache/proteus/prepend.txt
@ -0,0 +1,12 @@
+#define ts_show_hip9011 false
+#define ts_show_cj125 false
+#define ts_show_full_pinout false
+#define ts_show_lcd false
+#define ts_show_joystick false
+#define ts_show_egt false
+#define ts_show_gps false
+#define ts_show_analog_divider false
+#define ts_show_spi false
+#define ts_show_sd_card false
+#define ts_show_can_pins false
+#define ts_show_tunerstudio_port false
--- a/firmware/tunerstudio/cache/proteus/proteus_prefix.txt
+++ b/firmware/tunerstudio/cache/proteus/proteus_prefix.txt
@ -0,0 +1,4 @@
+ #define output_pin_e_enum "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Highside 2","Highside 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Lowside 8","Lowside 9","Lowside 10","Lowside 11","Lowside 12","Lowside 13","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 5","Ign 4","Ign 3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 2","Ign 1","INVALID","INVALID","Lowside 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Highside 4","Highside 3","Lowside 14","Lowside 15","Lowside 16","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 12","Ign 11","Ign 10","Ign 9","Ign 8","Ign 7","Ign 6","Lowside 2","Lowside 3","Lowside 4","Lowside 5","Lowside 6","Lowside 7","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
+ #define adc_channel_e_enum "Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2","NONE"
+ #define brain_input_pin_e_enum "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Digital 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","VR 1","VR 2","INVALID","INVALID","Digital 2","Digital 3","Digital 4","Digital 5","Digital 6","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
+ #define switch_input_pin_e_enum "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Digital 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Digital 2","Digital 3","Digital 4","Digital 5","Digital 6","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID"
--- a/firmware/tunerstudio/cache/proteus/rusefi.input
+++ b/firmware/tunerstudio/cache/proteus/rusefi.input
--- a/firmware/tunerstudio/cache/proteus/rusefi_config.txt
+++ b/firmware/tunerstudio/cache/proteus/rusefi_config.txt
--- a/firmware/tunerstudio/cache/rusefi.input
+++ b/firmware/tunerstudio/cache/rusefi.input
--- a/firmware/tunerstudio/cache/rusefi_config.txt
+++ b/firmware/tunerstudio/cache/rusefi_config.txt
--- a/firmware/tunerstudio/cache/rusefi_template.xml
+++ b/firmware/tunerstudio/cache/rusefi_template.xml
@ -0,0 +1,240 @@
+<roms>
+
+<!-- @@generator_message@@ -->
+
+    <rom>
+        <romid>
+            <xmlid>RUSEFI</xmlid>
+            <internalidaddress>0</internalidaddress>
+            <internalidstring>OPEN_SR5_0.1</internalidstring>
+            <ecuid>RUSEFI</ecuid>
+            <make>rusEfi</make>
+            <model>rusEfi</model>
+            <filesize>@@TOTAL_CONFIG_SIZE@@</filesize>
+        </romid>
+
+        <table type="3D" name="Ignition Advance"
+        category="Ignition"
+        storageaddress="@@ignitionTable_offset_hex@@"
+               sizex="@@IGN_RPM_COUNT@@" sizey="@@IGN_LOAD_COUNT@@" storagetype="float" endian="big">
+            <scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
+                     coarseincrement="1"/>
+            <table type="X Axis" storageaddress="@@ignitionRpmBins_offset_hex@@" storagetype="float" endian="big"
+                   logparam="rpm">
+                <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
+            </table>
+            <table type="Y Axis" storageaddress="@@ignitionLoadBins_offset_hex@@" storagetype="float" endian="big"
+                   logparam="engine_load">
+                <scaling units="degree" expression="x" to_byte="x" format="0.00" fineincrement=".1"
+                         coarseincrement="1"/>
+            </table>
+        </table>
+
+        <table type="3D" name="Ignition Advance IAT correction" 
+        category="Ignition"
+        storageaddress="@@ignitionIatCorrTable_offset_hex@@"
+               sizex="@@IGN_RPM_COUNT@@" sizey="@@IGN_LOAD_COUNT@@" storagetype="float" endian="big">
+            <scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
+                     coarseincrement="1"/>
+            <table type="X Axis" storageaddress="@@ignitionIatCorrRpmBins_offset_hex@@" storagetype="float" endian="big"
+                   logparam="rpm">
+                <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
+            </table>
+            <table type="Y Axis" storageaddress="@@ignitionIatCorrLoadBins_offset_hex@@" storagetype="float"
+                   endian="big" logparam="engine_load">
+                <scaling units="temperature, C" expression="x" to_byte="x" format="0.00" fineincrement=".1"
+                         coarseincrement="1"/>
+            </table>
+        </table>
+
+        <table type="3D" name="Volumetric Efficiency"
+        category="Fuel"
+        storageaddress="@@veTable_offset_hex@@"
+               sizex="@@FUEL_RPM_COUNT@@" sizey="@@FUEL_LOAD_COUNT@@" storagetype="float" endian="big">
+            <scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
+                     coarseincrement="1"/>
+            <table type="X Axis" storageaddress="@@veRpmBins_offset_hex@@" storagetype="float" endian="big"
+                   logparam="rpm">
+                <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
+            </table>
+            <table type="Y Axis" storageaddress="@@veLoadBins_offset_hex@@" storagetype="float" endian="big"
+                   logparam="engine_load">
+                <scaling units="degree" expression="x" to_byte="x" format="0.00" fineincrement=".1"
+                         coarseincrement="1"/>
+            </table>
+        </table>
+
+        <table type="3D" name="Fuel Table" 
+        category="Fuel"
+        storageaddress="@@fuelTable_offset_hex@@" sizex="@@FUEL_RPM_COUNT@@"
+               sizey="@@FUEL_LOAD_COUNT@@" storagetype="float" endian="big">
+            <scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
+                     coarseincrement="1"/>
+            <table type="X Axis" storageaddress="@@fuelRpmBins_offset_hex@@" storagetype="float" endian="big"
+                   logparam="engine_load">
+                <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
+                         coarseincrement="1"/>
+            </table>
+            <table type="Y Axis" storageaddress="@@fuelLoadBins_offset_hex@@" storagetype="float" endian="big"
+                   logparam="rpm">
+                <scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
+            </table>
+        </table>
+
+        <table type="3D" name="FSIO Table #1" 
+        category="FSIO"
+        storageaddress="@@fsioTable1_offset_hex@@" sizex="@@FSIO_TABLE_8@@"
+               sizey="@@FSIO_TABLE_8@@" storagetype="float" endian="big">
+            <scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
+                     coarseincrement="1"/>
+            <table type="X Axis" storageaddress="@@fsioTable1RpmBins_offset_hex@@" storagetype="float" endian="big"
+                   logparam="">
+                <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
+                         coarseincrement="1"/>
+            </table>
+            <table type="Y Axis" storageaddress="@@fsioTable1LoadBins_offset_hex@@" storagetype="float" endian="big"
+                   logparam="rpm">
+                <scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
+            </table>
+        </table>
+
+        <table type="3D" name="FSIO Table #2" 
+        category="FSIO"
+        storageaddress="@@fsioTable2_offset_hex@@" sizex="@@FSIO_TABLE_8@@"
+               sizey="@@FSIO_TABLE_8@@" storagetype="uint8" endian="big">
+            <scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
+                     coarseincrement="1"/>
+            <table type="X Axis" storageaddress="@@fsioTable2RpmBins_offset_hex@@" storagetype="float" endian="big"
+                   logparam="engine_load">
+                <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
+                         coarseincrement="1"/>
+            </table>
+            <table type="Y Axis" storageaddress="@@fsioTable2LoadBins_offset_hex@@" storagetype="float" endian="big"
+                   logparam="rpm">
+                <scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
+            </table>
+        </table>
+
+        <table type="3D" name="FSIO Table #3" 
+        category="FSIO"
+        storageaddress="@@fsioTable3_offset_hex@@" sizex="@@FSIO_TABLE_8@@"
+               sizey="@@FSIO_TABLE_8@@" storagetype="uint8" endian="big">
+            <scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
+                     coarseincrement="1"/>
+            <table type="X Axis" storageaddress="@@fsioTable3RpmBins_offset_hex@@" storagetype="float" endian="big"
+                   logparam="">
+                <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
+                         coarseincrement="1"/>
+            </table>
+            <table type="Y Axis" storageaddress="@@fsioTable3LoadBins_offset_hex@@" storagetype="float" endian="big"
+                   logparam="rpm">
+                <scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
+            </table>
+        </table>
+
+        <table type="3D" name="FSIO Table #4" 
+        category="FSIO"
+        storageaddress="@@fsioTable4_offset_hex@@" sizex="@@FSIO_TABLE_8@@"
+               sizey="@@FSIO_TABLE_8@@" storagetype="uint8" endian="big">
+            <scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
+                     coarseincrement="1"/>
+            <table type="X Axis" storageaddress="@@fsioTable4RpmBins_offset_hex@@" storagetype="float" endian="big"
+                   logparam="engine_load">
+                <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
+                         coarseincrement="1"/>
+            </table>
+            <table type="Y Axis" storageaddress="@@fsioTable4LoadBins_offset_hex@@" storagetype="float" endian="big"
+                   logparam="engine_load">
+                <scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
+            </table>
+        </table>
+
+        <table type="3D" name="Target AFR"
+        category="Fuel"
+        storageaddress="@@afrTable_offset_hex@@" sizex="@@FUEL_LOAD_COUNT@@"
+               sizey="@@FUEL_RPM_COUNT@@" storagetype="uint8" endian="big">
+            <scaling units="Engine Load" expression="x/10" to_byte="x*10" format="0.00" fineincrement=".1"
+                     coarseincrement="1"/>
+            <table type="X Axis" storageaddress="@@afrRpmBins_offset_hex@@" storagetype="float" endian="big">
+                <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
+                         coarseincrement="1"/>
+            </table>
+            <table type="Y Axis" storageaddress="@@afrLoadBins_offset_hex@@" storagetype="float" endian="big">
+                <scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
+            </table>
+        </table>
+
+        <table type="3D" name="Baro Correction"
+        category="Fuel"
+        storageaddress="@@baroCorrTable_offset_hex@@" sizex="@@BARO_CORR_SIZE@@"
+               sizey="@@BARO_CORR_SIZE@@" storagetype="float" endian="big">
+            <scaling units="Pressure" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
+            <table type="X Axis" storageaddress="@@baroCorrPressureBins_offset_hex@@" storagetype="float" endian="big">
+                <scaling units="kPa" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
+            </table>
+            <table type="Y Axis" storageaddress="@@baroCorrRpmBins_offset_hex@@" storagetype="float" endian="big">
+                <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
+            </table>
+        </table>
+
+        <table type="2D" name="Coolant-based Warnup Enrichment"
+        category="Fuel"
+        storageaddress="@@cltFuelCorr_offset_hex@@" sizex="16"
+               storagetype="float" endian="big">
+            <scaling units="Compensation (%)" expression="x" to_byte="x" format="0.00"
+                     fineincrement=".01" coarseincrement="0.1"/>
+            <table type="X Axis" storageaddress="@@cltFuelCorrBins_offset_hex@@" storagetype="float" endian="big">
+                <scaling units="uni" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
+            </table>
+        </table>
+
+        <table type="2D" name="FSIO Curve #1" storageaddress="@@fsioCurve1_offset_hex@@"
+        category="FSIO"
+               sizex="@@FSIO_CURVE_16@@" storagetype="float" endian="big">
+            <scaling units="Compensation (%)" expression="x" to_byte="x" format="0.00"
+                     fineincrement=".01" coarseincrement="0.1"/>
+            <table type="X Axis" storageaddress="@@fsioCurve1Bins_offset_hex@@" storagetype="float" endian="big">
+                <scaling units="uni" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
+            </table>
+        </table>
+
+        <table type="2D" name="FSIO Curve #2" storageaddress="@@fsioCurve2_offset_hex@@"
+        category="FSIO"
+               sizex="@@FSIO_CURVE_16@@" storagetype="float" endian="big">
+            <scaling units="Compensation (%)" expression="x" to_byte="x" format="0.00"
+                     fineincrement=".01" coarseincrement="0.1"/>
+            <table type="X Axis" storageaddress="@@fsioCurve2Bins_offset_hex@@" storagetype="float" endian="big">
+                <scaling units="uni" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
+            </table>
+        </table>
+
+        <table type="2D" name="Coolant temperature-based extra idle air" storageaddress="@@cltIdleCorr_offset_hex@@"
+               sizex="@@CLT_CURVE_SIZE@@" storagetype="float" endian="big">
+            <scaling units="Compensation (%)" expression="x" to_byte="x" format="0.00"
+                     fineincrement=".01" coarseincrement="0.1"/>
+            <table type="X Axis" storageaddress="@@cltIdleCorrBins_offset_hex@@" storagetype="float" endian="big">
+                <scaling units="uni" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
+            </table>
+        </table>
+
+
+        <table type="2D" name="Engine Noise" storageaddress="@@knockNoise_offset_hex@@"
+               sizex="@@ENGINE_NOISE_CURVE_SIZE@@" storagetype="float" endian="big">
+            <scaling units="Volts" expression="x" to_byte="x" format="0.00"
+                     fineincrement=".01" coarseincrement="0.1"/>
+            <table type="X Axis" storageaddress="@@knockNoiseRpmBins_offset_hex@@" storagetype="float" endian="big">
+                <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
+            </table>
+        </table>
+
+        <table type="2D" name="Injector Lag" storageaddress="@@injector_battLagCorr_offset_hex@@"
+               sizex="@@VBAT_INJECTOR_CURVE_SIZE@@" storagetype="float" endian="big">
+            <scaling units="ms" expression="x" to_byte="x" format="0.00"
+                     fineincrement=".01" coarseincrement="0.1"/>
+            <table type="X Axis" storageaddress="@@injector_battLagCorrBins_offset_hex@@" storagetype="float" endian="big">
+                <scaling units="Volts" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
+            </table>
+        </table>
+
+    </rom>
+</roms>
--- a/firmware/tunerstudio/rusefi.ini
+++ b/firmware/tunerstudio/rusefi.ini
@ -89,7 +89,7 @@ enable2ndByteCanID = false

 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 27 22:18:29 EDT 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 28 14:03:17 UTC 2020

 pageSize            = 20000
 page = 1
--- a/firmware/tunerstudio/rusefi_frankenso.ini
+++ b/firmware/tunerstudio/rusefi_frankenso.ini
@ -89,7 +89,7 @@ enable2ndByteCanID = false

 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 27 18:35:37 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 28 14:03:21 UTC 2020

 pageSize            = 20000
 page = 1
@ -1195,6 +1195,7 @@ page = 1
 	injector_flow = "This is your injector flow at the fuel pressure used in the vehicle. cc/min, cubic centimetre per minute\nBy the way, g/s = 0.125997881 * (lb/hr)\ng/s = 0.125997881 * (cc/min)/10.5\ng/s = 0.0119997981 * cc/min"
 	cj125isUaDivided = "Is your UA CJ125 output wired to MCU via resistor divider? Ua can go over 3.3v but only at lambda >3, i.e very lean AFR above 44.1\nWhen exposed to free air and 17x gain, Ua will be 4.17 volt"
 	etb_use_two_wires = "TLE7209 uses two-wire mode. TLE9201 and VNH2SP30 do NOT use two wire mode."
+	isDoubleSolenoidIdle = "Subaru style where default valve position is somewhere in the middle. First solenoid opens it more while second can close it more than default position."
 	cj125isUrDivided = "Is your UR CJ125 output wired to MCU via resistor divider?\nLooks like 3v range should be enough, divider generally not needed."
 	absoluteFuelPressure = "If your fuel regulator does not have vacuum line"
 	tpsErrorDetectionTooLow = "TPS error detection: what throttle % is unrealistically low?\nAlso used for accelerator pedal error detection if so equiped."
@ -1408,7 +1409,6 @@ page = 1
 ;       recordField = toothTime, "tooth", 0, 16, 0.01, "ms"


-
 		; recordDef = headerLen, footerLen, recordLen
 		recordDef =   0,   0,   5

@ -3249,6 +3249,7 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "MIL / Check Engine Pin",				malfunctionIndicatorPin
 		field = "test557pin",							test557pin
 		field = "Fan Pin",								fanPin
+		field = "A/C Relay",							acRelayPin
 		field = "Main Relay Pin",  						mainRelayPin
 		field = "Starter Relay Pin",  					starterRelayDisablePin

@ -3633,6 +3634,9 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "Pin mode",							fanPinMode
 		field = "On temperature",					fanOnTemperature
 		field = "Off temperature",					fanOffTemperature
+; this one has build-in FSIO logic
+		field = "A/C Relay",						acRelayPin
+		field = "A/C Relay Mode",					acRelayPinMode

 	dialog = fuelPumpConfig, "Fuel Pump"
 		field = "Pin",						fuelPumpPin
--- a/firmware/tunerstudio/rusefi_kinetis.ini
+++ b/firmware/tunerstudio/rusefi_kinetis.ini
@ -89,7 +89,7 @@ enable2ndByteCanID = false

 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Fri Jun 26 13:10:23 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Jun 28 14:03:24 UTC 2020

 pageSize            = 20000
 page = 1
@ -1195,6 +1195,7 @@ page = 1
 	injector_flow = "This is your injector flow at the fuel pressure used in the vehicle. cc/min, cubic centimetre per minute\nBy the way, g/s = 0.125997881 * (lb/hr)\ng/s = 0.125997881 * (cc/min)/10.5\ng/s = 0.0119997981 * cc/min"
 	cj125isUaDivided = "Is your UA CJ125 output wired to MCU via resistor divider? Ua can go over 3.3v but only at lambda >3, i.e very lean AFR above 44.1\nWhen exposed to free air and 17x gain, Ua will be 4.17 volt"
 	etb_use_two_wires = "TLE7209 uses two-wire mode. TLE9201 and VNH2SP30 do NOT use two wire mode."
+	isDoubleSolenoidIdle = "Subaru style where default valve position is somewhere in the middle. First solenoid opens it more while second can close it more than default position."
 	cj125isUrDivided = "Is your UR CJ125 output wired to MCU via resistor divider?\nLooks like 3v range should be enough, divider generally not needed."
 	absoluteFuelPressure = "If your fuel regulator does not have vacuum line"
 	tpsErrorDetectionTooLow = "TPS error detection: what throttle % is unrealistically low?\nAlso used for accelerator pedal error detection if so equiped."
@ -1408,7 +1409,6 @@ page = 1
 ;       recordField = toothTime, "tooth", 0, 16, 0.01, "ms"


-
 		; recordDef = headerLen, footerLen, recordLen
 		recordDef =   0,   0,   5

@ -3250,6 +3250,7 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "MIL / Check Engine Pin",				malfunctionIndicatorPin
 		field = "test557pin",							test557pin
 		field = "Fan Pin",								fanPin
+		field = "A/C Relay",							acRelayPin
 		field = "Main Relay Pin",  						mainRelayPin
 		field = "Starter Relay Pin",  					starterRelayDisablePin

@ -3634,6 +3635,9 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "Pin mode",							fanPinMode
 		field = "On temperature",					fanOnTemperature
 		field = "Off temperature",					fanOffTemperature
+; this one has build-in FSIO logic
+		field = "A/C Relay",						acRelayPin
+		field = "A/C Relay Mode",					acRelayPinMode

 	dialog = fuelPumpConfig, "Fuel Pump"
 		field = "Pin",						fuelPumpPin
--- a/firmware/tunerstudio/rusefi_microrusefi.ini
+++ b/firmware/tunerstudio/rusefi_microrusefi.ini
@ -89,7 +89,7 @@ enable2ndByteCanID = false

 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 27 22:18:32 EDT 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 28 14:03:19 UTC 2020

 pageSize            = 20000
 page = 1
--- a/firmware/tunerstudio/rusefi_prometheus.ini
+++ b/firmware/tunerstudio/rusefi_prometheus.ini
@ -89,7 +89,7 @@ enable2ndByteCanID = false

 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 27 18:35:39 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 28 14:03:22 UTC 2020

 pageSize            = 20000
 page = 1
@ -1195,6 +1195,7 @@ page = 1
 	injector_flow = "This is your injector flow at the fuel pressure used in the vehicle. cc/min, cubic centimetre per minute\nBy the way, g/s = 0.125997881 * (lb/hr)\ng/s = 0.125997881 * (cc/min)/10.5\ng/s = 0.0119997981 * cc/min"
 	cj125isUaDivided = "Is your UA CJ125 output wired to MCU via resistor divider? Ua can go over 3.3v but only at lambda >3, i.e very lean AFR above 44.1\nWhen exposed to free air and 17x gain, Ua will be 4.17 volt"
 	etb_use_two_wires = "TLE7209 uses two-wire mode. TLE9201 and VNH2SP30 do NOT use two wire mode."
+	isDoubleSolenoidIdle = "Subaru style where default valve position is somewhere in the middle. First solenoid opens it more while second can close it more than default position."
 	cj125isUrDivided = "Is your UR CJ125 output wired to MCU via resistor divider?\nLooks like 3v range should be enough, divider generally not needed."
 	absoluteFuelPressure = "If your fuel regulator does not have vacuum line"
 	tpsErrorDetectionTooLow = "TPS error detection: what throttle % is unrealistically low?\nAlso used for accelerator pedal error detection if so equiped."
@ -1408,7 +1409,6 @@ page = 1
 ;       recordField = toothTime, "tooth", 0, 16, 0.01, "ms"


-
 		; recordDef = headerLen, footerLen, recordLen
 		recordDef =   0,   0,   5

@ -3245,6 +3245,7 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "MIL / Check Engine Pin",				malfunctionIndicatorPin
 		field = "test557pin",							test557pin
 		field = "Fan Pin",								fanPin
+		field = "A/C Relay",							acRelayPin
 		field = "Main Relay Pin",  						mainRelayPin
 		field = "Starter Relay Pin",  					starterRelayDisablePin

@ -3629,6 +3630,9 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "Pin mode",							fanPinMode
 		field = "On temperature",					fanOnTemperature
 		field = "Off temperature",					fanOffTemperature
+; this one has build-in FSIO logic
+		field = "A/C Relay",						acRelayPin
+		field = "A/C Relay Mode",					acRelayPinMode

 	dialog = fuelPumpConfig, "Fuel Pump"
 		field = "Pin",						fuelPumpPin
--- a/firmware/tunerstudio/rusefi_proteus.ini
+++ b/firmware/tunerstudio/rusefi_proteus.ini
@ -89,7 +89,7 @@ enable2ndByteCanID = false

 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 27 18:35:40 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 28 14:03:23 UTC 2020

 pageSize            = 20000
 page = 1
@ -1195,6 +1195,7 @@ page = 1
 	injector_flow = "This is your injector flow at the fuel pressure used in the vehicle. cc/min, cubic centimetre per minute\nBy the way, g/s = 0.125997881 * (lb/hr)\ng/s = 0.125997881 * (cc/min)/10.5\ng/s = 0.0119997981 * cc/min"
 	cj125isUaDivided = "Is your UA CJ125 output wired to MCU via resistor divider? Ua can go over 3.3v but only at lambda >3, i.e very lean AFR above 44.1\nWhen exposed to free air and 17x gain, Ua will be 4.17 volt"
 	etb_use_two_wires = "TLE7209 uses two-wire mode. TLE9201 and VNH2SP30 do NOT use two wire mode."
+	isDoubleSolenoidIdle = "Subaru style where default valve position is somewhere in the middle. First solenoid opens it more while second can close it more than default position."
 	cj125isUrDivided = "Is your UR CJ125 output wired to MCU via resistor divider?\nLooks like 3v range should be enough, divider generally not needed."
 	absoluteFuelPressure = "If your fuel regulator does not have vacuum line"
 	tpsErrorDetectionTooLow = "TPS error detection: what throttle % is unrealistically low?\nAlso used for accelerator pedal error detection if so equiped."
@ -1408,7 +1409,6 @@ page = 1
 ;       recordField = toothTime, "tooth", 0, 16, 0.01, "ms"


-
 		; recordDef = headerLen, footerLen, recordLen
 		recordDef =   0,   0,   5

@ -3239,6 +3239,7 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "MIL / Check Engine Pin",				malfunctionIndicatorPin
 		field = "test557pin",							test557pin
 		field = "Fan Pin",								fanPin
+		field = "A/C Relay",							acRelayPin
 		field = "Main Relay Pin",  						mainRelayPin
 		field = "Starter Relay Pin",  					starterRelayDisablePin

@ -3608,6 +3609,9 @@ cmd_set_engine_type_default					= "w\x00\x31\x00\x00"
 		field = "Pin mode",							fanPinMode
 		field = "On temperature",					fanOnTemperature
 		field = "Off temperature",					fanOffTemperature
+; this one has build-in FSIO logic
+		field = "A/C Relay",						acRelayPin
+		field = "A/C Relay Mode",					acRelayPinMode

 	dialog = fuelPumpConfig, "Fuel Pump"
 		field = "Pin",						fuelPumpPin
--- a/java_console/models/src/com/rusefi/config/generated/EngineState.java
+++ b/java_console/models/src/com/rusefi/config/generated/EngineState.java
@ -1,6 +1,6 @@
 package com.rusefi.config.generated;

-// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/engine_state.txt Fri Apr 10 12:53:32 EDT 2020
+// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/engine_state.txt Sun Jun 28 14:03:25 UTC 2020

 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
--- 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 gen_config.sh integration/rusefi_config.txt Mon Jun 22 02:17:44 UTC 2020
+// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Jun 28 14:03:17 UTC 2020

 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
--- a/java_console/models/src/com/rusefi/config/generated/PidState.java
+++ b/java_console/models/src/com/rusefi/config/generated/PidState.java
@ -1,6 +1,6 @@
 package com.rusefi.config.generated;

-// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/pid_state.txt Sun Sep 22 08:31:57 EDT 2019
+// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/pid_state.txt Sun Jun 28 14:03:25 UTC 2020

 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
--- a/java_console/models/src/com/rusefi/config/generated/TriggerCentral.java
+++ b/java_console/models/src/com/rusefi/config/generated/TriggerCentral.java
@ -1,6 +1,6 @@
 package com.rusefi.config.generated;

-// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/trigger_central.txt Sun Sep 22 08:31:58 EDT 2019
+// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/trigger_central.txt Sun Jun 28 14:03:25 UTC 2020

 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
--- a/java_console/models/src/com/rusefi/config/generated/TriggerState.java
+++ b/java_console/models/src/com/rusefi/config/generated/TriggerState.java
@ -1,6 +1,6 @@
 package com.rusefi.config.generated;

-// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/trigger_state.txt Sun Sep 22 08:31:58 EDT 2019
+// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/trigger_state.txt Sun Jun 28 14:03:25 UTC 2020

 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
--- a/java_console/models/src/com/rusefi/config/generated/WallFuelState.java
+++ b/java_console/models/src/com/rusefi/config/generated/WallFuelState.java
@ -1,6 +1,6 @@
 package com.rusefi.config.generated;

-// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/wall_fuel_state.txt Sun Sep 22 08:31:58 EDT 2019
+// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on (unknown script) integration/wall_fuel_state.txt Sun Jun 28 14:03:25 UTC 2020

 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
--- a/java_console/rusefi.xml
+++ b/java_console/rusefi.xml
@ -1,6 +1,6 @@
 <roms>

-<!-- was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat Tue May 19 11:54:01 EDT 2020 -->
+<!-- was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh Sun Jun 28 14:03:19 UTC 2020 -->

    <rom>
        <romid>