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

better variable name & docs

This commit is contained in:
rusefi 2017-03-04 09:07:10 -05:00
parent 5b5391b6ae
commit e8b31b0668
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
firmware/controllers/trigger/trigger_simulator.cpp
View File

@ -24,6 +24,10 @@ bool isUsefulSignal(trigger_event_e signal, engine_configuration_s *engineConfig
return !engineConfiguration->useOnlyRisingEdgeForTrigger || isRisingEdge[(int) signal]; return !engineConfiguration->useOnlyRisingEdgeForTrigger || isRisingEdge[(int) signal];
} }
#if EFI_UNIT_TEST || defined(__DOXYGEN__)
extern bool printTriggerDebug;
#endif /* ! EFI_UNIT_TEST */
void TriggerStimulatorHelper::nextStep(TriggerState *state, TriggerShape * shape, int i, void TriggerStimulatorHelper::nextStep(TriggerState *state, TriggerShape * shape, int i,
trigger_config_s const*triggerConfig DECLARE_ENGINE_PARAMETER_S) { trigger_config_s const*triggerConfig DECLARE_ENGINE_PARAMETER_S) {
int stateIndex = i % shape->getSize(); int stateIndex = i % shape->getSize();
@ -43,6 +47,14 @@ void TriggerStimulatorHelper::nextStep(TriggerState *state, TriggerShape * shape
bool thirdWheelState = shape->wave.getChannelState(2, prevIndex); bool thirdWheelState = shape->wave.getChannelState(2, prevIndex);
bool new3rdWheelState = shape->wave.getChannelState(2, stateIndex); bool new3rdWheelState = shape->wave.getChannelState(2, stateIndex);
#if EFI_UNIT_TEST || defined(__DOXYGEN__)
if (printTriggerDebug) {
printf("nextStep: %d>%d primary %d>%d secondary %d>%d\r\n", prevIndex, stateIndex, primaryWheelState, newPrimaryWheelState,
secondaryWheelState, newSecondaryWheelState );
}
#endif /* EFI_UNIT_TEST */
// todo: code duplication with TriggerEmulatorHelper::handleEmulatorCallback? // todo: code duplication with TriggerEmulatorHelper::handleEmulatorCallback?
if (primaryWheelState != newPrimaryWheelState) { if (primaryWheelState != newPrimaryWheelState) {
@ -64,11 +76,11 @@ void TriggerStimulatorHelper::nextStep(TriggerState *state, TriggerShape * shape
} }
} }
void TriggerStimulatorHelper::assertSyncPositionAndSetDutyCycle(uint32_t index, TriggerState *state, TriggerShape * shape, void TriggerStimulatorHelper::assertSyncPositionAndSetDutyCycle(const uint32_t syncIndex, TriggerState *state, TriggerShape * shape,
trigger_config_s const*triggerConfig DECLARE_ENGINE_PARAMETER_S) { trigger_config_s const*triggerConfig DECLARE_ENGINE_PARAMETER_S) {
int startIndex = engineConfiguration->useOnlyRisingEdgeForTrigger ? index + 2 : index + 1; int startIndex = engineConfiguration->useOnlyRisingEdgeForTrigger ? syncIndex + 2 : syncIndex + 1;
for (uint32_t i = startIndex; i <= index + 2 * shape->getSize(); i++) { for (uint32_t i = startIndex; i <= syncIndex + 2 * shape->getSize(); i++) {
nextStep(state, shape, i, triggerConfig PASS_ENGINE_PARAMETER); nextStep(state, shape, i, triggerConfig PASS_ENGINE_PARAMETER);
} }
int revolutionCounter = state->getTotalRevolutionCounter(); int revolutionCounter = state->getTotalRevolutionCounter();
@ -84,6 +96,9 @@ void TriggerStimulatorHelper::assertSyncPositionAndSetDutyCycle(uint32_t index,
} }
} }
/**
* @return trigger synchronization point index, or error code if not found
*/
uint32_t TriggerStimulatorHelper::doFindTrigger(TriggerShape * shape, uint32_t TriggerStimulatorHelper::doFindTrigger(TriggerShape * shape,
trigger_config_s const*triggerConfig, TriggerState *state DECLARE_ENGINE_PARAMETER_S) { trigger_config_s const*triggerConfig, TriggerState *state DECLARE_ENGINE_PARAMETER_S) {
for (int i = 0; i < 4 * PWM_PHASE_MAX_COUNT; i++) { for (int i = 0; i < 4 * PWM_PHASE_MAX_COUNT; i++) {

2
firmware/controllers/trigger/trigger_simulator.h
View File

@ -20,7 +20,7 @@ public:
void nextStep(TriggerState *state, TriggerShape * shape, int i, trigger_config_s const*triggerConfig DECLARE_ENGINE_PARAMETER_S); void nextStep(TriggerState *state, TriggerShape * shape, int i, trigger_config_s const*triggerConfig DECLARE_ENGINE_PARAMETER_S);
void assertSyncPositionAndSetDutyCycle(uint32_t index, TriggerState *state, TriggerShape * shape, void assertSyncPositionAndSetDutyCycle(const uint32_t index, TriggerState *state, TriggerShape * shape,
trigger_config_s const*triggerConfig DECLARE_ENGINE_PARAMETER_S); trigger_config_s const*triggerConfig DECLARE_ENGINE_PARAMETER_S);
}; };