refactoring: vvt is not aux

only:hellen-honda-k
This commit is contained in:
Andrey 2023-03-05 02:07:34 -05:00
parent 1a60d9d49a
commit 6b4c4a5833
9 changed files with 15 additions and 15 deletions

View File

@ -75,7 +75,7 @@
#define EFI_ALTERNATOR_CONTROL FALSE
#define EFI_AUX_PID FALSE
#define EFI_VVT_PID FALSE
#define EFI_SIGNAL_EXECUTOR_SLEEP FALSE
#define EFI_SIGNAL_EXECUTOR_ONE_TIMER TRUE

View File

@ -77,7 +77,7 @@
#define EFI_ALTERNATOR_CONTROL FALSE
#define EFI_AUX_PID FALSE
#define EFI_VVT_PID FALSE
#define EFI_SIGNAL_EXECUTOR_SLEEP FALSE
#define EFI_SIGNAL_EXECUTOR_ONE_TIMER TRUE

View File

@ -117,7 +117,7 @@
#define EFI_ALTERNATOR_CONTROL TRUE
#define EFI_AUX_PID TRUE
#define EFI_VVT_PID TRUE
#define EFI_SIGNAL_EXECUTOR_SLEEP FALSE
#define EFI_SIGNAL_EXECUTOR_ONE_TIMER TRUE

View File

@ -125,8 +125,8 @@
#define EFI_ALTERNATOR_CONTROL TRUE
#endif
#ifndef EFI_AUX_PID
#define EFI_AUX_PID TRUE
#ifndef EFI_VVT_PID
#define EFI_VVT_PID TRUE
#endif
#define EFI_SIGNAL_EXECUTOR_SLEEP FALSE

View File

@ -38,7 +38,7 @@ int VvtController::getPeriodMs() {
}
void VvtController::PeriodicTask() {
if (engine->auxParametersVersion.isOld(engine->getGlobalConfigurationVersion())) {
if (engine->vvtParametersVersion.isOld(engine->getGlobalConfigurationVersion())) {
m_pid.reset();
}
@ -115,7 +115,7 @@ void VvtController::setOutput(expected<percent_t> outputValue) {
#endif // EFI_SHAFT_POSITION_INPUT
}
#if EFI_AUX_PID
#if EFI_VVT_PID
static const char *vvtOutputNames[CAM_INPUTS_COUNT] = {
"Vvt Output#1",

View File

@ -195,7 +195,7 @@ public:
void setConfig();
LocalVersionHolder versionForConfigurationListeners;
LocalVersionHolder auxParametersVersion;
LocalVersionHolder vvtParametersVersion;
AuxActor auxValves[AUX_DIGITAL_VALVE_COUNT][2];

View File

@ -684,9 +684,9 @@ void initEngineController() {
initAlternatorCtrl();
#endif /* EFI_ALTERNATOR_CONTROL */
#if EFI_AUX_PID
#if EFI_VVT_PID
initVvtActuators();
#endif /* EFI_AUX_PID */
#endif /* EFI_VVT_PID */
#if EFI_MALFUNCTION_INDICATOR
initMalfunctionIndicator();

View File

@ -368,9 +368,9 @@ void applyNewHardwareSettings() {
#if EFI_LOGIC_ANALYZER
startLogicAnalyzerPins();
#endif /* EFI_LOGIC_ANALYZER */
#if EFI_AUX_PID
#if EFI_VVT_PID
startVvtControlPins();
#endif /* EFI_AUX_PID */
#endif /* EFI_VVT_PID */
#if EFI_SENT_SUPPORT
startSent();
@ -459,9 +459,9 @@ void stopHardware() {
stopTriggerEmulatorPins();
#endif /* EFI_EMULATE_POSITION_SENSORS */
#if EFI_AUX_PID
#if EFI_VVT_PID
stopVvtControlPins();
#endif /* EFI_AUX_PID */
#endif /* EFI_VVT_PID */
}
/**

View File

@ -111,7 +111,7 @@
#define EFI_MAX_31855 FALSE
#define EFI_ELECTRONIC_THROTTLE_BODY TRUE
#define EFI_AUX_PID TRUE
#define EFI_VVT_PID TRUE
#ifndef HAL_TRIGGER_USE_PAL
#define HAL_TRIGGER_USE_PAL FALSE