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

auto-sync

This commit is contained in:
rusEfi 2016-01-03 10:01:32 -05:00
parent c4e314a1d1
commit cd9ffa94c1
8 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/engines/bmw_e34.cpp
View File

@ -34,7 +34,7 @@ void setBmwE34(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->specs.displacement = 2.91; engineConfiguration->specs.displacement = 2.91;
engineConfiguration->specs.firingOrder = FO_1_THEN_5_THEN_3_THEN_6_THEN_2_THEN_4; engineConfiguration->specs.firingOrder = FO_1_THEN_5_THEN_3_THEN_6_THEN_2_THEN_4;
engineConfiguration->injectionMode = IM_BATCH; engineConfiguration->injectionMode = IM_BATCH;
engineConfiguration->twoWireBatch = true; engineConfiguration->twoWireBatchInjection = true;
engineConfiguration->ignitionMode = IM_WASTED_SPARK; engineConfiguration->ignitionMode = IM_WASTED_SPARK;
engineConfiguration->useOnlyFrontForTrigger = true; engineConfiguration->useOnlyFrontForTrigger = true;

2
firmware/config/engines/ford_1995_inline_6.cpp
View File

@ -34,7 +34,7 @@ void setFordInline6(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->specs.firingOrder = FO_1_THEN_5_THEN_3_THEN_6_THEN_2_THEN_4; engineConfiguration->specs.firingOrder = FO_1_THEN_5_THEN_3_THEN_6_THEN_2_THEN_4;
engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS; engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS;
engineConfiguration->injectionMode = IM_BATCH; engineConfiguration->injectionMode = IM_BATCH;
engineConfiguration->twoWireBatch = true; engineConfiguration->twoWireBatchInjection = true;
/** /**

2
firmware/config/engines/mazda_626.cpp
View File

@ -28,7 +28,7 @@ void setMazda626EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->injectionMode = IM_BATCH; engineConfiguration->injectionMode = IM_BATCH;
engineConfiguration->twoWireBatch = true; engineConfiguration->twoWireBatchInjection = true;
// chartsize 600 // chartsize 600
engineConfiguration->engineChartSize = 600; engineConfiguration->engineChartSize = 600;

11
firmware/controllers/algo/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Jan 01 17:06:33 EST 2016 // this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jan 03 09:10:53 EST 2016
// begin // begin
#include "rusefi_types.h" #include "rusefi_types.h"
typedef struct { typedef struct {
@ -1154,12 +1154,17 @@ typedef struct {
offset 1508 bit 12 */ offset 1508 bit 12 */
bool_t isManualSpinningMode : 1; bool_t isManualSpinningMode : 1;
/** /**
* This is needed if batched injection and individual injector wiring
offset 1508 bit 13 */ offset 1508 bit 13 */
bool_t twoWireBatch : 1; bool_t twoWireBatchInjection : 1;
/** /**
* See #172 * See #172
offset 1508 bit 14 */ offset 1508 bit 14 */
bool_t useOnlyFrontForTrigger : 1; bool_t useOnlyFrontForTrigger : 1;
/**
* This is needed if batched igniton (waster spark) and individual coil wiring
offset 1508 bit 15 */
bool_t twoWireBatchIgnition : 1;
/** /**
* offset 1512 * offset 1512
*/ */
@ -1607,4 +1612,4 @@ typedef struct {
} persistent_config_s; } persistent_config_s;
// end // end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Jan 01 17:06:33 EST 2016 // this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jan 03 09:10:53 EST 2016

3
firmware/controllers/algo/rusefi_generated.h
View File

@ -584,8 +584,9 @@
#define isIdleThreadEnabled_offset 1508 #define isIdleThreadEnabled_offset 1508
#define isPrintTriggerSynchDetails_offset 1508 #define isPrintTriggerSynchDetails_offset 1508
#define isManualSpinningMode_offset 1508 #define isManualSpinningMode_offset 1508
#define twoWireBatch_offset 1508 #define twoWireBatchInjection_offset 1508
#define useOnlyFrontForTrigger_offset 1508 #define useOnlyFrontForTrigger_offset 1508
#define twoWireBatchIgnition_offset 1508
#define engineChartSize_offset 1512 #define engineChartSize_offset 1512
#define targetIdleRpm_offset 1516 #define targetIdleRpm_offset 1516
#define acSwitchAdc_offset 1520 #define acSwitchAdc_offset 1520

2
firmware/controllers/math/engine_math.cpp
View File

@ -199,7 +199,7 @@ void FuelSchedule::addFuelEvents(injection_mode_e mode DECLARE_ENGINE_PARAMETER_
+ i * (float) CONFIG(engineCycleDuration) / CONFIG(specs.cylindersCount); + i * (float) CONFIG(engineCycleDuration) / CONFIG(specs.cylindersCount);
registerInjectionEvent(index, angle, false PASS_ENGINE_PARAMETER); registerInjectionEvent(index, angle, false PASS_ENGINE_PARAMETER);
if (CONFIG(twoWireBatch)) { if (CONFIG(twoWireBatchInjection)) {
/** /**
* also fire the 2nd half of the injectors so that we can implement a batch mode on individual wires * also fire the 2nd half of the injectors so that we can implement a batch mode on individual wires

7
firmware/controllers/settings.cpp
View File

@ -837,8 +837,11 @@ static void enableOrDisable(const char *param, bool isEnabled) {
} else if (strEqualCaseInsensitive(param, "use_only_first_channel")) { } else if (strEqualCaseInsensitive(param, "use_only_first_channel")) {
engineConfiguration->trigger.useOnlyFirstChannel = isEnabled; engineConfiguration->trigger.useOnlyFirstChannel = isEnabled;
incrementGlobalConfigurationVersion(); incrementGlobalConfigurationVersion();
} else if (strEqualCaseInsensitive(param, "two_wire_batch")) { } else if (strEqualCaseInsensitive(param, "two_wire_batch_injection")) {
engineConfiguration->twoWireBatch = isEnabled; engineConfiguration->twoWireBatchInjection = isEnabled;
incrementGlobalConfigurationVersion();
} else if (strEqualCaseInsensitive(param, "two_wire_wasted_spark")) {
engineConfiguration->twoWireBatchIgnition = isEnabled;
incrementGlobalConfigurationVersion(); incrementGlobalConfigurationVersion();
} else if (strEqualCaseInsensitive(param, "joystick")) { } else if (strEqualCaseInsensitive(param, "joystick")) {
engineConfiguration->isJoystickEnabled = isEnabled; engineConfiguration->isJoystickEnabled = isEnabled;

4
firmware/integration/rusefi_config.txt
View File

@ -527,9 +527,9 @@ custom idle_mode_e 4 bits, U32, @OFFSET@, [0:0], "false", "true"
bit isIdleThreadEnabled bit isIdleThreadEnabled
bit isPrintTriggerSynchDetails bit isPrintTriggerSynchDetails
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 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 twoWireBatch bit twoWireBatchInjection;This is needed if batched injection and individual injector wiring
bit useOnlyFrontForTrigger;See #172 bit useOnlyFrontForTrigger;See #172
bit twoWireBatchIgnition;This is needed if batched igniton (waster spark) and individual coil wiring
uint32_t engineChartSize;;"count", 1, 0, 0, 300, 0 uint32_t engineChartSize;;"count", 1, 0, 0, 300, 0