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

only: dead

This commit is contained in:
rusefillc 2024-01-16 10:31:03 -05:00
parent 04d2bec6f4
commit afe59ea99f
13 changed files with 9 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,133 +0,0 @@
/**
* @file citroenBerlingoTU3JP.cpp
*
* CITROEN_TU3JP
* set engine_type 15
* Board pin out for Frankenstein
*
* @date Apr 15, 2014
* @author Andrey Belomutskiy, (c) 2012-2020
*/
#include "pch.h"
#include "citroenBerlingoTU3JP.h"
#include "custom_engine.h"
void setCitroenBerlingoTU3JPConfiguration() {
/**
* Base engine setting
*/
setCrankOperationMode();
engineConfiguration->trigger.type = trigger_type_e::TT_TOOTHED_WHEEL_60_2;
engineConfiguration->globalTriggerAngleOffset = 114;
engineConfiguration->cylindersCount = 4;
engineConfiguration->displacement = 1.360;
engineConfiguration->firingOrder = FO_1_3_4_2;
engineConfiguration->ignitionMode = IM_WASTED_SPARK;
engineConfiguration->injectionMode = IM_BATCH;
engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS;
engineConfiguration->rpmHardLimit = 5000;
// memcpy(config->ve2RpmBins, rpmSteps, sizeof(rpmSteps));
/**
* Algorithm Alpha-N setting
*/
setAlgorithm(LM_ALPHA_N);
setTimingRpmBin(800, 7000);
/**
* Outputs
*/
// Frankenstein lo-side output #1: PC14 Igniter 1-4
// Frankenstein lo-side output #2: PC15 Igniter 2-3
// Frankenstein lo-side output #3: PE6 Injector 1-4
// Frankenstein lo-side output #4: PC13 Injector 2-3
// Frankenstein lo-side output #5: PE4
// Frankenstein lo-side output #6: PE5
// Frankenstein lo-side output #7: PE2
// Frankenstein lo-side output #8: PE3 Tachometer
// Frankenstein lo-side output #9: PE0 Fan
// Frankenstein lo-side output #10: PE1 MIL
// Frankenstein lo-side output #11: PB8 Main relay
// Frankenstein lo-side output #12: PB9 Fuel pump
engineConfiguration->ignitionPins[0] = Gpio::C14;
engineConfiguration->ignitionPins[1] = Gpio::Unassigned;
engineConfiguration->ignitionPins[2] = Gpio::C15;
engineConfiguration->ignitionPins[3] = Gpio::Unassigned;
engineConfiguration->injector.flow = 137; //SIEMENS DEKA VAZ20734
engineConfiguration->injectionPins[0] = Gpio::E6;
engineConfiguration->injectionPins[1] = Gpio::C13;
engineConfiguration->injectionPins[2] = Gpio::Unassigned;
engineConfiguration->injectionPins[3] = Gpio::Unassigned;
engineConfiguration->fanPin = Gpio::E0;
engineConfiguration->fanOffTemperature = 95;
engineConfiguration->fanOnTemperature = 99;
engineConfiguration->malfunctionIndicatorPin = Gpio::E1;
engineConfiguration->mainRelayPin = Gpio::B8;
engineConfiguration->fuelPumpPin = Gpio::B9;
// engineConfiguration->o2heaterPin = Gpio::C13;
// engineConfiguration->logicAnalyzerPins[1] = Gpio::Unassigned;
/**
* Inputs
*/
// See https://docs.google.com/spreadsheet/ccc?key=0Arl1FeMZcfisdEdGdUlHdWh6cVBoSzFIbkxqa1QtZ3c
// Frankenstein analog input #1: PA1 adc1 MAP
// Frankenstein analog input #2: PA3 adc3 TPS
// Frankenstein analog input #3: PC3 adc13 IAT
// Frankenstein analog input #4: PC1 adc11 CLT
// Frankenstein analog input #5: PA0 adc0 vBatt
// Frankenstein analog input #6: PC2 adc12 WBO
// Frankenstein analog input #7: PA4 adc4
// Frankenstein analog input #8: PA2 adc2
// Frankenstein analog input #9: PA6 adc6
// Frankenstein analog input #10: PA7 adc7
// Frankenstein analog input #11: PC4 adc14
// Frankenstein analog input #12: PC5|PA8 adc15 Speed Sensor
/**
* MAP <BOSCH 0 261 230 057>
*/
engineConfiguration->map.sensor.hwChannel = EFI_ADC_1;
engineConfiguration->map.sensor.type = MT_CUSTOM;
engineConfiguration->map.sensor.lowValue = 10;
engineConfiguration->map.sensor.highValue = 105;
engineConfiguration->mapHighValueVoltage = 5;
/**
* TPS <MAGNETI MARELLI>
*/
engineConfiguration->tps1_1AdcChannel = EFI_ADC_3;
engineConfiguration->tpsMax = 102; // convert 12to10 bit (ADC/4)
engineConfiguration->tpsMin = 825; // convert 12to10 bit (ADC/4)
/**
* IAT <OEM ECU>
*/
engineConfiguration->iat.adcChannel = EFI_ADC_13;
engineConfiguration->iat.config = {-20.0, 23.0, 92.0, 15600.0, 2250.0, 240.0, 2660};
/**
* CLT <LADA Samara>
*/
engineConfiguration->clt.adcChannel = EFI_ADC_11;
engineConfiguration->clt.config = {-20.0, 25.0, 100.0, 28680.0, 2796.0, 177.0, 2660};
/**
* vBatt
*/
engineConfiguration->vbattAdcChannel = EFI_ADC_0;
engineConfiguration->vbattDividerCoeff = ((float) (2.6 + 10.1)) / 2.6 * 2;
/**
* WBO Innovate LC-1
*/
engineConfiguration->afr.hwChannel = EFI_ADC_12;
}

