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

Override trigger gaps feature #2734

This commit is contained in:
Andrey 2021-05-25 17:15:48 -04:00
parent 9a65cb6f7f
commit e4497358f5
7 changed files with 392 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/controllers/algo/engine.cpp
View File

@ -151,10 +151,15 @@ void Engine::initializeTriggerWaveform(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
* in very VERY rare circumstances
*/
if (CONFIG(overrideTriggerGaps)) {
for (int gapIndex = 0;gapIndex<GAP_TRACKING_LENGTH;gapIndex++) {
int gapIndex = 0;
for (;gapIndex<=CONFIG(overrideTriggerGaps);gapIndex++) {
float gapOverride = CONFIG(triggerGapOverride[gapIndex]);
TRIGGER_WAVEFORM(setTriggerSynchronizationGap3(/*gapIndex*/gapIndex, gapOverride * TRIGGER_GAP_DEVIATION_LOW, gapOverride * TRIGGER_GAP_DEVIATION_HIGH));
}
for (;gapIndex<GAP_TRACKING_LENGTH;gapIndex++) {
ENGINE(triggerCentral.triggerShape).syncronizationRatioFrom[gapIndex] = NAN;
ENGINE(triggerCentral.triggerShape).syncronizationRatioTo[gapIndex] = NAN;
}
}
if (!TRIGGER_WAVEFORM(shapeDefinitionError)) {

4
firmware/controllers/trigger/decoders/trigger_structure.cpp
View File

@ -345,8 +345,8 @@ void TriggerWaveform::setTriggerSynchronizationGap2(float syncRatioFrom, float s
void TriggerWaveform::setTriggerSynchronizationGap3(int gapIndex, float syncRatioFrom, float syncRatioTo) {
isSynchronizationNeeded = true;
efiAssertVoid(OBD_PCM_Processor_Fault, gapIndex >= 0 && gapIndex < GAP_TRACKING_LENGTH, "gapIndex out of range");
this->syncronizationRatioFrom[gapIndex] = syncRatioFrom;
this->syncronizationRatioTo[gapIndex] = syncRatioTo;
syncronizationRatioFrom[gapIndex] = syncRatioFrom;
syncronizationRatioTo[gapIndex] = syncRatioTo;
if (gapIndex == 0) {
// we have a special case here - only sync with one gap has this feature
this->syncRatioAvg = (int)efiRound((syncRatioFrom + syncRatioTo) * 0.5f, 1.0f);

1
unit_tests/tests/tests.mk
View File

@ -7,6 +7,7 @@ TESTS_SRC_CPP = \
tests/trigger/test_2jz_vvt.cpp \
tests/trigger/test_real_cranking_miata_NA.cpp \
tests/trigger/test_quad_cam.cpp \
tests/trigger/test_override_gaps.cpp \
tests/trigger/test_injection_scheduling.cpp \
tests/ignition_injection/injection_mode_transition.cpp \
tests/ignition_injection/test_startOfCrankingPrimingPulse.cpp \

353
unit_tests/tests/trigger/recourses/cranking_na_4.csv Normal file
View File

@ -0,0 +1,353 @@
Time[s], Channel 0, Channel 1, Channel 2, Channel 3
0.000000000000000, 0, 1, 0, 0
0.597303000000000, 1, 1, 0, 0
0.690782250000000, 0, 1, 0, 0
0.753783000000000, 0, 0, 0, 0
0.793342750000000, 1, 0, 0, 0
0.852666750000000, 0, 0, 0, 0
0.934247250000000, 0, 1, 0, 0
0.944100000000000, 1, 1, 0, 0
0.982097250000000, 1, 0, 0, 0
0.995239750000000, 0, 0, 0, 0
1.076422000000000, 1, 0, 0, 0
1.125428000000000, 0, 0, 0, 0
1.194742000000000, 0, 1, 0, 0
1.204179750000000, 1, 1, 0, 0
1.253800750000000, 0, 1, 0, 0
1.301142250000000, 0, 0, 0, 0
1.334191500000000, 1, 0, 0, 0
1.383534000000000, 0, 0, 0, 0
1.394234500000000, 0, 0, 0, 1
1.400246500000000, 0, 0, 0, 0
1.453526750000000, 0, 1, 0, 0
1.462915250000000, 1, 1, 0, 0
1.496864500000000, 1, 1, 1, 0
1.499390250000000, 1, 0, 1, 0
1.500240750000000, 1, 0, 0, 0
1.511785000000000, 0, 0, 0, 0
1.590854500000000, 1, 0, 0, 0
1.624796250000000, 1, 0, 0, 1
1.628157500000000, 1, 0, 0, 0
1.639984500000000, 0, 0, 0, 0
1.709758750000000, 0, 1, 0, 0
1.719445500000000, 1, 1, 0, 0
1.753222500000000, 1, 1, 1, 0
1.756599750000000, 1, 1, 0, 0
1.769712500000000, 0, 1, 0, 0
1.817179000000000, 0, 0, 0, 0
1.851105500000000, 1, 0, 0, 0
1.881458500000000, 1, 0, 0, 1
1.887885000000000, 1, 0, 0, 0
1.901183500000000, 0, 0, 0, 0
1.976916750000000, 0, 1, 0, 0
1.982245500000000, 1, 1, 0, 0
2.001249000000000, 1, 0, 0, 0
2.007023500000000, 0, 0, 0, 0
2.013282250000000, 0, 0, 1, 0
2.019240750000000, 0, 0, 0, 0
2.044481750000000, 1, 0, 0, 0
2.061358750000000, 0, 0, 0, 0
2.075630250000000, 0, 0, 0, 1
2.081616000000000, 0, 0, 0, 0
2.085293250000000, 0, 1, 0, 0
2.089132000000000, 1, 1, 0, 0
2.107152000000000, 0, 1, 0, 0
2.119999250000000, 0, 1, 1, 0
2.122536250000000, 0, 0, 1, 0
2.125959500000000, 0, 0, 0, 0
2.136714000000000, 1, 0, 0, 0
2.156019500000000, 0, 0, 0, 0
2.183659250000000, 0, 1, 0, 0
2.188138000000000, 1, 1, 0, 0
2.204608750000000, 1, 0, 0, 0
2.209400750000000, 0, 0, 0, 0
2.244644500000000, 1, 0, 0, 0
2.268264750000000, 0, 0, 0, 0
2.302761250000000, 0, 1, 0, 0
2.308357000000000, 1, 1, 0, 0
2.335511750000000, 0, 1, 0, 0
2.360120500000000, 0, 0, 0, 0
2.382952000000000, 1, 0, 0, 0
2.415355250000000, 0, 0, 0, 0
2.415411000000000, 0, 0, 0, 1
2.421711000000000, 0, 0, 0, 0
2.453217250000000, 0, 1, 0, 0
2.457700500000000, 1, 1, 0, 0
2.473481250000000, 1, 0, 0, 0
2.477961250000000, 0, 0, 0, 0
2.490361750000000, 0, 0, 1, 0
2.496701000000000, 0, 0, 0, 0
2.511592750000000, 1, 0, 0, 0
2.533664000000000, 0, 0, 0, 0
2.544411750000000, 0, 0, 0, 1
2.550750500000000, 0, 0, 0, 0
2.565646750000000, 0, 1, 0, 0
2.570874250000000, 1, 1, 0, 0
2.596120750000000, 0, 1, 0, 0
2.603356750000000, 0, 1, 1, 0
2.609695500000000, 0, 1, 0, 0
2.618533750000000, 0, 0, 0, 0
2.636519500000000, 1, 0, 0, 0
2.652089500000000, 1, 0, 0, 1
2.654946250000000, 1, 0, 0, 0
2.657360500000000, 0, 0, 0, 0
2.684479750000000, 0, 1, 0, 0
2.688290750000000, 1, 1, 0, 0
2.701797000000000, 1, 0, 0, 0
2.703975750000000, 1, 0, 1, 0
2.705553000000000, 0, 0, 1, 0
2.706832250000000, 0, 0, 0, 0
2.731711750000000, 1, 0, 0, 0
2.746657500000000, 0, 0, 0, 0
2.747464750000000, 0, 0, 0, 1
2.750320250000000, 0, 0, 0, 0
2.767363750000000, 0, 1, 0, 0
2.770612000000000, 1, 1, 0, 0
2.784873500000000, 0, 1, 0, 0
2.786212250000000, 0, 1, 1, 0
2.789068250000000, 0, 1, 0, 0
2.796690000000000, 0, 0, 0, 0
2.808129000000000, 1, 0, 0, 0
2.816713750000000, 1, 0, 0, 1
2.820862000000000, 1, 0, 0, 0
2.823204500000000, 0, 0, 0, 0
2.844381250000000, 0, 1, 0, 0
2.847948000000000, 1, 1, 0, 0
2.856611500000000, 1, 1, 1, 0
2.860670750000000, 1, 0, 1, 0
2.861195750000000, 1, 0, 0, 0
2.864234500000000, 0, 0, 0, 0
2.891122250000000, 1, 0, 0, 0
2.899834000000000, 1, 0, 0, 1
2.903982000000000, 1, 0, 0, 0
2.908962500000000, 0, 0, 0, 0
2.934292750000000, 0, 1, 0, 0
2.938504750000000, 1, 1, 0, 0
2.947109000000000, 1, 1, 1, 0
2.951265250000000, 1, 1, 0, 0
2.958108000000000, 0, 1, 0, 0
2.974461000000000, 0, 0, 0, 0
2.988463250000000, 1, 0, 0, 0
2.996741250000000, 1, 0, 0, 1
3.000741000000000, 1, 0, 0, 0
3.006508250000000, 0, 0, 0, 0
3.031735000000000, 0, 1, 0, 0
3.035770250000000, 1, 1, 0, 0
3.044127000000000, 1, 1, 1, 0
3.048126750000000, 1, 1, 0, 0
3.050004750000000, 1, 0, 0, 0
3.053938750000000, 0, 0, 0, 0
3.082187500000000, 1, 0, 0, 0
3.090599750000000, 1, 0, 0, 1
3.094599000000000, 1, 0, 0, 0
3.099064000000000, 0, 0, 0, 0
3.121742500000000, 0, 1, 0, 0
3.125211000000000, 1, 1, 0, 0
3.133515250000000, 1, 1, 1, 0
3.137515500000000, 1, 1, 0, 0
3.140913250000000, 0, 1, 0, 0
3.153884000000000, 0, 0, 0, 0
3.165637500000000, 1, 0, 0, 0
3.173992500000000, 1, 0, 0, 1
3.178047250000000, 1, 0, 0, 0
3.180729750000000, 0, 0, 0, 0
3.201579000000000, 0, 1, 0, 0
3.204921750000000, 1, 1, 0, 0
3.213357750000000, 1, 1, 1, 0
3.216623500000000, 1, 0, 1, 0
3.217410500000000, 1, 0, 0, 0
3.219858000000000, 0, 0, 0, 0
3.244237500000000, 1, 0, 0, 0
3.252720000000000, 1, 0, 0, 1
3.256772750000000, 1, 0, 0, 0
3.260246500000000, 0, 0, 0, 0
3.282604750000000, 0, 1, 0, 0
3.286237250000000, 1, 1, 0, 0
3.294611250000000, 1, 1, 1, 0
3.298664000000000, 1, 1, 0, 0
3.302665500000000, 0, 1, 0, 0
3.316308750000000, 0, 0, 0, 0
3.328703250000000, 1, 0, 0, 0
3.336327750000000, 1, 0, 0, 1
3.339958750000000, 1, 0, 0, 0
3.344727000000000, 0, 0, 0, 0
3.367171500000000, 0, 1, 0, 0
3.370925250000000, 1, 1, 0, 0
3.378618250000000, 1, 1, 1, 0
3.382252250000000, 1, 1, 0, 0
3.384436250000000, 1, 0, 0, 0
3.388222750000000, 0, 0, 0, 0
3.416294750000000, 1, 0, 0, 0
3.424031750000000, 1, 0, 0, 1
3.427664250000000, 1, 0, 0, 0
3.433887750000000, 0, 0, 0, 0
3.458179750000000, 0, 1, 0, 0
3.462032000000000, 1, 1, 0, 0
3.469672750000000, 1, 1, 1, 0
3.473303500000000, 1, 1, 0, 0
3.479536000000000, 0, 1, 0, 0
3.494128250000000, 0, 0, 0, 0
3.507612750000000, 1, 0, 0, 0
3.515348000000000, 1, 0, 0, 1
3.519726250000000, 1, 0, 0, 0
3.525064250000000, 0, 0, 0, 0
3.549249500000000, 0, 1, 0, 0
3.553064750000000, 1, 1, 0, 0
3.560877750000000, 1, 1, 1, 0
3.565257000000000, 1, 1, 0, 0
3.566632500000000, 1, 0, 0, 0
3.570395750000000, 0, 0, 0, 0
3.598924250000000, 1, 0, 0, 0
3.606786500000000, 1, 0, 0, 1
3.611164250000000, 1, 0, 0, 0
3.618061750000000, 0, 0, 0, 0
3.645154250000000, 0, 1, 0, 0
3.649681250000000, 1, 1, 0, 0
3.657434500000000, 1, 1, 1, 0
3.661813250000000, 1, 1, 0, 0
3.670815750000000, 0, 1, 0, 0
3.688438250000000, 0, 0, 0, 0
3.704016250000000, 1, 0, 0, 0
3.713044500000000, 1, 0, 0, 1
3.717438250000000, 1, 0, 0, 0
3.724337250000000, 0, 0, 0, 0
3.753059000000000, 0, 1, 0, 0
3.757789250000000, 1, 1, 0, 0
3.766903750000000, 1, 1, 1, 0
3.771298000000000, 1, 1, 0, 0
3.774756000000000, 1, 0, 0, 0
3.779567750000000, 0, 0, 0, 0
3.813150750000000, 1, 0, 0, 0
3.822316500000000, 1, 0, 0, 1
3.826709750000000, 1, 0, 0, 0
3.833365250000000, 0, 0, 0, 0
3.861303250000000, 0, 1, 0, 0
3.865678250000000, 1, 1, 0, 0
3.874729500000000, 1, 1, 1, 0
3.879122250000000, 1, 1, 0, 0
3.885432500000000, 0, 1, 0, 0
3.901804000000000, 0, 0, 0, 0
3.916312500000000, 1, 0, 0, 0
3.926710250000000, 1, 0, 0, 1
3.931114000000000, 1, 0, 0, 0
3.935154500000000, 0, 0, 0, 0
3.960757500000000, 0, 1, 0, 0
3.964707750000000, 1, 1, 0, 0
3.975200000000000, 1, 1, 1, 0
3.978687500000000, 1, 0, 1, 0
3.979603250000000, 1, 0, 0, 0
3.982577000000000, 0, 0, 0, 0
4.012022250000000, 1, 0, 0, 0
4.022571249999999, 1, 0, 0, 1
4.026973250000000, 1, 0, 0, 0
4.031498000000000, 0, 0, 0, 0
4.058177000000000, 0, 1, 0, 0
4.062353250000000, 1, 1, 0, 0
4.072772000000000, 1, 1, 1, 0
4.077174750000000, 1, 1, 0, 0
4.081332000000000, 0, 1, 0, 0
4.097002000000000, 0, 0, 0, 0
4.110908999999999, 1, 0, 0, 0
4.120788750000000, 1, 0, 0, 1
4.124461999999999, 1, 0, 0, 0
4.128978500000000, 0, 0, 0, 0
4.153949750000000, 0, 1, 0, 0
4.157891999999999, 1, 1, 0, 0
4.167859500000000, 1, 1, 1, 0
4.171531500000000, 1, 1, 0, 0
4.171903750000000, 1, 0, 0, 0
4.175793250000000, 0, 0, 0, 0
4.203495999999999, 1, 0, 0, 0
4.213517250000000, 1, 0, 0, 1
4.217189750000000, 1, 0, 0, 0
4.220478750000000, 0, 0, 0, 0
4.244155249999999, 0, 1, 0, 0
4.248003000000000, 1, 1, 0, 0
4.257908250000000, 1, 1, 1, 0
4.261581000000000, 1, 1, 0, 0
4.265512500000000, 0, 1, 0, 0
4.279967000000000, 0, 0, 0, 0
4.292958500000000, 1, 0, 0, 0
4.301921249999999, 1, 0, 0, 1
4.305682500000000, 1, 0, 0, 0
4.309842500000000, 0, 0, 0, 0
4.333131000000000, 0, 1, 0, 0
4.336821000000000, 1, 1, 0, 0
4.345852250000000, 1, 1, 1, 0
4.349612500000000, 1, 1, 0, 0
4.349921750000000, 1, 0, 0, 0
4.353559250000000, 0, 0, 0, 0
4.380871000000000, 1, 0, 0, 0
4.389951750000000, 1, 0, 0, 1
4.393711750000000, 1, 0, 0, 0
4.398547250000000, 0, 0, 0, 0
4.422318750000000, 0, 1, 0, 0
4.426012500000000, 1, 1, 0, 0
4.434984000000000, 1, 1, 1, 0
4.438747500000000, 1, 1, 0, 0
4.442958500000000, 0, 1, 0, 0
4.457011749999999, 0, 0, 0, 0
4.469824000000000, 1, 0, 0, 0
4.478235000000000, 1, 0, 0, 1
4.482117250000000, 1, 0, 0, 0
4.486370500000000, 0, 0, 0, 0
4.509275250000000, 0, 1, 0, 0
4.512929750000000, 1, 1, 0, 0
4.521418000000000, 1, 1, 1, 0
4.525300500000000, 1, 1, 0, 0
4.525894750000000, 1, 0, 0, 0
4.529504250000000, 0, 0, 0, 0
4.555600500000000, 1, 0, 0, 0
4.564136500000000, 1, 0, 0, 1
4.568017250000000, 1, 0, 0, 0
4.571718250000000, 0, 0, 0, 0
4.594211500000000, 0, 1, 0, 0
4.597895750000000, 1, 1, 0, 0
4.606325249999999, 1, 1, 1, 0
4.610207750000000, 1, 1, 0, 0
4.614726500000000, 0, 1, 0, 0
4.628670000000000, 0, 0, 0, 0
4.641402250000000, 1, 0, 0, 0
4.649373000000000, 1, 0, 0, 1
4.653259750000000, 1, 0, 0, 0
4.657920000000000, 0, 0, 0, 0
4.680652250000000, 0, 1, 0, 0
4.684264250000000, 1, 1, 0, 0
4.692311999999999, 1, 1, 1, 0
4.696197499999999, 1, 1, 0, 0
4.697045250000000, 1, 0, 0, 0
4.700623000000000, 0, 0, 0, 0
4.727223749999999, 1, 0, 0, 0
4.735317000000000, 1, 0, 0, 1
4.739203250000000, 1, 0, 0, 0
4.744205000000000, 0, 0, 0, 0
4.767295000000000, 0, 1, 0, 0
4.770934250000000, 1, 1, 0, 0
4.778928250000000, 1, 1, 1, 0
4.782818250000000, 1, 1, 0, 0
4.787484249999999, 0, 1, 0, 0
4.801081750000000, 0, 0, 0, 0
4.813555249999999, 1, 0, 0, 0
4.821384999999999, 1, 0, 0, 1
4.825413999999999, 1, 0, 0, 0
4.829746750000000, 0, 0, 0, 0
4.852260500000000, 0, 1, 0, 0
4.855929000000000, 1, 1, 0, 0
4.863834499999999, 1, 1, 1, 0
4.867862750000000, 1, 1, 0, 0
4.868925250000000, 1, 0, 0, 0
4.872512500000000, 0, 0, 0, 0
4.898664000000000, 1, 0, 0, 0
4.906615749999999, 1, 0, 0, 1
4.910643750000000, 1, 0, 0, 0
4.914934000000000, 0, 0, 0, 0
4.937726250000000, 0, 1, 0, 0
4.941493250000000, 1, 1, 0, 0
4.949340500000000, 1, 1, 1, 0
4.953369500000000, 1, 1, 0, 0
4.958768750000000, 0, 1, 0, 0
4.973157749999999, 0, 0, 0, 0
4.986453249999999, 1, 0, 0, 0
4.994298000000000, 1, 0, 0, 1
4.998304500000000, 1, 0, 0, 0
5.003722499999999, 0, 0, 0, 0
1 Time[s] Channel 0 Channel 1 Channel 2 Channel 3
2 0.000000000000000 0 1 0 0
3 0.597303000000000 1 1 0 0
4 0.690782250000000 0 1 0 0
5 0.753783000000000 0 0 0 0
6 0.793342750000000 1 0 0 0
7 0.852666750000000 0 0 0 0
8 0.934247250000000 0 1 0 0
9 0.944100000000000 1 1 0 0
10 0.982097250000000 1 0 0 0
11 0.995239750000000 0 0 0 0
12 1.076422000000000 1 0 0 0
13 1.125428000000000 0 0 0 0
14 1.194742000000000 0 1 0 0
15 1.204179750000000 1 1 0 0
16 1.253800750000000 0 1 0 0
17 1.301142250000000 0 0 0 0
18 1.334191500000000 1 0 0 0
19 1.383534000000000 0 0 0 0
20 1.394234500000000 0 0 0 1
21 1.400246500000000 0 0 0 0
22 1.453526750000000 0 1 0 0
23 1.462915250000000 1 1 0 0
24 1.496864500000000 1 1 1 0
25 1.499390250000000 1 0 1 0
26 1.500240750000000 1 0 0 0
27 1.511785000000000 0 0 0 0
28 1.590854500000000 1 0 0 0
29 1.624796250000000 1 0 0 1
30 1.628157500000000 1 0 0 0
31 1.639984500000000 0 0 0 0
32 1.709758750000000 0 1 0 0
33 1.719445500000000 1 1 0 0
34 1.753222500000000 1 1 1 0
35 1.756599750000000 1 1 0 0
36 1.769712500000000 0 1 0 0
37 1.817179000000000 0 0 0 0
38 1.851105500000000 1 0 0 0
39 1.881458500000000 1 0 0 1
40 1.887885000000000 1 0 0 0
41 1.901183500000000 0 0 0 0
42 1.976916750000000 0 1 0 0
43 1.982245500000000 1 1 0 0
44 2.001249000000000 1 0 0 0
45 2.007023500000000 0 0 0 0
46 2.013282250000000 0 0 1 0
47 2.019240750000000 0 0 0 0
48 2.044481750000000 1 0 0 0
49 2.061358750000000 0 0 0 0
50 2.075630250000000 0 0 0 1
51 2.081616000000000 0 0 0 0
52 2.085293250000000 0 1 0 0
53 2.089132000000000 1 1 0 0
54 2.107152000000000 0 1 0 0
55 2.119999250000000 0 1 1 0
56 2.122536250000000 0 0 1 0
57 2.125959500000000 0 0 0 0
58 2.136714000000000 1 0 0 0
59 2.156019500000000 0 0 0 0
60 2.183659250000000 0 1 0 0
61 2.188138000000000 1 1 0 0
62 2.204608750000000 1 0 0 0
63 2.209400750000000 0 0 0 0
64 2.244644500000000 1 0 0 0
65 2.268264750000000 0 0 0 0
66 2.302761250000000 0 1 0 0
67 2.308357000000000 1 1 0 0
68 2.335511750000000 0 1 0 0
69 2.360120500000000 0 0 0 0
70 2.382952000000000 1 0 0 0
71 2.415355250000000 0 0 0 0
72 2.415411000000000 0 0 0 1
73 2.421711000000000 0 0 0 0
74 2.453217250000000 0 1 0 0
75 2.457700500000000 1 1 0 0
76 2.473481250000000 1 0 0 0
77 2.477961250000000 0 0 0 0
78 2.490361750000000 0 0 1 0
79 2.496701000000000 0 0 0 0
80 2.511592750000000 1 0 0 0
81 2.533664000000000 0 0 0 0
82 2.544411750000000 0 0 0 1
83 2.550750500000000 0 0 0 0
84 2.565646750000000 0 1 0 0
85 2.570874250000000 1 1 0 0
86 2.596120750000000 0 1 0 0
87 2.603356750000000 0 1 1 0
88 2.609695500000000 0 1 0 0
89 2.618533750000000 0 0 0 0
90 2.636519500000000 1 0 0 0
91 2.652089500000000 1 0 0 1
92 2.654946250000000 1 0 0 0
93 2.657360500000000 0 0 0 0
94 2.684479750000000 0 1 0 0
95 2.688290750000000 1 1 0 0
96 2.701797000000000 1 0 0 0
97 2.703975750000000 1 0 1 0
98 2.705553000000000 0 0 1 0
99 2.706832250000000 0 0 0 0
100 2.731711750000000 1 0 0 0
101 2.746657500000000 0 0 0 0
102 2.747464750000000 0 0 0 1
103 2.750320250000000 0 0 0 0
104 2.767363750000000 0 1 0 0
105 2.770612000000000 1 1 0 0
106 2.784873500000000 0 1 0 0
107 2.786212250000000 0 1 1 0
108 2.789068250000000 0 1 0 0
109 2.796690000000000 0 0 0 0
110 2.808129000000000 1 0 0 0
111 2.816713750000000 1 0 0 1
112 2.820862000000000 1 0 0 0
113 2.823204500000000 0 0 0 0
114 2.844381250000000 0 1 0 0
115 2.847948000000000 1 1 0 0
116 2.856611500000000 1 1 1 0
117 2.860670750000000 1 0 1 0
118 2.861195750000000 1 0 0 0
119 2.864234500000000 0 0 0 0
120 2.891122250000000 1 0 0 0
121 2.899834000000000 1 0 0 1
122 2.903982000000000 1 0 0 0
123 2.908962500000000 0 0 0 0
124 2.934292750000000 0 1 0 0
125 2.938504750000000 1 1 0 0
126 2.947109000000000 1 1 1 0
127 2.951265250000000 1 1 0 0
128 2.958108000000000 0 1 0 0
129 2.974461000000000 0 0 0 0
130 2.988463250000000 1 0 0 0
131 2.996741250000000 1 0 0 1
132 3.000741000000000 1 0 0 0
133 3.006508250000000 0 0 0 0
134 3.031735000000000 0 1 0 0
135 3.035770250000000 1 1 0 0
136 3.044127000000000 1 1 1 0
137 3.048126750000000 1 1 0 0
138 3.050004750000000 1 0 0 0
139 3.053938750000000 0 0 0 0
140 3.082187500000000 1 0 0 0
141 3.090599750000000 1 0 0 1
142 3.094599000000000 1 0 0 0
143 3.099064000000000 0 0 0 0
144 3.121742500000000 0 1 0 0
145 3.125211000000000 1 1 0 0
146 3.133515250000000 1 1 1 0
147 3.137515500000000 1 1 0 0
148 3.140913250000000 0 1 0 0
149 3.153884000000000 0 0 0 0
150 3.165637500000000 1 0 0 0
151 3.173992500000000 1 0 0 1
152 3.178047250000000 1 0 0 0
153 3.180729750000000 0 0 0 0
154 3.201579000000000 0 1 0 0
155 3.204921750000000 1 1 0 0
156 3.213357750000000 1 1 1 0
157 3.216623500000000 1 0 1 0
158 3.217410500000000 1 0 0 0
159 3.219858000000000 0 0 0 0
160 3.244237500000000 1 0 0 0
161 3.252720000000000 1 0 0 1
162 3.256772750000000 1 0 0 0
163 3.260246500000000 0 0 0 0
164 3.282604750000000 0 1 0 0
165 3.286237250000000 1 1 0 0
166 3.294611250000000 1 1 1 0
167 3.298664000000000 1 1 0 0
168 3.302665500000000 0 1 0 0
169 3.316308750000000 0 0 0 0
170 3.328703250000000 1 0 0 0
171 3.336327750000000 1 0 0 1
172 3.339958750000000 1 0 0 0
173 3.344727000000000 0 0 0 0
174 3.367171500000000 0 1 0 0
175 3.370925250000000 1 1 0 0
176 3.378618250000000 1 1 1 0
177 3.382252250000000 1 1 0 0
178 3.384436250000000 1 0 0 0
179 3.388222750000000 0 0 0 0
180 3.416294750000000 1 0 0 0
181 3.424031750000000 1 0 0 1
182 3.427664250000000 1 0 0 0
183 3.433887750000000 0 0 0 0
184 3.458179750000000 0 1 0 0
185 3.462032000000000 1 1 0 0
186 3.469672750000000 1 1 1 0
187 3.473303500000000 1 1 0 0
188 3.479536000000000 0 1 0 0
189 3.494128250000000 0 0 0 0
190 3.507612750000000 1 0 0 0
191 3.515348000000000 1 0 0 1
192 3.519726250000000 1 0 0 0
193 3.525064250000000 0 0 0 0
194 3.549249500000000 0 1 0 0
195 3.553064750000000 1 1 0 0
196 3.560877750000000 1 1 1 0
197 3.565257000000000 1 1 0 0
198 3.566632500000000 1 0 0 0
199 3.570395750000000 0 0 0 0
200 3.598924250000000 1 0 0 0
201 3.606786500000000 1 0 0 1
202 3.611164250000000 1 0 0 0
203 3.618061750000000 0 0 0 0
204 3.645154250000000 0 1 0 0
205 3.649681250000000 1 1 0 0
206 3.657434500000000 1 1 1 0
207 3.661813250000000 1 1 0 0
208 3.670815750000000 0 1 0 0
209 3.688438250000000 0 0 0 0
210 3.704016250000000 1 0 0 0
211 3.713044500000000 1 0 0 1
212 3.717438250000000 1 0 0 0
213 3.724337250000000 0 0 0 0
214 3.753059000000000 0 1 0 0
215 3.757789250000000 1 1 0 0
216 3.766903750000000 1 1 1 0
217 3.771298000000000 1 1 0 0
218 3.774756000000000 1 0 0 0
219 3.779567750000000 0 0 0 0
220 3.813150750000000 1 0 0 0
221 3.822316500000000 1 0 0 1
222 3.826709750000000 1 0 0 0
223 3.833365250000000 0 0 0 0
224 3.861303250000000 0 1 0 0
225 3.865678250000000 1 1 0 0
226 3.874729500000000 1 1 1 0
227 3.879122250000000 1 1 0 0
228 3.885432500000000 0 1 0 0
229 3.901804000000000 0 0 0 0
230 3.916312500000000 1 0 0 0
231 3.926710250000000 1 0 0 1
232 3.931114000000000 1 0 0 0
233 3.935154500000000 0 0 0 0
234 3.960757500000000 0 1 0 0
235 3.964707750000000 1 1 0 0
236 3.975200000000000 1 1 1 0
237 3.978687500000000 1 0 1 0
238 3.979603250000000 1 0 0 0
239 3.982577000000000 0 0 0 0
240 4.012022250000000 1 0 0 0
241 4.022571249999999 1 0 0 1
242 4.026973250000000 1 0 0 0
243 4.031498000000000 0 0 0 0
244 4.058177000000000 0 1 0 0
245 4.062353250000000 1 1 0 0
246 4.072772000000000 1 1 1 0
247 4.077174750000000 1 1 0 0
248 4.081332000000000 0 1 0 0
249 4.097002000000000 0 0 0 0
250 4.110908999999999 1 0 0 0
251 4.120788750000000 1 0 0 1
252 4.124461999999999 1 0 0 0
253 4.128978500000000 0 0 0 0
254 4.153949750000000 0 1 0 0
255 4.157891999999999 1 1 0 0
256 4.167859500000000 1 1 1 0
257 4.171531500000000 1 1 0 0
258 4.171903750000000 1 0 0 0
259 4.175793250000000 0 0 0 0
260 4.203495999999999 1 0 0 0
261 4.213517250000000 1 0 0 1
262 4.217189750000000 1 0 0 0
263 4.220478750000000 0 0 0 0
264 4.244155249999999 0 1 0 0
265 4.248003000000000 1 1 0 0
266 4.257908250000000 1 1 1 0
267 4.261581000000000 1 1 0 0
268 4.265512500000000 0 1 0 0
269 4.279967000000000 0 0 0 0
270 4.292958500000000 1 0 0 0
271 4.301921249999999 1 0 0 1
272 4.305682500000000 1 0 0 0
273 4.309842500000000 0 0 0 0
274 4.333131000000000 0 1 0 0
275 4.336821000000000 1 1 0 0
276 4.345852250000000 1 1 1 0
277 4.349612500000000 1 1 0 0
278 4.349921750000000 1 0 0 0
279 4.353559250000000 0 0 0 0
280 4.380871000000000 1 0 0 0
281 4.389951750000000 1 0 0 1
282 4.393711750000000 1 0 0 0
283 4.398547250000000 0 0 0 0
284 4.422318750000000 0 1 0 0
285 4.426012500000000 1 1 0 0
286 4.434984000000000 1 1 1 0
287 4.438747500000000 1 1 0 0
288 4.442958500000000 0 1 0 0
289 4.457011749999999 0 0 0 0
290 4.469824000000000 1 0 0 0
291 4.478235000000000 1 0 0 1
292 4.482117250000000 1 0 0 0
293 4.486370500000000 0 0 0 0
294 4.509275250000000 0 1 0 0
295 4.512929750000000 1 1 0 0
296 4.521418000000000 1 1 1 0
297 4.525300500000000 1 1 0 0
298 4.525894750000000 1 0 0 0
299 4.529504250000000 0 0 0 0
300 4.555600500000000 1 0 0 0
301 4.564136500000000 1 0 0 1
302 4.568017250000000 1 0 0 0
303 4.571718250000000 0 0 0 0
304 4.594211500000000 0 1 0 0
305 4.597895750000000 1 1 0 0
306 4.606325249999999 1 1 1 0
307 4.610207750000000 1 1 0 0
308 4.614726500000000 0 1 0 0
309 4.628670000000000 0 0 0 0
310 4.641402250000000 1 0 0 0
311 4.649373000000000 1 0 0 1
312 4.653259750000000 1 0 0 0
313 4.657920000000000 0 0 0 0
314 4.680652250000000 0 1 0 0
315 4.684264250000000 1 1 0 0
316 4.692311999999999 1 1 1 0
317 4.696197499999999 1 1 0 0
318 4.697045250000000 1 0 0 0
319 4.700623000000000 0 0 0 0
320 4.727223749999999 1 0 0 0
321 4.735317000000000 1 0 0 1
322 4.739203250000000 1 0 0 0
323 4.744205000000000 0 0 0 0
324 4.767295000000000 0 1 0 0
325 4.770934250000000 1 1 0 0
326 4.778928250000000 1 1 1 0
327 4.782818250000000 1 1 0 0
328 4.787484249999999 0 1 0 0
329 4.801081750000000 0 0 0 0
330 4.813555249999999 1 0 0 0
331 4.821384999999999 1 0 0 1
332 4.825413999999999 1 0 0 0
333 4.829746750000000 0 0 0 0
334 4.852260500000000 0 1 0 0
335 4.855929000000000 1 1 0 0
336 4.863834499999999 1 1 1 0
337 4.867862750000000 1 1 0 0
338 4.868925250000000 1 0 0 0
339 4.872512500000000 0 0 0 0
340 4.898664000000000 1 0 0 0
341 4.906615749999999 1 0 0 1
342 4.910643750000000 1 0 0 0
343 4.914934000000000 0 0 0 0
344 4.937726250000000 0 1 0 0
345 4.941493250000000 1 1 0 0
346 4.949340500000000 1 1 1 0
347 4.953369500000000 1 1 0 0
348 4.958768750000000 0 1 0 0
349 4.973157749999999 0 0 0 0
350 4.986453249999999 1 0 0 0
351 4.994298000000000 1 0 0 1
352 4.998304500000000 1 0 0 0
353 5.003722499999999 0 0 0 0

28
unit_tests/tests/trigger/test_override_gaps.cpp Normal file
View File

@ -0,0 +1,28 @@
/*
* @file test_override_gaps.cpp
*
* Created on: May 25, 2021
* @author Andrey Belomutskiy, (c) 2012-2021
*/
#include "engine_test_helper.h"
#include "globalaccess.h"
TEST(subaru, overrideGap) {
WITH_ENGINE_TEST_HELPER(MIATA_NA6_MAP);
CONFIG(overrideTriggerGaps) = true;
CONFIG(gapTrackingLengthOverride) = 2;
CONFIG(triggerGapOverride[0]) = 7.3;
CONFIG(triggerGapOverride[1]) = 1;
eth.setTriggerType(TT_SUBARU_7_WITHOUT_6 PASS_ENGINE_PARAMETER_SUFFIX);
ASSERT_EQ(2, engine->triggerCentral.triggerShape.gapTrackingLength);
ASSERT_EQ(FALSE, engine->triggerCentral.triggerShape.shapeDefinitionError) << "overrideGap shapeDefinitionError";
}

5
unit_tests/tests/trigger/test_real_cranking_miata_NA.cpp
View File

@ -7,10 +7,7 @@
#include "engine_test_helper.h"
TEST(cramking, realNA) {
TEST(cranking, realNA) {
FILE * fp = fopen("tests/trigger/recourses/cranking_na_3.csv", "r");
ASSERT_TRUE(fp != nullptr);

2
unit_tests/tests/trigger/test_trigger_multi_sync.cpp
View File

@ -12,6 +12,6 @@ TEST(trigger, miataNA) {
TriggerWaveform naShape;
initializeMazdaMiataNaShape(&naShape);
WITH_ENGINE_TEST_HELPER(MIATA_NA6_MAP);
// todo: https://github.com/rusefi/rusefi/issues/679
}