mirror of https://github.com/rusefi/rusefi-1.git
auto-sync
This commit is contained in:
parent
7942bce89b
commit
d36297c800
|
@ -63,8 +63,8 @@ static const ignition_table_t tps_advance_table = {
|
||||||
{/*15 engineLoad=100.00*/ /*0 800.0*/+12.00, /*1 1213.0*/+13.20, /*2 1626.0*/+14.40, /*3 2040.0*/+15.60, /*4 2453.0*/+16.80, /*5 2866.0*/+18.00, /*6 3280.0*/+19.20, /*7 3693.0*/+20.40, /*8 4106.0*/+21.60, /*9 4520.0*/+22.80, /*10 4933.0*/+24.00, /*11 5346.0*/+25.20, /*12 5760.0*/+26.40, /*13 6173.0*/+27.60, /*14 6586.0*/+28.80, /*15 7000.0*/+30.00}
|
{/*15 engineLoad=100.00*/ /*0 800.0*/+12.00, /*1 1213.0*/+13.20, /*2 1626.0*/+14.40, /*3 2040.0*/+15.60, /*4 2453.0*/+16.80, /*5 2866.0*/+18.00, /*6 3280.0*/+19.20, /*7 3693.0*/+20.40, /*8 4106.0*/+21.60, /*9 4520.0*/+22.80, /*10 4933.0*/+24.00, /*11 5346.0*/+25.20, /*12 5760.0*/+26.40, /*13 6173.0*/+27.60, /*14 6586.0*/+28.80, /*15 7000.0*/+30.00}
|
||||||
};
|
};
|
||||||
|
|
||||||
static const float rpmSteps[16] = {800, 1200, 1600, 2000, 2500, 2800,
|
//static const float rpmSteps[16] = {400, 800, 1200, 1600, 2000, 2400, 2800, 3200, 3600, 4000, 4400, 4800, 5200, 5600, 6000, 6400};
|
||||||
3280, 3693.0, 4106.0, 4520.0, 4933.0, 5346.0, 5760.0, 6173.0, 6586.0, 7000.0};
|
//static const float mapSteps[16] = {25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95, 100};
|
||||||
|
|
||||||
EXTERN_ENGINE;
|
EXTERN_ENGINE;
|
||||||
|
|
||||||
|
@ -117,29 +117,35 @@ void setCitroenBerlingoTU3JPConfiguration(DECLARE_ENGINE_PARAMETER_F) {
|
||||||
// Frankenstein lo-side output #6: PE5
|
// Frankenstein lo-side output #6: PE5
|
||||||
// Frankenstein lo-side output #7: PE2
|
// Frankenstein lo-side output #7: PE2
|
||||||
// Frankenstein lo-side output #8: PE3
|
// Frankenstein lo-side output #8: PE3
|
||||||
// Frankenstein lo-side output #9: PE0
|
// Frankenstein lo-side output #9: PE0 Fan
|
||||||
// Frankenstein lo-side output #10: PE1
|
// Frankenstein lo-side output #10: PE1 MIL
|
||||||
// Frankenstein lo-side output #11: PB8
|
// Frankenstein lo-side output #11: PB8 Main relay
|
||||||
// Frankenstein lo-side output #12: PB9 Fuel pump
|
// Frankenstein lo-side output #12: PB9 Fuel pump
|
||||||
|
|
||||||
|
boardConfiguration->ignitionPins[0] = GPIOC_14;
|
||||||
|
boardConfiguration->ignitionPins[1] = GPIO_UNASSIGNED;
|
||||||
|
boardConfiguration->ignitionPins[2] = GPIOC_15;
|
||||||
|
boardConfiguration->ignitionPins[3] = GPIO_UNASSIGNED;
|
||||||
|
|
||||||
engineConfiguration->injector.flow = 137; //SIEMENS DEKA VAZ20734
|
engineConfiguration->injector.flow = 137; //SIEMENS DEKA VAZ20734
|
||||||
boardConfiguration->injectionPins[0] = GPIOE_6;
|
boardConfiguration->injectionPins[0] = GPIOE_6;
|
||||||
boardConfiguration->injectionPins[1] = GPIOC_13;
|
boardConfiguration->injectionPins[1] = GPIOC_13;
|
||||||
boardConfiguration->injectionPins[2] = GPIO_UNASSIGNED;
|
boardConfiguration->injectionPins[2] = GPIO_UNASSIGNED;
|
||||||
boardConfiguration->injectionPins[3] = GPIO_UNASSIGNED;
|
boardConfiguration->injectionPins[3] = GPIO_UNASSIGNED;
|
||||||
|
|
||||||
boardConfiguration->ignitionPins[0] = GPIOC_14;
|
boardConfiguration->fanPin = GPIOE_0;
|
||||||
boardConfiguration->ignitionPins[1] = GPIO_UNASSIGNED;
|
boardConfiguration->fanPinMode = OM_DEFAULT;
|
||||||
boardConfiguration->ignitionPins[2] = GPIOC_15;
|
|
||||||
boardConfiguration->ignitionPins[3] = GPIO_UNASSIGNED;
|
boardConfiguration->malfunctionIndicatorPin = GPIOE_1;
|
||||||
|
boardConfiguration->malfunctionIndicatorPinMode = OM_DEFAULT;
|
||||||
|
|
||||||
|
boardConfiguration->mainRelayPin = GPIOB_8;
|
||||||
|
|
||||||
boardConfiguration->fuelPumpPin = GPIOB_9;
|
boardConfiguration->fuelPumpPin = GPIOB_9;
|
||||||
boardConfiguration->fuelPumpPinMode = OM_DEFAULT;
|
boardConfiguration->fuelPumpPinMode = OM_DEFAULT;
|
||||||
|
|
||||||
setLCD(boardConfiguration);
|
setLCD(boardConfiguration);
|
||||||
|
|
||||||
boardConfiguration->fanPin = GPIO_UNASSIGNED;
|
|
||||||
// boardConfiguration->fanPinMode = OM_DEFAULT;
|
|
||||||
|
|
||||||
// boardConfiguration->o2heaterPin = GPIOC_13;
|
// boardConfiguration->o2heaterPin = GPIOC_13;
|
||||||
// boardConfiguration->logicAnalyzerPins[1] = GPIO_UNASSIGNED;
|
// boardConfiguration->logicAnalyzerPins[1] = GPIO_UNASSIGNED;
|
||||||
|
@ -160,7 +166,7 @@ void setCitroenBerlingoTU3JPConfiguration(DECLARE_ENGINE_PARAMETER_F) {
|
||||||
// Frankenstein analog input #9: PA6 adc6
|
// Frankenstein analog input #9: PA6 adc6
|
||||||
// Frankenstein analog input #10: PA7 adc7
|
// Frankenstein analog input #10: PA7 adc7
|
||||||
// Frankenstein analog input #11: PC4 adc14
|
// Frankenstein analog input #11: PC4 adc14
|
||||||
// Frankenstein analog input #12: PC5 adc15
|
// Frankenstein analog input #12: PC5|PA8 adc15 Speed Sensor
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* MAP <BOSCH 0 261 230 057>
|
* MAP <BOSCH 0 261 230 057>
|
||||||
|
@ -197,6 +203,11 @@ void setCitroenBerlingoTU3JPConfiguration(DECLARE_ENGINE_PARAMETER_F) {
|
||||||
*/
|
*/
|
||||||
engineConfiguration->afr.hwChannel = EFI_ADC_12;
|
engineConfiguration->afr.hwChannel = EFI_ADC_12;
|
||||||
/**
|
/**
|
||||||
|
* Speed Sensor
|
||||||
|
*/
|
||||||
|
engineConfiguration->vehicleSpeedSensorInputPin = GPIOA_8;
|
||||||
|
engineConfiguration->hasVehicleSpeedSensor = true;
|
||||||
|
/**
|
||||||
* Other
|
* Other
|
||||||
*/
|
*/
|
||||||
// engineConfiguration->mafAdcChannel = GPIO_UNASSIGNED;
|
// engineConfiguration->mafAdcChannel = GPIO_UNASSIGNED;
|
||||||
|
|
|
@ -379,7 +379,6 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
|
||||||
setFsioExt(engineConfiguration, 0, GPIOE_5, "0 fsio_setting", 400);
|
setFsioExt(engineConfiguration, 0, GPIOE_5, "0 fsio_setting", 400);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
boardConfiguration->logicAnalyzerPins[0] = GPIO_UNASSIGNED;
|
|
||||||
engineConfiguration->vehicleSpeedSensorInputPin = GPIOA_8;
|
engineConfiguration->vehicleSpeedSensorInputPin = GPIOA_8;
|
||||||
engineConfiguration->hasVehicleSpeedSensor = true;
|
engineConfiguration->hasVehicleSpeedSensor = true;
|
||||||
|
|
||||||
|
|
|
@ -179,8 +179,6 @@ static void setHondaAccordConfigurationCommon(DECLARE_ENGINE_PARAMETER_F) {
|
||||||
|
|
||||||
setFrankenso_01_LCD(boardConfiguration);
|
setFrankenso_01_LCD(boardConfiguration);
|
||||||
|
|
||||||
boardConfiguration->logicAnalyzerPins[1] = GPIO_UNASSIGNED;
|
|
||||||
|
|
||||||
|
|
||||||
boardConfiguration->idleSolenoidFrequency = 500;
|
boardConfiguration->idleSolenoidFrequency = 500;
|
||||||
}
|
}
|
||||||
|
|
|
@ -436,7 +436,7 @@
|
||||||
* @note The default is @p FALSE.
|
* @note The default is @p FALSE.
|
||||||
*/
|
*/
|
||||||
#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)
|
#if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)
|
||||||
#define CH_DBG_ENABLE_TRACE FALSE
|
#define CH_DBG_ENABLE_TRACE TRUE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -462,7 +462,7 @@
|
||||||
* @note The default is @p FALSE.
|
* @note The default is @p FALSE.
|
||||||
*/
|
*/
|
||||||
#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)
|
#if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)
|
||||||
#define CH_DBG_FILL_THREADS FALSE
|
#define CH_DBG_FILL_THREADS TRUE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -482,7 +482,7 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
|
||||||
|
|
||||||
boardConfiguration->triggerInputPins[0] = GPIOC_6;
|
boardConfiguration->triggerInputPins[0] = GPIOC_6;
|
||||||
boardConfiguration->triggerInputPins[1] = GPIOA_5;
|
boardConfiguration->triggerInputPins[1] = GPIOA_5;
|
||||||
boardConfiguration->logicAnalyzerPins[0] = GPIOA_8;
|
boardConfiguration->logicAnalyzerPins[0] = GPIO_UNASSIGNED;
|
||||||
boardConfiguration->logicAnalyzerPins[1] = GPIO_UNASSIGNED; // GPIOE_5 is a popular option (if available)
|
boardConfiguration->logicAnalyzerPins[1] = GPIO_UNASSIGNED; // GPIOE_5 is a popular option (if available)
|
||||||
boardConfiguration->logicAnalyzerPins[2] = GPIO_UNASSIGNED;
|
boardConfiguration->logicAnalyzerPins[2] = GPIO_UNASSIGNED;
|
||||||
boardConfiguration->logicAnalyzerPins[3] = GPIO_UNASSIGNED;
|
boardConfiguration->logicAnalyzerPins[3] = GPIO_UNASSIGNED;
|
||||||
|
|
|
@ -230,3 +230,9 @@ void registedFundamentralIoPin(char *msg, ioportid_t port, ioportmask_t pin, iom
|
||||||
palSetPadMode(port, pin, mode);
|
palSetPadMode(port, pin, mode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void efiIcuStart(ICUDriver *icup, const ICUConfig *config) {
|
||||||
|
efiAssertVoid((icup->state == ICU_STOP) || (icup->state == ICU_READY),
|
||||||
|
"input already used?");
|
||||||
|
|
||||||
|
icuStart(icup, config);
|
||||||
|
}
|
||||||
|
|
|
@ -42,5 +42,6 @@ GPIO_TypeDef * getHwPort(brain_pin_e brainPin);
|
||||||
}
|
}
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
|
void efiIcuStart(ICUDriver *icup, const ICUConfig *config);
|
||||||
|
|
||||||
#endif /* PIN_REPOSITORY_H_ */
|
#endif /* PIN_REPOSITORY_H_ */
|
||||||
|
|
|
@ -79,7 +79,7 @@ void initShaftPositionInputCapture(void) {
|
||||||
print("initShaftPositionInputCapture 1 %s\r\n", hwPortname(boardConfiguration->triggerInputPins[0]));
|
print("initShaftPositionInputCapture 1 %s\r\n", hwPortname(boardConfiguration->triggerInputPins[0]));
|
||||||
// todo: reuse 'setWaveReaderMode' method here?
|
// todo: reuse 'setWaveReaderMode' method here?
|
||||||
if (driver != NULL) {
|
if (driver != NULL) {
|
||||||
icuStart(driver, &shaft_icucfg);
|
efiIcuStart(driver, &shaft_icucfg);
|
||||||
icuEnable(driver);
|
icuEnable(driver);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -89,7 +89,7 @@ void initShaftPositionInputCapture(void) {
|
||||||
shaft_icucfg.channel = ICU_CHANNEL_1;
|
shaft_icucfg.channel = ICU_CHANNEL_1;
|
||||||
print("initShaftPositionInputCapture 2 %s\r\n", hwPortname(boardConfiguration->triggerInputPins[1]));
|
print("initShaftPositionInputCapture 2 %s\r\n", hwPortname(boardConfiguration->triggerInputPins[1]));
|
||||||
if (driver != NULL) {
|
if (driver != NULL) {
|
||||||
icuStart(driver, &shaft_icucfg);
|
efiIcuStart(driver, &shaft_icucfg);
|
||||||
icuEnable(driver);
|
icuEnable(driver);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -173,7 +173,7 @@ void startInputDriver(WaveReaderHw *hw, bool isActiveHigh) {
|
||||||
icuDisable(driver);
|
icuDisable(driver);
|
||||||
icuStop(driver);
|
icuStop(driver);
|
||||||
}
|
}
|
||||||
icuStart(driver, &wave_icucfg);
|
efiIcuStart(driver, &wave_icucfg);
|
||||||
icuEnable(driver);
|
icuEnable(driver);
|
||||||
}
|
}
|
||||||
hw->started = true;
|
hw->started = true;
|
||||||
|
|
|
@ -276,5 +276,5 @@ int getRusEfiVersion(void) {
|
||||||
return 1; // this is here to make the compiler happy about the unused array
|
return 1; // this is here to make the compiler happy about the unused array
|
||||||
if (UNUSED_CCM_SIZE[0] == 0)
|
if (UNUSED_CCM_SIZE[0] == 0)
|
||||||
return 1; // this is here to make the compiler happy about the unused array
|
return 1; // this is here to make the compiler happy about the unused array
|
||||||
return 20150306;
|
return 20150309;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue