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

etb: option to skip reporting calibrated values back to TS 

If this enabled - TPS settings will be automaticaly update in engineConfiguration
This will cause TS runs out of sync!
This commit is contained in:
Andrey Gusakov 2025-02-27 18:11:26 +03:00 committed by rusefillc
parent eabd14e818
commit 35ef47fa7d
3 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
firmware/controllers/actuators/electronic_throttle.cpp
View File

@ -655,10 +655,11 @@ void EtbController::checkJam(percent_t setpoint, percent_t observation) {
}
}
void EtbController::autoCalibrateTps() {
void EtbController::autoCalibrateTps(bool reportToTs) {
// Only auto calibrate throttles
if (m_function == DC_Throttle1 || m_function == DC_Throttle2) {
m_isAutocal = true;
m_isAutocalTs = reportToTs;
efiPrintf("m_isAutocal");
}
}
@ -682,7 +683,6 @@ struct EtbImpl final : public TBase {
EtbImpl(TArgs&&... args) : TBase(std::forward<TArgs>(args)...) { }
void update() override {
#if EFI_TUNER_STUDIO
if (TBase::m_isAutocal) {
// Don't allow if engine is running!
if (Sensor::getOrZero(SensorType::Rpm) > 0) {
@ -729,27 +729,43 @@ struct EtbImpl final : public TBase {
return;
}
// Write out the learned values to TS, waiting briefly after setting each to let TS grab it
engine->outputChannels.calibrationMode = (uint8_t)functionToCalModePriMax(myFunction);
engine->outputChannels.calibrationValue = convertVoltageTo10bitADC(primaryMax);
chThdSleepMilliseconds(500);
engine->outputChannels.calibrationMode = (uint8_t)functionToCalModePriMin(myFunction);
engine->outputChannels.calibrationValue = convertVoltageTo10bitADC(primaryMin);
chThdSleepMilliseconds(500);
if (!TBase::m_isAutocalTs) {
if (myFunction == DC_Throttle1) {
engineConfiguration->tpsMin = convertVoltageTo10bitADC(primaryMin);
engineConfiguration->tpsMax = convertVoltageTo10bitADC(primaryMax);
engineConfiguration->tps1SecondaryMin = convertVoltageTo10bitADC(secondaryMin);
engineConfiguration->tps1SecondaryMax = convertVoltageTo10bitADC(secondaryMax);
} else {
engineConfiguration->tps2Min = convertVoltageTo10bitADC(primaryMin);
engineConfiguration->tps2Max = convertVoltageTo10bitADC(primaryMax);
engineConfiguration->tps2SecondaryMin = convertVoltageTo10bitADC(secondaryMin);
engineConfiguration->tps2SecondaryMax = convertVoltageTo10bitADC(secondaryMax);
}
}
#if EFI_TUNER_STUDIO
if (TBase::m_isAutocalTs) {
// Write out the learned values to TS, waiting briefly after setting each to let TS grab it
engine->outputChannels.calibrationMode = (uint8_t)functionToCalModePriMax(myFunction);
engine->outputChannels.calibrationValue = convertVoltageTo10bitADC(primaryMax);
chThdSleepMilliseconds(500);
engine->outputChannels.calibrationMode = (uint8_t)functionToCalModePriMin(myFunction);
engine->outputChannels.calibrationValue = convertVoltageTo10bitADC(primaryMin);
chThdSleepMilliseconds(500);
engine->outputChannels.calibrationMode = (uint8_t)functionToCalModeSecMax(myFunction);
engine->outputChannels.calibrationValue = convertVoltageTo10bitADC(secondaryMax);
chThdSleepMilliseconds(500);
engine->outputChannels.calibrationMode = (uint8_t)functionToCalModeSecMin(myFunction);
engine->outputChannels.calibrationValue = convertVoltageTo10bitADC(secondaryMin);
chThdSleepMilliseconds(500);
engine->outputChannels.calibrationMode = (uint8_t)functionToCalModeSecMax(myFunction);
engine->outputChannels.calibrationValue = convertVoltageTo10bitADC(secondaryMax);
chThdSleepMilliseconds(500);
engine->outputChannels.calibrationMode = (uint8_t)functionToCalModeSecMin(myFunction);
engine->outputChannels.calibrationValue = convertVoltageTo10bitADC(secondaryMin);
chThdSleepMilliseconds(500);
engine->outputChannels.calibrationMode = (uint8_t)TsCalMode::None;
engine->outputChannels.calibrationMode = (uint8_t)TsCalMode::None;
}
#endif /* EFI_TUNER_STUDIO */
TBase::m_isAutocal = false;
return;
}
#endif /* EFI_TUNER_STUDIO */
TBase::update();
}
@ -800,14 +816,14 @@ void etbPidReset() {
}
}
void etbAutocal(size_t throttleIndex) {
void etbAutocal(size_t throttleIndex, bool reportToTs) {
if (throttleIndex >= ETB_COUNT) {
return;
}
if (auto etb = engine->etbControllers[throttleIndex]) {
assertNotNullVoid(etb);
etb->autoCalibrateTps();
etb->autoCalibrateTps(reportToTs);
// todo fix root cause! work-around: make sure not to write bad tune since that would brick requestBurn();
}
}

4
firmware/controllers/actuators/electronic_throttle.h
View File

@ -34,7 +34,7 @@ void onConfigurationChangeElectronicThrottleCallback(engine_configuration_s *pre
void unregisterEtbPins();
void setProteusHitachiEtbDefaults();
void etbAutocal(size_t throttleIndex);
void etbAutocal(size_t throttleIndex, bool reportToTs = true);
float getSanitizedPedal();
@ -67,7 +67,7 @@ public:
virtual void setIdlePosition(percent_t pos) = 0;
virtual void setWastegatePosition(percent_t pos) = 0;
virtual void update() = 0;
virtual void autoCalibrateTps() = 0;
virtual void autoCalibrateTps(bool reportToTs = true) = 0;
virtual bool isEtbMode() const = 0;
virtual const pid_state_s& getPidState() const = 0;

4
firmware/controllers/actuators/electronic_throttle_impl.h
View File

@ -60,7 +60,7 @@ public:
const pid_state_s& getPidState() const override { return m_pid; };
// Use the throttle to automatically calibrate the relevant throttle position sensor(s).
void autoCalibrateTps() override;
void autoCalibrateTps(bool reportToTs = true) override;
// Override if this throttle needs special per-throttle adjustment (bank-to-bank trim, for example)
virtual percent_t getThrottleTrim(float /*rpm*/, percent_t /*targetPosition*/) const {
@ -80,6 +80,8 @@ public:
protected:
// This is set if an automatic TPS calibration should be run
bool m_isAutocal = false;
// Report calibated values to TS, if false - set directrly to config
bool m_isAutocalTs = true;
bool hadTpsError = false;
bool hadPpsError = false;