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-09-06 15:02:45 -05:00
parent 5ef2030350
commit 4d9e0f540d
10 changed files with 62 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
firmware/config/engines/citroenBerlingoTU3JP.cpp
View File

@ -29,55 +29,75 @@ void setCitroenBerlingoTU3JPConfiguration(engine_configuration_s *engineConfigur
// rpm limiter // rpm limiter
engineConfiguration->rpmHardLimit = 5000; engineConfiguration->rpmHardLimit = 5000;
// set thermistor
setThermistorConfiguration(&engineConfiguration->cltThermistorConf, -40.0, 100700.0, 25.0, 2796.0, 100.0, 177.0);
engineConfiguration->cltThermistorConf.bias_resistor = 2700; // eah winter is hard, sensor as LADA Samara :)
setThermistorConfiguration(&engineConfiguration->iatThermistorConf, -20.0, 15600.0, 23.0, 2250.0, 92.0, 240.0);
engineConfiguration->iatThermistorConf.bias_resistor = 2700; // same as OEM ECU
/** /**
* Outputs * Outputs
*/ */
// Frankenstain low out #3: PE6 injector 1-4 // Frankenstain low out #3: PE6 injector 1-4
// Frankenstain low out #4: PC13 injector 2-3 // Frankenstain low out #4: PC13 injector 2-3
// boardConfiguration->o2heaterPin = GPIOC_13;
boardConfiguration->injectionPins[0] = GPIOE_6; boardConfiguration->injectionPins[0] = GPIOE_6;
boardConfiguration->injectionPins[1] = GPIOC_13; boardConfiguration->injectionPins[1] = GPIOC_13;
boardConfiguration->injectionPins[2] = GPIO_NONE; boardConfiguration->injectionPins[2] = GPIO_NONE;
boardConfiguration->injectionPins[3] = GPIO_NONE; boardConfiguration->injectionPins[3] = GPIO_NONE;
// boardConfiguration->ignitionPins[0] = GPIOE_NONE; // boardConfiguration->ignitionPins[0] = GPIO_NONE;
// boardConfiguration->ignitionPins[1] = GPIO_NONE; // boardConfiguration->ignitionPins[1] = GPIO_NONE;
// boardConfiguration->ignitionPins[2] = GPIO_NONE; // boardConfiguration->ignitionPins[2] = GPIO_NONE;
// boardConfiguration->ignitionPins[3] = GPIO_NONE; // boardConfiguration->ignitionPins[3] = GPIO_NONE;
boardConfiguration->fuelPumpPin = GPIOE_3; // temporary value pin boardConfiguration->fuelPumpPin = GPIOB_9;
boardConfiguration->fuelPumpPinMode = OM_DEFAULT; boardConfiguration->fuelPumpPinMode = OM_DEFAULT;
// boardConfiguration->o2heaterPin = GPIOC_13;
// boardConfiguration->logicAnalyzerPins[1] = GPIO_NONE; // boardConfiguration->logicAnalyzerPins[1] = GPIO_NONE;
// Frankenstein analog input #1: adc1 /**
// Frankenstein analog input #2: adc3 * Inputs
// Frankenstein analog input #3: adc13 */
// Frankenstein analog input #4: adc11
// todo: see https://docs.google.com/spreadsheet/ccc?key=0Arl1FeMZcfisdEdGdUlHdWh6cVBoSzFIbkxqa1QtZ3c
// Frankenstein analog input #5: adc
// Frankenstein analog input #6: adc
// Frankenstein analog input #7: adc
// Frankenstein analog input #8: adc
// Frankenstein analog input #9: adc
// Frankenstein analog input #10: adc
// Frankenstein analog input #11: adc
// Frankenstein analog input #12: adc
engineConfiguration->mafAdcChannel = EFI_ADC_1;
engineConfiguration->tpsAdcChannel = EFI_ADC_3;
engineConfiguration->cltAdcChannel = EFI_ADC_11;
// See https://docs.google.com/spreadsheet/ccc?key=0Arl1FeMZcfisdEdGdUlHdWh6cVBoSzFIbkxqa1QtZ3c
// Frankenstein analog input #1: PA1 adc1 *2.9 *0.6
// Frankenstein analog input #2: PA3 adc3 *2.9 *1.0
// Frankenstein analog input #3: PC3 adc13 *2.5 *0.005
// Frankenstein analog input #4: PC1 adc11 *0.05 *1.5
// Frankenstein analog input #5: PA0 adc0 *0.05 *0.01
// Frankenstein analog input #6: PC2 adc12 *0.06 *1.2
// Frankenstein analog input #7: PA4 adc4 *3.0 *0.4
// Frankenstein analog input #8: PA2 adc2 *2.9 *0.9
// Frankenstein analog input #9: PA6 adc6 *3.0 *6.0
// Frankenstein analog input #10: PA7 adc7 *2.9 *2.35
// Frankenstein analog input #11: PC4 adc14 *0.00 *0.00
// Frankenstein analog input #12: PC5 adc15 *0.00 *0.00
/**
* MAP <need tune>
*/
engineConfiguration->mafAdcChannel = EFI_ADC_1;
engineConfiguration->map.sensor.sensorType = MT_CUSTOM; engineConfiguration->map.sensor.sensorType = MT_CUSTOM;
engineConfiguration->map.sensor.customValueAt0 = 20; engineConfiguration->map.sensor.customValueAt0 = 20;
engineConfiguration->map.sensor.customValueAt5 = 200; engineConfiguration->map.sensor.customValueAt5 = 200;
/**
* TPS <need tune>
*/
engineConfiguration->tpsAdcChannel = EFI_ADC_3;
engineConfiguration->tpsMin = 100;
engineConfiguration->tpsMax = 750;
/**
* IAT
*/
engineConfiguration->iatAdcChannel = EFI_ADC_13;
setThermistorConfiguration(&engineConfiguration->iatThermistorConf, -20.0, 15600.0, 23.0, 2250.0, 92.0, 240.0);
engineConfiguration->iatThermistorConf.bias_resistor = 2700; // same as OEM ECU
/**
* CLT
*/
engineConfiguration->cltAdcChannel = EFI_ADC_15;
setThermistorConfiguration(&engineConfiguration->cltThermistorConf, -20.0, 28680.0, 25.0, 2796.0, 100.0, 177.0);
engineConfiguration->cltThermistorConf.bias_resistor = 2700; // eah winter is hard, sensor as LADA Samara :)
/**
* vBatt
*/
engineConfiguration->vbattAdcChannel = EFI_ADC_0;
engineConfiguration->vbattDividerCoeff = ((float) (2.7 + 10)) / 2.7 * 2;
} }

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

