mirror of https://github.com/FOME-Tech/fome-fw.git
refactoring: vvt is not aux (#263)
* refactoring: vvt is not aux (cherry picked from commit 6b4c4a583316a32d7723c2cfa16cda39fa9afb1b) * this repo has VVT conditional at small-can-board
This commit is contained in:
parent
2c6f76b631
commit
7ad5b00f2e
|
@ -121,8 +121,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
|
||||
|
|
|
@ -132,7 +132,7 @@ const trigger_state_s* getLiveData(size_t idx) {
|
|||
|
||||
template<>
|
||||
const vvt_s* getLiveData(size_t idx) {
|
||||
#if EFI_AUX_PID
|
||||
#if EFI_VVT_PID
|
||||
switch (idx) {
|
||||
case 0: return &engine->module<VvtController1>().unmock();
|
||||
case 1: return &engine->module<VvtController2>().unmock();
|
||||
|
|
|
@ -130,7 +130,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",
|
||||
|
|
|
@ -156,12 +156,12 @@ public:
|
|||
KnockController,
|
||||
SensorChecker,
|
||||
LimpManager,
|
||||
#if EFI_AUX_PID
|
||||
#if EFI_VVT_PID
|
||||
VvtController1,
|
||||
VvtController2,
|
||||
VvtController3,
|
||||
VvtController4,
|
||||
#endif // EFI_AUX_PID
|
||||
#endif // EFI_VVT_PID
|
||||
#if EFI_BOOST_CONTROL
|
||||
BoostController,
|
||||
#endif // EFI_BOOST_CONTROL
|
||||
|
|
|
@ -627,9 +627,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();
|
||||
|
|
|
@ -328,9 +328,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();
|
||||
|
@ -398,9 +398,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 */
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -144,6 +144,7 @@ Usages:
|
|||
folder: controllers/actuators
|
||||
constexpr: "___engine.module<VvtController1>()"
|
||||
isPtr: true
|
||||
conditional_compilation: "EFI_VVT_PID"
|
||||
|
||||
- name: lambda_monitor
|
||||
folder: controllers/math
|
||||
|
|
|
@ -91,7 +91,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
|
||||
|
|
Loading…
Reference in New Issue