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

auto-sync

This commit is contained in:
rusEfi 2015-02-12 08:04:34 -06:00
parent 7c86a945d9
commit 1fab4489ba
6 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/config/engines/dodge_neon.cpp
View File

@ -130,7 +130,7 @@ void setDodgeNeon1995EngineConfiguration(engine_configuration_s *engineConfigura
// set_ignition_offset 350 // set_ignition_offset 350
engineConfiguration->ignitionBaseAngle = 350; engineConfiguration->ignitionBaseAngle = 350;
// set_injection_offset 510 // set_injection_offset 510
engineConfiguration->injectionAngle = 510; engineConfiguration->injectionAngle = 510 + 497;
/** /**
* that's 1995 config * that's 1995 config
@ -189,6 +189,7 @@ void setDodgeNeonNGCEngineConfiguration(engine_configuration_s *engineConfigurat
// set_global_trigger_offset_angle 46 // set_global_trigger_offset_angle 46
engineConfiguration->globalTriggerAngleOffset = 46; engineConfiguration->globalTriggerAngleOffset = 46;
engineConfiguration->injectionAngle = 46;
engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS; engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS;
engineConfiguration->injectionMode = IM_SEQUENTIAL; engineConfiguration->injectionMode = IM_SEQUENTIAL;

4
firmware/config/engines/ford_aspire.cpp
View File

@ -100,8 +100,8 @@ void setFordAspireEngineConfiguration(engine_configuration_s *engineConfiguratio
engineConfiguration->specs.firingOrder = FO_1_THEN_3_THEN_4_THEN2; engineConfiguration->specs.firingOrder = FO_1_THEN_3_THEN_4_THEN2;
engineConfiguration->globalTriggerAngleOffset = 175; engineConfiguration->globalTriggerAngleOffset = 175;
engineConfiguration->ignitionBaseAngle = 98 - 11; engineConfiguration->ignitionBaseAngle = 87;
engineConfiguration->injectionAngle = 59; engineConfiguration->injectionAngle = 59 + 175;
setDefaultAspireMaps(engineConfiguration); setDefaultAspireMaps(engineConfiguration);
// set_cranking_rpm 550 // set_cranking_rpm 550

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

@ -263,7 +263,7 @@ void setFordEscortGt(engine_configuration_s *engineConfiguration) {
// set_ignition_offset 170 // set_ignition_offset 170
engineConfiguration->ignitionBaseAngle = 0; engineConfiguration->ignitionBaseAngle = 0;
// set_injection_offset 510 // set_injection_offset 510
engineConfiguration->injectionAngle = 0; engineConfiguration->injectionAngle = 135;
engineConfiguration->crankingTimingAngle = 10; engineConfiguration->crankingTimingAngle = 10;
engineConfiguration->crankingChargeAngle = 70; engineConfiguration->crankingChargeAngle = 70;

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

@ -65,6 +65,10 @@ float getEngineLoadT(DECLARE_ENGINE_PARAMETER_F) {
return getMap(); return getMap();
case LM_ALPHA_N: case LM_ALPHA_N:
return getTPS(PASS_ENGINE_PARAMETER_F); return getTPS(PASS_ENGINE_PARAMETER_F);
case LM_REAL_MAF: {
int mafAdc = getAdcValue(engineConfiguration->mafAdcChannel);
return getMafT(engineConfiguration);
}
default: default:
firmwareError("Unexpected engine load parameter: %d", engineConfiguration->algorithm); firmwareError("Unexpected engine load parameter: %d", engineConfiguration->algorithm);
return -1; return -1;
@ -152,7 +156,7 @@ void FuelSchedule::addFuelEvents(injection_mode_e mode DECLARE_ENGINE_PARAMETER_
; ;
list->reset(); list->reset();
float baseAngle = tdcPosition() + engineConfiguration->injectionAngle; float baseAngle = engineConfiguration->injectionAngle;
switch (mode) { switch (mode) {
case IM_SEQUENTIAL: case IM_SEQUENTIAL:

2
firmware/rusefi.cpp
View File

@ -258,5 +258,5 @@ int getRusEfiVersion(void) {
return 1; // this is here to make the compiler happy about the unused array return 1; // this is here to make the compiler happy about the unused array
if (UNUSED_CCM_SIZE == 0) if (UNUSED_CCM_SIZE == 0)
return 1; // this is here to make the compiler happy about the unused array return 1; // this is here to make the compiler happy about the unused array
return 20150211; return 20150212;
} }

17
java_console/autotest/src/com/rusefi/AutoTest.java
View File

@ -24,7 +24,7 @@ public class AutoTest {
testMazdaProtege(); testMazdaProtege();
testDodgeNeon(); test1995DodgeNeon();
sendCommand("set_engine_type 7"); sendCommand("set_engine_type 7");
testFord6(); testFord6();
@ -54,7 +54,7 @@ public class AutoTest {
assertWave(msg, chart, WaveChart.INJECTOR_2, 0.11733333333333336, x + 180, x + 540); assertWave(msg, chart, WaveChart.INJECTOR_2, 0.11733333333333336, x + 180, x + 540);
} }
private static void testDodgeNeon() { private static void test1995DodgeNeon() {
sendCommand("set_engine_type 2"); sendCommand("set_engine_type 2");
WaveChart chart; WaveChart chart;
sendCommand("set_whole_fuel_map 3"); sendCommand("set_whole_fuel_map 3");
@ -62,7 +62,7 @@ public class AutoTest {
sendCommand("set_ignition_mode 1"); sendCommand("set_ignition_mode 1");
chart = nextChart(); chart = nextChart();
String msg = "Neon"; String msg = "1995 Neon";
float x = 110; float x = 110;
assertWave(msg, chart, WaveChart.INJECTOR_4, 0.133, x + 540); assertWave(msg, chart, WaveChart.INJECTOR_4, 0.133, x + 540);
assertWave(msg, chart, WaveChart.INJECTOR_2, 0.133, x); assertWave(msg, chart, WaveChart.INJECTOR_2, 0.133, x);
@ -164,10 +164,12 @@ public class AutoTest {
chart = nextChart(); chart = nextChart();
assertWave(chart, WaveChart.INJECTOR_1, 0.086, 238.75); msg = "aspire running";
assertWave(chart, WaveChart.INJECTOR_2, 0.086, 53.04);
assertWave(chart, WaveChart.INJECTOR_3, 0.086, 417.04); assertWave(msg, chart, WaveChart.INJECTOR_1, 0.086, 238.75);
assertWave(chart, WaveChart.INJECTOR_4, 0.086, 594.04); assertWave(msg, chart, WaveChart.INJECTOR_2, 0.086, 53.04);
assertWave(msg, chart, WaveChart.INJECTOR_3, 0.086, 417.04);
assertWave(msg, chart, WaveChart.INJECTOR_4, 0.086, 594.04);
x = 22; x = 22;
assertWave(chart, WaveChart.SPARK_1, 0.133, x, x + 180, x + 360, x + 540); assertWave(chart, WaveChart.SPARK_1, 0.133, x, x + 180, x + 360, x + 540);
@ -191,6 +193,7 @@ public class AutoTest {
assertNull("chart for " + WaveChart.SPARK_2, chart.get(WaveChart.SPARK_2)); assertNull("chart for " + WaveChart.SPARK_2, chart.get(WaveChart.SPARK_2));
sendCommand("set_global_trigger_offset_angle 130"); sendCommand("set_global_trigger_offset_angle 130");
sendCommand("set_injection_offset 189");
chart = nextChart(); chart = nextChart();
x = 580; x = 580;
assertWave(chart, WaveChart.SPARK_1, 0.133, x, x + 180, x + 360, x + 540); assertWave(chart, WaveChart.SPARK_1, 0.133, x, x + 180, x + 360, x + 540);