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

remove twoWireBatchIgnition

This commit is contained in:
Matthew Kennedy 2023-03-02 22:10:11 -08:00
parent edc8956c35
commit 3fa2f44014
5 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/config/engines/toyota_jzs147.cpp
View File

@ -86,7 +86,6 @@ void setToyota_2jz_vics() {
engineConfiguration->ignitionMode = IM_WASTED_SPARK; // just for now
engineConfiguration->injectionMode = IM_BATCH; // just for now
engineConfiguration->twoWireBatchIgnition = true;
engineConfiguration->twoWireBatchInjection = true;
strcpy(engineConfiguration->engineMake, ENGINE_MAKE_TOYOTA);

7
firmware/controllers/engine_cycle/spark_logic.cpp
View File

@ -116,11 +116,8 @@ static void prepareCylinderIgnitionSchedule(angle_t dwellAngleDuration, floatms_
IgnitionOutputPin *secondOutput;
// We need two outputs if:
// - we are running wasted spark, and have "two wire" mode enabled
// - We are running sequential mode, but we're cranking, so we should run in two wire wasted mode (not one wire wasted)
bool isTwoWireWasted = engineConfiguration->twoWireBatchIgnition || (engineConfiguration->ignitionMode == IM_INDIVIDUAL_COILS);
if (ignitionMode == IM_WASTED_SPARK && isTwoWireWasted) {
// If wasted spark, find the paired coil in addition to "main" output for this cylinder
if (ignitionMode == IM_WASTED_SPARK) {
int secondIndex = index + engineConfiguration->specs.cylindersCount / 2;
int secondCoilIndex = ID2INDEX(getCylinderId(secondIndex));
secondOutput = &enginePins.coils[secondCoilIndex];

3
firmware/controllers/settings.cpp
View File

@ -452,9 +452,6 @@ static void enableOrDisable(const char *param, bool isEnabled) {
} else if (strEqualCaseInsensitive(param, "boardUseTachPullUp")) {
engineConfiguration->boardUseTachPullUp = isEnabled;
incrementGlobalConfigurationVersion();
} else if (strEqualCaseInsensitive(param, "two_wire_wasted_spark")) {
engineConfiguration->twoWireBatchIgnition = isEnabled;
incrementGlobalConfigurationVersion();
} else if (strEqualCaseInsensitive(param, "verbose_idle")) {
engineConfiguration->isVerboseIAC = isEnabled;
} else if (strEqualCaseInsensitive(param, "auxdebug1")) {

2
firmware/integration/rusefi_config.txt
View File

@ -994,7 +994,7 @@ bit skippedWheelOnCam,"On camshaft","On crankshaft";Where is your primary skippe
bit 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
bit twoWireBatchInjection;This is needed if your coils are individually wired and you wish to use batch injection.\nenable two_wire_batch_injection
bit neverInstantRpm
bit twoWireBatchIgnition;This is needed if your coils are individually wired (COP) and you wish to use batch ignition (Wasted Spark).
bit unused1200b14
bit useFixedBaroCorrFromMap
bit useSeparateAdvanceForCranking,"Table","Fixed (auto taper)";In Constant mode, timing is automatically tapered to running as RPM increases.\nIn Table mode, the "Cranking ignition advance" table is used directly.
bit useAdvanceCorrectionsForCranking;This enables the various ignition corrections during cranking (IAT, CLT, FSIO and PID idle).\nYou probably don't need this.

1
firmware/tunerstudio/rusefi.input
View File

@ -2106,7 +2106,6 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_
dialog = ignitionBasic, ""
field = "Enabled", isIgnitionEnabled
field = "Mode", ignitionMode, {isIgnitionEnabled == 1}
field = "Individually wired Wasted Spark", twoWireBatchIgnition, {isIgnitionEnabled == 1 && ignitionMode == @@ignition_mode_e_IM_WASTED_SPARK@@ }
field = "Override ignition table load axis", ignOverrideMode, {isIgnitionEnabled}
field = "#Use fixed timing while validating with a timing gun"
field = "Timing Mode", timingMode, {isIgnitionEnabled == 1}