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

auto-sync

This commit is contained in:
rusEfi 2015-02-12 16:09:38 -06:00
parent e2afd5baba
commit fc8da6e573
4 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,6 +47,7 @@ void setFordInline6(engine_configuration_s *engineConfiguration, board_configura
engineConfiguration->globalTriggerAngleOffset = 0; engineConfiguration->globalTriggerAngleOffset = 0;
engineConfiguration->ignitionBaseAngle = 13; engineConfiguration->ignitionBaseAngle = 13;
engineConfiguration->injectionAngle = 27.269999;
setThermistorConfiguration(&engineConfiguration->clt, -10.0, 160310.0, 60.0, 7700.0, 120.0, 1180.0); setThermistorConfiguration(&engineConfiguration->clt, -10.0, 160310.0, 60.0, 7700.0, 120.0, 1180.0);
engineConfiguration->clt.bias_resistor = 2700; engineConfiguration->clt.bias_resistor = 2700;

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

@ -157,7 +157,11 @@ void FuelSchedule::addFuelEvents(OutputSignalList *sourceList, injection_mode_e
events.reset(); events.reset();
float baseAngle = engineConfiguration->injectionAngle; efiAssertVoid(engine!=NULL, "engine is NULL");
// float baseAngle = engineConfiguration->injectionAngle - MS2US(engine->fuelMs) / engine->rpmCalculator.oneDegreeUs;
float baseAngle = engineConfiguration->injectionAngle - engine->fuelMs;
switch (mode) { switch (mode) {
case IM_SEQUENTIAL: case IM_SEQUENTIAL:

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

@ -6,9 +6,7 @@ import com.rusefi.waves.WaveChart;
import static com.rusefi.IoUtil.nextChart; import static com.rusefi.IoUtil.nextChart;
import static com.rusefi.IoUtil.sendCommand; import static com.rusefi.IoUtil.sendCommand;
import static com.rusefi.TestingUtils.assertNull; import static com.rusefi.TestingUtils.*;
import static com.rusefi.TestingUtils.assertTrue;
import static com.rusefi.TestingUtils.assertWave;
/** /**
* rusEfi firmware simulator functional test suite * rusEfi firmware simulator functional test suite
@ -41,8 +39,8 @@ public class AutoTest {
double x = 100; double x = 100;
assertWave(msg, chart, WaveChart.SPARK_1, 0.194433, x, x + 180, x + 360, x + 540); assertWave(msg, chart, WaveChart.SPARK_1, 0.194433, x, x + 180, x + 360, x + 540);
x = 135; x = 135;
assertWave(msg, chart, WaveChart.INJECTOR_1, 0.00626666, x, x + 180, x + 360, x + 540); assertWaveFall(msg, chart, WaveChart.INJECTOR_1, 0.00626666, x, x + 180, x + 360, x + 540);
assertWave(msg, chart, WaveChart.INJECTOR_2, 0.00626666, x, x + 180, x + 360, x + 540); assertWaveFall(msg, chart, WaveChart.INJECTOR_2, 0.00626666, x, x + 180, x + 360, x + 540);
msg = "ProtegeLX running"; msg = "ProtegeLX running";
IoUtil.changeRpm(2000); IoUtil.changeRpm(2000);
@ -50,8 +48,8 @@ public class AutoTest {
x = 121; x = 121;
assertWave(msg, chart, WaveChart.SPARK_1, 0.13333333333333333, x, x + 180, x + 360, x + 540); assertWave(msg, chart, WaveChart.SPARK_1, 0.13333333333333333, x, x + 180, x + 360, x + 540);
x = 135; x = 135;
assertWave(msg, chart, WaveChart.INJECTOR_1, 0.11733333333333336, x, x + 360); assertWaveFall(msg, chart, WaveChart.INJECTOR_1, 0.11733333333333336, x, x + 360);
assertWave(msg, chart, WaveChart.INJECTOR_2, 0.11733333333333336, x + 180, x + 540); assertWaveFall(msg, chart, WaveChart.INJECTOR_2, 0.11733333333333336, x + 180, x + 540);
} }
private static void test1995DodgeNeon() { private static void test1995DodgeNeon() {
@ -64,10 +62,10 @@ public class AutoTest {
String msg = "1995 Neon"; String msg = "1995 Neon";
float x = 110; float x = 110;
assertWave(msg, chart, WaveChart.INJECTOR_4, 0.133, x + 540); assertWaveFall(msg, chart, WaveChart.INJECTOR_4, 0.133, x + 540);
assertWave(msg, chart, WaveChart.INJECTOR_2, 0.133, x); assertWaveFall(msg, chart, WaveChart.INJECTOR_2, 0.133, x);
assertWave(msg, chart, WaveChart.INJECTOR_1, 0.133, x + 180); assertWaveFall(msg, chart, WaveChart.INJECTOR_1, 0.133, x + 180);
assertWave(msg, chart, WaveChart.INJECTOR_3, 0.133, x + 360); assertWaveFall(msg, chart, WaveChart.INJECTOR_3, 0.133, x + 360);
x = 106; x = 106;
assertWave(msg, chart, WaveChart.SPARK_4, 0.13333, x + 540); assertWave(msg, chart, WaveChart.SPARK_4, 0.13333, x + 540);
@ -80,7 +78,7 @@ public class AutoTest {
sendCommand("set_algorithm 3"); sendCommand("set_algorithm 3");
chart = nextChart(); chart = nextChart();
x = 110; x = 110;
assertWave(msg, chart, WaveChart.INJECTOR_4, 0.463, x + 540); assertWaveFall(msg, chart, WaveChart.INJECTOR_4, 0.463, x + 540);
} }
private static void testFordFiesta() { private static void testFordFiesta() {
@ -166,10 +164,10 @@ public class AutoTest {
msg = "aspire running"; msg = "aspire running";
assertWave(msg, chart, WaveChart.INJECTOR_1, 0.086, 238.75); assertWaveFall(msg, chart, WaveChart.INJECTOR_1, 0.086, 238.75);
assertWave(msg, chart, WaveChart.INJECTOR_2, 0.086, 53.04); assertWaveFall(msg, chart, WaveChart.INJECTOR_2, 0.086, 53.04);
assertWave(msg, chart, WaveChart.INJECTOR_3, 0.086, 417.04); assertWaveFall(msg, chart, WaveChart.INJECTOR_3, 0.086, 417.04);
assertWave(msg, chart, WaveChart.INJECTOR_4, 0.086, 594.04); assertWaveFall(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);
@ -183,10 +181,10 @@ public class AutoTest {
sendCommand("set_global_trigger_offset_angle 175"); sendCommand("set_global_trigger_offset_angle 175");
chart = nextChart(); chart = nextChart();
assertWave(chart, WaveChart.INJECTOR_1, 0.555, 238.75); assertWaveFall(chart, WaveChart.INJECTOR_1, 0.555, 238.75);
assertWave(chart, WaveChart.INJECTOR_2, 0.555, 53.04); assertWaveFall(chart, WaveChart.INJECTOR_2, 0.555, 53.04);
assertWave(chart, WaveChart.INJECTOR_3, 0.555, 417.04); assertWaveFall(chart, WaveChart.INJECTOR_3, 0.555, 417.04);
assertWave(chart, WaveChart.INJECTOR_4, 0.555, 594.04); assertWaveFall(chart, WaveChart.INJECTOR_4, 0.555, 594.04);
x = 41; x = 41;
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);
@ -215,9 +213,9 @@ public class AutoTest {
sendCommand("set_algorithm 3"); sendCommand("set_algorithm 3");
chart = nextChart(); chart = nextChart();
x = 8.88; x = 8.88;
assertWave(msg, chart, WaveChart.INJECTOR_1, 0.329, x + 180); assertWaveFall(msg, chart, WaveChart.INJECTOR_1, 0.329, x + 180);
assertWave(msg, chart, WaveChart.INJECTOR_2, 0.329, x); assertWaveFall(msg, chart, WaveChart.INJECTOR_2, 0.329, x);
assertWave(msg, chart, WaveChart.INJECTOR_4, 0.329, x + 540); assertWaveFall(msg, chart, WaveChart.INJECTOR_4, 0.329, x + 540);
// above hard limit // above hard limit
IoUtil.changeRpm(10000); IoUtil.changeRpm(10000);

4
java_console/autotest/src/com/rusefi/TestingUtils.java
View File

@ -52,6 +52,10 @@ public class TestingUtils {
assertWave(true, msg, chart, key, width, expectedAngles); assertWave(true, msg, chart, key, width, expectedAngles);
} }
static void assertWaveFall(WaveChart chart, String key, double width, double... expectedAngles) {
assertWaveFall("", chart, key, width, expectedAngles);
}
static void assertWaveFall(String msg, WaveChart chart, String key, double width, double... expectedAngles) { static void assertWaveFall(String msg, WaveChart chart, String key, double width, double... expectedAngles) {
assertWave(false, msg, chart, key, width, expectedAngles); assertWave(false, msg, chart, key, width, expectedAngles);
} }