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

auto-sync

This commit is contained in:
rusEfi 2014-10-31 13:05:18 -05:00
parent b695d36d28
commit ae7820f863
7 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,6 +51,8 @@ void setDodgeNeon1995EngineConfiguration(engine_configuration_s *engineConfigura
engineConfiguration->algorithm = LM_ALPHA_N;
engineConfiguration->hasIatSensor = false;
// set_rpm_hard_limit 4000
engineConfiguration->rpmHardLimit = 4000; // yes, 4k. let's play it safe for now
// set_cranking_rpm 550

2
firmware/controllers/algo/ec2.h
View File

@ -44,6 +44,8 @@ class engine_configuration2_s {
public:
engine_configuration2_s();
engine_configuration_s *engineConfiguration;
Thermistor iat;
Thermistor clt;

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

@ -240,8 +240,10 @@ void setDefaultConfiguration(engine_configuration_s *engineConfiguration, board_
engineConfiguration->diffLoadEnrichmentCoef = 1;
engineConfiguration->hasMapSensor = TRUE;
engineConfiguration->hasCltSensor = TRUE;
engineConfiguration->hasMapSensor = true;
engineConfiguration->hasAfrSensor = true;
engineConfiguration->hasCltSensor = true;
engineConfiguration->hasBaroSensor = false;
boardConfiguration->idleSolenoidFrequency = 200;
// engineConfiguration->idleMode = IM_AUTO;

7
firmware/controllers/algo/engine_configuration.h
View File

@ -14,6 +14,7 @@
#include "sensor_types.h"
#include "can_header.h"
#include "rusefi_enums.h"
#include "global.h"
#define MOCK_UNDEFINED -1
@ -422,7 +423,11 @@ typedef struct {
board_configuration_s bc;
int hasMapSensor;
bool_t hasMapSensor : 1; // bit 0
bool_t hasIatSensor : 1; // bit 1
bool_t hasBaroSensor : 1; // bit 1
bool_t hasAfrSensor : 1; // bit 2
// that's the next 32 bit field
int hasCltSensor;
idle_mode_e idleMode;

5
firmware/controllers/engine_controller.cpp
View File

@ -194,7 +194,6 @@ static void handleGpio(Engine *engine, int index) {
io_pin_e pin = (io_pin_e) ((int) GPIO_0 + index);
int value = calc.getValue2(fuelPumpLogic, engine);
if (value != getOutputPinValue(pin)) {
// scheduleMsg(&logger, "setting %s %s", getIo_pin_e(pin), boolToString(value));
@ -303,11 +302,15 @@ static void printAnalogChannelInfo(const char *name, adc_channel_e hwChannel) {
static void printAnalogInfo(void) {
printAnalogChannelInfo("TPS", engineConfiguration->tpsAdcChannel);
printAnalogChannelInfo("CLT", engineConfiguration->cltAdcChannel);
if (engineConfiguration->hasIatSensor) {
printAnalogChannelInfo("IAT", engineConfiguration->iatAdcChannel);
}
printAnalogChannelInfo("MAF", engineConfiguration->mafAdcChannel);
printAnalogChannelInfo("AFR", engineConfiguration->afrSensor.afrAdcChannel);
printAnalogChannelInfo("MAP", engineConfiguration->map.sensor.hwChannel);
if (engineConfiguration->hasBaroSensor) {
printAnalogChannelInfo("BARO", engineConfiguration->baroSensor.hwChannel);
}
printAnalogChannelInfoExt("Vbatt", engineConfiguration->vbattAdcChannel, getVBatt());
}

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

@ -110,7 +110,9 @@ bool isValidIntakeAirTemperature(float temperature) {
float getCoolantTemperature(engine_configuration2_s * engineConfiguration2) {
float temperature = getTemperatureC(&engineConfiguration2->clt);
if (!isValidCoolantTemperature(temperature)) {
if (engineConfiguration2->engineConfiguration->hasCltSensor) {
warning(OBD_PCM_Processor_Fault, "unrealistic CLT %f", temperature);
}
return LIMPING_MODE_CLT_TEMPERATURE;
}
return temperature;
@ -155,7 +157,9 @@ void prepareThermistorCurve(ThermistorConf * config) {
float getIntakeAirTemperature(engine_configuration2_s * engineConfiguration2) {
float temperature = getTemperatureC(&engineConfiguration2->iat);
if (!isValidIntakeAirTemperature(temperature)) {
if (engineConfiguration2->engineConfiguration->hasIatSensor) {
warning(OBD_PCM_Processor_Fault, "unrealistic IAT %f", temperature);
}
return LIMPING_MODE_IAT_TEMPERATURE;
}
return temperature;

2
firmware/rusefi.cpp
View File

@ -143,7 +143,7 @@ void runRusEfi(void) {
// that's dirty, this assignment should be nicer or in a better spot
engine.engineConfiguration = engineConfiguration;
engine.engineConfiguration2 = engineConfiguration2;
engineConfiguration2->engineConfiguration = engineConfiguration;
initErrorHandling();