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

only: dead NB2

This commit is contained in:
rusefillc 2024-01-16 18:34:46 -05:00 committed by Andrey
parent 41f60069f5
commit 216afa92b9
9 changed files with 10 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
firmware/config/engines/mazda/mazda_miata_vvt.cpp
View File

@ -190,6 +190,8 @@ static const float mafTransferKgH[MAF_TRANSFER_SIZE] = {
*/
#if HW_HELLEN || HW_PROTEUS
#define MAF_TRANSFER_SIZE 10
// this transfer function somehow works with 1K pull-down
@ -388,150 +390,7 @@ static void setMazdaMiataEngineNB2Defaults() {
engineConfiguration->driveWheelRevPerKm = 538;
engineConfiguration->finalGearRatio = 3.909;
}
// MAZDA_MIATA_2003
void setMazdaMiata2003EngineConfiguration() {
setFrankensoConfiguration();
setMazdaMiataEngineNB2Defaults();
// engineConfiguration->triggerInputPins[0] = Gpio::A8; // custom Frankenso wiring in order to use SPI1 for accelerometer
engineConfiguration->triggerInputPins[0] = Gpio::A5; // board still not modified
engineConfiguration->triggerInputPins[1] = Gpio::Unassigned;
engineConfiguration->camInputs[0] = Gpio::C6;
// engineConfiguration->is_enabled_spi_1 = true;
engineConfiguration->alternatorControlPin = Gpio::E10;
engineConfiguration->alternatorControlPinMode = OM_OPENDRAIN;
// engineConfiguration->vehicleSpeedSensorInputPin = Gpio::A8;
engineConfiguration->vvtPins[0] = Gpio::E3; // VVT solenoid control
// high-side driver with +12v VP jumper
engineConfiguration->tachOutputPin = Gpio::E8; // tachometer
// set global_trigger_offset_angle 0
engineConfiguration->globalTriggerAngleOffset = 0;
// enable trigger_details
engineConfiguration->verboseTriggerSynchDetails = false;
// set cranking_timing_angle 10
engineConfiguration->crankingTimingAngle = 10;
/**
* Saab attempt
* Saab coil on #1 PD8 extra blue wire
* Miata coil on #2 PC9 - orange ECU wire "2&3"
* Saab coil on #3 PD9 extra white wire
* Miata coil on #4 PE14 - white ECU wire "1&4"
*/
engineConfiguration->ignitionPins[0] = Gpio::E14;
engineConfiguration->ignitionPins[1] = Gpio::Unassigned;
engineConfiguration->ignitionPins[2] = Gpio::C9;
engineConfiguration->ignitionPins[3] = Gpio::Unassigned;
engineConfiguration->malfunctionIndicatorPin = Gpio::D5;
// engineConfiguration->malfunctionIndicatorPin = Gpio::D9;
// engineConfiguration->malfunctionIndicatorPinMode = OM_INVERTED;
// todo: blue jumper wire - what is it?!
// Frankenso analog #6 pin 3R, W56 (5th lower row pin from the end) top <> W45 bottom jumper, not OEM
// see setFrankensoConfiguration
// map.sensor.hwChannel = EFI_ADC_0; W53
/**
* PA4 Wideband O2 Sensor
*/
// todo: re-wire the board to use "Frankenso analog #7 pin 3J, W48 top <>W48 bottom jumper, not OEM"
//engineConfiguration->afr.hwChannel = EFI_ADC_3; // PA3
engineConfiguration->afr.hwChannel = EFI_ADC_4;
//
/**
* Combined RPM, CLT and VBATT warning light
*
* to test
* set_fsio_setting 2 1800
* set_fsio_setting 3 65
* set_fsio_setting 4 15
*/
engineConfiguration->scriptSetting[1] = 6500; // #2 RPM threshold
engineConfiguration->scriptSetting[2] = 105; // #3 CLT threshold
engineConfiguration->scriptSetting[3] = 12.0; // #4 voltage threshold
// enable auto_idle
// set idle_p 0.05
// set idle_i 0
// set idle_d 0
// set debug_mode 3
// set idle_rpm 1700
// see setDefaultIdleParameters
engineConfiguration->adcVcc = 3.3f;
engineConfiguration->vbattDividerCoeff = 8.80f;
// by the way NB2 MAF internal diameter is about 2.5 inches / 63mm
// 1K pull-down to read current from this MAF
engineConfiguration->mafAdcChannel = EFI_ADC_6; // PA6 W46 <> W46
engineConfiguration->throttlePedalUpVoltage = 0.65f;
// TLE7209 two-wire ETB control
// PWM
engineConfiguration->etb_use_two_wires = true;
engineConfiguration->etbIo[0].controlPin = Gpio::Unassigned;
//
engineConfiguration->etbIo[0].directionPin1 = Gpio::E12; // orange
//
engineConfiguration->etbIo[0].directionPin2 = Gpio::C7; // white/blue
// set_analog_input_pin tps PC3
engineConfiguration->tps1_1AdcChannel = EFI_ADC_13; // PC3 blue
// set_analog_input_pin pps PA2
/* a step back - Frankenso does not use ETB
engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_2;
*/
//set etb_p 12
engineConfiguration->etb.pFactor = 12; // a bit lower p-factor seems to work better on TLE9201? MRE?
engineConfiguration->etb.iFactor = 0;
engineConfiguration->etb.dFactor = 0;
engineConfiguration->etb.offset = 40;
engineConfiguration->etb.minValue = -60;
engineConfiguration->etb.maxValue = 50;
config->crankingFuelCoef[0] = 2.8; // base cranking fuel adjustment coefficient
config->crankingFuelBins[0] = -20; // temperature in C
config->crankingFuelCoef[1] = 2.2;
config->crankingFuelBins[1] = -10;
config->crankingFuelCoef[2] = 1.8;
config->crankingFuelBins[2] = 5;
config->crankingFuelCoef[3] = 1.5;
config->crankingFuelBins[3] = 30;
config->crankingFuelCoef[4] = 1.0;
config->crankingFuelBins[4] = 35;
config->crankingFuelCoef[5] = 1.0;
config->crankingFuelBins[5] = 50;
config->crankingFuelCoef[6] = 1.0;
config->crankingFuelBins[6] = 65;
config->crankingFuelCoef[7] = 1.0;
config->crankingFuelBins[7] = 90;
}
#endif // HW_HELLEN || HW_PROTEUS
/**
* https://github.com/rusefi/rusefi/wiki/HOWTO-TCU-A42DE-on-Proteus

7
firmware/config/engines/mazda/mazda_miata_vvt.h
View File

@ -11,13 +11,6 @@
#include "engine_configuration.h"
/**
* Primary rusEfi test mule https://rusefi.com/forum/viewtopic.php?f=3&t=1095
* MAZDA_MIATA_2003
* set engine_type 47
*/
void setMazdaMiata2003EngineConfiguration();
/**
* https://github.com/rusefi/rusefi/wiki/Mazda-Miata-2001
* set engine_type 1

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

@ -993,9 +993,7 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
case engine_type_e::DODGE_RAM:
setDodgeRam1996();
break;
case engine_type_e::FRANKENSO_MAZDA_MIATA_2003:
setMazdaMiata2003EngineConfiguration();
break;
case engine_type_e::ET_UNUSED_47:
case engine_type_e::ET_UNUSED_55:
case engine_type_e::TEST_ENGINE_VVT:
setTestVVTEngineConfiguration();

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

@ -118,10 +118,7 @@ enum class engine_type_e : uint16_t {
DODGE_NEON_2003_CRANK = 46,
/**
* proper NB2 setup, 2003 red test mule car
*/
FRANKENSO_MAZDA_MIATA_2003 = 47,
ET_UNUSED_47 = 47,
// todo: add wastegate case into HW CI
TEST_DC_WASTEGATE_DISCOVERY = 48,

3
firmware/tunerstudio/rusefi.input
View File

@ -2204,8 +2204,6 @@ cmd_set_engine_type_hellen_coupe_bk2 = "@@TS_IO_TEST_COMMAND_char@@@@ts_comm
; MIATA_NA6_MAP = 41
cmd_set_engine_type_Frankenso_Miata_NA6_MAP = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_FRANKENSO_MIATA_NA6_MAP_16_hex@@"
; MAZDA_MIATA_2003 = 47
cmd_set_engine_type_Frankenso_Miata_NB2 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_FRANKENSO_MAZDA_MIATA_2003_16_hex@@"
cmd_set_engine_type_FUEL_BENCH = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_FUEL_BENCH_16_hex@@"
@ -4468,7 +4466,6 @@ dialog = tcuControls, "Transmission Settings"
field = "!These buttons send a command to rusEFI controller to apply preset values"
field = "!Once you send the command, please reconnect to rusEFI controller in order to read fresh values"
commandButton = "Frankenso Miata NA6 Stage 1", cmd_set_engine_type_Frankenso_Miata_NA6_MAP@@if_show_Frankenso_presets
commandButton = "Frankenso Miata NB2 MAP", cmd_set_engine_type_Frankenso_Miata_NB2@@if_show_Frankenso_presets
; commandButton = "Mitsubishi 3A92", cmd_set_engine_type_MITSUBISHI_3A92
; commandButton = "Mitsubishi 4G93", cmd_set_engine_type_MITSUBISHI_4G93

2
unit_tests/tests/actuators/test_tacho.cpp
View File

@ -5,7 +5,7 @@ extern float getTachDuty(void);
TEST(Actuators, Tachometer) {
// This engine has a tach pin set - we need that
EngineTestHelper eth(engine_type_e::FRANKENSO_MAZDA_MIATA_2003);
EngineTestHelper eth(engine_type_e::PROTEUS_MIATA_NB2);
// We don't actually care about ign/inj at all, just tach
engineConfiguration->isInjectionEnabled = false;

2
unit_tests/tests/trigger/test_cam_vvt_input.cpp
View File

@ -132,7 +132,7 @@ TEST(trigger, testCamInput) {
}
TEST(trigger, testNB2CamInput) {
EngineTestHelper eth(engine_type_e::FRANKENSO_MAZDA_MIATA_2003);
EngineTestHelper eth(engine_type_e::PROTEUS_MIATA_NB2);
engineConfiguration->isFasterEngineSpinUpEnabled = false;

4
unit_tests/tests/trigger/test_symmetrical_crank.cpp
View File

@ -15,7 +15,7 @@ static void postFourEvents(EngineTestHelper *eth, float mult) {
}
TEST(engine, testAngleLogicInSymmetricalCrankIssue2980) {
EngineTestHelper eth(engine_type_e::FRANKENSO_MAZDA_MIATA_2003);
EngineTestHelper eth(engine_type_e::PROTEUS_MIATA_NB2);
TriggerFormDetails *triggerForm = &engine->triggerCentral.triggerFormDetails;
@ -44,7 +44,7 @@ TEST(engine, testAngleLogicInSymmetricalCrankIssue2980) {
TEST(engine, testSymmetricalCrank) {
EngineTestHelper eth(engine_type_e::FRANKENSO_MAZDA_MIATA_2003);
EngineTestHelper eth(engine_type_e::PROTEUS_MIATA_NB2);
// this test is not about isFasterEngineSpinUpEnabled so let's disable it to simplify things
engineConfiguration->isFasterEngineSpinUpEnabled = false;

2
unit_tests/tests/trigger/test_trigger_decoder.cpp
View File

@ -322,7 +322,7 @@ TEST(misc, testRpmCalculator) {
}
TEST(trigger, testAnotherTriggerDecoder) {
testTriggerDecoder2("Miata 2003", engine_type_e::FRANKENSO_MAZDA_MIATA_2003, 3, 0.38888889, 0.0);
testTriggerDecoder2("Miata 2003", engine_type_e::PROTEUS_MIATA_NB2, 3, 0.38888889, 0.0);
}
TEST(trigger, testTriggerDecoder) {