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

dual-ETB progress

This commit is contained in:
rusEfi 2019-12-10 00:07:46 -05:00
parent 62481d7fe8
commit 1cc71ef8ec
4 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/engine_controller.cpp
View File

@ -819,6 +819,6 @@ int getRusEfiVersion(void) {
if (initBootloader() != 0) if (initBootloader() != 0)
return 123; return 123;
#endif /* EFI_BOOTLOADER_INCLUDE_CODE */ #endif /* EFI_BOOTLOADER_INCLUDE_CODE */
return 20191206; return 20191209;
} }
#endif /* EFI_UNIT_TEST */ #endif /* EFI_UNIT_TEST */

23
firmware/controllers/sensors/tps.cpp
View File

@ -1,5 +1,5 @@
/** /**
* @author Andrey Belomutskiy, (c) 2012-2018 * @author Andrey Belomutskiy, (c) 2012-2019
*/ */
#include "engine.h" #include "engine.h"
#include "tps.h" #include "tps.h"
@ -78,7 +78,7 @@ float getTpsRateOfChange(void) {
* Return current TPS position based on configured ADC levels, and adc * Return current TPS position based on configured ADC levels, and adc
* *
* */ * */
percent_t getTpsValue(int adc DECLARE_ENGINE_PARAMETER_SUFFIX) { percent_t getTpsValue(int index, int adc DECLARE_ENGINE_PARAMETER_SUFFIX) {
DISPLAY_STATE(Engine) DISPLAY_STATE(Engine)
DISPLAY_TAG(TPS_SECTION); DISPLAY_TAG(TPS_SECTION);
@ -109,9 +109,16 @@ percent_t getTpsValue(int adc DECLARE_ENGINE_PARAMETER_SUFFIX) {
DISPLAY_TEXT(Current_ADC) DISPLAY_TEXT(Current_ADC)
DISPLAY(DISPLAY_FIELD(currentTpsAdc)) DISPLAY(DISPLAY_FIELD(currentTpsAdc))
DISPLAY_TEXT(interpolate_between) DISPLAY_TEXT(interpolate_between)
float result = interpolateMsg("TPS", TPS_TS_CONVERSION * CONFIG(DISPLAY_CONFIG(tpsMax)), 100,
DISPLAY(DISPLAY_CONFIG(tpsMax))
DISPLAY_TEXT(and) DISPLAY_TEXT(and)
TPS_TS_CONVERSION * CONFIG(DISPLAY_CONFIG(tpsMin)), 0, adc); DISPLAY(DISPLAY_CONFIG(tpsMin))
int tpsMax = index == 0 ? CONFIG(tpsMax) : CONFIG(tps2Max);
int tpsMin = index == 0 ? CONFIG(tpsMin) : CONFIG(tps2Min);
float result = interpolateMsg("TPS", TPS_TS_CONVERSION * tpsMax, 100,
TPS_TS_CONVERSION * tpsMin, 0, adc);
if (result < engineConfiguration->tpsErrorDetectionTooLow) { if (result < engineConfiguration->tpsErrorDetectionTooLow) {
#if EFI_PROD_CODE #if EFI_PROD_CODE
// too much noise with simulator // too much noise with simulator
@ -140,6 +147,7 @@ float getTPSVoltage(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
* Return TPS ADC readings. * Return TPS ADC readings.
* We need ADC value because TunerStudio has a nice TPS configuration wizard, and this wizard * We need ADC value because TunerStudio has a nice TPS configuration wizard, and this wizard
* wants a TPS value. * wants a TPS value.
* @param index [0, ETB_COUNT)
*/ */
int getTPS12bitAdc(int index DECLARE_ENGINE_PARAMETER_SUFFIX) { int getTPS12bitAdc(int index DECLARE_ENGINE_PARAMETER_SUFFIX) {
#if !EFI_PROD_CODE #if !EFI_PROD_CODE
@ -197,8 +205,9 @@ void grabPedalIsWideOpen() {
/** /**
* @brief Position on physical primary TPS * @brief Position on physical primary TPS
*/ */
static percent_t getPrimatyRawTPS(int index DECLARE_ENGINE_PARAMETER_SUFFIX) { static percent_t getPrimaryRawTPS(int index DECLARE_ENGINE_PARAMETER_SUFFIX) {
percent_t tpsValue = getTpsValue(getTPS12bitAdc(index PASS_ENGINE_PARAMETER_SUFFIX) PASS_ENGINE_PARAMETER_SUFFIX); int adcValue = getTPS12bitAdc(index PASS_ENGINE_PARAMETER_SUFFIX);
percent_t tpsValue = getTpsValue(index, adcValue PASS_ENGINE_PARAMETER_SUFFIX);
return tpsValue; return tpsValue;
} }
@ -238,7 +247,7 @@ percent_t getTPSWithIndex(int index DECLARE_ENGINE_PARAMETER_SUFFIX) {
// todo: blah blah // todo: blah blah
// todo: if two TPS do not match - show OBD code via malfunction_central.c // todo: if two TPS do not match - show OBD code via malfunction_central.c
return getPrimatyRawTPS(index PASS_ENGINE_PARAMETER_SUFFIX); return getPrimaryRawTPS(index PASS_ENGINE_PARAMETER_SUFFIX);
} }
percent_t getTPS(DECLARE_ENGINE_PARAMETER_SIGNATURE) { percent_t getTPS(DECLARE_ENGINE_PARAMETER_SIGNATURE) {

2
firmware/controllers/sensors/tps.h
View File

@ -30,7 +30,7 @@ int convertVoltageTo10bitADC(float voltage);
int getTPS12bitAdc(int index DECLARE_ENGINE_PARAMETER_SUFFIX); int getTPS12bitAdc(int index DECLARE_ENGINE_PARAMETER_SUFFIX);
#define getTPS10bitAdc() (getTPS12bitAdc(0 PASS_ENGINE_PARAMETER_SUFFIX) / TPS_TS_CONVERSION) #define getTPS10bitAdc() (getTPS12bitAdc(0 PASS_ENGINE_PARAMETER_SUFFIX) / TPS_TS_CONVERSION)
float getTPSVoltage(DECLARE_ENGINE_PARAMETER_SIGNATURE); float getTPSVoltage(DECLARE_ENGINE_PARAMETER_SIGNATURE);
percent_t getTpsValue(int adc DECLARE_ENGINE_PARAMETER_SUFFIX); percent_t getTpsValue(int index, int adc DECLARE_ENGINE_PARAMETER_SUFFIX);
void setBosch0280750009(DECLARE_ENGINE_PARAMETER_SIGNATURE); void setBosch0280750009(DECLARE_ENGINE_PARAMETER_SIGNATURE);
void setMockTpsAdc(percent_t tpsPosition DECLARE_ENGINE_PARAMETER_SUFFIX); void setMockTpsAdc(percent_t tpsPosition DECLARE_ENGINE_PARAMETER_SUFFIX);
void setMockTpsValue(percent_t tpsPosition DECLARE_ENGINE_PARAMETER_SUFFIX); void setMockTpsValue(percent_t tpsPosition DECLARE_ENGINE_PARAMETER_SUFFIX);

4
unit_tests/tests/test_sensors.cpp
View File

@ -34,12 +34,12 @@ TEST(sensors, tps) {
engineConfiguration->tpsMax = 193; engineConfiguration->tpsMax = 193;
engineConfiguration->tpsMin = 43; engineConfiguration->tpsMin = 43;
ASSERT_NEAR(49.3333, getTpsValue(4 * 117 PASS_ENGINE_PARAMETER_SUFFIX), EPS4D); ASSERT_NEAR(49.3333, getTpsValue(0, 4 * 117 PASS_ENGINE_PARAMETER_SUFFIX), EPS4D);
engineConfiguration->tpsMax = 43; engineConfiguration->tpsMax = 43;
engineConfiguration->tpsMin = 193; engineConfiguration->tpsMin = 193;
assertEqualsM("test#2", 50.6667, getTpsValue(4 * 117 PASS_ENGINE_PARAMETER_SUFFIX)); assertEqualsM("test#2", 50.6667, getTpsValue(0, 4 * 117 PASS_ENGINE_PARAMETER_SUFFIX));
} }
TEST(sensors, testTpsRateOfChange) { TEST(sensors, testTpsRateOfChange) {