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

auto-sync

This commit is contained in:
rusEfi 2014-11-29 22:03:22 -06:00
parent 0da68c5563
commit b9c2e7a107
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -256,9 +256,9 @@ void setDodgeNeonNGCEngineConfiguration(engine_configuration_s *engineConfigurat
/** /**
* TPS D11/W11 * TPS
*/ */
engineConfiguration->tpsAdcChannel = EFI_ADC_1; engineConfiguration->tpsAdcChannel = EFI_ADC_15;
engineConfiguration->tpsMin = 125; // convert 12to10 bit (ADC/4) engineConfiguration->tpsMin = 125; // convert 12to10 bit (ADC/4)
engineConfiguration->tpsMax = 625; // convert 12to10 bit (ADC/4) engineConfiguration->tpsMax = 625; // convert 12to10 bit (ADC/4)

2
firmware/console/status_loop.cpp
View File

@ -431,7 +431,7 @@ void updateTunerStudioState(Engine *engine, TunerStudioOutputChannels *tsOutputC
tsOutputChannels->air_fuel_ratio = getAfr(); tsOutputChannels->air_fuel_ratio = getAfr();
tsOutputChannels->v_batt = getVBatt(engineConfiguration); tsOutputChannels->v_batt = getVBatt(engineConfiguration);
tsOutputChannels->tsConfigVersion = TS_FILE_VERSION; tsOutputChannels->tsConfigVersion = TS_FILE_VERSION;
tsOutputChannels->tpsADC = getTPS10bitAdc(); tsOutputChannels->tpsADC = getTPS10bitAdc(PASS_ENGINE_PARAMETER_F);
tsOutputChannels->atmospherePressure = getBaroPressure(); tsOutputChannels->atmospherePressure = getBaroPressure();
tsOutputChannels->manifold_air_pressure = getMap(); tsOutputChannels->manifold_air_pressure = getMap();
tsOutputChannels->checkEngine = hasErrorCodes(); tsOutputChannels->checkEngine = hasErrorCodes();

1
firmware/controllers/injector_central.cpp
View File

@ -171,6 +171,7 @@ static void sparkbench2(const char *delayStr, const char *indexStr, const char *
pinbench(delayStr, onTimeStr, offTimeStr, countStr, p, b); pinbench(delayStr, onTimeStr, offTimeStr, countStr, p, b);
} }
// sparkbench 5 400 4
static void sparkbench(const char * onTimeStr, const char *offTimeStr, const char *countStr) { static void sparkbench(const char * onTimeStr, const char *offTimeStr, const char *countStr) {
sparkbench2("0", "1", onTimeStr, offTimeStr, countStr); sparkbench2("0", "1", onTimeStr, offTimeStr, countStr);
} }

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

@ -79,7 +79,7 @@ float getTPSVoltage(DECLARE_ENGINE_PARAMETER_F) {
* 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.
*/ */
int getTPS10bitAdc(void) { int getTPS10bitAdc(DECLARE_ENGINE_PARAMETER_F) {
#if !EFI_PROD_CODE #if !EFI_PROD_CODE
if (mockTps != MOCK_UNDEFINED) if (mockTps != MOCK_UNDEFINED)
return mockTps; return mockTps;
@ -92,7 +92,7 @@ int getTPS10bitAdc(void) {
* @brief Position on physical primary TPS * @brief Position on physical primary TPS
*/ */
static float getPrimatyRawTPS(DECLARE_ENGINE_PARAMETER_F) { static float getPrimatyRawTPS(DECLARE_ENGINE_PARAMETER_F) {
float tpsValue = getTpsValue(getTPS10bitAdc() PASS_ENGINE_PARAMETER); float tpsValue = getTpsValue(getTPS10bitAdc(PASS_ENGINE_PARAMETER_F) PASS_ENGINE_PARAMETER);
return tpsValue; return tpsValue;
} }

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

@ -15,7 +15,7 @@
float getTPS(DECLARE_ENGINE_PARAMETER_F); float getTPS(DECLARE_ENGINE_PARAMETER_F);
int convertVoltageTo10bitADC(float voltage); int convertVoltageTo10bitADC(float voltage);
int getTPS10bitAdc(void); int getTPS10bitAdc(DECLARE_ENGINE_PARAMETER_F);
float getTPSVoltage(DECLARE_ENGINE_PARAMETER_F); float getTPSVoltage(DECLARE_ENGINE_PARAMETER_F);
typedef struct { typedef struct {