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

Nissan progress

This commit is contained in:
Andrey 2021-07-02 19:23:37 -04:00
parent 8134452d10
commit a7075acbf1
1 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
unit_tests/tests/trigger/test_nissan_vq_vvt.cpp
View File

@ -11,27 +11,51 @@
class TriggerCallback { class TriggerCallback {
public: public:
Engine *engine; Engine *engine;
int index; int toothIndex;
TriggerWaveform *form; TriggerWaveform *form;
bool isVvt;
}; };
void func(TriggerCallback *callback) { void func(TriggerCallback *callback) {
int formIndex = callback->index % callback->form->getSize(); int formIndex = callback->toothIndex % callback->form->getSize();
Engine *engine = callback->engine; Engine *engine = callback->engine;
EXPAND_Engine; EXPAND_Engine;
int value = callback->form->wave.channels[0].getState(formIndex); int value = callback->form->wave.channels[0].getState(formIndex);
trigger_event_e signal;
if (value) {
signal = SHAFT_PRIMARY_RISING;
} else {
signal = SHAFT_PRIMARY_FALLING;
}
efitick_t nowNt = getTimeNowNt(); efitick_t nowNt = getTimeNowNt();
engine->triggerCentral.handleShaftSignal(signal, nowNt PASS_ENGINE_PARAMETER_SUFFIX); if (callback->isVvt) {
trigger_value_e v = value ? TV_RISE : TV_FALL;
hwHandleVvtCamSignal(v, nowNt, 0 PASS_ENGINE_PARAMETER_SUFFIX);
} else {
handleShaftSignal(0, value, nowNt PASS_ENGINE_PARAMETER_SUFFIX);
}
} }
static void scheduleTriggerEvents(TriggerWaveform *shape, bool isVvt DECLARE_ENGINE_PARAMETER_SUFFIX) {
int totalIndex = 0;
/**
* yet another approach to trigger testing: let's schedule a huge list of events from heap
* and then execute those one
*/
for (int r = 0; r < 20; r++) {
for (int i = 0; i < shape->getSize(); i++) {
float angle = shape->getAngle(totalIndex);
TriggerCallback *param = new TriggerCallback();
param->engine = engine;
param->toothIndex = totalIndex;
param->form = shape;
param->isVvt = isVvt;
scheduling_s *sch = new scheduling_s();
engine->executor.scheduleByTimestamp(sch, 1000 * angle, { func, param });
totalIndex++;
}
}
}
TEST(nissan, vq_vvt) { TEST(nissan, vq_vvt) {
WITH_ENGINE_TEST_HELPER (HELLEN_121_NISSAN); WITH_ENGINE_TEST_HELPER (HELLEN_121_NISSAN);
engineConfiguration->isIgnitionEnabled = false; engineConfiguration->isIgnitionEnabled = false;
@ -41,27 +65,17 @@ TEST(nissan, vq_vvt) {
static TriggerWaveform crank; static TriggerWaveform crank;
initializeNissanVQcrank(&crank); initializeNissanVQcrank(&crank);
int totalIndex = 0; scheduleTriggerEvents(&crank, false PASS_ENGINE_PARAMETER_SUFFIX);
/**
* yet another approach to trigger testing: let's schedule a huge list of events from heap
* and then execute those one
*/
for (int r = 0; r < 20; r++) {
for (int i = 0; i < crank.getSize(); i++) {
float angle = crank.getAngle(totalIndex);
TriggerCallback *param = new TriggerCallback();
param->engine = engine;
param->index = totalIndex;
param->form = &crank;
scheduling_s *sch = new scheduling_s();
engine->executor.scheduleByTimestamp(sch, 1000 * angle, { func, param });
totalIndex++;
}
}
} }
{
static TriggerWaveform vvt;
initializeNissanVQvvt(&vvt);
scheduleTriggerEvents(&vvt, true PASS_ENGINE_PARAMETER_SUFFIX);
}
scheduling_s *head; scheduling_s *head;
while ((head = engine->executor.getHead()) != nullptr) { while ((head = engine->executor.getHead()) != nullptr) {
eth.setTimeAndInvokeEventsUs(head->momentX); eth.setTimeAndInvokeEventsUs(head->momentX);