12
firmware/config/engines/citroenBerlingoTU3JP.h
View File

@ -1,12 +0,0 @@
/**
* @file citroenBerlingoTU3JP.h
*
* @date Apr 15, 2014
* @author Andrey Belomutskiy, (c) 2012-2020
*/
#pragma once
#include "engine_configuration.h"
void setCitroenBerlingoTU3JPConfiguration();

1
firmware/config/engines/engines.mk
View File

@ -11,7 +11,6 @@ ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \
$(PROJECT_DIR)/config/engines/mazda/mazda_miata_1_6.cpp \
$(PROJECT_DIR)/config/engines/mazda/mazda_miata_na8.cpp \
$(PROJECT_DIR)/config/engines/mazda/mazda_miata_vvt.cpp \
$(PROJECT_DIR)/config/engines/citroenBerlingoTU3JP.cpp \
$(PROJECT_DIR)/config/engines/dodge_neon.cpp \
$(PROJECT_DIR)/config/engines/ford_1995_inline_6.cpp \
$(PROJECT_DIR)/config/engines/gm_ls_4.cpp \

39
firmware/config/engines/mazda/mazda_miata.cpp
View File

@ -132,42 +132,3 @@ void common079721_2351() {
engineConfiguration->clt.adcChannel = EFI_ADC_11;
}
/**
* Tom tomiata, Frankenstein board
*/
void setFrankensteinMiata1996() {
commonMiataNa();
engineConfiguration->displacement = 1.839;
#if (IGN_RPM_COUNT == DEFAULT_IGN_RPM_COUNT) && (IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT)
copyTable(config->ignitionTable, miataNA8_maf_advance_table);
#endif
// upside down
engineConfiguration->triggerInputPins[0] = Gpio::A5;
engineConfiguration->triggerInputPins[1] = Gpio::C6;
engineConfiguration->fuelPumpPin = Gpio::E4;
engineConfiguration->idle.solenoidPin = Gpio::E5;
engineConfiguration->mafAdcChannel = EFI_ADC_1;
engineConfiguration->clt.adcChannel = EFI_ADC_11;
engineConfiguration->tps1_1AdcChannel = EFI_ADC_13;
engineConfiguration->ignitionPins[0] = Gpio::E12; // Frankenstein: high side #3
engineConfiguration->ignitionPins[1] = Gpio::Unassigned;
engineConfiguration->ignitionPins[2] = Gpio::E14; // Frankenstein: high side #4
engineConfiguration->ignitionPins[3] = Gpio::Unassigned;
// harness is sequential but we have a limited board
engineConfiguration->crankingInjectionMode = IM_BATCH;
engineConfiguration->injectionMode = IM_BATCH;
engineConfiguration->injectionPins[0] = Gpio::B9; // Frankenstein: low side - out #12
engineConfiguration->injectionPins[1] = Gpio::B8; // Frankenstein: low side - out #11
engineConfiguration->injectionPins[2] = Gpio::Unassigned;
engineConfiguration->injectionPins[3] = Gpio::Unassigned;
engineConfiguration->injectionPins[4] = Gpio::Unassigned;
engineConfiguration->injectionPins[5] = Gpio::Unassigned;
}

1
firmware/config/engines/mazda/mazda_miata.h
View File

@ -14,4 +14,3 @@
#include "engine_configuration.h"
void common079721_2351();
void setFrankensteinMiata1996();

17
firmware/config/engines/mazda/mazda_miata_1_6.cpp
View File

@ -338,23 +338,6 @@ void setMiataNA6_MAP_MRE() {
#endif /* BOARD_TLE8888_COUNT */
}
void setMiata94_MAP_MRE() {
setMiataNA6_MAP_MRE();
#if (BOARD_TLE8888_COUNT > 0)
// "35 - GP Out 1"
engineConfiguration->fuelPumpPin = Gpio::TLE8888_PIN_21;
#endif /* BOARD_TLE8888_COUNT */
engineConfiguration->injectionMode = IM_SEQUENTIAL;
engineConfiguration->displacement = 1.8;
strcpy(engineConfiguration->engineMake, ENGINE_MAKE_MAZDA);
strcpy(engineConfiguration->engineCode, "94");
engineConfiguration->map.sensor.type = MT_MPX4250;
}
void setHellenNA94() {
miataNAcommonEngineSettings();
strcpy(engineConfiguration->engineCode, "94");

1
firmware/config/engines/mazda/mazda_miata_1_6.h
View File

@ -19,7 +19,6 @@ void setMiataNA6_MAP_MRE();
/**
* set engine_type 20
*/
void setMiata94_MAP_MRE();
void miataNAcommonEngineSettings();
/**

16
firmware/config/engines/subaru.cpp
View File

@ -15,22 +15,6 @@
#include "defaults.h"
#include "mre_meta.h"
void setSubaru2003Wrx() {
engineConfiguration->trigger.type = trigger_type_e::TT_TOOTHED_WHEEL;
engineConfiguration->trigger.customTotalToothCount = 5;
engineConfiguration->trigger.customSkippedToothCount = 1;
engineConfiguration->useStepperIdle = true;
// See http://rusefi.com/forum/viewtopic.php?f=4&t=1161
engineConfiguration->idle.stepperDirectionPin = Gpio::D1; // top stepper drive pin, white wire recommended
engineConfiguration->idle.stepperStepPin = Gpio::D6; // yellow wire recommended
engineConfiguration->stepperEnablePin = Gpio::B1; // bottom stepper driver board pin, blue wire recommended
engineConfiguration->triggerSimulatorPins[0] = Gpio::Unassigned; // we want to avoid PD1 conflict
engineConfiguration->triggerSimulatorPins[1] = Gpio::Unassigned;
}
/**
* MRE_SUBARU_EJ18
* set engine_type 37

1
firmware/config/engines/subaru.h
View File

@ -7,7 +7,6 @@
#include "engine_configuration.h"
void setSubaru2003Wrx();
void setSubaruEJ20GDefaults();
void setSubaruEJ18_MRE();
void setSubaruEG33Defaults();

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

@ -38,7 +38,6 @@
#include "bmw_m73.h"
#include "bmw_n73.h"
#include "citroenBerlingoTU3JP.h"
#include "canam.h"
#include "custom_engine.h"
#include "dodge_neon.h"
@ -735,9 +734,7 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
case engine_type_e::BMW_M73_MRE_SLAVE:
setEngineBMW_M73_microRusEfi();
break;
case engine_type_e::MRE_MIATA_94_MAP:
setMiata94_MAP_MRE();
break;
case engine_type_e::UNUSED_20:
case engine_type_e::MRE_MIATA_NA6_MAP:
setMiataNA6_MAP_MRE();
break;
@ -993,15 +990,9 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
case engine_type_e::FORD_ESCORT_GT:
setFordEscortGt();
break;
case engine_type_e::MIATA_1996:
setFrankensteinMiata1996();
break;
case engine_type_e::CITROEN_TU3JP:
setCitroenBerlingoTU3JPConfiguration();
break;
case engine_type_e::SUBARU_2003_WRX:
setSubaru2003Wrx();
break;
case engine_type_e::UNUSED_21:
case engine_type_e::UNUSED_65:
case engine_type_e::UNUSED_22:
case engine_type_e::DODGE_RAM:
setDodgeRam1996();
break;

8
firmware/controllers/algo/engine_types.h
View File

@ -61,10 +61,10 @@ enum class engine_type_e : uint16_t {
TEST_ROTARY = 19,
// Frankenso board
FRANKENSO_MIATA_NA6_MAP = 41,
MRE_MIATA_94_MAP = 20,
MIATA_1996 = 21,
UNUSED_20 = 20,
UNUSED_21 = 21,
SUBARU_2003_WRX = 22,
UNUSED_22 = 22,
/**
* microRusEFI used as Body Control Module BCM BCU
@ -147,7 +147,7 @@ enum class engine_type_e : uint16_t {
MRE_VW_B6 = 62,
PROTEUS_BMW_M73 = 63,
DODGE_RAM = 64,
CITROEN_TU3JP = 65,
UNUSED_65 = 65,
MRE_MIATA_NA6_MAP = 66,
PROTEUS_MIATA_NB2 = 67,
MRE_M111 = 68,

7
firmware/tunerstudio/rusefi.input
View File

@ -2172,12 +2172,6 @@ cmd_set_engine_type_microRusEFI_VW_B6 = "@@TS_IO_TEST_COMMAND_char@@@@ts_comman
cmd_set_engine_type_microRusEFI_MRE_BODY_CONTROL = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_MRE_BODY_CONTROL_16_hex@@"
cmd_set_engine_type_MRE_SECONDARY_CAN = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_MRE_SECONDARY_CAN_16_hex@@"
cmd_set_engine_type_microRusEFI_Miata_NA6_MAP = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_MRE_MIATA_NA6_MAP_16_hex@@"
cmd_set_engine_type_microRusEFI_Miata_94_MAP = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_MRE_MIATA_94_MAP_16_hex@@"
cmd_set_engine_type_MRE_SUBARU_EJ18 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_MRE_SUBARU_EJ18_16_hex@@"
; cmd_set_engine_type_ = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_
cmd_set_engine_type_MITSUBISHI_3A92 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_MITSUBISHI_3A92_16_hex@@"
cmd_set_engine_type_MITSUBISHI_4G93 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_MITSUBISHI_4G93_16_hex@@"
@ -4483,7 +4477,6 @@ dialog = tcuControls, "Transmission Settings"
commandButton = "microRusEFI M111", cmd_set_engine_type_MRE_M111@@if_show_microRusEFI_presets
commandButton = "microRusEFI GDI VAG B6 test", cmd_set_engine_type_microRusEFI_VW_B6@@if_show_microRusEFI_presets
; commandButton = "microRusEFI BCM", cmd_set_engine_type_microRusEFI_MRE_BODY_CONTROL@@if_show_microRusEFI_presets
; commandButton = "microRusEFI Subaru EJ18", cmd_set_engine_type_MRE_SUBARU_EJ18@@if_show_microRusEFI_presets
commandButton = "microRusEFI CAN Extender", cmd_set_engine_type_MRE_SECONDARY_CAN@@if_show_microRusEFI_presets
commandButton = "Hyundai PB", cmd_set_engine_type_HYUNDAI_PB@@if_show_Proteus_presets

13
java_console/autotest/src/main/java/com/rusefi/f4discovery/CommonFunctionalTest.java
View File

@ -183,22 +183,11 @@ public class CommonFunctionalTest extends RusefiTestBase {
}
@Test
public void testCamaro() {
ecu.setEngineType(engine_type_e.CAMARO_4);
}
@Test
public void testSachs() {
// two stroke
public void testTwoStrokeSachs() {
ecu.setEngineType(engine_type_e.SACHS);
ecu.changeRpm(1200);
}
@Test
public void testCitroenBerlingo() {
ecu.setEngineType(engine_type_e.CITROEN_TU3JP);
ecu.changeRpm(1200);
}
@Test
public void test2003DodgeNeon() {
ecu.setEngineType(engine_type_e.DODGE_NEON_2003_CRANK);
ecu.sendCommand("set wwaeTau 0");