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

better (?) variable names

This commit is contained in:
rusefi 2019-02-10 22:47:49 -05:00
parent de6d9d6f8d
commit 9325cd6d23
21 changed files with 139 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/engines/dodge_neon.cpp
View File

@ -488,7 +488,7 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->alternatorControl.pFactor = 20;
engineConfiguration->alternatorControl.iFactor = 0.2;
engineConfiguration->alternatorControl.dFactor = 0.1;
engineConfiguration->alternatorControl.period = 10;
engineConfiguration->alternatorControl.periodMs = 10;
// enableFrankensoCan();
engineConfiguration->canWriteEnabled = true;

4
firmware/config/engines/mazda_miata_vvt.cpp
View File

@ -261,7 +261,7 @@ void setMazdaMiata2003EngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
engineConfiguration->alternatorControl.pFactor = 14;
engineConfiguration->alternatorControl.iFactor = 0.1;
engineConfiguration->alternatorControl.dFactor = 0;
engineConfiguration->alternatorControl.period = 10;
engineConfiguration->alternatorControl.periodMs = 10;
engineConfiguration->auxPid[0].pFactor = 2;
engineConfiguration->auxPid[0].iFactor = 0.005;
@ -445,7 +445,7 @@ void setMazdaMiata2003EngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
engineConfiguration->idleRpmPid.pFactor = 0.07;
engineConfiguration->idleRpmPid.iFactor = 0.0001;
engineConfiguration->idleRpmPid.dFactor = 5;
engineConfiguration->idleRpmPid.period = 10;
engineConfiguration->idleRpmPid.periodMs = 10;
}
void setMazdaMiata2003EngineConfigurationNaFuelRail(DECLARE_ENGINE_PARAMETER_SIGNATURE) {

2
firmware/console/status_loop.cpp
View File

@ -660,7 +660,7 @@ static void lcdThread(void *arg) {
updateHD44780lcd();
#endif
}
chThdSleepMilliseconds(engineConfiguration->bc.lcdThreadPeriod);
chThdSleepMilliseconds(engineConfiguration->bc.lcdThreadPeriodMs);
}
}

10
firmware/controllers/algo/engine_configuration.cpp
View File

@ -601,7 +601,7 @@ static void setCanDefaults(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
boardConfiguration->canTxPin = GPIOB_6;
boardConfiguration->canRxPin = GPIOB_12;
engineConfiguration->canSleepPeriod = 50;
engineConfiguration->canSleepPeriodMs = 50;
engineConfiguration->canReadEnabled = true;
engineConfiguration->canWriteEnabled = true;
engineConfiguration->canNbcType = CAN_BUS_MAZDA_RX8;
@ -1026,10 +1026,10 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
engineConfiguration->mapErrorDetectionTooLow = 5;
engineConfiguration->mapErrorDetectionTooHigh = 250;
boardConfiguration->idleThreadPeriod = 100;
boardConfiguration->consoleLoopPeriod = 200;
boardConfiguration->lcdThreadPeriod = 300;
boardConfiguration->generalPeriodicThreadPeriod = 50;
boardConfiguration->idleThreadPeriodMs = 100;
boardConfiguration->consoleLoopPeriodMs = 200;
boardConfiguration->lcdThreadPeriodMs = 300;
boardConfiguration->generalPeriodicThreadPeriodMs = 50;
boardConfiguration->useLcdScreen = true;
boardConfiguration->boardTestModeJumperPin = GPIOB_0;

16
firmware/controllers/algo/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Feb 09 17:16:52 EST 2019
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Feb 10 20:05:25 EST 2019
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -26,7 +26,7 @@ typedef struct {
* PID dTime
* offset 14
*/
int16_t period;
int16_t periodMs;
/**
* Output min value
* offset 16
@ -541,15 +541,15 @@ typedef struct {
/**
* offset 304
*/
int idleThreadPeriod;
int idleThreadPeriodMs;
/**
* offset 308
*/
int consoleLoopPeriod;
int consoleLoopPeriodMs;
/**
* offset 312
*/
int lcdThreadPeriod;
int lcdThreadPeriodMs;
/**
* offset 316
*/
@ -557,7 +557,7 @@ typedef struct {
/**
* offset 320
*/
int generalPeriodicThreadPeriod;
int generalPeriodicThreadPeriodMs;
/**
* offset 324
*/
@ -1196,7 +1196,7 @@ typedef struct {
* CANbus thread period, ms
* offset 492
*/
int canSleepPeriod;
int canSleepPeriodMs;
/**
* See engineCycle
* set operation_mode X
@ -2481,4 +2481,4 @@ typedef struct {
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Feb 09 17:16:52 EST 2019
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Feb 10 20:05:25 EST 2019

56
firmware/controllers/algo/rusefi_generated.h
View File

@ -288,8 +288,8 @@
#define vehicleSpeedCoef_offset_hex 1e4
#define canNbcType_offset 488
#define canNbcType_offset_hex 1e8
#define canSleepPeriod_offset 492
#define canSleepPeriod_offset_hex 1ec
#define canSleepPeriodMs_offset 492
#define canSleepPeriodMs_offset_hex 1ec
#define operationMode_offset 496
#define operationMode_offset_hex 1f0
#define displayMode_offset 500
@ -512,16 +512,16 @@
#define triggerInputPins3_offset_hex 388
#define mainRelayPin_offset 908
#define mainRelayPin_offset_hex 38c
#define idleThreadPeriod_offset 912
#define idleThreadPeriod_offset_hex 390
#define consoleLoopPeriod_offset 916
#define consoleLoopPeriod_offset_hex 394
#define lcdThreadPeriod_offset 920
#define lcdThreadPeriod_offset_hex 398
#define idleThreadPeriodMs_offset 912
#define idleThreadPeriodMs_offset_hex 390
#define consoleLoopPeriodMs_offset 916
#define consoleLoopPeriodMs_offset_hex 394
#define lcdThreadPeriodMs_offset 920
#define lcdThreadPeriodMs_offset_hex 398
#define sdCardCsPin_offset 924
#define sdCardCsPin_offset_hex 39c
#define generalPeriodicThreadPeriod_offset 928
#define generalPeriodicThreadPeriod_offset_hex 3a0
#define generalPeriodicThreadPeriodMs_offset 928
#define generalPeriodicThreadPeriodMs_offset_hex 3a0
#define tunerStudioSerialSpeed_offset 932
#define tunerStudioSerialSpeed_offset_hex 3a4
#define boardTestModeJumperPin_offset 936
@ -1084,8 +1084,8 @@
#define alternatorControl_dFactor_offset_hex 71c
#define alternatorControl_offset_offset 1824
#define alternatorControl_offset_offset_hex 720
#define alternatorControl_period_offset 1826
#define alternatorControl_period_offset_hex 722
#define alternatorControl_periodMs_offset 1826
#define alternatorControl_periodMs_offset_hex 722
#define alternatorControl_minValue_offset 1828
#define alternatorControl_minValue_offset_hex 724
#define alternatorControl_maxValue_offset 1830
@ -1100,8 +1100,8 @@
#define etb_dFactor_offset_hex 730
#define etb_offset_offset 1844
#define etb_offset_offset_hex 734
#define etb_period_offset 1846
#define etb_period_offset_hex 736
#define etb_periodMs_offset 1846
#define etb_periodMs_offset_hex 736
#define etb_minValue_offset 1848
#define etb_minValue_offset_hex 738
#define etb_maxValue_offset 1850
@ -1116,8 +1116,8 @@
#define warmupAfrPid_dFactor_offset_hex 744
#define warmupAfrPid_offset_offset 1864
#define warmupAfrPid_offset_offset_hex 748
#define warmupAfrPid_period_offset 1866
#define warmupAfrPid_period_offset_hex 74a
#define warmupAfrPid_periodMs_offset 1866
#define warmupAfrPid_periodMs_offset_hex 74a
#define warmupAfrPid_minValue_offset 1868
#define warmupAfrPid_minValue_offset_hex 74c
#define warmupAfrPid_maxValue_offset 1870
@ -1138,8 +1138,8 @@
#define idleRpmPid_dFactor_offset_hex 764
#define idleRpmPid_offset_offset 1896
#define idleRpmPid_offset_offset_hex 768
#define idleRpmPid_period_offset 1898
#define idleRpmPid_period_offset_hex 76a
#define idleRpmPid_periodMs_offset 1898
#define idleRpmPid_periodMs_offset_hex 76a
#define idleRpmPid_minValue_offset 1900
#define idleRpmPid_minValue_offset_hex 76c
#define idleRpmPid_maxValue_offset 1902
@ -1386,8 +1386,8 @@
#define fuelClosedLoopPid_dFactor_offset_hex a8c
#define fuelClosedLoopPid_offset_offset 2704
#define fuelClosedLoopPid_offset_offset_hex a90
#define fuelClosedLoopPid_period_offset 2706
#define fuelClosedLoopPid_period_offset_hex a92
#define fuelClosedLoopPid_periodMs_offset 2706
#define fuelClosedLoopPid_periodMs_offset_hex a92
#define fuelClosedLoopPid_minValue_offset 2708
#define fuelClosedLoopPid_minValue_offset_hex a94
#define fuelClosedLoopPid_maxValue_offset 2710
@ -1454,8 +1454,8 @@
#define auxPid1_dFactor_offset_hex b08
#define auxPid1_offset_offset 2828
#define auxPid1_offset_offset_hex b0c
#define auxPid1_period_offset 2830
#define auxPid1_period_offset_hex b0e
#define auxPid1_periodMs_offset 2830
#define auxPid1_periodMs_offset_hex b0e
#define auxPid1_minValue_offset 2832
#define auxPid1_minValue_offset_hex b10
#define auxPid1_maxValue_offset 2834
@ -1470,8 +1470,8 @@
#define auxPid2_dFactor_offset_hex b1c
#define auxPid2_offset_offset 2848
#define auxPid2_offset_offset_hex b20
#define auxPid2_period_offset 2850
#define auxPid2_period_offset_hex b22
#define auxPid2_periodMs_offset 2850
#define auxPid2_periodMs_offset_hex b22
#define auxPid2_minValue_offset 2852
#define auxPid2_minValue_offset_hex b24
#define auxPid2_maxValue_offset 2854
@ -1486,8 +1486,8 @@
#define auxPid3_dFactor_offset_hex b30
#define auxPid3_offset_offset 2868
#define auxPid3_offset_offset_hex b34
#define auxPid3_period_offset 2870
#define auxPid3_period_offset_hex b36
#define auxPid3_periodMs_offset 2870
#define auxPid3_periodMs_offset_hex b36
#define auxPid3_minValue_offset 2872
#define auxPid3_minValue_offset_hex b38
#define auxPid3_maxValue_offset 2874
@ -1502,8 +1502,8 @@
#define auxPid4_dFactor_offset_hex b44
#define auxPid4_offset_offset 2888
#define auxPid4_offset_offset_hex b48
#define auxPid4_period_offset 2890
#define auxPid4_period_offset_hex b4a
#define auxPid4_periodMs_offset 2890
#define auxPid4_periodMs_offset_hex b4a
#define auxPid4_minValue_offset 2892
#define auxPid4_minValue_offset_hex b4c
#define auxPid4_maxValue_offset 2894

4
firmware/controllers/alternatorController.cpp
View File

@ -110,7 +110,7 @@ static msg_t AltCtrlThread(int param) {
void showAltInfo(void) {
scheduleMsg(logger, "alt=%s @%s t=%dms", boolToString(engineConfiguration->isAlternatorControlEnabled),
hwPortname(CONFIGB(alternatorControlPin)),
engineConfiguration->alternatorControl.period);
engineConfiguration->alternatorControl.periodMs);
scheduleMsg(logger, "p=%.2f/i=%.2f/d=%.2f offset=%.2f", engineConfiguration->alternatorControl.pFactor,
0, 0, engineConfiguration->alternatorControl.offset); // todo: i & d
scheduleMsg(logger, "vbatt=%.2f/duty=%.2f/target=%.2f", getVBatt(PASS_ENGINE_PARAMETER_SIGNATURE), currentAltDuty,
@ -145,7 +145,7 @@ void setDefaultAlternatorParameters(void) {
engineConfiguration->alternatorControl.offset = 0;
engineConfiguration->alternatorControl.pFactor = 30;
engineConfiguration->alternatorControl.period = 100;
engineConfiguration->alternatorControl.periodMs = 100;
}
void onConfigurationChangeAlternatorCallback(engine_configuration_s *previousConfiguration) {

10
firmware/controllers/electronic_throttle.cpp
View File

@ -245,7 +245,7 @@ void setDefaultEtbParameters(void) {
engineConfiguration->etb.pFactor = 1;
engineConfiguration->etb.iFactor = 0.5;
engineConfiguration->etb.period = 100;
engineConfiguration->etb.periodMs = 100;
engineConfiguration->etbFreq = 300;
// CONFIGB(etbControlPin1) = GPIOE_4; // test board, matched default fuel pump relay
@ -309,7 +309,7 @@ static void setAutoStep(float value) {
}
static void setAutoPeriod(int period) {
tuneWorkingPidSettings.period = period;
tuneWorkingPidSettings.periodMs = period;
autoTune.reset();
}
@ -355,10 +355,10 @@ void initElectronicThrottle(void) {
tuneWorkingPidSettings.iFactor = 0;
tuneWorkingPidSettings.dFactor = 0;
// tuneWorkingPidSettings.offset = 10; // todo: not hard-coded value
//todo tuneWorkingPidSettings.period = 10;
//todo tuneWorkingPidSettings.periodMs = 10;
tuneWorkingPidSettings.minValue = 0;
tuneWorkingPidSettings.maxValue = 100;
tuneWorkingPidSettings.period = 100;
tuneWorkingPidSettings.periodMs = 100;
// this is useful one you do "enable etb_auto"
addConsoleActionF("set_etbat_output", setTempOutput);
@ -368,7 +368,7 @@ void initElectronicThrottle(void) {
pid.reset();
int periodMs = maxI(10, engineConfiguration->etb.period);
int periodMs = maxI(10, engineConfiguration->etb.periodMs);
etbController.setPeriod(periodMs);
etbController.Start();
}

2
firmware/controllers/engine_controller.cpp
View File

@ -219,7 +219,7 @@ static void periodicSlowCallback(Engine *engine);
static void scheduleNextSlowInvocation(void) {
// schedule next invocation
int periodMs = CONFIGB(generalPeriodicThreadPeriod);
int periodMs = CONFIGB(generalPeriodicThreadPeriodMs);
if (periodMs == 0)
periodMs = 50; // this might happen while resetting configuration
chVTSetAny(&periodicSlowTimer, TIME_MS2I(periodMs), (vtfunc_t) &periodicSlowCallback, engine);

6
firmware/controllers/idle_thread.cpp
View File

@ -232,7 +232,7 @@ static percent_t automaticIdleController() {
// If errorAmpCoef > 1.0, then PID thinks that RPM is lower than it is, and controls IAC more aggressively
idlePid.setErrorAmplification(errorAmpCoef);
percent_t newValue = idlePid.getValue(targetRpm, rpm, engineConfiguration->idleRpmPid.period);
percent_t newValue = idlePid.getValue(targetRpm, rpm, engineConfiguration->idleRpmPid.periodMs);
// the state of PID has been changed, so we might reset it now, but only when needed (see idlePidDeactivationTpsThreshold)
mightResetPid = true;
@ -420,7 +420,7 @@ void setIdleDFactor(float value) {
}
void setIdleDT(int value) {
engineConfiguration->idleRpmPid.period = value;
engineConfiguration->idleRpmPid.periodMs = value;
apply();
showIdleInfo();
}
@ -443,7 +443,7 @@ void setDefaultIdleParameters(void) {
engineConfiguration->idleRpmPid.pFactor = 0.1f;
engineConfiguration->idleRpmPid.iFactor = 0.05f;
engineConfiguration->idleRpmPid.dFactor = 0.0f;
engineConfiguration->idleRpmPid.period = 10;
engineConfiguration->idleRpmPid.periodMs = 10;
}
static void applyIdleSolenoidPinState(PwmConfig *state, int stateIndex) {

2
firmware/controllers/settings.cpp
View File

@ -1271,7 +1271,7 @@ static void setValue(const char *paramStr, const char *valueStr) {
#if EFI_PROD_CODE || defined(__DOXYGEN__)
} else if (strEqualCaseInsensitive(paramStr, "alt_t")) {
if (valueI > 10) {
engineConfiguration->alternatorControl.period = valueI;
engineConfiguration->alternatorControl.periodMs = valueI;
}
showAltInfo();
} else if (strEqualCaseInsensitive(paramStr, "alt_offset")) {

2
firmware/controllers/system/pwm_generator_logic.cpp
View File

@ -156,7 +156,7 @@ void PwmConfig::handleCycleStart() {
efitimeus_t PwmConfig::togglePwmState() {
#if DEBUG_PWM
scheduleMsg(&logger, "togglePwmState phaseIndex=%d iteration=%d", safe.phaseIndex, safe.iteration);
scheduleMsg(&logger, "period=%.2f safe.period=%.2f", period, safe.period);
scheduleMsg(&logger, "period=%.2f safe.period=%.2f", period, safe.periodNt);
#endif
if (cisnan(periodNt)) {

10
firmware/hw_layer/can_hw.cpp
View File

@ -258,12 +258,12 @@ static msg_t canThread(void *arg) {
if (engineConfiguration->canReadEnabled)
canRead(); // todo: since this is a blocking operation, do we need a separate thread for 'write'?
if (engineConfiguration->canSleepPeriod < 10) {
warning(CUSTOM_OBD_LOW_CAN_PERIOD, "%d too low CAN", engineConfiguration->canSleepPeriod);
engineConfiguration->canSleepPeriod = 50;
if (engineConfiguration->canSleepPeriodMs < 10) {
warning(CUSTOM_OBD_LOW_CAN_PERIOD, "%d too low CAN", engineConfiguration->canSleepPeriodMs);
engineConfiguration->canSleepPeriodMs = 50;
}
chThdSleepMilliseconds(engineConfiguration->canSleepPeriod);
chThdSleepMilliseconds(engineConfiguration->canSleepPeriodMs);
}
#if defined __GNUC__ || defined(__DOXYGEN__)
return -1;
@ -280,7 +280,7 @@ static void canInfo(void) {
scheduleMsg(&logger, "CAN RX %s", hwPortname(CONFIGB(canRxPin)));
scheduleMsg(&logger, "type=%d canReadEnabled=%s canWriteEnabled=%s period=%d", engineConfiguration->canNbcType,
boolToString(engineConfiguration->canReadEnabled), boolToString(engineConfiguration->canWriteEnabled),
engineConfiguration->canSleepPeriod);
engineConfiguration->canSleepPeriodMs);
scheduleMsg(&logger, "CAN rx_cnt=%d/tx_ok=%d/tx_not_ok=%d", canReadCounter, canWriteOk, canWriteNotOk);
}

2
firmware/hw_layer/sensors/CJ125_logic.cpp
View File

@ -121,6 +121,6 @@ void CJ125::cjInitPid(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
heaterPidConfig.maxValue = 1;
heaterPidConfig.offset = 0;
// todo: period?
heaterPidConfig.period = 1.0f;
heaterPidConfig.periodMs = 1.0f;
heaterPid.reset();
}

12
firmware/integration/rusefi_config.txt
View File

@ -146,7 +146,7 @@ struct pid_s
float iFactor;;"", 1, 0, -10000, 10000, 7
float dFactor;;"", 1, 0, -10000, 10000, 7
int16_t offset;Linear addition to PID logic;"", 1, 0, 0, 1000, 0
int16_t period;PID dTime;"ms", 1, 0, 0, 3000, 0
int16_t periodMs;PID dTime;"ms", 1, 0, 0, 3000, 0
int16_t minValue;Output min value;"", 1, 0, -3000, 3000.0, 3
int16_t maxValue;Output max value;"", 1, 0, -3000, 3000.0, 3
end_struct
@ -371,7 +371,7 @@ float vehicleSpeedCoef;+This coefficient translates vehicle speed input frequenc
custom can_nbc_e 4 bits, U32, @OFFSET@, [0:1], "BMW", "FIAT", "VAG" , "MAZDA RX8"
can_nbc_e canNbcType;set can_mode X
int canSleepPeriod;CANbus thread period, ms;"ms", 1, 0, 0, 1000.0, 2
int canSleepPeriodMs;CANbus thread period, ms;"ms", 1, 0, 0, 1000.0, 2
custom operation_mode_e 4 bits, U32, @OFFSET@, [0:2], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank", "INVALID", "INVALID", "INVALID"
@ -512,11 +512,11 @@ custom adc_channel_mode_e 4 bits, U32, @OFFSET@, [0:1], "Off", "Slow", "Fas
brain_input_pin_e[TRIGGER_INPUT_PIN_COUNT iterate] triggerInputPins;
brain_pin_e mainRelayPin;
int idleThreadPeriod;
int consoleLoopPeriod;
int lcdThreadPeriod;
int idleThreadPeriodMs;
int consoleLoopPeriodMs;
int lcdThreadPeriodMs;
brain_pin_e sdCardCsPin;
int generalPeriodicThreadPeriod;
int generalPeriodicThreadPeriodMs;
uint32_t tunerStudioSerialSpeed;;"BPs", 1, 0, 0,1000000, 0

2
firmware/rusefi.cpp
View File

@ -240,7 +240,7 @@ void runRusEfi(void) {
updateDevConsoleState();
#endif /* EFI_CLI_SUPPORT */
chThdSleepMilliseconds(CONFIGB(consoleLoopPeriod));
chThdSleepMilliseconds(CONFIGB(consoleLoopPeriodMs));
}
}

42
firmware/tunerstudio/rusefi.ini
View File

@ -63,7 +63,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Feb 06 20:56:44 PST 2019
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Feb 10 20:05:25 EST 2019
pageSize = 20000
page = 1
@ -165,7 +165,7 @@ page = 1
fuelLevelSensor = bits, U32, 480, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
vehicleSpeedCoef = scalar, F32, 484, "coef", 1, 0, 0.01, 2000.0, 2
canNbcType = bits, U32, 488, [0:1], "BMW", "FIAT", "VAG" , "MAZDA RX8"
canSleepPeriod = scalar, S32, 492, "ms", 1, 0, 0, 1000.0, 2
canSleepPeriodMs = scalar, S32, 492, "ms", 1, 0, 0, 1000.0, 2
operationMode = bits, U32, 496, [0:2], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank", "INVALID", "INVALID", "INVALID"
displayMode = bits, U32, 500, [0:1], "none", "hd44780", "hd44780 over pcf8574", "INVALID"
logFormat = bits, U32, 504, [0:0], "native", "Mega Log Viewer"
@ -272,11 +272,11 @@ page = 1
triggerInputPins2 = bits, U32, 900, [0:6], "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "INVALID", "INVALID", "INVALID", "INVALID", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
triggerInputPins3 = bits, U32, 904, [0:6], "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "INVALID", "INVALID", "INVALID", "INVALID", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
mainRelayPin = bits, U32, 908, [0:6], "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
;no TS info - skipping idleThreadPeriod offset 912
;no TS info - skipping consoleLoopPeriod offset 916
;no TS info - skipping lcdThreadPeriod offset 920
;no TS info - skipping idleThreadPeriodMs offset 912
;no TS info - skipping consoleLoopPeriodMs offset 916
;no TS info - skipping lcdThreadPeriodMs offset 920
sdCardCsPin = bits, U32, 924, [0:6], "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
;no TS info - skipping generalPeriodicThreadPeriod offset 928
;no TS info - skipping generalPeriodicThreadPeriodMs offset 928
tunerStudioSerialSpeed = scalar, U32, 932, "BPs", 1, 0, 0,1000000, 0
boardTestModeJumperPin = bits, U32, 936, [0:6], "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
;no TS info - skipping canDeviceMode offset 940
@ -557,21 +557,21 @@ page = 1
alternatorControl_iFactor = scalar, F32, 1816, "", 1, 0, -10000, 10000, 7
alternatorControl_dFactor = scalar, F32, 1820, "", 1, 0, -10000, 10000, 7
alternatorControl_offset = scalar, S16, 1824, "", 1, 0, 0, 1000, 0
alternatorControl_period = scalar, S16, 1826, "ms", 1, 0, 0, 3000, 0
alternatorControl_periodMs = scalar, S16, 1826, "ms", 1, 0, 0, 3000, 0
alternatorControl_minValue = scalar, S16, 1828, "", 1, 0, -3000, 3000.0, 3
alternatorControl_maxValue = scalar, S16, 1830, "", 1, 0, -3000, 3000.0, 3
etb_pFactor = scalar, F32, 1832, "", 1, 0, -10000, 10000, 7
etb_iFactor = scalar, F32, 1836, "", 1, 0, -10000, 10000, 7
etb_dFactor = scalar, F32, 1840, "", 1, 0, -10000, 10000, 7
etb_offset = scalar, S16, 1844, "", 1, 0, 0, 1000, 0
etb_period = scalar, S16, 1846, "ms", 1, 0, 0, 3000, 0
etb_periodMs = scalar, S16, 1846, "ms", 1, 0, 0, 3000, 0
etb_minValue = scalar, S16, 1848, "", 1, 0, -3000, 3000.0, 3
etb_maxValue = scalar, S16, 1850, "", 1, 0, -3000, 3000.0, 3
warmupAfrPid_pFactor = scalar, F32, 1852, "", 1, 0, -10000, 10000, 7
warmupAfrPid_iFactor = scalar, F32, 1856, "", 1, 0, -10000, 10000, 7
warmupAfrPid_dFactor = scalar, F32, 1860, "", 1, 0, -10000, 10000, 7
warmupAfrPid_offset = scalar, S16, 1864, "", 1, 0, 0, 1000, 0
warmupAfrPid_period = scalar, S16, 1866, "ms", 1, 0, 0, 3000, 0
warmupAfrPid_periodMs = scalar, S16, 1866, "ms", 1, 0, 0, 3000, 0
warmupAfrPid_minValue = scalar, S16, 1868, "", 1, 0, -3000, 3000.0, 3
warmupAfrPid_maxValue = scalar, S16, 1870, "", 1, 0, -3000, 3000.0, 3
mapErrorDetectionTooLow = scalar, F32, 1872, "kPa", 1, 0, -100.0, 100.0, 2
@ -581,7 +581,7 @@ page = 1
idleRpmPid_iFactor = scalar, F32, 1888, "", 1, 0, -10000, 10000, 7
idleRpmPid_dFactor = scalar, F32, 1892, "", 1, 0, -10000, 10000, 7
idleRpmPid_offset = scalar, S16, 1896, "", 1, 0, 0, 1000, 0
idleRpmPid_period = scalar, S16, 1898, "ms", 1, 0, 0, 3000, 0
idleRpmPid_periodMs = scalar, S16, 1898, "ms", 1, 0, 0, 3000, 0
idleRpmPid_minValue = scalar, S16, 1900, "", 1, 0, -3000, 3000.0, 3
idleRpmPid_maxValue = scalar, S16, 1902, "", 1, 0, -3000, 3000.0, 3
wwaeBeta = scalar, F32, 1904, "%", 1, 0, 0.0, 1.0, 2
@ -699,7 +699,7 @@ page = 1
fuelClosedLoopPid_iFactor = scalar, F32, 2696, "", 1, 0, -10000, 10000, 7
fuelClosedLoopPid_dFactor = scalar, F32, 2700, "", 1, 0, -10000, 10000, 7
fuelClosedLoopPid_offset = scalar, S16, 2704, "", 1, 0, 0, 1000, 0
fuelClosedLoopPid_period = scalar, S16, 2706, "ms", 1, 0, 0, 3000, 0
fuelClosedLoopPid_periodMs = scalar, S16, 2706, "ms", 1, 0, 0, 3000, 0
fuelClosedLoopPid_minValue = scalar, S16, 2708, "", 1, 0, -3000, 3000.0, 3
fuelClosedLoopPid_maxValue = scalar, S16, 2710, "", 1, 0, -3000, 3000.0, 3
fuelClosedLoopAfrHighThreshold = scalar, F32, 2712, "ratio", 1, 0, 0, 100, 1
@ -732,28 +732,28 @@ page = 1
auxPid1_iFactor = scalar, F32, 2820, "", 1, 0, -10000, 10000, 7
auxPid1_dFactor = scalar, F32, 2824, "", 1, 0, -10000, 10000, 7
auxPid1_offset = scalar, S16, 2828, "", 1, 0, 0, 1000, 0
auxPid1_period = scalar, S16, 2830, "ms", 1, 0, 0, 3000, 0
auxPid1_periodMs = scalar, S16, 2830, "ms", 1, 0, 0, 3000, 0
auxPid1_minValue = scalar, S16, 2832, "", 1, 0, -3000, 3000.0, 3
auxPid1_maxValue = scalar, S16, 2834, "", 1, 0, -3000, 3000.0, 3
auxPid2_pFactor = scalar, F32, 2836, "", 1, 0, -10000, 10000, 7
auxPid2_iFactor = scalar, F32, 2840, "", 1, 0, -10000, 10000, 7
auxPid2_dFactor = scalar, F32, 2844, "", 1, 0, -10000, 10000, 7
auxPid2_offset = scalar, S16, 2848, "", 1, 0, 0, 1000, 0
auxPid2_period = scalar, S16, 2850, "ms", 1, 0, 0, 3000, 0
auxPid2_periodMs = scalar, S16, 2850, "ms", 1, 0, 0, 3000, 0
auxPid2_minValue = scalar, S16, 2852, "", 1, 0, -3000, 3000.0, 3
auxPid2_maxValue = scalar, S16, 2854, "", 1, 0, -3000, 3000.0, 3
auxPid3_pFactor = scalar, F32, 2856, "", 1, 0, -10000, 10000, 7
auxPid3_iFactor = scalar, F32, 2860, "", 1, 0, -10000, 10000, 7
auxPid3_dFactor = scalar, F32, 2864, "", 1, 0, -10000, 10000, 7
auxPid3_offset = scalar, S16, 2868, "", 1, 0, 0, 1000, 0
auxPid3_period = scalar, S16, 2870, "ms", 1, 0, 0, 3000, 0
auxPid3_periodMs = scalar, S16, 2870, "ms", 1, 0, 0, 3000, 0
auxPid3_minValue = scalar, S16, 2872, "", 1, 0, -3000, 3000.0, 3
auxPid3_maxValue = scalar, S16, 2874, "", 1, 0, -3000, 3000.0, 3
auxPid4_pFactor = scalar, F32, 2876, "", 1, 0, -10000, 10000, 7
auxPid4_iFactor = scalar, F32, 2880, "", 1, 0, -10000, 10000, 7
auxPid4_dFactor = scalar, F32, 2884, "", 1, 0, -10000, 10000, 7
auxPid4_offset = scalar, S16, 2888, "", 1, 0, 0, 1000, 0
auxPid4_period = scalar, S16, 2890, "ms", 1, 0, 0, 3000, 0
auxPid4_periodMs = scalar, S16, 2890, "ms", 1, 0, 0, 3000, 0
auxPid4_minValue = scalar, S16, 2892, "", 1, 0, -3000, 3000.0, 3
auxPid4_maxValue = scalar, S16, 2894, "", 1, 0, -3000, 3000.0, 3
oilPressure_hwChannel = bits, U32, 2896, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@ -928,7 +928,7 @@ page = 1
; CONFIG_DEFINITION_END
idleRpmPid_offset = "Constant base value"
idleRpmPid_period = "PID recalculation period"
idleRpmPid_periodMs = "PID recalculation period"
[Tuning]
@ -2617,7 +2617,7 @@ cmd_set_engine_type_Miata_NA2 = "w\x00\x30\x00\x2F"
field = "Offset", idleRpmPid_offset
field = "Min", idleRpmPid_minValue
field = "Max", idleRpmPid_maxValue
field = "period", idleRpmPid_period
field = "period", idleRpmPid_periodMs
field = "RPM dead zone to deactivate IAC pid", idlePidRpmDeadZone
field = "RPM upper limit to deactivate IAC pid",idlePidRpmUpperLimit
field = "PID Extra for low RPM", pidExtraForLowRpm
@ -2735,7 +2735,7 @@ cmd_set_engine_type_Miata_NA2 = "w\x00\x30\x00\x2F"
field = "PWM Frequency", auxPidFrequency1
field = "verbose", isVerboseAuxPid1
field = "#target based on FSIO map#1"
field = "control period", auxPid1_period, {activateAuxPid1 == 1}
field = "control period", auxPid1_periodMs, {activateAuxPid1 == 1}
field = "#PID control"
field = "offset", auxPid1_offset, {activateAuxPid1 == 1}
field = "P factor", auxPid1_pFactor, {activateAuxPid1 == 1}
@ -2760,7 +2760,7 @@ cmd_set_engine_type_Miata_NA2 = "w\x00\x30\x00\x2F"
field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0}
field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1}
field = "Verbose", isVerboseAlternator, {isAlternatorControlEnabled == 1}
field = "control period", alternatorControl_period, {isAlternatorControlEnabled == 1}
field = "control period", alternatorControl_periodMs, {isAlternatorControlEnabled == 1}
field = "#PID control"
field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0}
field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0}
@ -2826,7 +2826,7 @@ cmd_set_engine_type_Miata_NA2 = "w\x00\x30\x00\x2F"
field = "Can Read Enabled", canReadEnabled
field = "Can Write Enabled", canWriteEnabled
; field = "Can Nbc Type", canNbcType
field = "Can Sleep Period", canSleepPeriod
field = "Can Sleep Period", canSleepPeriodMs
field = "RX pin", canRxPin
field = "TX pin", canTxPin
@ -3090,7 +3090,7 @@ cmd_set_engine_type_Miata_NA2 = "w\x00\x30\x00\x2F"
field = "iFactor", etb_iFactor, {pedalPositionAdcChannel != 16}
field = "dFactor", etb_dFactor, {pedalPositionAdcChannel != 16}
field = "offset", etb_offset, {pedalPositionAdcChannel != 16}
field = "control period", etb_period, {pedalPositionAdcChannel != 16}
field = "control period", etb_periodMs, {pedalPositionAdcChannel != 16}
field = "pid min", etb_minValue, {pedalPositionAdcChannel != 16}
field = "pid max", etb_maxValue, {pedalPositionAdcChannel != 16}

12
firmware/tunerstudio/rusefi.input
View File

@ -68,7 +68,7 @@ enable2ndByteCanID = false
; CONFIG_DEFINITION_END
idleRpmPid_offset = "Constant base value"
idleRpmPid_period = "PID recalculation period"
idleRpmPid_periodMs = "PID recalculation period"
[Tuning]
@ -1757,7 +1757,7 @@ cmd_set_engine_type_Miata_NA2 = "w\x00\x30\x00\x2F"
field = "Offset", idleRpmPid_offset
field = "Min", idleRpmPid_minValue
field = "Max", idleRpmPid_maxValue
field = "period", idleRpmPid_period
field = "period", idleRpmPid_periodMs
field = "RPM dead zone to deactivate IAC pid", idlePidRpmDeadZone
field = "RPM upper limit to deactivate IAC pid",idlePidRpmUpperLimit
field = "PID Extra for low RPM", pidExtraForLowRpm
@ -1875,7 +1875,7 @@ cmd_set_engine_type_Miata_NA2 = "w\x00\x30\x00\x2F"
field = "PWM Frequency", auxPidFrequency1
field = "verbose", isVerboseAuxPid1
field = "#target based on FSIO map#1"
field = "control period", auxPid1_period, {activateAuxPid1 == 1}
field = "control period", auxPid1_periodMs, {activateAuxPid1 == 1}
field = "#PID control"
field = "offset", auxPid1_offset, {activateAuxPid1 == 1}
field = "P factor", auxPid1_pFactor, {activateAuxPid1 == 1}
@ -1900,7 +1900,7 @@ cmd_set_engine_type_Miata_NA2 = "w\x00\x30\x00\x2F"
field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0}
field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1}
field = "Verbose", isVerboseAlternator, {isAlternatorControlEnabled == 1}
field = "control period", alternatorControl_period, {isAlternatorControlEnabled == 1}
field = "control period", alternatorControl_periodMs, {isAlternatorControlEnabled == 1}
field = "#PID control"
field = "offset", alternatorControl_offset, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0}
field = "P factor", alternatorControl_pFactor, {isAlternatorControlEnabled == 1 && onOffAlternatorLogic == 0}
@ -1966,7 +1966,7 @@ cmd_set_engine_type_Miata_NA2 = "w\x00\x30\x00\x2F"
field = "Can Read Enabled", canReadEnabled
field = "Can Write Enabled", canWriteEnabled
; field = "Can Nbc Type", canNbcType
field = "Can Sleep Period", canSleepPeriod
field = "Can Sleep Period", canSleepPeriodMs
field = "RX pin", canRxPin
field = "TX pin", canTxPin
@ -2230,7 +2230,7 @@ cmd_set_engine_type_Miata_NA2 = "w\x00\x30\x00\x2F"
field = "iFactor", etb_iFactor, {pedalPositionAdcChannel != 16}
field = "dFactor", etb_dFactor, {pedalPositionAdcChannel != 16}
field = "offset", etb_offset, {pedalPositionAdcChannel != 16}
field = "control period", etb_period, {pedalPositionAdcChannel != 16}
field = "control period", etb_periodMs, {pedalPositionAdcChannel != 16}
field = "pid min", etb_minValue, {pedalPositionAdcChannel != 16}
field = "pid max", etb_maxValue, {pedalPositionAdcChannel != 16}

10
firmware/util/pid.cpp
View File

@ -31,7 +31,7 @@ bool Pid::isSame(pid_s *pid) {
&& this->pid->iFactor == pid->iFactor
&& this->pid->dFactor == pid->dFactor
&& this->pid->offset == pid->offset
&& this->pid->period == pid->period;
&& this->pid->periodMs == pid->periodMs;
}
float Pid::getValue(float target, float input) {
@ -126,14 +126,14 @@ void Pid::postState(TunerStudioOutputChannels *tsOutputChannels, int pMult) {
tsOutputChannels->debugIntField1 = getP() * pMult;
tsOutputChannels->debugIntField2 = getOffset();
tsOutputChannels->debugIntField3 = resetCounter;
tsOutputChannels->debugIntField4 = pid->period;
tsOutputChannels->debugIntField4 = pid->periodMs;
}
#endif /* EFI_TUNER_STUDIO */
void Pid::sleep() {
#if !EFI_UNIT_TEST || defined(__DOXYGEN__)
int period = maxI(10, pid->period);
chThdSleepMilliseconds(period);
int periodMs = maxI(10, pid->periodMs);
chThdSleepMilliseconds(periodMs);
#endif /* EFI_UNIT_TEST */
}
@ -144,7 +144,7 @@ void Pid::showPidStatus(Logging *logging, const char*msg) {
pid->pFactor,
pid->iFactor,
pid->dFactor,
pid->period);
pid->periodMs);
scheduleMsg(logging, "%s status: value=%.2f input=%.2f/target=%.2f iTerm=%.5f dTerm=%.5f",
msg,

68
java_console/models/src/com/rusefi/config/Fields.java
View File

@ -1,6 +1,6 @@
package com.rusefi.config;
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jan 26 23:18:47 EST 2019
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Feb 10 20:05:25 EST 2019
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int BLOCKING_FACTOR = 400;
@ -188,7 +188,7 @@ public class Fields {
public static final int fuelLevelSensor_offset = 480;
public static final int vehicleSpeedCoef_offset = 484;
public static final int canNbcType_offset = 488;
public static final int canSleepPeriod_offset = 492;
public static final int canSleepPeriodMs_offset = 492;
public static final int operationMode_offset = 496;
public static final int displayMode_offset = 500;
public static final int logFormat_offset = 504;
@ -364,14 +364,14 @@ public class Fields {
public static final int triggerInputPins3_offset = 904;
public static final int triggerInputPins3_offset_hex = 388;
public static final int mainRelayPin_offset = 908;
public static final int idleThreadPeriod_offset = 912;
public static final int idleThreadPeriod_offset_hex = 390;
public static final int consoleLoopPeriod_offset = 916;
public static final int consoleLoopPeriod_offset_hex = 394;
public static final int lcdThreadPeriod_offset = 920;
public static final int lcdThreadPeriod_offset_hex = 398;
public static final int idleThreadPeriodMs_offset = 912;
public static final int idleThreadPeriodMs_offset_hex = 390;
public static final int consoleLoopPeriodMs_offset = 916;
public static final int consoleLoopPeriodMs_offset_hex = 394;
public static final int lcdThreadPeriodMs_offset = 920;
public static final int lcdThreadPeriodMs_offset_hex = 398;
public static final int sdCardCsPin_offset = 924;
public static final int generalPeriodicThreadPeriod_offset = 928;
public static final int generalPeriodicThreadPeriodMs_offset = 928;
public static final int tunerStudioSerialSpeed_offset = 932;
public static final int boardTestModeJumperPin_offset = 936;
public static final int canDeviceMode_offset = 940;
@ -735,8 +735,8 @@ public class Fields {
public static final int alternatorControl_dFactor_offset = 1820;
public static final int alternatorControl_offset_offset = 1824;
public static final int alternatorControl_offset_offset_hex = 720;
public static final int alternatorControl_period_offset = 1826;
public static final int alternatorControl_period_offset_hex = 722;
public static final int alternatorControl_periodMs_offset = 1826;
public static final int alternatorControl_periodMs_offset_hex = 722;
public static final int alternatorControl_minValue_offset = 1828;
public static final int alternatorControl_minValue_offset_hex = 724;
public static final int alternatorControl_maxValue_offset = 1830;
@ -750,8 +750,8 @@ public class Fields {
public static final int etb_dFactor_offset_hex = 730;
public static final int etb_offset_offset = 1844;
public static final int etb_offset_offset_hex = 734;
public static final int etb_period_offset = 1846;
public static final int etb_period_offset_hex = 736;
public static final int etb_periodMs_offset = 1846;
public static final int etb_periodMs_offset_hex = 736;
public static final int etb_minValue_offset = 1848;
public static final int etb_minValue_offset_hex = 738;
public static final int etb_maxValue_offset = 1850;
@ -763,7 +763,7 @@ public class Fields {
public static final int warmupAfrPid_dFactor_offset_hex = 744;
public static final int warmupAfrPid_offset_offset = 1864;
public static final int warmupAfrPid_offset_offset_hex = 748;
public static final int warmupAfrPid_period_offset = 1866;
public static final int warmupAfrPid_periodMs_offset = 1866;
public static final int warmupAfrPid_minValue_offset = 1868;
public static final int warmupAfrPid_maxValue_offset = 1870;
public static final int mapErrorDetectionTooLow_offset = 1872;
@ -780,7 +780,7 @@ public class Fields {
public static final int idleRpmPid_dFactor_offset_hex = 764;
public static final int idleRpmPid_offset_offset = 1896;
public static final int idleRpmPid_offset_offset_hex = 768;
public static final int idleRpmPid_period_offset = 1898;
public static final int idleRpmPid_periodMs_offset = 1898;
public static final int idleRpmPid_minValue_offset = 1900;
public static final int idleRpmPid_maxValue_offset = 1902;
public static final int wwaeBeta_offset = 1904;
@ -946,7 +946,7 @@ public class Fields {
public static final int fuelClosedLoopPid_iFactor_offset = 2696;
public static final int fuelClosedLoopPid_dFactor_offset = 2700;
public static final int fuelClosedLoopPid_offset_offset = 2704;
public static final int fuelClosedLoopPid_period_offset = 2706;
public static final int fuelClosedLoopPid_periodMs_offset = 2706;
public static final int fuelClosedLoopPid_minValue_offset = 2708;
public static final int fuelClosedLoopPid_maxValue_offset = 2710;
public static final int fuelClosedLoopAfrHighThreshold_offset = 2712;
@ -980,7 +980,7 @@ public class Fields {
public static final int auxPid1_iFactor_offset = 2820;
public static final int auxPid1_dFactor_offset = 2824;
public static final int auxPid1_offset_offset = 2828;
public static final int auxPid1_period_offset = 2830;
public static final int auxPid1_periodMs_offset = 2830;
public static final int auxPid1_minValue_offset = 2832;
public static final int auxPid1_maxValue_offset = 2834;
public static final int auxPid2_offset = 2836;
@ -988,7 +988,7 @@ public class Fields {
public static final int auxPid2_iFactor_offset = 2840;
public static final int auxPid2_dFactor_offset = 2844;
public static final int auxPid2_offset_offset = 2848;
public static final int auxPid2_period_offset = 2850;
public static final int auxPid2_periodMs_offset = 2850;
public static final int auxPid2_minValue_offset = 2852;
public static final int auxPid2_maxValue_offset = 2854;
public static final int auxPid3_offset = 2856;
@ -996,7 +996,7 @@ public class Fields {
public static final int auxPid3_iFactor_offset = 2860;
public static final int auxPid3_dFactor_offset = 2864;
public static final int auxPid3_offset_offset = 2868;
public static final int auxPid3_period_offset = 2870;
public static final int auxPid3_periodMs_offset = 2870;
public static final int auxPid3_minValue_offset = 2872;
public static final int auxPid3_maxValue_offset = 2874;
public static final int auxPid4_offset = 2876;
@ -1004,7 +1004,7 @@ public class Fields {
public static final int auxPid4_iFactor_offset = 2880;
public static final int auxPid4_dFactor_offset = 2884;
public static final int auxPid4_offset_offset = 2888;
public static final int auxPid4_period_offset = 2890;
public static final int auxPid4_periodMs_offset = 2890;
public static final int auxPid4_minValue_offset = 2892;
public static final int auxPid4_maxValue_offset = 2894;
public static final int oilPressure_offset = 2896;
@ -1291,7 +1291,7 @@ public class Fields {
public static final Field FUELLEVELSENSOR = Field.create("FUELLEVELSENSOR", 480, FieldType.INT, adc_channel_e);
public static final Field VEHICLESPEEDCOEF = Field.create("VEHICLESPEEDCOEF", 484, FieldType.FLOAT);
public static final Field CANNBCTYPE = Field.create("CANNBCTYPE", 488, FieldType.INT);
public static final Field CANSLEEPPERIOD = Field.create("CANSLEEPPERIOD", 492, FieldType.INT);
public static final Field CANSLEEPPERIODMS = Field.create("CANSLEEPPERIODMS", 492, FieldType.INT);
public static final Field OPERATIONMODE = Field.create("OPERATIONMODE", 496, FieldType.INT);
public static final Field DISPLAYMODE = Field.create("DISPLAYMODE", 500, FieldType.INT);
public static final Field LOGFORMAT = Field.create("LOGFORMAT", 504, FieldType.INT);
@ -1403,11 +1403,11 @@ public class Fields {
public static final Field TRIGGERINPUTPINS2 = Field.create("TRIGGERINPUTPINS2", 900, FieldType.INT, brain_input_pin_e);
public static final Field TRIGGERINPUTPINS3 = Field.create("TRIGGERINPUTPINS3", 904, FieldType.INT, brain_input_pin_e);
public static final Field MAINRELAYPIN = Field.create("MAINRELAYPIN", 908, FieldType.INT, brain_pin_e);
public static final Field IDLETHREADPERIOD = Field.create("IDLETHREADPERIOD", 912, FieldType.INT);
public static final Field CONSOLELOOPPERIOD = Field.create("CONSOLELOOPPERIOD", 916, FieldType.INT);
public static final Field LCDTHREADPERIOD = Field.create("LCDTHREADPERIOD", 920, FieldType.INT);
public static final Field IDLETHREADPERIODMS = Field.create("IDLETHREADPERIODMS", 912, FieldType.INT);
public static final Field CONSOLELOOPPERIODMS = Field.create("CONSOLELOOPPERIODMS", 916, FieldType.INT);
public static final Field LCDTHREADPERIODMS = Field.create("LCDTHREADPERIODMS", 920, FieldType.INT);
public static final Field SDCARDCSPIN = Field.create("SDCARDCSPIN", 924, FieldType.INT, brain_pin_e);
public static final Field GENERALPERIODICTHREADPERIOD = Field.create("GENERALPERIODICTHREADPERIOD", 928, FieldType.INT);
public static final Field GENERALPERIODICTHREADPERIODMS = Field.create("GENERALPERIODICTHREADPERIODMS", 928, FieldType.INT);
public static final Field TUNERSTUDIOSERIALSPEED = Field.create("TUNERSTUDIOSERIALSPEED", 932, FieldType.INT);
public static final Field BOARDTESTMODEJUMPERPIN = Field.create("BOARDTESTMODEJUMPERPIN", 936, FieldType.INT, brain_pin_e);
public static final Field CANDEVICEMODE = Field.create("CANDEVICEMODE", 940, FieldType.INT);
@ -1684,21 +1684,21 @@ public class Fields {
public static final Field ALTERNATORCONTROL_IFACTOR = Field.create("ALTERNATORCONTROL_IFACTOR", 1816, FieldType.FLOAT);
public static final Field ALTERNATORCONTROL_DFACTOR = Field.create("ALTERNATORCONTROL_DFACTOR", 1820, FieldType.FLOAT);
public static final Field ALTERNATORCONTROL_OFFSET = Field.create("ALTERNATORCONTROL_OFFSET", 1824, FieldType.INT);
public static final Field ALTERNATORCONTROL_PERIOD = Field.create("ALTERNATORCONTROL_PERIOD", 1826, FieldType.INT);
public static final Field ALTERNATORCONTROL_PERIODMS = Field.create("ALTERNATORCONTROL_PERIODMS", 1826, FieldType.INT);
public static final Field ALTERNATORCONTROL_MINVALUE = Field.create("ALTERNATORCONTROL_MINVALUE", 1828, FieldType.INT);
public static final Field ALTERNATORCONTROL_MAXVALUE = Field.create("ALTERNATORCONTROL_MAXVALUE", 1830, FieldType.INT);
public static final Field ETB_PFACTOR = Field.create("ETB_PFACTOR", 1832, FieldType.FLOAT);
public static final Field ETB_IFACTOR = Field.create("ETB_IFACTOR", 1836, FieldType.FLOAT);
public static final Field ETB_DFACTOR = Field.create("ETB_DFACTOR", 1840, FieldType.FLOAT);
public static final Field ETB_OFFSET = Field.create("ETB_OFFSET", 1844, FieldType.INT);
public static final Field ETB_PERIOD = Field.create("ETB_PERIOD", 1846, FieldType.INT);
public static final Field ETB_PERIODMS = Field.create("ETB_PERIODMS", 1846, FieldType.INT);
public static final Field ETB_MINVALUE = Field.create("ETB_MINVALUE", 1848, FieldType.INT);
public static final Field ETB_MAXVALUE = Field.create("ETB_MAXVALUE", 1850, FieldType.INT);
public static final Field WARMUPAFRPID_PFACTOR = Field.create("WARMUPAFRPID_PFACTOR", 1852, FieldType.FLOAT);
public static final Field WARMUPAFRPID_IFACTOR = Field.create("WARMUPAFRPID_IFACTOR", 1856, FieldType.FLOAT);
public static final Field WARMUPAFRPID_DFACTOR = Field.create("WARMUPAFRPID_DFACTOR", 1860, FieldType.FLOAT);
public static final Field WARMUPAFRPID_OFFSET = Field.create("WARMUPAFRPID_OFFSET", 1864, FieldType.INT);
public static final Field WARMUPAFRPID_PERIOD = Field.create("WARMUPAFRPID_PERIOD", 1866, FieldType.INT);
public static final Field WARMUPAFRPID_PERIODMS = Field.create("WARMUPAFRPID_PERIODMS", 1866, FieldType.INT);
public static final Field WARMUPAFRPID_MINVALUE = Field.create("WARMUPAFRPID_MINVALUE", 1868, FieldType.INT);
public static final Field WARMUPAFRPID_MAXVALUE = Field.create("WARMUPAFRPID_MAXVALUE", 1870, FieldType.INT);
public static final Field MAPERRORDETECTIONTOOLOW = Field.create("MAPERRORDETECTIONTOOLOW", 1872, FieldType.FLOAT);
@ -1708,7 +1708,7 @@ public class Fields {
public static final Field IDLERPMPID_IFACTOR = Field.create("IDLERPMPID_IFACTOR", 1888, FieldType.FLOAT);
public static final Field IDLERPMPID_DFACTOR = Field.create("IDLERPMPID_DFACTOR", 1892, FieldType.FLOAT);
public static final Field IDLERPMPID_OFFSET = Field.create("IDLERPMPID_OFFSET", 1896, FieldType.INT);
public static final Field IDLERPMPID_PERIOD = Field.create("IDLERPMPID_PERIOD", 1898, FieldType.INT);
public static final Field IDLERPMPID_PERIODMS = Field.create("IDLERPMPID_PERIODMS", 1898, FieldType.INT);
public static final Field IDLERPMPID_MINVALUE = Field.create("IDLERPMPID_MINVALUE", 1900, FieldType.INT);
public static final Field IDLERPMPID_MAXVALUE = Field.create("IDLERPMPID_MAXVALUE", 1902, FieldType.INT);
public static final Field WWAEBETA = Field.create("WWAEBETA", 1904, FieldType.FLOAT);
@ -1817,7 +1817,7 @@ public class Fields {
public static final Field FUELCLOSEDLOOPPID_IFACTOR = Field.create("FUELCLOSEDLOOPPID_IFACTOR", 2696, FieldType.FLOAT);
public static final Field FUELCLOSEDLOOPPID_DFACTOR = Field.create("FUELCLOSEDLOOPPID_DFACTOR", 2700, FieldType.FLOAT);
public static final Field FUELCLOSEDLOOPPID_OFFSET = Field.create("FUELCLOSEDLOOPPID_OFFSET", 2704, FieldType.INT);
public static final Field FUELCLOSEDLOOPPID_PERIOD = Field.create("FUELCLOSEDLOOPPID_PERIOD", 2706, FieldType.INT);
public static final Field FUELCLOSEDLOOPPID_PERIODMS = Field.create("FUELCLOSEDLOOPPID_PERIODMS", 2706, FieldType.INT);
public static final Field FUELCLOSEDLOOPPID_MINVALUE = Field.create("FUELCLOSEDLOOPPID_MINVALUE", 2708, FieldType.INT);
public static final Field FUELCLOSEDLOOPPID_MAXVALUE = Field.create("FUELCLOSEDLOOPPID_MAXVALUE", 2710, FieldType.INT);
public static final Field FUELCLOSEDLOOPAFRHIGHTHRESHOLD = Field.create("FUELCLOSEDLOOPAFRHIGHTHRESHOLD", 2712, FieldType.FLOAT);
@ -1850,28 +1850,28 @@ public class Fields {
public static final Field AUXPID1_IFACTOR = Field.create("AUXPID1_IFACTOR", 2820, FieldType.FLOAT);
public static final Field AUXPID1_DFACTOR = Field.create("AUXPID1_DFACTOR", 2824, FieldType.FLOAT);
public static final Field AUXPID1_OFFSET = Field.create("AUXPID1_OFFSET", 2828, FieldType.INT);
public static final Field AUXPID1_PERIOD = Field.create("AUXPID1_PERIOD", 2830, FieldType.INT);
public static final Field AUXPID1_PERIODMS = Field.create("AUXPID1_PERIODMS", 2830, FieldType.INT);
public static final Field AUXPID1_MINVALUE = Field.create("AUXPID1_MINVALUE", 2832, FieldType.INT);
public static final Field AUXPID1_MAXVALUE = Field.create("AUXPID1_MAXVALUE", 2834, FieldType.INT);
public static final Field AUXPID2_PFACTOR = Field.create("AUXPID2_PFACTOR", 2836, FieldType.FLOAT);
public static final Field AUXPID2_IFACTOR = Field.create("AUXPID2_IFACTOR", 2840, FieldType.FLOAT);
public static final Field AUXPID2_DFACTOR = Field.create("AUXPID2_DFACTOR", 2844, FieldType.FLOAT);
public static final Field AUXPID2_OFFSET = Field.create("AUXPID2_OFFSET", 2848, FieldType.INT);
public static final Field AUXPID2_PERIOD = Field.create("AUXPID2_PERIOD", 2850, FieldType.INT);
public static final Field AUXPID2_PERIODMS = Field.create("AUXPID2_PERIODMS", 2850, FieldType.INT);
public static final Field AUXPID2_MINVALUE = Field.create("AUXPID2_MINVALUE", 2852, FieldType.INT);
public static final Field AUXPID2_MAXVALUE = Field.create("AUXPID2_MAXVALUE", 2854, FieldType.INT);
public static final Field AUXPID3_PFACTOR = Field.create("AUXPID3_PFACTOR", 2856, FieldType.FLOAT);
public static final Field AUXPID3_IFACTOR = Field.create("AUXPID3_IFACTOR", 2860, FieldType.FLOAT);
public static final Field AUXPID3_DFACTOR = Field.create("AUXPID3_DFACTOR", 2864, FieldType.FLOAT);
public static final Field AUXPID3_OFFSET = Field.create("AUXPID3_OFFSET", 2868, FieldType.INT);
public static final Field AUXPID3_PERIOD = Field.create("AUXPID3_PERIOD", 2870, FieldType.INT);
public static final Field AUXPID3_PERIODMS = Field.create("AUXPID3_PERIODMS", 2870, FieldType.INT);
public static final Field AUXPID3_MINVALUE = Field.create("AUXPID3_MINVALUE", 2872, FieldType.INT);
public static final Field AUXPID3_MAXVALUE = Field.create("AUXPID3_MAXVALUE", 2874, FieldType.INT);
public static final Field AUXPID4_PFACTOR = Field.create("AUXPID4_PFACTOR", 2876, FieldType.FLOAT);
public static final Field AUXPID4_IFACTOR = Field.create("AUXPID4_IFACTOR", 2880, FieldType.FLOAT);
public static final Field AUXPID4_DFACTOR = Field.create("AUXPID4_DFACTOR", 2884, FieldType.FLOAT);
public static final Field AUXPID4_OFFSET = Field.create("AUXPID4_OFFSET", 2888, FieldType.INT);
public static final Field AUXPID4_PERIOD = Field.create("AUXPID4_PERIOD", 2890, FieldType.INT);
public static final Field AUXPID4_PERIODMS = Field.create("AUXPID4_PERIODMS", 2890, FieldType.INT);
public static final Field AUXPID4_MINVALUE = Field.create("AUXPID4_MINVALUE", 2892, FieldType.INT);
public static final Field AUXPID4_MAXVALUE = Field.create("AUXPID4_MAXVALUE", 2894, FieldType.INT);
public static final Field OILPRESSURE_HWCHANNEL = Field.create("OILPRESSURE_HWCHANNEL", 2896, FieldType.INT, adc_channel_e);

4
unit_tests/tests/test_idle_controller.cpp
View File

@ -17,7 +17,7 @@ TEST(idle, pid) {
pidS.offset = 0;
pidS.minValue = 10;
pidS.maxValue = 90;
pidS.period = 1;
pidS.periodMs = 1;
Pid pid(&pidS);
@ -45,7 +45,7 @@ TEST(idle, pid) {
pidS.offset = 0;
pidS.minValue = 0;
pidS.maxValue = 100;
pidS.period = 1;
pidS.periodMs = 1;
pid.reset();