reducing complexity (#5428)

This commit is contained in:
rusefillc 2023-07-21 18:55:57 -07:00 committed by GitHub
parent 6d31e56d27
commit cb30e54b2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 7 deletions

View File

@ -142,8 +142,7 @@ static void turnVvtPidOn(int index) {
&engine->executor,
engineConfiguration->vvtPins[index],
&instances[index].m_pin,
// todo: do we need two separate frequencies?
engineConfiguration->vvtOutputFrequency[0], 0.1);
engineConfiguration->vvtOutputFrequency, 0.1);
}
void startVvtControlPins() {

View File

@ -400,7 +400,7 @@ static void setDefaultEngineConfiguration() {
engineConfiguration->auxPid[0].minValue = 10;
engineConfiguration->auxPid[0].maxValue = 90;
engineConfiguration->vvtOutputFrequency[0] = 300; // VVT solenoid control
engineConfiguration->vvtOutputFrequency = 300; // VVT solenoid control
engineConfiguration->isCylinderCleanupEnabled = true;

View File

@ -1217,7 +1217,8 @@ int16_t tps2Max;Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!\
float tChargeMaxRpmMaxTps;;"", 1, 0, 0, 3, 4
custom pwm_freq_t 2 scalar, U16, @OFFSET@, "Hz", 1, 0, 0, 3000, 0
pwm_freq_t[CAMS_PER_BANK iterate] vvtOutputFrequency;
pwm_freq_t vvtOutputFrequency
uint16_t unused1538
int alternatorPwmFrequency;;"Hz", 1, 0, 0, 3000, 0

View File

@ -299,8 +299,7 @@ enable2ndByteCanID = false
requiresPowerCycle = idle_solenoidFrequency
requiresPowerCycle = boostPwmFrequency
requiresPowerCycle = alternatorPwmFrequency
requiresPowerCycle = vvtOutputFrequency1
requiresPowerCycle = vvtOutputFrequency2
requiresPowerCycle = vvtOutputFrequency
requiresPowerCycle = vvtPins1
requiresPowerCycle = vvtPins2
requiresPowerCycle = vvtPins3
@ -3630,7 +3629,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_
field = "VVT solenoid bank 1 exhaust", vvtPins2
field = "VVT solenoid bank 2 intake", vvtPins3
field = "VVT solenoid bank 2 exhaust", vvtPins4
field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0}
field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0}
field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 }
field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 }