@ -102,7 +102,7 @@ void setFordInline6(engine_configuration_s *engineConfiguration, board_configura
engineConfiguration->tpsMin = convertVoltageTo10bitADC(1.250); engineConfiguration->tpsMin = convertVoltageTo10bitADC(1.250);
engineConfiguration->tpsMax = convertVoltageTo10bitADC(4.538); engineConfiguration->tpsMax = convertVoltageTo10bitADC(4.538);
// engineConfiguration->vBattAdcChannel = 0; // // engineConfiguration->vbattAdcChannel = 0; //
// engineConfiguration->mafAdcChannel = 1; // engineConfiguration->mafAdcChannel = 1;
boardConfiguration->triggerInputPins[0] = GPIOA_8; boardConfiguration->triggerInputPins[0] = GPIOA_8;

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

@ -149,7 +149,7 @@ void setFordAspireEngineConfiguration(engine_configuration_s *engineConfiguratio
engineConfiguration->tpsAdcChannel = EFI_ADC_3; engineConfiguration->tpsAdcChannel = EFI_ADC_3;
engineConfiguration->vBattAdcChannel = EFI_ADC_0; engineConfiguration->vbattAdcChannel = EFI_ADC_0;
engineConfiguration->map.sensor.hwChannel = EFI_ADC_4; engineConfiguration->map.sensor.hwChannel = EFI_ADC_4;
engineConfiguration->mafAdcChannel = EFI_ADC_1; engineConfiguration->mafAdcChannel = EFI_ADC_1;
engineConfiguration->cltAdcChannel = EFI_ADC_11; engineConfiguration->cltAdcChannel = EFI_ADC_11;

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

@ -117,7 +117,7 @@ static void setHondaAccordConfigurationCommon(engine_configuration_s *engineConf
/** /**
* VBatt * VBatt
*/ */
engineConfiguration->vBattAdcChannel = EFI_ADC_14; engineConfiguration->vbattAdcChannel = EFI_ADC_14;
engineConfiguration->vbattDividerCoeff = ((float) (8.2 + 33)) / 8.2 * 2; engineConfiguration->vbattDividerCoeff = ((float) (8.2 + 33)) / 8.2 * 2;
// todo engineConfiguration->afrSensor.afrAdcChannel = 14; // todo engineConfiguration->afrSensor.afrAdcChannel = 14;

7
firmware/config/engines/mazda_miata.cpp
View File

@ -241,6 +241,13 @@ void setMiata1994(engine_configuration_s *engineConfiguration, board_configurati
setFrankenso_01_LCD(boardConfiguration); setFrankenso_01_LCD(boardConfiguration);
/**
* VBatt
*/
engineConfiguration->vbattAdcChannel = EFI_ADC_14;
engineConfiguration->vbattDividerCoeff = ((float) (8.2 + 33)) / 8.2 * 2;
} }
/** /**

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

@ -35,7 +35,7 @@ void setMazdaMiataNbEngineConfiguration(engine_configuration_s *engineConfigurat
engineConfiguration->iatThermistorConf.bias_resistor = 2700; engineConfiguration->iatThermistorConf.bias_resistor = 2700;
engineConfiguration->tpsAdcChannel = EFI_ADC_3; // 15 is the old value engineConfiguration->tpsAdcChannel = EFI_ADC_3; // 15 is the old value
engineConfiguration->vBattAdcChannel = EFI_ADC_0; // 1 is the old value engineConfiguration->vbattAdcChannel = EFI_ADC_0; // 1 is the old value
// engineConfiguration->map.channel = 1; // engineConfiguration->map.channel = 1;
engineConfiguration->mafAdcChannel = EFI_ADC_1; engineConfiguration->mafAdcChannel = EFI_ADC_1;
engineConfiguration->cltAdcChannel = EFI_ADC_11; engineConfiguration->cltAdcChannel = EFI_ADC_11;

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

@ -219,7 +219,7 @@ void setDefaultConfiguration(engine_configuration_s *engineConfiguration, board_
engineConfiguration->HD44780height = 4; engineConfiguration->HD44780height = 4;
engineConfiguration->tpsAdcChannel = EFI_ADC_3; engineConfiguration->tpsAdcChannel = EFI_ADC_3;
engineConfiguration->vBattAdcChannel = EFI_ADC_5; engineConfiguration->vbattAdcChannel = EFI_ADC_5;
engineConfiguration->cltAdcChannel = EFI_ADC_6; engineConfiguration->cltAdcChannel = EFI_ADC_6;
engineConfiguration->iatAdcChannel = EFI_ADC_7; engineConfiguration->iatAdcChannel = EFI_ADC_7;
engineConfiguration->mafAdcChannel = EFI_ADC_0; engineConfiguration->mafAdcChannel = EFI_ADC_0;

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

@ -360,7 +360,7 @@ typedef struct {
trigger_config_s triggerConfig; trigger_config_s triggerConfig;
int space; int space;
adc_channel_e vBattAdcChannel; adc_channel_e vbattAdcChannel;
float globalFuelCorrection; float globalFuelCorrection;

2
firmware/controllers/engine_controller.cpp
View File

@ -230,7 +230,7 @@ static void printAnalogInfo(void) {
printAnalogChannelInfo("AFR", engineConfiguration->afrSensor.afrAdcChannel); printAnalogChannelInfo("AFR", engineConfiguration->afrSensor.afrAdcChannel);
printAnalogChannelInfo("MAP", engineConfiguration->map.sensor.hwChannel); printAnalogChannelInfo("MAP", engineConfiguration->map.sensor.hwChannel);
printAnalogChannelInfo("BARO", engineConfiguration->baroSensor.hwChannel); printAnalogChannelInfo("BARO", engineConfiguration->baroSensor.hwChannel);
printAnalogChannelInfoExt("Vbatt", engineConfiguration->vBattAdcChannel, getVBatt()); printAnalogChannelInfoExt("Vbatt", engineConfiguration->vbattAdcChannel, getVBatt());
} }
static THD_WORKING_AREA(csThreadStack, UTILITY_THREAD_STACK_SIZE); // declare thread stack static THD_WORKING_AREA(csThreadStack, UTILITY_THREAD_STACK_SIZE); // declare thread stack

2
firmware/controllers/sensors/voltage.c
View File

@ -21,5 +21,5 @@ float getVRef(void) {
} }
float getVBatt(void) { float getVBatt(void) {
return getVoltage(engineConfiguration->vBattAdcChannel) * engineConfiguration->vbattDividerCoeff; return getVoltage(engineConfiguration->vbattAdcChannel) * engineConfiguration->vbattDividerCoeff;
} }