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

refactoring: extracting method to facilitate debugging

This commit is contained in:
rusefi 2019-08-07 22:02:08 -04:00
parent 7a00ccd2ce
commit 676035f950
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,7 +215,7 @@ void TriggerShape::addEvent(angle_t angle, trigger_wheel_e const channelIndex, t
if (privateTriggerDefinitionSize > 0) { if (privateTriggerDefinitionSize > 0) {
if (angle <= previousAngle) { if (angle <= previousAngle) {
warning(CUSTOM_ERR_TRG_ANGLE_ORDER, "invalid angle order: new=%.2f and prev=%.2f, size=%d", angle, previousAngle, privateTriggerDefinitionSize); warning(CUSTOM_ERR_TRG_ANGLE_ORDER, "invalid angle order: new=%.2f and prev=%.2f, size=%d", angle, previousAngle, privateTriggerDefinitionSize);
shapeDefinitionError = true; setShapeDefinitionError(true);
return; return;
} }
} }
@ -227,7 +227,7 @@ void TriggerShape::addEvent(angle_t angle, trigger_wheel_e const channelIndex, t
if (wave->pinStates == NULL) { if (wave->pinStates == NULL) {
warning(CUSTOM_ERR_STATE_NULL, "wave pinStates is NULL"); warning(CUSTOM_ERR_STATE_NULL, "wave pinStates is NULL");
shapeDefinitionError = true; setShapeDefinitionError(true);
return; return;
} }
wave->setState(/* switchIndex */ 0, /* value */ initialState[i]); wave->setState(/* switchIndex */ 0, /* value */ initialState[i]);
@ -242,7 +242,7 @@ void TriggerShape::addEvent(angle_t angle, trigger_wheel_e const channelIndex, t
int exactMatch = wave.findAngleMatch(angle, privateTriggerDefinitionSize); int exactMatch = wave.findAngleMatch(angle, privateTriggerDefinitionSize);
if (exactMatch != EFI_ERROR_CODE) { if (exactMatch != EFI_ERROR_CODE) {
warning(CUSTOM_ERR_SAME_ANGLE, "same angle: not supported"); warning(CUSTOM_ERR_SAME_ANGLE, "same angle: not supported");
shapeDefinitionError = true; setShapeDefinitionError(true);
return; return;
} }
@ -344,6 +344,10 @@ int TriggerShape::findAngleIndex(float target) const {
return left - 1; return left - 1;
} }
void TriggerShape::setShapeDefinitionError(bool value) {
shapeDefinitionError = value;
}
void TriggerShape::findTriggerPosition(event_trigger_position_s *position, void TriggerShape::findTriggerPosition(event_trigger_position_s *position,
angle_t angleOffset DEFINE_CONFIG_PARAM(angle_t, globalTriggerAngleOffset)) { angle_t angleOffset DEFINE_CONFIG_PARAM(angle_t, globalTriggerAngleOffset)) {
efiAssertVoid(CUSTOM_ERR_6574, !cisnan(angleOffset), "findAngle#1"); efiAssertVoid(CUSTOM_ERR_6574, !cisnan(angleOffset), "findAngle#1");
@ -594,7 +598,7 @@ void TriggerShape::initializeTriggerShape(Logging *logger, operation_mode_e oper
break; break;
default: default:
shapeDefinitionError = true; setShapeDefinitionError(true);
warning(CUSTOM_ERR_NO_SHAPE, "initializeTriggerShape() not implemented: %d", triggerConfig->type); warning(CUSTOM_ERR_NO_SHAPE, "initializeTriggerShape() not implemented: %d", triggerConfig->type);
} }
/** /**

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

@ -86,6 +86,7 @@ public:
bool useOnlyRisingEdgeForTrigger, const trigger_config_s *triggerConfig); bool useOnlyRisingEdgeForTrigger, const trigger_config_s *triggerConfig);
void findTriggerPosition(event_trigger_position_s *position, void findTriggerPosition(event_trigger_position_s *position,
angle_t angleOffset DEFINE_CONFIG_PARAM(angle_t, globalTriggerAngleOffset)); angle_t angleOffset DEFINE_CONFIG_PARAM(angle_t, globalTriggerAngleOffset));
void setShapeDefinitionError(bool value);
/** /**
* Simplest trigger shape does not require any synchronization - for example if there is only * Simplest trigger shape does not require any synchronization - for example if there is only

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

@ -32,7 +32,7 @@ void initializeSkippedToothTriggerShapeExt(TriggerShape *s, int totalTeethCount,
operation_mode_e operationMode) { operation_mode_e operationMode) {
if (totalTeethCount <= 0) { if (totalTeethCount <= 0) {
warning(CUSTOM_OBD_TRIGGER_SHAPE, "totalTeethCount is zero or less: %d", totalTeethCount); warning(CUSTOM_OBD_TRIGGER_SHAPE, "totalTeethCount is zero or less: %d", totalTeethCount);
s->shapeDefinitionError = true; s->setShapeDefinitionError(true);
return; return;
} }
efiAssertVoid(CUSTOM_ERR_6588, s != NULL, "TriggerShape is NULL"); efiAssertVoid(CUSTOM_ERR_6588, s != NULL, "TriggerShape is NULL");

2
firmware/controllers/trigger/trigger_decoder.cpp
View File

@ -118,7 +118,7 @@ void calculateTriggerSynchPoint(TriggerShape *shape, TriggerState *state DECLARE
efiAssertVoid(CUSTOM_SHAPE_LEN_ZERO, length > 0, "shapeLength=0"); efiAssertVoid(CUSTOM_SHAPE_LEN_ZERO, length > 0, "shapeLength=0");
if (length >= PWM_PHASE_MAX_COUNT) { if (length >= PWM_PHASE_MAX_COUNT) {
warning(CUSTOM_ERR_TRIGGER_SHAPE_TOO_LONG, "Count above %d", length); warning(CUSTOM_ERR_TRIGGER_SHAPE_TOO_LONG, "Count above %d", length);
shape->shapeDefinitionError = true; shape->setShapeDefinitionError(true);
return; return;
} }

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

@ -96,7 +96,7 @@ void TriggerStimulatorHelper::assertSyncPositionAndSetDutyCycle(const uint32_t s
int revolutionCounter = state->getTotalRevolutionCounter(); int revolutionCounter = state->getTotalRevolutionCounter();
if (revolutionCounter != GAP_TRACKING_LENGTH + 1) { if (revolutionCounter != GAP_TRACKING_LENGTH + 1) {
warning(CUSTOM_OBD_TRIGGER_SHAPE, "sync failed/wrong gap parameters trigger=%s rc=%d", getTrigger_type_e(engineConfiguration->trigger.type), revolutionCounter); warning(CUSTOM_OBD_TRIGGER_SHAPE, "sync failed/wrong gap parameters trigger=%s rc=%d", getTrigger_type_e(engineConfiguration->trigger.type), revolutionCounter);
shape->shapeDefinitionError = true; shape->setShapeDefinitionError(true);
return; return;
} }
shape->shapeDefinitionError = false; shape->shapeDefinitionError = false;
@ -117,7 +117,7 @@ uint32_t TriggerStimulatorHelper::findTriggerSyncPoint(TriggerShape * shape,
if (state->shaft_is_synchronized) if (state->shaft_is_synchronized)
return i; return i;
} }
engine->triggerCentral.triggerShape.shapeDefinitionError = 1; engine->triggerCentral.triggerShape.setShapeDefinitionError(true);
warning(CUSTOM_ERR_TRIGGER_SYNC, "findTriggerZeroEventIndex() failed"); warning(CUSTOM_ERR_TRIGGER_SYNC, "findTriggerZeroEventIndex() failed");
return EFI_ERROR_CODE; return EFI_ERROR_CODE;
} }