mirror of https://github.com/FOME-Tech/fome-fw.git
wider macro usage
This commit is contained in:
parent
ddd8a40ed2
commit
55d6e252c8
|
@ -1308,7 +1308,7 @@ void applyNonPersistentConfiguration(Logging * logger DECLARE_ENGINE_PARAMETER_S
|
|||
assertEngineReference();
|
||||
|
||||
#if EFI_ENGINE_CONTROL || defined(__DOXYGEN__)
|
||||
engine->triggerCentral.triggerShape.initializeTriggerShape(logger PASS_ENGINE_PARAMETER_SUFFIX);
|
||||
TRIGGER_SHAPE(initializeTriggerShape(logger PASS_ENGINE_PARAMETER_SUFFIX));
|
||||
#endif
|
||||
|
||||
#if EFI_FSIO || defined(__DOXYGEN__)
|
||||
|
|
|
@ -299,8 +299,8 @@ void TriggerShape::findTriggerPosition(event_trigger_position_s *position, angle
|
|||
efiAssertVoid(CUSTOM_ERR_6574, !cisnan(angleOffset), "findAngle#1");
|
||||
assertAngleRange(angleOffset, "findAngle#a1", CUSTOM_ERR_6545);
|
||||
|
||||
efiAssertVoid(CUSTOM_ERR_6575, !cisnan(ENGINE(triggerCentral.triggerShape.tdcPosition)), "tdcPos#1")
|
||||
assertAngleRange(ENGINE(triggerCentral.triggerShape.tdcPosition), "tdcPos#a1", CUSTOM_ERR_6546);
|
||||
efiAssertVoid(CUSTOM_ERR_6575, !cisnan(TRIGGER_SHAPE(tdcPosition)), "tdcPos#1")
|
||||
assertAngleRange(TRIGGER_SHAPE(tdcPosition), "tdcPos#a1", CUSTOM_ERR_6546);
|
||||
|
||||
efiAssertVoid(CUSTOM_ERR_6576, !cisnan(CONFIG(globalTriggerAngleOffset)), "tdcPos#2")
|
||||
assertAngleRange(CONFIG(globalTriggerAngleOffset), "tdcPos#a2", CUSTOM_ERR_6547);
|
||||
|
|
|
@ -419,8 +419,8 @@ EXTERN_ENGINE
|
|||
static void triggerShapeInfo(void) {
|
||||
#if (EFI_PROD_CODE || EFI_SIMULATOR) || defined(__DOXYGEN__)
|
||||
TriggerShape *s = &engine->triggerCentral.triggerShape;
|
||||
scheduleMsg(logger, "useRise=%s", boolToString(s->useRiseEdge));
|
||||
scheduleMsg(logger, "gap from %.2f to %.2f", s->syncRatioFrom, s->syncRatioTo);
|
||||
scheduleMsg(logger, "useRise=%s", boolToString(TRIGGER_SHAPE(useRiseEdge)));
|
||||
scheduleMsg(logger, "gap from %.2f to %.2f", TRIGGER_SHAPE(syncRatioFrom), TRIGGER_SHAPE(syncRatioTo));
|
||||
|
||||
for (int i = 0; i < s->getSize(); i++) {
|
||||
scheduleMsg(logger, "event %d %.2f", i, s->eventAngles[i]);
|
||||
|
@ -660,7 +660,7 @@ void onConfigurationChangeTriggerCallback(engine_configuration_s *previousConfig
|
|||
assertEngineReference();
|
||||
|
||||
#if EFI_ENGINE_CONTROL || defined(__DOXYGEN__)
|
||||
engine->triggerCentral.triggerShape.initializeTriggerShape(logger PASS_ENGINE_PARAMETER_SUFFIX);
|
||||
TRIGGER_SHAPE(initializeTriggerShape(logger PASS_ENGINE_PARAMETER_SUFFIX));
|
||||
engine->triggerCentral.resetAccumSignalData();
|
||||
#endif
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue