Merge remote-tracking branch 'origin/master'
This commit is contained in:
rusefi
commit
a82eff635f
|
|
@ -1,4 +1,4 @@
|
|||
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Thu May 07 00:52:12 EDT 2020
|
||||
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Thu May 07 09:06:40 EDT 2020
|
||||
// by class com.rusefi.output.CHeaderConsumer
|
||||
// begin
|
||||
#ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
|
||||
|
|
@ -1737,6 +1737,7 @@ struct engine_configuration_s {
|
|||
offset 976 bit 9 */
|
||||
bool showHumanReadableWarning : 1;
|
||||
/**
|
||||
* If enabled, adjust at a constant rate instead of a rate proportional to the current lambda error. This mode may be easier to tune, and more tolerant of sensor noise. Use of this mode is required if you have a narrowband O2 sensor.;
|
||||
offset 976 bit 10 */
|
||||
bool stftIgnoreErrorMagnitude : 1;
|
||||
/**
|
||||
|
|
@ -3440,4 +3441,4 @@ typedef struct persistent_config_s persistent_config_s;
|
|||
|
||||
#endif
|
||||
// end
|
||||
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Thu May 07 00:52:12 EDT 2020
|
||||
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Thu May 07 09:06:40 EDT 2020
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu May 07 00:52:01 EDT 2020
|
||||
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu May 07 09:06:18 EDT 2020
|
||||
// by class com.rusefi.output.CHeaderConsumer
|
||||
// begin
|
||||
#ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
|
||||
|
|
@ -1737,6 +1737,7 @@ struct engine_configuration_s {
|
|||
offset 976 bit 9 */
|
||||
bool showHumanReadableWarning : 1;
|
||||
/**
|
||||
* If enabled, adjust at a constant rate instead of a rate proportional to the current lambda error. This mode may be easier to tune, and more tolerant of sensor noise. Use of this mode is required if you have a narrowband O2 sensor.;
|
||||
offset 976 bit 10 */
|
||||
bool stftIgnoreErrorMagnitude : 1;
|
||||
/**
|
||||
|
|
@ -3440,4 +3441,4 @@ typedef struct persistent_config_s persistent_config_s;
|
|||
|
||||
#endif
|
||||
// end
|
||||
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu May 07 00:52:01 EDT 2020
|
||||
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu May 07 09:06:18 EDT 2020
|
||||
|
|
|
|||
|
|
@ -0,0 +1,105 @@
|
|||
#include "closed_loop_fuel.h"
|
||||
#include "closed_loop_fuel_cell.h"
|
||||
|
||||
#include "engine.h"
|
||||
|
||||
#include "sensor.h"
|
||||
#include "engine_math.h"
|
||||
#include "deadband.h"
|
||||
|
||||
EXTERN_ENGINE;
|
||||
|
||||
ClosedLoopFuelCellImpl cells[STFT_CELL_COUNT];
|
||||
|
||||
static Deadband<25> idleDeadband;
|
||||
static Deadband<2> overrunDeadband;
|
||||
static Deadband<2> loadDeadband;
|
||||
|
||||
size_t computeStftBin(int rpm, float load, stft_s& cfg) {
|
||||
// Low RPM -> idle
|
||||
if (idleDeadband.lt(rpm, cfg.maxIdleRegionRpm * RPM_1_BYTE_PACKING_MULT))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Low load -> overrun
|
||||
if (overrunDeadband.lt(load, cfg.maxOverrunLoad))
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
// High load -> power
|
||||
if (loadDeadband.gt(load, cfg.minPowerLoad))
|
||||
{
|
||||
return 2;
|
||||
}
|
||||
|
||||
// Default -> normal "in the middle" cell
|
||||
return 3;
|
||||
}
|
||||
|
||||
static bool shouldCorrect(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
|
||||
const auto& cfg = CONFIG(stft);
|
||||
|
||||
// User disable bit
|
||||
if (!CONFIG(fuelClosedLoopCorrectionEnabled)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Don't correct if not running
|
||||
if (!ENGINE(rpmCalculator).isRunning(PASS_ENGINE_PARAMETER_SIGNATURE)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Startup delay - allow O2 sensor to warm up, etc
|
||||
if (cfg.startupDelay > ENGINE(engineState.running.timeSinceCrankingInSecs)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Check that the engine is hot enough (and clt not failed)
|
||||
auto clt = Sensor::get(SensorType::Clt);
|
||||
if (!clt.Valid || clt.Value < cfg.minClt) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// If all was well, then we're enabled!
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool shouldUpdateCorrection(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
|
||||
const auto& cfg = CONFIG(stft);
|
||||
|
||||
// Pause (but don't reset) correction if the AFR is off scale.
|
||||
// It's probably a transient and poorly tuned transient correction
|
||||
float afr = ENGINE(sensors.currentAfr);
|
||||
if (afr < (cfg.minAfr * 0.1f) || afr > (cfg.maxAfr * 0.1f)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
float fuelClosedLoopCorrection(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
|
||||
if (!shouldCorrect(PASS_ENGINE_PARAMETER_SIGNATURE)) {
|
||||
return 1.0f;
|
||||
}
|
||||
|
||||
size_t binIdx = computeStftBin(GET_RPM(), getEngineLoadT(PASS_ENGINE_PARAMETER_SIGNATURE), CONFIG(stft));
|
||||
|
||||
#if EFI_TUNER_STUDIO
|
||||
if (engineConfiguration->debugMode == DBG_FUEL_PID_CORRECTION) {
|
||||
tsOutputChannels.debugIntField1 = binIdx;
|
||||
}
|
||||
#endif // EFI_TUNER_STUDIO
|
||||
|
||||
auto& cell = cells[binIdx];
|
||||
|
||||
// todo: push configuration at startup
|
||||
cell.configure(&CONFIG(stft.cellCfgs[binIdx]));
|
||||
|
||||
if (shouldUpdateCorrection(PASS_ENGINE_PARAMETER_SIGNATURE)) {
|
||||
cell.update(CONFIG(stft.deadband) * 0.001f, CONFIG(stftIgnoreErrorMagnitude) PASS_ENGINE_PARAMETER_SUFFIX);
|
||||
}
|
||||
|
||||
return cell.getAdjustment();
|
||||
}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
#pragma once
|
||||
|
||||
#include "globalaccess.h"
|
||||
#include "engine_configuration_generated_structures.h"
|
||||
|
||||
float fuelClosedLoopCorrection(DECLARE_ENGINE_PARAMETER_SIGNATURE);
|
||||
size_t computeStftBin(int rpm, float load, stft_s& cfg);
|
||||
|
|
@ -4,5 +4,6 @@ CONTROLLERS_MATH_SRC =
|
|||
CONTROLLERS_MATH_SRC_CPP = $(PROJECT_DIR)/controllers/math/engine_math.cpp \
|
||||
$(PROJECT_DIR)/controllers/math/pid_auto_tune.cpp \
|
||||
$(PROJECT_DIR)/controllers/math/speed_density.cpp \
|
||||
$(PROJECT_DIR)/controllers/math/closed_loop_fuel.cpp \
|
||||
$(PROJECT_DIR)/controllers/math/closed_loop_fuel_cell.cpp \
|
||||
|
||||
|
|
|
|||
|
|
@ -227,8 +227,9 @@ int gpiochips_init(void)
|
|||
* return -1 if driver does not implemet setPadMode ops
|
||||
* else return value from gpiochip driver.
|
||||
*/
|
||||
|
||||
int gpiochips_setPadMode(brain_pin_e pin, int mode)
|
||||
/* this fuction uses iomode_t that is related to STM32 (or other MCU)
|
||||
* output modes. Use some common enums? */
|
||||
int gpiochips_setPadMode(brain_pin_e pin, iomode_t mode)
|
||||
{
|
||||
struct gpiochip *chip = gpiochip_find(pin);
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ extern "C"
|
|||
|
||||
struct gpiochip_ops {
|
||||
/* pin argument is pin number within gpio chip, not a global number */
|
||||
int (*setPadMode)(void *data, unsigned int pin, int mode);
|
||||
int (*setPadMode)(void *data, unsigned int pin, iomode_t mode);
|
||||
int (*writePad)(void *data, unsigned int pin, int value);
|
||||
int (*readPad)(void *data, unsigned int pin);
|
||||
brain_pin_diag_e (*getDiag)(void *data, unsigned int pin);
|
||||
|
|
@ -49,7 +49,7 @@ int gpiochips_setPinNames(brain_pin_e pin, const char **names);
|
|||
/* gpio extenders subsystem init */
|
||||
int gpiochips_init(void);
|
||||
|
||||
int gpiochips_setPadMode(brain_pin_e pin, int mode);
|
||||
int gpiochips_setPadMode(brain_pin_e pin, iomode_t mode);
|
||||
int gpiochips_writePad(brain_pin_e pin, int value);
|
||||
int gpiochips_readPad(brain_pin_e pin);
|
||||
brain_pin_diag_e gpiochips_getDiag(brain_pin_e pin);
|
||||
|
|
|
|||
|
|
@ -96,22 +96,31 @@ typedef enum {
|
|||
#define FWDStat1 0x38
|
||||
|
||||
/* Status registers */
|
||||
#define CMD_OPSTAT0 CMD_R(0x34)
|
||||
#define CMD_OPSTAT1 CMD_R(0x35)
|
||||
#define CMD_OPSTAT(n) CMD_R(0x34 + ((n) & 0x01))
|
||||
#define CMD_WWDSTAT CMD_R(WWDStat)
|
||||
#define CMD_FWDSTAT0 CMD_R(FWDStat0)
|
||||
#define CMD_FWDSTAT1 CMD_R(FWDStat1)
|
||||
#define CMD_TECSTAT CMD_R(0x39)
|
||||
#define CMD_WdDiag CMD_R(0x2e)
|
||||
|
||||
/* Diagnostic */
|
||||
#define CMD_DIAG(n) CMD_R(0x20 + ((n) & 0x01))
|
||||
#define CMD_VRSDIAG(n) CMD_R(0x22 + ((n) & 0x01))
|
||||
#define CMD_COMDIAG CMD_R(0x24)
|
||||
#define CMD_OUTDIAG(n) CMD_R(0x25 + ((n) & 0x07))
|
||||
#define CMD_PPOVDIAG CMD_R(0x2a)
|
||||
#define CMD_BRIDIAG(n) CMD_R(0x2b + ((n) & 0x01))
|
||||
#define CMD_IGNDIAG CMD_R(0x2d)
|
||||
#define CMD_WDDIAG CMD_R(0x2e)
|
||||
|
||||
#define CMD_OUTCONFIG(n, d) CMD_WR(0x40 + (n), d)
|
||||
#define CMD_BRICONFIG(n, d) CMD_WR(0x46 + ((n) & 0x01), d)
|
||||
//#define CMD_VRSCONFIG0(d) CMD_WR(0x49, d)
|
||||
#define CMD_VRSCONFIG1(d) CMD_WR(0x4a, d)
|
||||
#define CMD_INCONFIG(n, d) CMD_WR(0x53 + (n & 0x03), d)
|
||||
#define CMD_DDCONFIG(n, d) CMD_WR(0x57 + (n & 0x03), d)
|
||||
#define CMD_OECONFIG(n, d) CMD_WR(0x5b + (n & 0x03), d)
|
||||
#define CMD_CONT(n, d) CMD_WR(0x7b + (n & 0x03), d)
|
||||
#define CMD_INCONFIG(n, d) CMD_WR(0x53 + ((n) & 0x03), d)
|
||||
#define CMD_DDCONFIG(n, d) CMD_WR(0x57 + ((n) & 0x03), d)
|
||||
#define CMD_OECONFIG(n, d) CMD_WR(0x5b + ((n) & 0x03), d)
|
||||
#define CMD_CONT(n, d) CMD_WR(0x7b + ((n) & 0x03), d)
|
||||
|
||||
const uint8_t watchDogResponses[16][4] = {
|
||||
/* Reverse order:
|
||||
|
|
@ -133,6 +142,7 @@ const uint8_t watchDogResponses[16][4] = {
|
|||
{0x4E, 0xBE, 0x41, 0xB1},
|
||||
{0x01, 0xF1, 0x0E, 0xFE}
|
||||
};
|
||||
|
||||
/*==========================================================================*/
|
||||
/* Driver exported variables. */
|
||||
/*==========================================================================*/
|
||||
|
|
@ -199,11 +209,22 @@ struct tle8888_priv {
|
|||
uint32_t o_direct_mask;
|
||||
/* output enabled mask */
|
||||
uint32_t o_oe_mask;
|
||||
/* push-pull enabled mask (for OUT21..OUT24 only) */
|
||||
/* this is overhead to store 4 bits in uint32_t
|
||||
* but I don't want any magic shift math */
|
||||
uint32_t o_pp_mask;
|
||||
|
||||
tle8888_drv_state drv_state;
|
||||
|
||||
/* diagnostic registers */
|
||||
uint8_t OutDiag[5];
|
||||
uint8_t BriDiag[2];
|
||||
uint8_t IgnDiag;
|
||||
/* status registers */
|
||||
uint16_t OpStat[2];
|
||||
uint8_t OpStat[2];
|
||||
|
||||
/* last diagnostick was read */
|
||||
systime_t ts_diag;
|
||||
};
|
||||
|
||||
static struct tle8888_priv chips[BOARD_TLE8888_COUNT];
|
||||
|
|
@ -300,12 +321,39 @@ static int tle8888_spi_rw(struct tle8888_priv *chip, uint16_t tx, uint16_t *rx)
|
|||
|
||||
static int tle8888_update_output(struct tle8888_priv *chip)
|
||||
{
|
||||
int i;
|
||||
int ret = 0;
|
||||
uint8_t briconfig0 = 0;
|
||||
|
||||
/* TODO: lock? */
|
||||
|
||||
uint32_t out_data = chip->o_state;
|
||||
|
||||
/* calculate briconfig0 */
|
||||
uint32_t out_low = out_data & chip->o_pp_mask;
|
||||
for (i = 20; i < 24; i++) {
|
||||
if (out_low & BIT(i)) {
|
||||
/* low-side switch mode */
|
||||
} else {
|
||||
/* else enable high-side switch mode */
|
||||
briconfig0 |= BIT((i - 20) * 2);
|
||||
}
|
||||
}
|
||||
/* TODO: set freewheeling bits in briconfig0? */
|
||||
|
||||
/* output for push-pull pins is allways enabled
|
||||
* (at least until we start supporting hi-Z state) */
|
||||
out_data |= chip->o_pp_mask;
|
||||
/* TODO: apply hi-Z mask when support will be added */
|
||||
|
||||
/* set value only for non-direct driven pins */
|
||||
uint32_t out_data = chip->o_state & (~chip->o_direct_mask);
|
||||
/* look like here is some conflict in case of
|
||||
* direct-driven PP output */
|
||||
out_data &= (~chip->o_direct_mask);
|
||||
|
||||
/* bridge config */
|
||||
ret = tle8888_spi_rw(chip, CMD_BRICONFIG(0, briconfig0), NULL);
|
||||
|
||||
for (int i = 0; i < 4; i++) {
|
||||
uint8_t od;
|
||||
|
||||
|
|
@ -324,10 +372,10 @@ static int tle8888_update_output(struct tle8888_priv *chip)
|
|||
}
|
||||
|
||||
/**
|
||||
* @brief read TLE8888 OpStat1 registers data.
|
||||
* @details Sends read command, then send same command and read reply
|
||||
* @brief read TLE8888 OpStat1 and diagnostic registers data.
|
||||
* @details Chained read of several registers
|
||||
*/
|
||||
static int tle8888_update_status(struct tle8888_priv *chip)
|
||||
static int tle8888_update_status_and_diag(struct tle8888_priv *chip)
|
||||
{
|
||||
int ret = 0;
|
||||
uint16_t rx = 0;
|
||||
|
|
@ -338,19 +386,62 @@ static int tle8888_update_status(struct tle8888_priv *chip)
|
|||
/* the address and content of the selected register is transmitted with the
|
||||
* next SPI transmission (for not existing addresses or wrong access mode
|
||||
* the data is always '0' */
|
||||
/* this is quite expensive to call tle8888_spi_rw on each register read
|
||||
* TODO: implement tle8888_spi_rw_array ? */
|
||||
|
||||
ret = tle8888_spi_rw(chip, CMD_OPSTAT1, NULL);
|
||||
|
||||
if (ret)
|
||||
/* request OutDiad0, ignore received */
|
||||
if ((ret = tle8888_spi_rw(chip, CMD_OUTDIAG(0), NULL)))
|
||||
return ret;
|
||||
|
||||
ret = tle8888_spi_rw(chip, CMD_OPSTAT1, &rx);
|
||||
|
||||
if (ret)
|
||||
/* request OutDiad1, receive OutDiag0 */
|
||||
if ((ret = tle8888_spi_rw(chip, CMD_OUTDIAG(1), &rx)))
|
||||
return ret;
|
||||
chip->OutDiag[0] = getDataFromResponse(rx);
|
||||
|
||||
// available in debugFloatField3
|
||||
chip->OpStat[1] = rx;
|
||||
/* request OutDiad2, receive OutDiag1 */
|
||||
if ((ret = tle8888_spi_rw(chip, CMD_OUTDIAG(2), &rx)))
|
||||
return ret;
|
||||
chip->OutDiag[1] = getDataFromResponse(rx);
|
||||
|
||||
/* request OutDiad3, receive OutDiag2 */
|
||||
if ((ret = tle8888_spi_rw(chip, CMD_OUTDIAG(3), &rx)))
|
||||
return ret;
|
||||
chip->OutDiag[2] = getDataFromResponse(rx);
|
||||
|
||||
/* request OutDiad4, receive OutDiag3 */
|
||||
if ((ret = tle8888_spi_rw(chip, CMD_OUTDIAG(4), &rx)))
|
||||
return ret;
|
||||
chip->OutDiag[3] = getDataFromResponse(rx);
|
||||
|
||||
/* request BriDiag0, receive OutDiag4 */
|
||||
if ((ret = tle8888_spi_rw(chip, CMD_BRIDIAG(0), &rx)))
|
||||
return ret;
|
||||
chip->OutDiag[4] = getDataFromResponse(rx);
|
||||
|
||||
/* request BriDiag1, receive BriDiag0 */
|
||||
if ((ret = tle8888_spi_rw(chip, CMD_BRIDIAG(1), &rx)))
|
||||
return ret;
|
||||
chip->BriDiag[0] = getDataFromResponse(rx);
|
||||
|
||||
/* request IgnDiag, receive BriDiag1 */
|
||||
if ((ret = tle8888_spi_rw(chip, CMD_IGNDIAG, &rx)))
|
||||
return ret;
|
||||
chip->BriDiag[1] = getDataFromResponse(rx);
|
||||
|
||||
/* request OpStat0, receive IgnDiag */
|
||||
if ((ret = tle8888_spi_rw(chip, CMD_OPSTAT(0), &rx)))
|
||||
return ret;
|
||||
chip->IgnDiag = getDataFromResponse(rx);
|
||||
|
||||
/* request OpStat1, receive OpStat0 */
|
||||
if ((ret = tle8888_spi_rw(chip, CMD_OPSTAT(1), &rx)))
|
||||
return ret;
|
||||
chip->OpStat[0] = getDataFromResponse(rx);
|
||||
|
||||
/* request OpStat1, receive OpStat1 */
|
||||
if ((ret = tle8888_spi_rw(chip, CMD_OPSTAT(1), &rx)))
|
||||
return ret;
|
||||
chip->OpStat[1] = getDataFromResponse(rx);
|
||||
|
||||
/* TODO: unlock? */
|
||||
|
||||
|
|
@ -452,6 +543,9 @@ int startupConfiguration(struct tle8888_priv *chip) {
|
|||
|
||||
chip->o_direct_mask = 0;
|
||||
chip->o_oe_mask = 0;
|
||||
/* HACK HERE if you want to enable PP for OUT21..OUT24
|
||||
* without approprirate call to setPinMode */
|
||||
chip->o_pp_mask = 0; /* = BIT(20) | BIT(21) | BIT(22) | BIT(23); */
|
||||
/* enable direct drive of OUTPUT4..1
|
||||
* ...still need INJEN signal */
|
||||
chip->o_direct_mask |= 0x0000000f;
|
||||
|
|
@ -533,7 +627,7 @@ void watchdogLogic(struct tle8888_priv *chip) {
|
|||
tle8888_spi_rw(chip, CMD_FWDSTAT1, &maybeFirstResponse);
|
||||
// here we get response of the 'FWDStat1' above
|
||||
tle8888_spi_rw(chip, CMD_WdDiag, &functionWDrx);
|
||||
handleFWDStat1(chip, getRegisterFromResponse(functionWDrx), (functionWDrx >> 8) & 0xff);
|
||||
handleFWDStat1(chip, getRegisterFromResponse(functionWDrx), getDataFromResponse(functionWDrx));
|
||||
lastFunctionWatchdogTimeNt = nowNt;
|
||||
}
|
||||
|
||||
|
|
@ -603,9 +697,14 @@ static THD_FUNCTION(tle8888_driver_thread, p) {
|
|||
/* set state to TLE8888_FAILED? */
|
||||
}
|
||||
|
||||
ret = tle8888_update_status(chip);
|
||||
if (ret) {
|
||||
/* set state to TLE8888_FAILED or force reinit? */
|
||||
if (chVTTimeElapsedSinceX(chip->ts_diag) >= TIME_MS2I(TLE8888_POLL_INTERVAL_MS)) {
|
||||
/* this is expensive call, will do a lot of spi transfers... */
|
||||
ret = tle8888_update_status_and_diag(chip);
|
||||
if (ret) {
|
||||
/* set state to TLE8888_FAILED or force reinit? */
|
||||
}
|
||||
|
||||
chip->ts_diag = chVTGetSystemTimeX();
|
||||
}
|
||||
|
||||
/* if bit OE is cleared - reset happened */
|
||||
|
|
@ -630,6 +729,32 @@ void requestTLE8888initialization(void) {
|
|||
/* Driver exported functions. */
|
||||
/*==========================================================================*/
|
||||
|
||||
static int tle8888_setPadMode(void *data, unsigned int pin, iomode_t mode) {
|
||||
|
||||
if ((pin >= TLE8888_OUTPUTS) || (data == NULL))
|
||||
return -1;
|
||||
|
||||
/* do not enalbe PP mode yet */
|
||||
#if 0
|
||||
struct tle8888_priv *chip = (struct tle8888_priv *)data;
|
||||
|
||||
/* only OUT21..OUT24 support mode change: PP vs OD */
|
||||
if ((pin < 20) || (pin > 23))
|
||||
return 0;
|
||||
|
||||
/* this is absolutly confusing... we pass STM32 specific
|
||||
* values to tle8888 driver... But this is how gpios
|
||||
* currently implemented */
|
||||
if ((mode & PAL_STM32_OTYPE_MASK) == PAL_STM32_OTYPE_OPENDRAIN) {
|
||||
chip->o_pp_mask &= ~BIT(pin);
|
||||
} else {
|
||||
chip->o_pp_mask |= BIT(pin);
|
||||
}
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int tle8888_writePad(void *data, unsigned int pin, int value) {
|
||||
|
||||
if ((pin >= TLE8888_OUTPUTS) || (data == NULL))
|
||||
|
|
@ -653,6 +778,74 @@ static int tle8888_writePad(void *data, unsigned int pin, int value) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
static brain_pin_diag_e tle8888_2b_to_diag_no_temp(unsigned int bits)
|
||||
{
|
||||
if (bits == 0x01)
|
||||
return PIN_SHORT_TO_BAT;
|
||||
if (bits == 0x02)
|
||||
return PIN_OPEN;
|
||||
if (bits == 0x03)
|
||||
return PIN_SHORT_TO_GND;
|
||||
return PIN_OK;
|
||||
}
|
||||
|
||||
static brain_pin_diag_e tle8888_2b_to_diag_with_temp(unsigned int bits)
|
||||
{
|
||||
brain_pin_diag_e diag = tle8888_2b_to_diag_no_temp(bits);
|
||||
|
||||
if (diag == PIN_SHORT_TO_BAT)
|
||||
diag |= PIN_DRIVER_OVERTEMP;
|
||||
|
||||
return diag;
|
||||
}
|
||||
|
||||
static brain_pin_diag_e tle8888_getDiag(void *data, unsigned int pin)
|
||||
{
|
||||
if ((pin >= TLE8888_OUTPUTS) || (data == NULL))
|
||||
return PIN_INVALID;
|
||||
|
||||
struct tle8888_priv *chip = (struct tle8888_priv *)data;
|
||||
|
||||
if (pin < 4)
|
||||
return tle8888_2b_to_diag_with_temp((chip->OutDiag[0] >> ((pin - 0) * 2)) & 0x03);
|
||||
if (pin < 8) {
|
||||
if (pin == 7)
|
||||
return tle8888_2b_to_diag_no_temp((chip->OutDiag[1] >> ((pin - 4) * 2)) & 0x03);
|
||||
else
|
||||
return tle8888_2b_to_diag_with_temp((chip->OutDiag[1] >> ((pin - 4) * 2)) & 0x03);
|
||||
}
|
||||
if (pin < 12)
|
||||
return tle8888_2b_to_diag_with_temp((chip->OutDiag[2] >> ((pin - 8) * 2)) & 0x03);
|
||||
if (pin < 16) {
|
||||
if (pin == 12)
|
||||
return tle8888_2b_to_diag_no_temp((chip->OutDiag[3] >> ((pin - 12) * 2)) & 0x03);
|
||||
else
|
||||
return tle8888_2b_to_diag_with_temp((chip->OutDiag[3] >> ((pin - 12) * 2)) & 0x03);
|
||||
}
|
||||
if (pin < 20)
|
||||
return tle8888_2b_to_diag_with_temp((chip->OutDiag[4] >> ((pin - 16) * 2)) & 0x03);
|
||||
if (pin < 24) {
|
||||
/* half bridges */
|
||||
brain_pin_diag_e diag;
|
||||
|
||||
diag = tle8888_2b_to_diag_no_temp((chip->BriDiag[0] >> ((pin - 20) * 2)) & 0x03);
|
||||
if (((pin == 22) || (pin == 23)) &&
|
||||
(chip->BriDiag[1] & BIT(5)))
|
||||
diag |= PIN_DRIVER_OVERTEMP;
|
||||
if (((pin == 20) || (pin == 21)) &&
|
||||
(chip->BriDiag[1] & BIT(4)))
|
||||
diag |= PIN_DRIVER_OVERTEMP;
|
||||
if (chip->BriDiag[1] & BIT(pin - 20))
|
||||
diag |= PIN_OVERLOAD; /* overcurrent */
|
||||
|
||||
return diag;
|
||||
}
|
||||
if (pin < 28)
|
||||
return tle8888_2b_to_diag_with_temp((chip->IgnDiag >> ((pin - 24) * 2)) & 0x03);
|
||||
|
||||
return PIN_OK;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return 0 for valid configuration, -1 for invalid configuration
|
||||
*/
|
||||
|
|
@ -689,10 +882,10 @@ int tle8888SpiStartupExchange(struct tle8888_priv *chip) {
|
|||
|
||||
startupConfiguration(chip);
|
||||
|
||||
|
||||
if (CONFIG(verboseTLE8888)) {
|
||||
tle8888_dump_regs();
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -772,9 +965,10 @@ static int tle8888_deinit(void *data)
|
|||
}
|
||||
|
||||
struct gpiochip_ops tle8888_ops = {
|
||||
.setPadMode = tle8888_setPadMode,
|
||||
.writePad = tle8888_writePad,
|
||||
.readPad = NULL, /* chip outputs only */
|
||||
//.getDiag = tle8888_getDiag,
|
||||
.getDiag = tle8888_getDiag,
|
||||
.init = tle8888_init,
|
||||
.deinit = tle8888_deinit,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -817,7 +817,7 @@ custom maf_sensor_type_e 4 bits, S32, @OFFSET@, [0:7], @@maf_sensor_type_e_enum@
|
|||
bit enableCanVss
|
||||
bit enableInnovateLC2
|
||||
bit showHumanReadableWarning
|
||||
bit stftIgnoreErrorMagnitude
|
||||
bit stftIgnoreErrorMagnitude;+If enabled, adjust at a constant rate instead of a rate proportional to the current lambda error. This mode may be easier to tune, and more tolerant of sensor noise. Use of this mode is required if you have a narrowband O2 sensor.;
|
||||
bit unusedBit_251_11
|
||||
bit unusedBit_251_12
|
||||
bit unusedBit_251_13
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed May 06 22:04:17 EDT 2020
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu May 07 09:06:18 EDT 2020
|
||||
|
||||
pageSize = 20000
|
||||
page = 1
|
||||
|
|
@ -98,7 +98,7 @@ page = 1
|
|||
injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2
|
||||
injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0.0, 20.0, 2
|
||||
injector_battLagCorr = array, F32, 44, [8], "ms", 1, 0, 0.0, 50.0, 2
|
||||
unused76b0 = bits, U32, 76, [0:0], "false", "true"
|
||||
isForcedInduction = bits, U32, 76, [0:0], "false", "true"
|
||||
activateAuxPid1 = bits, U32, 76, [1:1], "false", "true"
|
||||
isVerboseAuxPid1 = bits, U32, 76, [2:2], "false", "true"
|
||||
activateAuxPid2 = bits, U32, 76, [3:3], "false", "true"
|
||||
|
|
@ -359,7 +359,7 @@ page = 1
|
|||
;no TS info - skipping lcdThreadPeriodMs offset 720
|
||||
;no TS info - skipping generalPeriodicThreadPeriodMs offset 724
|
||||
tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0,1000000, 0
|
||||
;no TS info - skipping anUnused4Bytes offset 732
|
||||
compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300.0, 1
|
||||
triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
|
||||
triggerSimulatorPins2 = bits, U08, 737, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
|
||||
triggerSimulatorPins3 = bits, U08, 738, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
|
||||
|
|
@ -1218,6 +1218,7 @@ page = 1
|
|||
triggerSimulatorFrequency = "Same RPM is used for two ways of producing simulated RPM. See also triggerSimulatorPins (with wires)\nSee also directSelfStimulation (no wires, bypassing input hardware)\nrpm X"
|
||||
malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot."
|
||||
tachOutputPin = "This implementation produces one pulse per engine cycle. See also dizzySparkOutputPin."
|
||||
compressionRatio = "Just for reference really, not taken into account by any logic at this point"
|
||||
useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed."
|
||||
vvtCamSensorUseRise = "Use rise or fall signal front"
|
||||
measureMapOnlyInOneCylinder = "Useful for individual intakes"
|
||||
|
|
@ -1230,6 +1231,7 @@ page = 1
|
|||
triggerErrorPin = "This pin is used for debugging - snap a logic analyzer on it and see if it's ever high"
|
||||
cdmInputPin = "Saab Combustion Detection Module knock signal input pin\nalso known as Saab Ion Sensing Module"
|
||||
sensorChartMode = "rusEfi console Sensor Sniffer mode"
|
||||
stftIgnoreErrorMagnitude = "If enabled, adjust at a constant rate instead of a rate proportional to the current lambda error. This mode may be easier to tune, and more tolerant of sensor noise. Use of this mode is required if you have a narrowband O2 sensor.;"
|
||||
launchSpeedTreshold = "Disabled above this speed"
|
||||
launchRpmTreshold = "Disabled below this rpm"
|
||||
launchTimingRpmRange = "Range from Launch Rpm for Timing Retard to activate"
|
||||
|
|
@ -2881,11 +2883,17 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
|
|||
|
||||
dialog = baseEngineConfig, "Engine Configuration"
|
||||
; field = "Engine Preset", engineType
|
||||
; this field is useful for rusEFI online catalog
|
||||
field = "Engine Make", engineMake
|
||||
; this field is useful for rusEFI online catalog
|
||||
field = "Engine Code", engineCode
|
||||
field = "Number of Cylinders", cylindersCount
|
||||
field = "Engine Displacement", displacement
|
||||
field = "Firing Order", firingOrder
|
||||
; this field is useful for rusEFI online catalog
|
||||
field = "Compression Ratio", compressionRatio
|
||||
; this field is useful for rusEFI online catalog
|
||||
field = "Forced Induction?", isForcedInduction
|
||||
|
||||
; Engine->Trigger configuration
|
||||
dialog = triggerConfiguration_settings, "Trigger Pattern"
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed May 06 22:04:23 EDT 2020
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu May 07 09:06:26 EDT 2020
|
||||
|
||||
pageSize = 20000
|
||||
page = 1
|
||||
|
|
@ -98,7 +98,7 @@ page = 1
|
|||
injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2
|
||||
injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0.0, 20.0, 2
|
||||
injector_battLagCorr = array, F32, 44, [8], "ms", 1, 0, 0.0, 50.0, 2
|
||||
unused76b0 = bits, U32, 76, [0:0], "false", "true"
|
||||
isForcedInduction = bits, U32, 76, [0:0], "false", "true"
|
||||
activateAuxPid1 = bits, U32, 76, [1:1], "false", "true"
|
||||
isVerboseAuxPid1 = bits, U32, 76, [2:2], "false", "true"
|
||||
activateAuxPid2 = bits, U32, 76, [3:3], "false", "true"
|
||||
|
|
@ -359,7 +359,7 @@ page = 1
|
|||
;no TS info - skipping lcdThreadPeriodMs offset 720
|
||||
;no TS info - skipping generalPeriodicThreadPeriodMs offset 724
|
||||
tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0,1000000, 0
|
||||
;no TS info - skipping anUnused4Bytes offset 732
|
||||
compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300.0, 1
|
||||
triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
|
||||
triggerSimulatorPins2 = bits, U08, 737, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
|
||||
triggerSimulatorPins3 = bits, U08, 738, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
|
||||
|
|
@ -1218,6 +1218,7 @@ page = 1
|
|||
triggerSimulatorFrequency = "Same RPM is used for two ways of producing simulated RPM. See also triggerSimulatorPins (with wires)\nSee also directSelfStimulation (no wires, bypassing input hardware)\nrpm X"
|
||||
malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot."
|
||||
tachOutputPin = "This implementation produces one pulse per engine cycle. See also dizzySparkOutputPin."
|
||||
compressionRatio = "Just for reference really, not taken into account by any logic at this point"
|
||||
useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed."
|
||||
vvtCamSensorUseRise = "Use rise or fall signal front"
|
||||
measureMapOnlyInOneCylinder = "Useful for individual intakes"
|
||||
|
|
@ -1230,6 +1231,7 @@ page = 1
|
|||
triggerErrorPin = "This pin is used for debugging - snap a logic analyzer on it and see if it's ever high"
|
||||
cdmInputPin = "Saab Combustion Detection Module knock signal input pin\nalso known as Saab Ion Sensing Module"
|
||||
sensorChartMode = "rusEfi console Sensor Sniffer mode"
|
||||
stftIgnoreErrorMagnitude = "If enabled, adjust at a constant rate instead of a rate proportional to the current lambda error. This mode may be easier to tune, and more tolerant of sensor noise. Use of this mode is required if you have a narrowband O2 sensor.;"
|
||||
launchSpeedTreshold = "Disabled above this speed"
|
||||
launchRpmTreshold = "Disabled below this rpm"
|
||||
launchTimingRpmRange = "Range from Launch Rpm for Timing Retard to activate"
|
||||
|
|
@ -2881,11 +2883,17 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
|
|||
|
||||
dialog = baseEngineConfig, "Engine Configuration"
|
||||
; field = "Engine Preset", engineType
|
||||
; this field is useful for rusEFI online catalog
|
||||
field = "Engine Make", engineMake
|
||||
; this field is useful for rusEFI online catalog
|
||||
field = "Engine Code", engineCode
|
||||
field = "Number of Cylinders", cylindersCount
|
||||
field = "Engine Displacement", displacement
|
||||
field = "Firing Order", firingOrder
|
||||
; this field is useful for rusEFI online catalog
|
||||
field = "Compression Ratio", compressionRatio
|
||||
; this field is useful for rusEFI online catalog
|
||||
field = "Forced Induction?", isForcedInduction
|
||||
|
||||
; Engine->Trigger configuration
|
||||
dialog = triggerConfiguration_settings, "Trigger Pattern"
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Wed May 06 22:04:30 EDT 2020
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Thu May 07 09:06:40 EDT 2020
|
||||
|
||||
pageSize = 20000
|
||||
page = 1
|
||||
|
|
@ -98,7 +98,7 @@ page = 1
|
|||
injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2
|
||||
injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0.0, 20.0, 2
|
||||
injector_battLagCorr = array, F32, 44, [8], "ms", 1, 0, 0.0, 50.0, 2
|
||||
unused76b0 = bits, U32, 76, [0:0], "false", "true"
|
||||
isForcedInduction = bits, U32, 76, [0:0], "false", "true"
|
||||
activateAuxPid1 = bits, U32, 76, [1:1], "false", "true"
|
||||
isVerboseAuxPid1 = bits, U32, 76, [2:2], "false", "true"
|
||||
activateAuxPid2 = bits, U32, 76, [3:3], "false", "true"
|
||||
|
|
@ -359,7 +359,7 @@ page = 1
|
|||
;no TS info - skipping lcdThreadPeriodMs offset 720
|
||||
;no TS info - skipping generalPeriodicThreadPeriodMs offset 724
|
||||
tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0,1000000, 0
|
||||
;no TS info - skipping anUnused4Bytes offset 732
|
||||
compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300.0, 1
|
||||
triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16"
|
||||
triggerSimulatorPins2 = bits, U08, 737, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16"
|
||||
triggerSimulatorPins3 = bits, U08, 738, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16"
|
||||
|
|
@ -1218,6 +1218,7 @@ page = 1
|
|||
triggerSimulatorFrequency = "Same RPM is used for two ways of producing simulated RPM. See also triggerSimulatorPins (with wires)\nSee also directSelfStimulation (no wires, bypassing input hardware)\nrpm X"
|
||||
malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot."
|
||||
tachOutputPin = "This implementation produces one pulse per engine cycle. See also dizzySparkOutputPin."
|
||||
compressionRatio = "Just for reference really, not taken into account by any logic at this point"
|
||||
useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed."
|
||||
vvtCamSensorUseRise = "Use rise or fall signal front"
|
||||
measureMapOnlyInOneCylinder = "Useful for individual intakes"
|
||||
|
|
@ -1230,6 +1231,7 @@ page = 1
|
|||
triggerErrorPin = "This pin is used for debugging - snap a logic analyzer on it and see if it's ever high"
|
||||
cdmInputPin = "Saab Combustion Detection Module knock signal input pin\nalso known as Saab Ion Sensing Module"
|
||||
sensorChartMode = "rusEfi console Sensor Sniffer mode"
|
||||
stftIgnoreErrorMagnitude = "If enabled, adjust at a constant rate instead of a rate proportional to the current lambda error. This mode may be easier to tune, and more tolerant of sensor noise. Use of this mode is required if you have a narrowband O2 sensor.;"
|
||||
launchSpeedTreshold = "Disabled above this speed"
|
||||
launchRpmTreshold = "Disabled below this rpm"
|
||||
launchTimingRpmRange = "Range from Launch Rpm for Timing Retard to activate"
|
||||
|
|
@ -2881,11 +2883,17 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
|
|||
|
||||
dialog = baseEngineConfig, "Engine Configuration"
|
||||
; field = "Engine Preset", engineType
|
||||
; this field is useful for rusEFI online catalog
|
||||
field = "Engine Make", engineMake
|
||||
; this field is useful for rusEFI online catalog
|
||||
field = "Engine Code", engineCode
|
||||
field = "Number of Cylinders", cylindersCount
|
||||
field = "Engine Displacement", displacement
|
||||
field = "Firing Order", firingOrder
|
||||
; this field is useful for rusEFI online catalog
|
||||
field = "Compression Ratio", compressionRatio
|
||||
; this field is useful for rusEFI online catalog
|
||||
field = "Forced Induction?", isForcedInduction
|
||||
|
||||
; Engine->Trigger configuration
|
||||
dialog = triggerConfiguration_settings, "Trigger Pattern"
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed May 06 22:04:20 EDT 2020
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu May 07 09:06:25 EDT 2020
|
||||
|
||||
pageSize = 20000
|
||||
page = 1
|
||||
|
|
@ -98,7 +98,7 @@ page = 1
|
|||
injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2
|
||||
injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0.0, 20.0, 2
|
||||
injector_battLagCorr = array, F32, 44, [8], "ms", 1, 0, 0.0, 50.0, 2
|
||||
unused76b0 = bits, U32, 76, [0:0], "false", "true"
|
||||
isForcedInduction = bits, U32, 76, [0:0], "false", "true"
|
||||
activateAuxPid1 = bits, U32, 76, [1:1], "false", "true"
|
||||
isVerboseAuxPid1 = bits, U32, 76, [2:2], "false", "true"
|
||||
activateAuxPid2 = bits, U32, 76, [3:3], "false", "true"
|
||||
|
|
@ -359,7 +359,7 @@ page = 1
|
|||
;no TS info - skipping lcdThreadPeriodMs offset 720
|
||||
;no TS info - skipping generalPeriodicThreadPeriodMs offset 724
|
||||
tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0,1000000, 0
|
||||
;no TS info - skipping anUnused4Bytes offset 732
|
||||
compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300.0, 1
|
||||
triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
|
||||
triggerSimulatorPins2 = bits, U08, 737, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
|
||||
triggerSimulatorPins3 = bits, U08, 738, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
|
||||
|
|
@ -1218,6 +1218,7 @@ page = 1
|
|||
triggerSimulatorFrequency = "Same RPM is used for two ways of producing simulated RPM. See also triggerSimulatorPins (with wires)\nSee also directSelfStimulation (no wires, bypassing input hardware)\nrpm X"
|
||||
malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot."
|
||||
tachOutputPin = "This implementation produces one pulse per engine cycle. See also dizzySparkOutputPin."
|
||||
compressionRatio = "Just for reference really, not taken into account by any logic at this point"
|
||||
useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed."
|
||||
vvtCamSensorUseRise = "Use rise or fall signal front"
|
||||
measureMapOnlyInOneCylinder = "Useful for individual intakes"
|
||||
|
|
@ -1230,6 +1231,7 @@ page = 1
|
|||
triggerErrorPin = "This pin is used for debugging - snap a logic analyzer on it and see if it's ever high"
|
||||
cdmInputPin = "Saab Combustion Detection Module knock signal input pin\nalso known as Saab Ion Sensing Module"
|
||||
sensorChartMode = "rusEfi console Sensor Sniffer mode"
|
||||
stftIgnoreErrorMagnitude = "If enabled, adjust at a constant rate instead of a rate proportional to the current lambda error. This mode may be easier to tune, and more tolerant of sensor noise. Use of this mode is required if you have a narrowband O2 sensor.;"
|
||||
launchSpeedTreshold = "Disabled above this speed"
|
||||
launchRpmTreshold = "Disabled below this rpm"
|
||||
launchTimingRpmRange = "Range from Launch Rpm for Timing Retard to activate"
|
||||
|
|
@ -2872,11 +2874,17 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
|
|||
|
||||
dialog = baseEngineConfig, "Engine Configuration"
|
||||
; field = "Engine Preset", engineType
|
||||
; this field is useful for rusEFI online catalog
|
||||
field = "Engine Make", engineMake
|
||||
; this field is useful for rusEFI online catalog
|
||||
field = "Engine Code", engineCode
|
||||
field = "Number of Cylinders", cylindersCount
|
||||
field = "Engine Displacement", displacement
|
||||
field = "Firing Order", firingOrder
|
||||
; this field is useful for rusEFI online catalog
|
||||
field = "Compression Ratio", compressionRatio
|
||||
; this field is useful for rusEFI online catalog
|
||||
field = "Forced Induction?", isForcedInduction
|
||||
|
||||
; Engine->Trigger configuration
|
||||
dialog = triggerConfiguration_settings, "Trigger Pattern"
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed May 06 22:04:25 EDT 2020
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu May 07 09:06:29 EDT 2020
|
||||
|
||||
pageSize = 20000
|
||||
page = 1
|
||||
|
|
@ -98,7 +98,7 @@ page = 1
|
|||
injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2
|
||||
injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0.0, 20.0, 2
|
||||
injector_battLagCorr = array, F32, 44, [8], "ms", 1, 0, 0.0, 50.0, 2
|
||||
unused76b0 = bits, U32, 76, [0:0], "false", "true"
|
||||
isForcedInduction = bits, U32, 76, [0:0], "false", "true"
|
||||
activateAuxPid1 = bits, U32, 76, [1:1], "false", "true"
|
||||
isVerboseAuxPid1 = bits, U32, 76, [2:2], "false", "true"
|
||||
activateAuxPid2 = bits, U32, 76, [3:3], "false", "true"
|
||||
|
|
@ -359,7 +359,7 @@ page = 1
|
|||
;no TS info - skipping lcdThreadPeriodMs offset 720
|
||||
;no TS info - skipping generalPeriodicThreadPeriodMs offset 724
|
||||
tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0,1000000, 0
|
||||
;no TS info - skipping anUnused4Bytes offset 732
|
||||
compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300.0, 1
|
||||
triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
|
||||
triggerSimulatorPins2 = bits, U08, 737, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
|
||||
triggerSimulatorPins3 = bits, U08, 738, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
|
||||
|
|
@ -1218,6 +1218,7 @@ page = 1
|
|||
triggerSimulatorFrequency = "Same RPM is used for two ways of producing simulated RPM. See also triggerSimulatorPins (with wires)\nSee also directSelfStimulation (no wires, bypassing input hardware)\nrpm X"
|
||||
malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot."
|
||||
tachOutputPin = "This implementation produces one pulse per engine cycle. See also dizzySparkOutputPin."
|
||||
compressionRatio = "Just for reference really, not taken into account by any logic at this point"
|
||||
useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed."
|
||||
vvtCamSensorUseRise = "Use rise or fall signal front"
|
||||
measureMapOnlyInOneCylinder = "Useful for individual intakes"
|
||||
|
|
@ -1230,6 +1231,7 @@ page = 1
|
|||
triggerErrorPin = "This pin is used for debugging - snap a logic analyzer on it and see if it's ever high"
|
||||
cdmInputPin = "Saab Combustion Detection Module knock signal input pin\nalso known as Saab Ion Sensing Module"
|
||||
sensorChartMode = "rusEfi console Sensor Sniffer mode"
|
||||
stftIgnoreErrorMagnitude = "If enabled, adjust at a constant rate instead of a rate proportional to the current lambda error. This mode may be easier to tune, and more tolerant of sensor noise. Use of this mode is required if you have a narrowband O2 sensor.;"
|
||||
launchSpeedTreshold = "Disabled above this speed"
|
||||
launchRpmTreshold = "Disabled below this rpm"
|
||||
launchTimingRpmRange = "Range from Launch Rpm for Timing Retard to activate"
|
||||
|
|
@ -2877,11 +2879,17 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
|
|||
|
||||
dialog = baseEngineConfig, "Engine Configuration"
|
||||
; field = "Engine Preset", engineType
|
||||
; this field is useful for rusEFI online catalog
|
||||
field = "Engine Make", engineMake
|
||||
; this field is useful for rusEFI online catalog
|
||||
field = "Engine Code", engineCode
|
||||
field = "Number of Cylinders", cylindersCount
|
||||
field = "Engine Displacement", displacement
|
||||
field = "Firing Order", firingOrder
|
||||
; this field is useful for rusEFI online catalog
|
||||
field = "Compression Ratio", compressionRatio
|
||||
; this field is useful for rusEFI online catalog
|
||||
field = "Forced Induction?", isForcedInduction
|
||||
|
||||
; Engine->Trigger configuration
|
||||
dialog = triggerConfiguration_settings, "Trigger Pattern"
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed May 06 22:04:28 EDT 2020
|
||||
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu May 07 09:06:33 EDT 2020
|
||||
|
||||
pageSize = 20000
|
||||
page = 1
|
||||
|
|
@ -98,7 +98,7 @@ page = 1
|
|||
injector_flow = scalar, F32, 8, "cm3/min", 1, 0, 0, 99999, 2
|
||||
injector_battLagCorrBins = array, F32, 12, [8], "volts", 1, 0, 0.0, 20.0, 2
|
||||
injector_battLagCorr = array, F32, 44, [8], "ms", 1, 0, 0.0, 50.0, 2
|
||||
unused76b0 = bits, U32, 76, [0:0], "false", "true"
|
||||
isForcedInduction = bits, U32, 76, [0:0], "false", "true"
|
||||
activateAuxPid1 = bits, U32, 76, [1:1], "false", "true"
|
||||
isVerboseAuxPid1 = bits, U32, 76, [2:2], "false", "true"
|
||||
activateAuxPid2 = bits, U32, 76, [3:3], "false", "true"
|
||||
|
|
@ -359,7 +359,7 @@ page = 1
|
|||
;no TS info - skipping lcdThreadPeriodMs offset 720
|
||||
;no TS info - skipping generalPeriodicThreadPeriodMs offset 724
|
||||
tunerStudioSerialSpeed = scalar, U32, 728, "BPs", 1, 0, 0,1000000, 0
|
||||
;no TS info - skipping anUnused4Bytes offset 732
|
||||
compressionRatio = scalar, F32, 732, "CR", 1, 0, 0, 300.0, 1
|
||||
triggerSimulatorPins1 = bits, U08, 736, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
|
||||
triggerSimulatorPins2 = bits, U08, 737, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
|
||||
triggerSimulatorPins3 = bits, U08, 738, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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"
|
||||
|
|
@ -1218,6 +1218,7 @@ page = 1
|
|||
triggerSimulatorFrequency = "Same RPM is used for two ways of producing simulated RPM. See also triggerSimulatorPins (with wires)\nSee also directSelfStimulation (no wires, bypassing input hardware)\nrpm X"
|
||||
malfunctionIndicatorPin = "Check engine light, also malfunction indicator light. Always blinks once on boot."
|
||||
tachOutputPin = "This implementation produces one pulse per engine cycle. See also dizzySparkOutputPin."
|
||||
compressionRatio = "Just for reference really, not taken into account by any logic at this point"
|
||||
useStepperIdle = "This setting should only be used if you have a stepper motor idle valve and a stepper motor driver installed."
|
||||
vvtCamSensorUseRise = "Use rise or fall signal front"
|
||||
measureMapOnlyInOneCylinder = "Useful for individual intakes"
|
||||
|
|
@ -1230,6 +1231,7 @@ page = 1
|
|||
triggerErrorPin = "This pin is used for debugging - snap a logic analyzer on it and see if it's ever high"
|
||||
cdmInputPin = "Saab Combustion Detection Module knock signal input pin\nalso known as Saab Ion Sensing Module"
|
||||
sensorChartMode = "rusEfi console Sensor Sniffer mode"
|
||||
stftIgnoreErrorMagnitude = "If enabled, adjust at a constant rate instead of a rate proportional to the current lambda error. This mode may be easier to tune, and more tolerant of sensor noise. Use of this mode is required if you have a narrowband O2 sensor.;"
|
||||
launchSpeedTreshold = "Disabled above this speed"
|
||||
launchRpmTreshold = "Disabled below this rpm"
|
||||
launchTimingRpmRange = "Range from Launch Rpm for Timing Retard to activate"
|
||||
|
|
@ -2872,11 +2874,17 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
|
|||
|
||||
dialog = baseEngineConfig, "Engine Configuration"
|
||||
; field = "Engine Preset", engineType
|
||||
; this field is useful for rusEFI online catalog
|
||||
field = "Engine Make", engineMake
|
||||
; this field is useful for rusEFI online catalog
|
||||
field = "Engine Code", engineCode
|
||||
field = "Number of Cylinders", cylindersCount
|
||||
field = "Engine Displacement", displacement
|
||||
field = "Firing Order", firingOrder
|
||||
; this field is useful for rusEFI online catalog
|
||||
field = "Compression Ratio", compressionRatio
|
||||
; this field is useful for rusEFI online catalog
|
||||
field = "Forced Induction?", isForcedInduction
|
||||
|
||||
; Engine->Trigger configuration
|
||||
dialog = triggerConfiguration_settings, "Trigger Pattern"
|
||||
|
|
|
|||
|
|
@ -24,6 +24,11 @@ public:
|
|||
return m_lastState;
|
||||
}
|
||||
|
||||
// Deadband has no concept of equal - only greater and less, so to compute gt, we just swap args
|
||||
bool lt(float lhs, float rhs) {
|
||||
return gt(rhs, lhs);
|
||||
}
|
||||
|
||||
private:
|
||||
bool m_lastState =false;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.rusefi.config.generated;
|
||||
|
||||
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed May 06 22:04:17 EDT 2020
|
||||
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu May 07 01:13:04 EDT 2020
|
||||
|
||||
// by class com.rusefi.output.FileJavaFieldsConsumer
|
||||
import com.rusefi.config.*;
|
||||
|
|
@ -73,7 +73,6 @@ public class Fields {
|
|||
public static final int antiLagEnabled_offset = 76;
|
||||
public static final int antiLagRpmTreshold_offset = 824;
|
||||
public static final int antiLagRpmTreshold_offset_hex = 338;
|
||||
public static final int anUnused4Bytes_offset = 732;
|
||||
public static final int autoTuneCltThreshold_offset = 2420;
|
||||
public static final int autoTuneCltThreshold_offset_hex = 974;
|
||||
public static final int autoTuneTpsQuietPeriod_offset = 2428;
|
||||
|
|
@ -294,6 +293,7 @@ public class Fields {
|
|||
public static final int COMPOSITE_DATA_LENGTH = 2500;
|
||||
public static final int COMPOSITE_PACKET_COUNT = 500;
|
||||
public static final int COMPOSITE_PACKET_SIZE = 5;
|
||||
public static final int compressionRatio_offset = 732;
|
||||
public static final String CONSOLE_DATA_PROTOCOL_TAG = " @";
|
||||
public static final int consoleLoopPeriodMs_offset = 716;
|
||||
public static final int consoleUartDevice_offset = 943;
|
||||
|
|
@ -1004,6 +1004,7 @@ public class Fields {
|
|||
public static final int isEngineControlEnabled_offset = 744;
|
||||
public static final int isFastAdcEnabled_offset = 744;
|
||||
public static final int isFasterEngineSpinUpEnabled_offset = 744;
|
||||
public static final int isForcedInduction_offset = 76;
|
||||
public static final int isHip9011Enabled_offset = 744;
|
||||
public static final int isIgnitionEnabled_offset = 1476;
|
||||
public static final int isInjectionEnabled_offset = 1476;
|
||||
|
|
@ -1531,7 +1532,6 @@ public class Fields {
|
|||
public static final int unused2432_offset_hex = 980;
|
||||
public static final int unused6312_offset = 6312;
|
||||
public static final int unused711_offset = 711;
|
||||
public static final int unused76b0_offset = 76;
|
||||
public static final int unused806_offset = 806;
|
||||
public static final int unused806_offset_hex = 326;
|
||||
public static final int unused_1484_bit_24_offset = 1476;
|
||||
|
|
@ -1654,7 +1654,7 @@ public class Fields {
|
|||
public static final Field ENGINETYPE = Field.create("ENGINETYPE", 0, FieldType.INT);
|
||||
public static final Field ENGINESNIFFERRPMTHRESHOLD = Field.create("ENGINESNIFFERRPMTHRESHOLD", 4, FieldType.INT);
|
||||
public static final Field INJECTOR_FLOW = Field.create("INJECTOR_FLOW", 8, FieldType.FLOAT);
|
||||
public static final Field UNUSED76B0 = Field.create("UNUSED76B0", 76, FieldType.BIT, 0);
|
||||
public static final Field ISFORCEDINDUCTION = Field.create("ISFORCEDINDUCTION", 76, FieldType.BIT, 0);
|
||||
public static final Field ACTIVATEAUXPID1 = Field.create("ACTIVATEAUXPID1", 76, FieldType.BIT, 1);
|
||||
public static final Field ISVERBOSEAUXPID1 = Field.create("ISVERBOSEAUXPID1", 76, FieldType.BIT, 2);
|
||||
public static final Field ACTIVATEAUXPID2 = Field.create("ACTIVATEAUXPID2", 76, FieldType.BIT, 3);
|
||||
|
|
@ -1912,7 +1912,7 @@ public class Fields {
|
|||
public static final Field LCDTHREADPERIODMS = Field.create("LCDTHREADPERIODMS", 720, FieldType.INT);
|
||||
public static final Field GENERALPERIODICTHREADPERIODMS = Field.create("GENERALPERIODICTHREADPERIODMS", 724, FieldType.INT);
|
||||
public static final Field TUNERSTUDIOSERIALSPEED = Field.create("TUNERSTUDIOSERIALSPEED", 728, FieldType.INT);
|
||||
public static final Field ANUNUSED4BYTES = Field.create("ANUNUSED4BYTES", 732, FieldType.INT);
|
||||
public static final Field COMPRESSIONRATIO = Field.create("COMPRESSIONRATIO", 732, FieldType.FLOAT);
|
||||
public static final Field TRIGGERSIMULATORPINS1 = Field.create("TRIGGERSIMULATORPINS1", 736, FieldType.INT8, brain_pin_e);
|
||||
public static final Field TRIGGERSIMULATORPINS2 = Field.create("TRIGGERSIMULATORPINS2", 737, FieldType.INT8, brain_pin_e);
|
||||
public static final Field TRIGGERSIMULATORPINS3 = Field.create("TRIGGERSIMULATORPINS3", 738, FieldType.INT8, brain_pin_e);
|
||||
|
|
@ -2637,7 +2637,7 @@ public class Fields {
|
|||
ENGINETYPE,
|
||||
ENGINESNIFFERRPMTHRESHOLD,
|
||||
INJECTOR_FLOW,
|
||||
UNUSED76B0,
|
||||
ISFORCEDINDUCTION,
|
||||
ACTIVATEAUXPID1,
|
||||
ISVERBOSEAUXPID1,
|
||||
ACTIVATEAUXPID2,
|
||||
|
|
@ -2886,7 +2886,7 @@ public class Fields {
|
|||
LCDTHREADPERIODMS,
|
||||
GENERALPERIODICTHREADPERIODMS,
|
||||
TUNERSTUDIOSERIALSPEED,
|
||||
ANUNUSED4BYTES,
|
||||
COMPRESSIONRATIO,
|
||||
TRIGGERSIMULATORPINS1,
|
||||
TRIGGERSIMULATORPINS2,
|
||||
TRIGGERSIMULATORPINS3,
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
|
||||
#include "closed_loop_fuel_cell.h"
|
||||
#include "closed_loop_fuel.h"
|
||||
|
||||
#include "engine.h"
|
||||
|
||||
|
|
@ -34,7 +35,6 @@ TEST(ClosedLoopCell, TestDeadband) {
|
|||
TEST(ClosedLoopFuelCell, AdjustRate) {
|
||||
StrictMock<MockClCell> cl;
|
||||
|
||||
// Error is more than deadtime, so nothing else should be called
|
||||
EXPECT_CALL(cl, getLambdaError(_, _, _))
|
||||
.WillOnce(Return(0.1f));
|
||||
EXPECT_CALL(cl, getMinAdjustment())
|
||||
|
|
@ -50,3 +50,32 @@ TEST(ClosedLoopFuelCell, AdjustRate) {
|
|||
// dt = 1000.0f / FAST_CALLBACK_PERIOD_MS
|
||||
EXPECT_FLOAT_EQ(cl.getAdjustment(), 1 + (0.2f / (1000.0f / FAST_CALLBACK_PERIOD_MS)));
|
||||
}
|
||||
|
||||
TEST(ClosedLoopFuel, CellSelection) {
|
||||
stft_s cfg;
|
||||
|
||||
// Sensible region config
|
||||
cfg.maxIdleRegionRpm = 1500 / RPM_1_BYTE_PACKING_MULT;
|
||||
cfg.minPowerLoad = 80;
|
||||
cfg.maxOverrunLoad = 30;
|
||||
|
||||
// Test idle
|
||||
EXPECT_EQ(0, computeStftBin(1000, 10, cfg));
|
||||
EXPECT_EQ(0, computeStftBin(1000, 50, cfg));
|
||||
EXPECT_EQ(0, computeStftBin(1000, 90, cfg));
|
||||
|
||||
// Test overrun
|
||||
EXPECT_EQ(1, computeStftBin(2000, 10, cfg));
|
||||
EXPECT_EQ(1, computeStftBin(4000, 10, cfg));
|
||||
EXPECT_EQ(1, computeStftBin(10000, 10, cfg));
|
||||
|
||||
// Test load
|
||||
EXPECT_EQ(2, computeStftBin(2000, 90, cfg));
|
||||
EXPECT_EQ(2, computeStftBin(4000, 90, cfg));
|
||||
EXPECT_EQ(2, computeStftBin(10000, 90, cfg));
|
||||
|
||||
// Main cell
|
||||
EXPECT_EQ(3, computeStftBin(2000, 50, cfg));
|
||||
EXPECT_EQ(3, computeStftBin(4000, 50, cfg));
|
||||
EXPECT_EQ(3, computeStftBin(10000, 50, cfg));
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue