diff --git a/firmware/config/engines/citroenBerlingoTU3JP.cpp b/firmware/config/engines/citroenBerlingoTU3JP.cpp index 74ead27c01..da29bb7c8d 100644 --- a/firmware/config/engines/citroenBerlingoTU3JP.cpp +++ b/firmware/config/engines/citroenBerlingoTU3JP.cpp @@ -14,30 +14,6 @@ #include "citroenBerlingoTU3JP.h" #include "custom_engine.h" -#if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT -static const uint8_t default_tps_advance_table[16][16] = { -{/*0 engineLoad=0.00*/ /*0 800.0*/+15, /*1 1213.0*/+16, /*2 1626.0*/+17, /*3 2040.0*/+19, /*4 2453.0*/+20, /*5 2866.0*/+21, /*6 3280.0*/+23, /*7 3693.0*/+24, /*8 4106.0*/+25, /*9 4520.0*/+27, /*10 4933.0*/+28, /*11 5346.0*/+29, /*12 5760.0*/+31, /*13 6173.0*/+32, /*14 6586.0*/+33, /*15 7000.0*/+35}, -{/*1 engineLoad=6.66*/ /*0 800.0*/+14, /*1 1213.0*/+16, /*2 1626.0*/+17, /*3 2040.0*/+18, /*4 2453.0*/+20, /*5 2866.0*/+21, /*6 3280.0*/+22, /*7 3693.0*/+24, /*8 4106.0*/+25, /*9 4520.0*/+26, /*10 4933.0*/+28, /*11 5346.0*/+29, /*12 5760.0*/+30, /*13 6173.0*/+32, /*14 6586.0*/+33, /*15 7000.0*/+34}, -{/*2 engineLoad=13.33*/ /*0 800.0*/+14, /*1 1213.0*/+15, /*2 1626.0*/+17, /*3 2040.0*/+18, /*4 2453.0*/+19, /*5 2866.0*/+21, /*6 3280.0*/+22, /*7 3693.0*/+23, /*8 4106.0*/+25, /*9 4520.0*/+26, /*10 4933.0*/+27, /*11 5346.0*/+29, /*12 5760.0*/+30, /*13 6173.0*/+31, /*14 6586.0*/+33, /*15 7000.0*/+34}, -{/*3 engineLoad=20.00*/ /*0 800.0*/+14, /*1 1213.0*/+15, /*2 1626.0*/+17, /*3 2040.0*/+18, /*4 2453.0*/+19, /*5 2866.0*/+20, /*6 3280.0*/+22, /*7 3693.0*/+23, /*8 4106.0*/+24, /*9 4520.0*/+26, /*10 4933.0*/+27, /*11 5346.0*/+28, /*12 5760.0*/+30, /*13 6173.0*/+31, /*14 6586.0*/+32, /*15 7000.0*/+34}, -{/*4 engineLoad=26.66*/ /*0 800.0*/+14, /*1 1213.0*/+15, /*2 1626.0*/+16, /*3 2040.0*/+18, /*4 2453.0*/+19, /*5 2866.0*/+20, /*6 3280.0*/+21, /*7 3693.0*/+23, /*8 4106.0*/+24, /*9 4520.0*/+25, /*10 4933.0*/+27, /*11 5346.0*/+28, /*12 5760.0*/+29, /*13 6173.0*/+31, /*14 6586.0*/+32, /*15 7000.0*/+33}, -{/*5 engineLoad=33.33*/ /*0 800.0*/+14, /*1 1213.0*/+15, /*2 1626.0*/+16, /*3 2040.0*/+17, /*4 2453.0*/+19, /*5 2866.0*/+20, /*6 3280.0*/+21, /*7 3693.0*/+23, /*8 4106.0*/+24, /*9 4520.0*/+25, /*10 4933.0*/+26, /*11 5346.0*/+28, /*12 5760.0*/+29, /*13 6173.0*/+30, /*14 6586.0*/+32, /*15 7000.0*/+33}, -{/*6 engineLoad=40.00*/ /*0 800.0*/+13, /*1 1213.0*/+15, /*2 1626.0*/+16, /*3 2040.0*/+17, /*4 2453.0*/+18, /*5 2866.0*/+20, /*6 3280.0*/+21, /*7 3693.0*/+22, /*8 4106.0*/+24, /*9 4520.0*/+25, /*10 4933.0*/+26, /*11 5346.0*/+27, /*12 5760.0*/+29, /*13 6173.0*/+30, /*14 6586.0*/+31, /*15 7000.0*/+33}, -{/*7 engineLoad=46.66*/ /*0 800.0*/+13, /*1 1213.0*/+14, /*2 1626.0*/+16, /*3 2040.0*/+17, /*4 2453.0*/+18, /*5 2866.0*/+19, /*6 3280.0*/+21, /*7 3693.0*/+22, /*8 4106.0*/+23, /*9 4520.0*/+25, /*10 4933.0*/+26, /*11 5346.0*/+27, /*12 5760.0*/+28, /*13 6173.0*/+30, /*14 6586.0*/+31, /*15 7000.0*/+32}, -{/*8 engineLoad=53.33*/ /*0 800.0*/+13, /*1 1213.0*/+14, /*2 1626.0*/+15, /*3 2040.0*/+17, /*4 2453.0*/+18, /*5 2866.0*/+19, /*6 3280.0*/+20, /*7 3693.0*/+22, /*8 4106.0*/+23, /*9 4520.0*/+24, /*10 4933.0*/+26, /*11 5346.0*/+27, /*12 5760.0*/+28, /*13 6173.0*/+29, /*14 6586.0*/+31, /*15 7000.0*/+32}, -{/*9 engineLoad=60.00*/ /*0 800.0*/+13, /*1 1213.0*/+14, /*2 1626.0*/+15, /*3 2040.0*/+16, /*4 2453.0*/+18, /*5 2866.0*/+19, /*6 3280.0*/+20, /*7 3693.0*/+21, /*8 4106.0*/+23, /*9 4520.0*/+24, /*10 4933.0*/+25, /*11 5346.0*/+26, /*12 5760.0*/+28, /*13 6173.0*/+29, /*14 6586.0*/+30, /*15 7000.0*/+32}, -{/*10 engineLoad=66.66*/ /*0 800.0*/+13, /*1 1213.0*/+14, /*2 1626.0*/+15, /*3 2040.0*/+16, /*4 2453.0*/+17, /*5 2866.0*/+19, /*6 3280.0*/+20, /*7 3693.0*/+21, /*8 4106.0*/+22, /*9 4520.0*/+24, /*10 4933.0*/+25, /*11 5346.0*/+26, /*12 5760.0*/+27, /*13 6173.0*/+29, /*14 6586.0*/+30, /*15 7000.0*/+31}, -{/*11 engineLoad=73.33*/ /*0 800.0*/+12, /*1 1213.0*/+14, /*2 1626.0*/+15, /*3 2040.0*/+16, /*4 2453.0*/+17, /*5 2866.0*/+18, /*6 3280.0*/+20, /*7 3693.0*/+21, /*8 4106.0*/+22, /*9 4520.0*/+23, /*10 4933.0*/+25, /*11 5346.0*/+26, /*12 5760.0*/+27, /*13 6173.0*/+28, /*14 6586.0*/+30, /*15 7000.0*/+31}, -{/*12 engineLoad=80.00*/ /*0 800.0*/+12, /*1 1213.0*/+13, /*2 1626.0*/+15, /*3 2040.0*/+16, /*4 2453.0*/+17, /*5 2866.0*/+18, /*6 3280.0*/+19, /*7 3693.0*/+21, /*8 4106.0*/+22, /*9 4520.0*/+23, /*10 4933.0*/+24, /*11 5346.0*/+26, /*12 5760.0*/+27, /*13 6173.0*/+28, /*14 6586.0*/+29, /*15 7000.0*/+31}, -{/*13 engineLoad=86.66*/ /*0 800.0*/+12, /*1 1213.0*/+13, /*2 1626.0*/+14, /*3 2040.0*/+16, /*4 2453.0*/+17, /*5 2866.0*/+18, /*6 3280.0*/+19, /*7 3693.0*/+20, /*8 4106.0*/+22, /*9 4520.0*/+23, /*10 4933.0*/+24, /*11 5346.0*/+25, /*12 5760.0*/+27, /*13 6173.0*/+28, /*14 6586.0*/+29, /*15 7000.0*/+30}, -{/*14 engineLoad=93.33*/ /*0 800.0*/+12, /*1 1213.0*/+13, /*2 1626.0*/+14, /*3 2040.0*/+15, /*4 2453.0*/+17, /*5 2866.0*/+18, /*6 3280.0*/+19, /*7 3693.0*/+20, /*8 4106.0*/+21, /*9 4520.0*/+23, /*10 4933.0*/+24, /*11 5346.0*/+25, /*12 5760.0*/+26, /*13 6173.0*/+27, /*14 6586.0*/+29, /*15 7000.0*/+30}, -{/*15 engineLoad=100.00*/ /*0 800.0*/+12, /*1 1213.0*/+13, /*2 1626.0*/+14, /*3 2040.0*/+15, /*4 2453.0*/+16, /*5 2866.0*/+18, /*6 3280.0*/+19, /*7 3693.0*/+20, /*8 4106.0*/+21, /*9 4520.0*/+22, /*10 4933.0*/+24, /*11 5346.0*/+25, /*12 5760.0*/+26, /*13 6173.0*/+27, /*14 6586.0*/+28, /*15 7000.0*/+30} -}; -#endif - -//static const float rpmSteps[16] = {400, 800, 1200, 1600, 2000, 2400, 2800, 3200, 3600, 4000, 4400, 4800, 5200, 5600, 6000, 6400}; -//static const float mapSteps[16] = {25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95, 100}; - void setCitroenBerlingoTU3JPConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); @@ -172,8 +148,4 @@ void setCitroenBerlingoTU3JPConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { * Other */ // engineConfiguration->mafAdcChannel = GPIO_UNASSIGNED; - -#if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT - copyTable(config->ignitionTable, default_tps_advance_table); -#endif } diff --git a/firmware/config/engines/dodge_ram.cpp b/firmware/config/engines/dodge_ram.cpp index 2ea3aab549..8e53b9d143 100644 --- a/firmware/config/engines/dodge_ram.cpp +++ b/firmware/config/engines/dodge_ram.cpp @@ -19,57 +19,15 @@ void setDodgeRam1996(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->trigger.type = TT_DODGE_RAM; engineConfiguration->injector.flow = 243.6; // 23.2lb/h engineConfiguration->map.sensor.type = MT_DODGE_NEON_2003; - setAlgorithm(LM_SPEED_DENSITY PASS_CONFIG_PARAMETER_SUFFIX); //Base engine setting engineConfiguration->specs.cylindersCount = 8; engineConfiguration->specs.firingOrder = FO_1_8_4_3_6_5_7_2; engineConfiguration->specs.displacement = 5.2; - engineConfiguration->triggerInputPins[0] = GPIOC_6; - engineConfiguration->triggerInputPins[1] = GPIOA_5; - - engineConfiguration->injectionPins[0] = GPIOE_2; - engineConfiguration->injectionPins[1] = GPIOB_9; - engineConfiguration->injectionPins[2] = GPIOD_5; - engineConfiguration->injectionPins[3] = GPIOB_8; - - engineConfiguration->injectionPins[4] = GPIOB_7; - engineConfiguration->injectionPins[5] = GPIOE_3; - engineConfiguration->injectionPins[6] = GPIOE_4; - engineConfiguration->injectionPins[7] = GPIOD_3; - - engineConfiguration->ignitionPins[0] = GPIOC_9; - engineConfiguration->ignitionPins[1] = GPIO_UNASSIGNED; - engineConfiguration->ignitionPins[2] = GPIO_UNASSIGNED; - engineConfiguration->ignitionPins[3] = GPIO_UNASSIGNED; - - engineConfiguration->mainRelayPin = GPIOE_5; - engineConfiguration->fuelPumpPin = GPIOE_6; - engineConfiguration->fanPin = GPIO_UNASSIGNED; - - engineConfiguration->engineChartSize = 450; - - // set global_trigger_offset_angle -50 engineConfiguration->globalTriggerAngleOffset = -50; - // set_global_fuel_correction 1 - - // set_whole_timing_map 10 - setWholeTimingTable_d(10 PASS_CONFIG_PARAMETER_SUFFIX); - - - engineConfiguration->alternatorControlPin = GPIOD_7; - engineConfiguration->alternatorControl.pFactor = 22; - - engineConfiguration->idle.solenoidPin = GPIOC_13; - engineConfiguration->idle.solenoidFrequency = 300; - - engineConfiguration->vbattAdcChannel = EFI_ADC_14; -// engineConfiguration->vbattDividerCoeff = ((float) (8.93 + 41.27)) / 8.93 * 2; - engineConfiguration->vbattDividerCoeff = 9.6; - setDodgeSensor(&engineConfiguration->clt, 2700); setDodgeSensor(&engineConfiguration->iat, 2700);