not industrial (#3627)

This commit is contained in:
Matthew Kennedy 2021-11-27 16:27:57 -08:00 committed by GitHub
parent 280b1630b6
commit 71aff73081
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 7 deletions

View File

@ -20,7 +20,7 @@
#endif /* HAS_OS_ACCESS */
static SimplePwm alternatorControl("alt");
static PidIndustrial alternatorPid(&persistentState.persistentConfiguration.engineConfiguration.alternatorControl);
static Pid alternatorPid(&persistentState.persistentConfiguration.engineConfiguration.alternatorControl);
static percent_t currentAltDuty;
@ -44,10 +44,6 @@ class AlternatorController : public PeriodicTimerController {
}
#endif
// todo: move this to pid_s one day
alternatorPid.antiwindupFreq = engineConfiguration->alternator_antiwindupFreq;
alternatorPid.derivativeFilterLoss = engineConfiguration->alternator_derivativeFilterLoss;
if (engineConfiguration->debugMode == DBG_ALTERNATOR_PID) {
// this block could be executed even in on/off alternator control mode
// but at least we would reflect latest state

View File

@ -1112,8 +1112,8 @@ custom pin_mode_e 1 bits, U08, @OFFSET@, [0:6], @@pin_mode_e_enum@@
pid_s etb;
brain_pin_e[TRIGGER_INPUT_PIN_COUNT iterate] triggerInputDebugPins;
brain_input_pin_e turboSpeedSensorInputPin;
float alternator_derivativeFilterLoss;;"x", 1, 0, -1000000, 1000000, 4
float alternator_antiwindupFreq;;"x", 1, 0, -1000000, 1000000, 4
float unused1760;;"x", 1, 0, 0, 1, 1
float unused1764;;"x", 1, 0, 0, 1, 1
int16_t tps2Min;Closed throttle#2. todo: extract these two fields into a structure\nSee also tps2_1AdcChannel\nset tps2_min X;"ADC", 1, 0, 0, 1023, 0
int16_t tps2Max;Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!\nSee also tps1_1AdcChannel\nset tps2_max X;"ADC", 1, 0, 0, 1023, 0
output_pin_e starterControlPin;See also startStopButtonPin