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

Refactor Trigger System #635

This commit is contained in:
rusefi 2019-02-03 01:27:47 -05:00
parent 935a9fa706
commit 4187f4b081
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/core/EfiWave.cpp
View File

@ -69,7 +69,7 @@ void MultiWave::checkSwitchTimes(int size) {
}
}
int MultiWave::getChannelState(int channelIndex, int phaseIndex) const {
pin_state_t MultiWave::getChannelState(int channelIndex, int phaseIndex) const {
return channels[channelIndex].pinStates[phaseIndex];
}

4
firmware/controllers/core/EfiWave.h
View File

@ -19,7 +19,7 @@
* todo: migrate to bit-array to save memory?
* this would cost some CPU cycles. see std::vector<bool>
*/
typedef int8_t pin_state_t;
typedef trigger_value_e pin_state_t;
/**
* This class represents one channel of a digital signal state sequence
@ -60,7 +60,7 @@ public:
float getSwitchTime(int phaseIndex) const;
void setSwitchTime(int phaseIndex, float value);
void checkSwitchTimes(int size);
int getChannelState(int channelIndex, int phaseIndex) const;
pin_state_t getChannelState(int channelIndex, int phaseIndex) const;
int findAngleMatch(float angle, int size) const;
int findInsertionAngle(float angle, int size) const;

2
firmware/controllers/system/pwm_generator_logic.cpp
View File

@ -311,7 +311,7 @@ void startSimplePwm(SimplePwm *state, const char *msg, ExecutorInterface *execut
}
float switchTimes[] = { dutyCycle, 1 };
pin_state_t pinStates0[] = { 0, 1 };
pin_state_t pinStates0[] = { TV_FALL, TV_RISE };
state->setSimplePwmDutyCycle(dutyCycle);
pin_state_t *pinStates[1] = { pinStates0 };

2
firmware/controllers/trigger/decoders/trigger_chrysler.cpp
View File

@ -466,7 +466,7 @@ void configureNeon1995TriggerShape(TriggerShape *s) {
s->useRiseEdge = false;
s->initialState[T_PRIMARY] = 1;
s->initialState[T_PRIMARY] = TV_RISE;
configureNeon1995TriggerShapeCommon(true, s);

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

@ -265,7 +265,7 @@ void TriggerShape::addEvent(bool useOnlyRisingEdgeForTrigger, angle_t angle, tri
privateTriggerDefinitionSize++;
for (int i = 0; i < PWM_PHASE_MAX_WAVE_PER_PWM; i++) {
int value = wave.getChannelState(/* channelIndex */i, index - 1);
pin_state_t value = wave.getChannelState(/* channelIndex */i, index - 1);
wave.channels[i].setState(index, value);
}
wave.setSwitchTime(index, angle);