Merge branch 'master' of https://github.com/fome-tech/fome-fw

FOME-Tech · Jun 25, 2023 · b05c6ff · b05c6ff
2 parents 1885f3e + 5ee3228
commit b05c6ff
Show file tree

Hide file tree

Showing 70 changed files with 165 additions and 246 deletions.
diff --git a/...ig/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h b/...ig/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h
@@ -1863,10 +1863,8 @@ struct engine_configuration_s {
 	// offset 1200 bit 11
 	bool isManualSpinningMode : 1 {};
 
-	// This is needed if your coils are individually wired and you wish to use batch injection.
-	// enable two_wire_batch_injection
 	// offset 1200 bit 12
-	bool twoWireBatchInjection : 1 {};
+	bool unused1200b12 : 1 {};
 
 	// offset 1200 bit 13
 	bool neverInstantRpm : 1 {};

diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h
@@ -981,7 +981,7 @@
 #define show_Frankenso_presets false
 #define show_Proteus_presets false
 #define show_test_presets false
-#define SIGNATURE_HASH 3454865741
+#define SIGNATURE_HASH 1353177119
 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4"
 #define spi_device_e_SPI_DEVICE_1 1
 #define spi_device_e_SPI_DEVICE_2 2
@@ -1248,7 +1248,7 @@
 #define ts_show_vbatt true
 #define ts_show_vr_threshold_2 true
 #define ts_show_vr_threshold_all true
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.subaru_eg33_f7.3454865741"
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.subaru_eg33_f7.1353177119"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define TS_SINGLE_WRITE_COMMAND_char W
 #define TS_TEST_COMMAND 't'

diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h
@@ -1863,10 +1863,8 @@ struct engine_configuration_s {
 	// offset 1200 bit 11
 	bool isManualSpinningMode : 1 {};
 
-	// This is needed if your coils are individually wired and you wish to use batch injection.
-	// enable two_wire_batch_injection
 	// offset 1200 bit 12
-	bool twoWireBatchInjection : 1 {};
+	bool unused1200b12 : 1 {};
 
 	// offset 1200 bit 13
 	bool neverInstantRpm : 1 {};

diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h
@@ -1031,7 +1031,7 @@
 #define SentEtbType_NONE 0
 #define show_Frankenso_presets true
 #define show_test_presets true
-#define SIGNATURE_HASH 350550839
+#define SIGNATURE_HASH 2309894757
 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4"
 #define spi_device_e_SPI_DEVICE_1 1
 #define spi_device_e_SPI_DEVICE_2 2
@@ -1297,7 +1297,7 @@
 #define ts_show_vbatt true
 #define ts_show_vr_threshold_2 true
 #define ts_show_vr_threshold_all true
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.f407-discovery.350550839"
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.f407-discovery.2309894757"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define TS_SINGLE_WRITE_COMMAND_char W
 #define TS_TEST_COMMAND 't'

diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 203198328
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.48way.203198328"
+#define SIGNATURE_HASH 2438350378
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.48way.2438350378"
diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 1838743557
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.alphax-2chan.1838743557"
+#define SIGNATURE_HASH 4040411479
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.alphax-2chan.4040411479"
diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 3880845924
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.alphax-4chan.3880845924"
+#define SIGNATURE_HASH 2048641846
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.alphax-4chan.2048641846"
diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 2682913949
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.alphax-8chan.2682913949"
+#define SIGNATURE_HASH 44092879
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.alphax-8chan.44092879"
diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 1410134757
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.atlas.1410134757"
+#define SIGNATURE_HASH 3376823223
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.atlas.3376823223"
diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 1893796468
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.core8.1893796468"
+#define SIGNATURE_HASH 3987456806
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.core8.3987456806"
diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 350550839
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.f407-discovery.350550839"
+#define SIGNATURE_HASH 2309894757
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.f407-discovery.2309894757"
diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 1220937666
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.f429-discovery.1220937666"
+#define SIGNATURE_HASH 3582774928
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.f429-discovery.3582774928"
diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 1788143368
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.frankenso_na6.1788143368"
+#define SIGNATURE_HASH 4158533210
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.frankenso_na6.4158533210"
diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 3243458488
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.harley81.3243458488"
+#define SIGNATURE_HASH 1545205482
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.harley81.1545205482"
diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 565127441
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.hellen-gm-e67.565127441"
+#define SIGNATURE_HASH 3169181763
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.hellen-gm-e67.3169181763"
diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 3124684624
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.hellen-honda-k.3124684624"
+#define SIGNATURE_HASH 661925378
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.hellen-honda-k.661925378"
diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 3219199614
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.hellen-nb1.3219199614"
+#define SIGNATURE_HASH 581689132
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.hellen-nb1.581689132"
diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 3476732468
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.hellen121nissan.3476732468"
+#define SIGNATURE_HASH 1383101286
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.hellen121nissan.1383101286"
diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 1664726503
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.hellen121vag.1664726503"
+#define SIGNATURE_HASH 4268981429
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.hellen121vag.4268981429"
diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 3360974437
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.hellen128.3360974437"
+#define SIGNATURE_HASH 1428074295
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.hellen128.1428074295"
diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 1554204292
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.hellen154hyundai.1554204292"
+#define SIGNATURE_HASH 3253309398
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.hellen154hyundai.3253309398"
diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 3111296629
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.hellen72.3111296629"
+#define SIGNATURE_HASH 607672103
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.hellen72.607672103"
diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 368633079
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.hellen81.368633079"
+#define SIGNATURE_HASH 2293378469
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.hellen81.2293378469"
diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 331412420
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.hellen88bmw.331412420"
+#define SIGNATURE_HASH 2391423638
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.hellen88bmw.2391423638"
diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 1534477893
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.hellenNA6.1534477893"
+#define SIGNATURE_HASH 3325857559
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.hellenNA6.3325857559"
diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 3889312245
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.hellenNA8_96.3889312245"
+#define SIGNATURE_HASH 2056845479
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.hellenNA8_96.2056845479"
diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 2940756602
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.mre_f4.2940756602"
+#define SIGNATURE_HASH 839035688
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.mre_f4.839035688"
diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 2940756602
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.mre_f7.2940756602"
+#define SIGNATURE_HASH 839035688
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.mre_f7.839035688"
diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 2018691666
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.prometheus_405.2018691666"
+#define SIGNATURE_HASH 3843556096
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.prometheus_405.3843556096"
diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 2018691666
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.prometheus_469.2018691666"
+#define SIGNATURE_HASH 3843556096
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.prometheus_469.3843556096"
diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 727220943
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.proteus_f4.727220943"
+#define SIGNATURE_HASH 3054652317
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.proteus_f4.3054652317"
diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 727220943
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.proteus_f7.727220943"
+#define SIGNATURE_HASH 3054652317
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.proteus_f7.3054652317"
diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 727220943
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.proteus_h7.727220943"
+#define SIGNATURE_HASH 3054652317
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.proteus_h7.3054652317"
diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 3454865741
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.subaru_eg33_f7.3454865741"
+#define SIGNATURE_HASH 1353177119
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.subaru_eg33_f7.1353177119"
diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h
@@ -1,2 +1,2 @@
-#define SIGNATURE_HASH 3261606880
-#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.23.tdg-pdm8.3261606880"
+#define SIGNATURE_HASH 1596121778
+#define TS_SIGNATURE "rusEFI (FOME) master.2023.06.25.tdg-pdm8.1596121778"
diff --git a/firmware/controllers/lua/generated/value_lookup_generated.cpp b/firmware/controllers/lua/generated/value_lookup_generated.cpp
@@ -529,8 +529,6 @@ float getConfigValueByName(const char *name) {
 			return engineConfiguration->verboseTriggerSynchDetails;
 		case -795241238:
 			return engineConfiguration->isManualSpinningMode;
-		case -1248413509:
-			return engineConfiguration->twoWireBatchInjection;
 		case 240697653:
 			return engineConfiguration->neverInstantRpm;
 		case 201676494:
@@ -2313,11 +2311,6 @@ void setConfigValueByName(const char *name, float value) {
 	{
 		engineConfiguration->isManualSpinningMode = (int)value;
 		return;
-	}
-		case -1248413509:
-	{
-		engineConfiguration->twoWireBatchInjection = (int)value;
-		return;
 	}
 		case 240697653:
 	{

diff --git a/firmware/controllers/lua/generated/value_lookup_generated.md b/firmware/controllers/lua/generated/value_lookup_generated.md
@@ -787,9 +787,6 @@ Verbose info in console below engineSnifferRpmThreshold\nenable trigger_details
 ### isManualSpinningMode
 Usually if we have no trigger events that means engine is stopped\nUnless we are troubleshooting and spinning the engine by hand - this case a longer\ndelay is needed
 
-### twoWireBatchInjection
-This is needed if your coils are individually wired and you wish to use batch injection.\nenable two_wire_batch_injection
-
 ### neverInstantRpm
 
 

diff --git a/firmware/tunerstudio/generated/fome.ini b/firmware/tunerstudio/generated/fome.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI (FOME) master.2023.06.23.f407-discovery.350550839"
+	signature	= "rusEFI (FOME) master.2023.06.25.f407-discovery.2309894757"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI (FOME) master.2023.06.23.f407-discovery.350550839" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI (FOME) master.2023.06.25.f407-discovery.2309894757" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -593,7 +593,7 @@ isWaveAnalyzerEnabled = bits, U32, 1200, [8:8], "false", "true"
 useSeparateVeForIdle = bits, U32, 1200, [9:9], "false", "true"
 verboseTriggerSynchDetails = bits, U32, 1200, [10:10], "false", "true"
 isManualSpinningMode = bits, U32, 1200, [11:11], "false", "true"
-twoWireBatchInjection = bits, U32, 1200, [12:12], "false", "true"
+unused1200b12 = bits, U32, 1200, [12:12], "false", "true"
 neverInstantRpm = bits, U32, 1200, [13:13], "false", "true"
 unused1200b14 = bits, U32, 1200, [14:14], "false", "true"
 useFixedBaroCorrFromMap = bits, U32, 1200, [15:15], "false", "true"
@@ -1666,7 +1666,6 @@ lambdaMaxDeviationRpmBins = array, U16, 22876, [4], "RPM", 1, 0, 0, 18000, 0
 	useSeparateVeForIdle = "This activates a separate fuel table for Idle, this allows fine tuning of the idle fuelling."
 	verboseTriggerSynchDetails = "Verbose info in console below engineSnifferRpmThreshold\nenable trigger_details"
 	isManualSpinningMode = "Usually if we have no trigger events that means engine is stopped\nUnless we are troubleshooting and spinning the engine by hand - this case a longer\ndelay is needed"
-	twoWireBatchInjection = "This is needed if your coils are individually wired and you wish to use batch injection.\nenable two_wire_batch_injection"
 	useSeparateAdvanceForCranking = "In Constant mode, timing is automatically tapered to running as RPM increases.\nIn Table mode, the "Cranking ignition advance" table is used directly."
 	useAdvanceCorrectionsForCranking = "This enables the various ignition corrections during cranking (IAT, CLT, FSIO and PID idle).\nYou probably don't need this."
 	flexCranking = "Enable a second cranking table to use for E100 flex fuel, interpolating between the two based on flex fuel sensor."
@@ -5839,7 +5838,6 @@ dialog = sent_stateDialog, "sent_state"
 		field = "Enabled",						isInjectionEnabled
 		field = "Mode",							injectionMode, {isInjectionEnabled == 1}
 		field = "#Batch injection with individual wiring"
-		field = "Individually wired Batch Fuel",				twoWireBatchInjection, {isInjectionEnabled == 1 && injectionMode == 2 }
 		field = "Override VE table load axis",			veOverrideMode, { isInjectionEnabled }
 		field = "Override AFR table load axis",			afrOverrideMode, { isInjectionEnabled }
 		field = "Injection phase control mode",				injectionTimingMode, { isInjectionEnabled }

diff --git a/firmware/tunerstudio/generated/fome_48way.ini b/firmware/tunerstudio/generated/fome_48way.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI (FOME) master.2023.06.23.48way.203198328"
+	signature	= "rusEFI (FOME) master.2023.06.25.48way.2438350378"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI (FOME) master.2023.06.23.48way.203198328" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI (FOME) master.2023.06.25.48way.2438350378" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -593,7 +593,7 @@ isWaveAnalyzerEnabled = bits, U32, 1200, [8:8], "false", "true"
 useSeparateVeForIdle = bits, U32, 1200, [9:9], "false", "true"
 verboseTriggerSynchDetails = bits, U32, 1200, [10:10], "false", "true"
 isManualSpinningMode = bits, U32, 1200, [11:11], "false", "true"
-twoWireBatchInjection = bits, U32, 1200, [12:12], "false", "true"
+unused1200b12 = bits, U32, 1200, [12:12], "false", "true"
 neverInstantRpm = bits, U32, 1200, [13:13], "false", "true"
 unused1200b14 = bits, U32, 1200, [14:14], "false", "true"
 useFixedBaroCorrFromMap = bits, U32, 1200, [15:15], "false", "true"
@@ -1666,7 +1666,6 @@ lambdaMaxDeviationRpmBins = array, U16, 22876, [4], "RPM", 1, 0, 0, 18000, 0
 	useSeparateVeForIdle = "This activates a separate fuel table for Idle, this allows fine tuning of the idle fuelling."
 	verboseTriggerSynchDetails = "Verbose info in console below engineSnifferRpmThreshold\nenable trigger_details"
 	isManualSpinningMode = "Usually if we have no trigger events that means engine is stopped\nUnless we are troubleshooting and spinning the engine by hand - this case a longer\ndelay is needed"
-	twoWireBatchInjection = "This is needed if your coils are individually wired and you wish to use batch injection.\nenable two_wire_batch_injection"
 	useSeparateAdvanceForCranking = "In Constant mode, timing is automatically tapered to running as RPM increases.\nIn Table mode, the "Cranking ignition advance" table is used directly."
 	useAdvanceCorrectionsForCranking = "This enables the various ignition corrections during cranking (IAT, CLT, FSIO and PID idle).\nYou probably don't need this."
 	flexCranking = "Enable a second cranking table to use for E100 flex fuel, interpolating between the two based on flex fuel sensor."
@@ -5839,7 +5838,6 @@ dialog = sent_stateDialog, "sent_state"
 		field = "Enabled",						isInjectionEnabled
 		field = "Mode",							injectionMode, {isInjectionEnabled == 1}
 		field = "#Batch injection with individual wiring"
-		field = "Individually wired Batch Fuel",				twoWireBatchInjection, {isInjectionEnabled == 1 && injectionMode == 2 }
 		field = "Override VE table load axis",			veOverrideMode, { isInjectionEnabled }
 		field = "Override AFR table load axis",			afrOverrideMode, { isInjectionEnabled }
 		field = "Injection phase control mode",				injectionTimingMode, { isInjectionEnabled }

diff --git a/firmware/tunerstudio/generated/fome_alphax-2chan.ini b/firmware/tunerstudio/generated/fome_alphax-2chan.ini
@@ -33,12 +33,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
-	signature	= "rusEFI (FOME) master.2023.06.23.alphax-2chan.1838743557"
+	signature	= "rusEFI (FOME) master.2023.06.25.alphax-2chan.4040411479"
 
 [TunerStudio]
 	queryCommand	= "S"
 	versionInfo	= "V"  ; firmware version for title bar.
-	signature= "rusEFI (FOME) master.2023.06.23.alphax-2chan.1838743557" ; signature is expected to be 7 or more characters.
+	signature= "rusEFI (FOME) master.2023.06.25.alphax-2chan.4040411479" ; signature is expected to be 7 or more characters.
 
 	; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
 	useLegacyFTempUnits = false
@@ -593,7 +593,7 @@ isWaveAnalyzerEnabled = bits, U32, 1200, [8:8], "false", "true"
 useSeparateVeForIdle = bits, U32, 1200, [9:9], "false", "true"
 verboseTriggerSynchDetails = bits, U32, 1200, [10:10], "false", "true"
 isManualSpinningMode = bits, U32, 1200, [11:11], "false", "true"
-twoWireBatchInjection = bits, U32, 1200, [12:12], "false", "true"
+unused1200b12 = bits, U32, 1200, [12:12], "false", "true"
 neverInstantRpm = bits, U32, 1200, [13:13], "false", "true"
 unused1200b14 = bits, U32, 1200, [14:14], "false", "true"
 useFixedBaroCorrFromMap = bits, U32, 1200, [15:15], "false", "true"
@@ -1666,7 +1666,6 @@ lambdaMaxDeviationRpmBins = array, U16, 22876, [4], "RPM", 1, 0, 0, 18000, 0
 	useSeparateVeForIdle = "This activates a separate fuel table for Idle, this allows fine tuning of the idle fuelling."
 	verboseTriggerSynchDetails = "Verbose info in console below engineSnifferRpmThreshold\nenable trigger_details"
 	isManualSpinningMode = "Usually if we have no trigger events that means engine is stopped\nUnless we are troubleshooting and spinning the engine by hand - this case a longer\ndelay is needed"
-	twoWireBatchInjection = "This is needed if your coils are individually wired and you wish to use batch injection.\nenable two_wire_batch_injection"
 	useSeparateAdvanceForCranking = "In Constant mode, timing is automatically tapered to running as RPM increases.\nIn Table mode, the "Cranking ignition advance" table is used directly."
 	useAdvanceCorrectionsForCranking = "This enables the various ignition corrections during cranking (IAT, CLT, FSIO and PID idle).\nYou probably don't need this."
 	flexCranking = "Enable a second cranking table to use for E100 flex fuel, interpolating between the two based on flex fuel sensor."
@@ -5835,7 +5834,6 @@ dialog = sent_stateDialog, "sent_state"
 		field = "Enabled",						isInjectionEnabled
 		field = "Mode",							injectionMode, {isInjectionEnabled == 1}
 		field = "#Batch injection with individual wiring"
-		field = "Individually wired Batch Fuel",				twoWireBatchInjection, {isInjectionEnabled == 1 && injectionMode == 2 }
 		field = "Override VE table load axis",			veOverrideMode, { isInjectionEnabled }
 		field = "Override AFR table load axis",			afrOverrideMode, { isInjectionEnabled }
 		field = "Injection phase control mode",				injectionTimingMode, { isInjectionEnabled }