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

all triggers should be documented way nicer #2001

This commit is contained in:
rusefillc 2020-12-02 22:17:38 -05:00
parent 805403cf55
commit 0ba97379fb
4 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,7 +102,8 @@ void TriggerWaveform::initialize(operation_mode_e operationMode) {
previousAngle = 0;
memset(isRiseEvent, 0, sizeof(isRiseEvent));
#if EFI_UNIT_TEST
memset(&triggerSignals, 0, sizeof(triggerSignals));
memset(&triggerSignalIndeces, 0, sizeof(triggerSignalIndeces));
memset(&triggerSignalStates, 0, sizeof(triggerSignalStates));
#endif
}
@ -228,8 +229,8 @@ void TriggerWaveform::addEvent(angle_t angle, trigger_wheel_e const channelIndex
}
#if EFI_UNIT_TEST
int signal = channelIndex * 1000 + stateParam;
triggerSignals[privateTriggerDefinitionSize] = signal;
triggerSignalIndeces[privateTriggerDefinitionSize] = channelIndex;
triggerSignalStates[privateTriggerDefinitionSize] = stateParam;
#endif

3
firmware/controllers/trigger/decoders/trigger_structure.h
View File

@ -181,7 +181,8 @@ public:
/**
* These signals are used for trigger export only
*/
int triggerSignals[PWM_PHASE_MAX_COUNT];
int triggerSignalIndeces[PWM_PHASE_MAX_COUNT];
int triggerSignalStates[PWM_PHASE_MAX_COUNT];
#endif
MultiChannelStateSequence wave;

6
firmware/controllers/trigger/trigger_central.cpp
View File

@ -566,7 +566,11 @@ void printAllTriggers() {
int triggerDefinitionCoordinate = (shape->getTriggerWaveformSynchPointIndex() + i) % shape->getSize();
fprintf(fp, "event %d %d %.2f\n", i, shape->triggerSignals[triggerDefinitionCoordinate], triggerFormDetails->eventAngles[i]);
fprintf(fp, "event %d %d %d %.2f\n",
i,
shape->triggerSignalIndeces[triggerDefinitionCoordinate],
shape->triggerSignalStates[triggerDefinitionCoordinate],
triggerFormDetails->eventAngles[i]);
}
}

26
java_console/ui/src/main/java/com/rusefi/TriggerImage.java
View File

@ -187,12 +187,11 @@ public class TriggerImage {
tokens = line.split(" ");
if (tokens.length < 4)
throw new IllegalStateException("Unexpected [" + line + "]");
String signalStr = tokens[2];
int signal = Integer.parseInt(signalStr);
String angleStr = tokens[3];
double angle = Double.parseDouble(angleStr);
int signalIndex = Integer.parseInt(tokens[2]);
int signalState = Integer.parseInt(tokens[3]);
double angle = Double.parseDouble(tokens[4]);
Signal s = new Signal(signal, angle);
Signal s = new Signal(signalIndex, signalState, angle);
// System.out.println(s);
signals.add(s);
index++;
@ -201,7 +200,7 @@ public class TriggerImage {
List<Signal> toShow = new ArrayList<>(signals);
for (int i = 1; i <= 2 + EXTRA_COUNT; i++) {
for (Signal s : signals)
toShow.add(new Signal(s.signal, s.angle + i * 720));
toShow.add(new Signal(s.waveIndex, s.state, s.angle + i * 720));
}
List<WaveState> waves = new ArrayList<>();
@ -210,10 +209,9 @@ public class TriggerImage {
waves.add(new WaveState());
for (Signal s : toShow) {
int waveIndex = s.signal / 1000;
WaveState.trigger_value_e signal = (s.signal % 1000 == 0) ? WaveState.trigger_value_e.TV_LOW : WaveState.trigger_value_e.TV_HIGH;
WaveState.trigger_value_e signal = (s.state == 0) ? WaveState.trigger_value_e.TV_LOW : WaveState.trigger_value_e.TV_HIGH;
WaveState waveState = waves.get(waveIndex);
WaveState waveState = waves.get(s.waveIndex);
waveState.handle(signal, s.angle);
}
for (WaveState wave : waves)
@ -227,18 +225,20 @@ public class TriggerImage {
}
private static class Signal {
private final int signal;
private final double angle;
private final int state;
private final int waveIndex;
public Signal(int signal, double angle) {
this.signal = signal;
public Signal(int waveIndex, int state, double angle) {
this.waveIndex = waveIndex;
this.state = state;
this.angle = angle;
}
@Override
public String toString() {
return "Signal{" +
"signal=" + signal +
"signal=" + waveIndex +
", angle=" + angle +
'}';
}