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

a bit of dead code

This commit is contained in:
rusefillc 2021-11-06 23:39:56 -04:00
parent d2b9fec0a2
commit ce45a907a7
8 changed files with 16 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/boards/microrusefi/board.mk
View File

@ -14,7 +14,7 @@ endif
# Set this if you want a default engine type other than normal MRE
ifeq ($(DEFAULT_ENGINE_TYPE),)
DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=MICRO_RUS_EFI
DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS
endif
ifeq ($(LED_CRITICAL_ERROR_BRAIN_PIN),)

4
firmware/config/boards/prometheus/prometheus-common.mk
View File

@ -21,10 +21,10 @@ ifeq ($(DEBUG_LEVEL_OPT),)
endif
ifeq ($(PROMETHEUS_BOARD),405)
DDEFS += -DDEFAULT_ENGINE_TYPE=PROMETHEUS_DEFAULTS -DFIRMWARE_ID=\"prometeus405\"
DDEFS += -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS -DFIRMWARE_ID=\"prometeus405\"
else
# Override DEFAULT_ENGINE_TYPE
DDEFS += -DDEFAULT_ENGINE_TYPE=PROMETHEUS_DEFAULTS -DFIRMWARE_ID=\"prometeus469\"
DDEFS += -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS -DFIRMWARE_ID=\"prometeus469\"
endif
# Shared variables

2
firmware/config/boards/proteus/board.mk
View File

@ -10,7 +10,7 @@ endif
# Set this if you want a default engine type other than normal Proteus
ifeq ($(DEFAULT_ENGINE_TYPE),)
DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=PROTEUS_DEFAULTS
DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS
endif
DDEFS += -DEFI_USE_OSC=TRUE

75
firmware/config/engines/mazda_626.cpp
View File

@ -13,78 +13,3 @@
#include "custom_engine.h"
#include "fsio_impl.h"
void setMazda626EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR);
// engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2;
engineConfiguration->trigger.type = TT_60_2_VW;
// engineConfiguration->trigger.type = TT_MAZDA_DOHC_1_4;
// with this complex trigger we do not need this by default
engineConfiguration->sensorChartMode = SC_OFF;
engineConfiguration->useOnlyRisingEdgeForTrigger = true;
engineConfiguration->injectionMode = IM_BATCH;
// enable two_wire_batch_injection
engineConfiguration->twoWireBatchInjection = true;
// enable two_wire_wasted_spark
engineConfiguration->twoWireBatchIgnition = true;
// chartsize 600
engineConfiguration->engineChartSize = 600;
engineConfiguration->injector.flow = 330;
engineConfiguration->specs.displacement = 2.0;
// set global_trigger_offset_angle 106
engineConfiguration->globalTriggerAngleOffset = 106;
// set ignition_mode 2
engineConfiguration->ignitionMode = IM_WASTED_SPARK;
// set cranking_timing_angle 15
engineConfiguration->crankingTimingAngle = 8;
// set cranking_fuel 9
engineConfiguration->cranking.baseFuel = 30;
engineConfiguration->rpmHardLimit = 7400;
engineConfiguration->tpsMin = 80;
engineConfiguration->tpsMax = 764;
setAlgorithm(LM_SPEED_DENSITY PASS_CONFIG_PARAMETER_SUFFIX);
// set_whole_timing_map 10
setWholeTimingTable_d(10 PASS_CONFIG_PARAMETER_SUFFIX);
// http://s1.micp.ru/tOb0U.png
engineConfiguration->clt.config = {-15, 23, 97, 5900, 1750, 165, 2700};
// http://s2.micp.ru/I6Cfe.png
engineConfiguration->iat.config = {23, 41, 97, 1750, 810, 165, 1820};
// engineConfiguration->map.sensor.hwChannel = EFI_ADC_4;
engineConfiguration->mafAdcChannel = EFI_ADC_NONE;
// todo: 8.2 or 10k?
engineConfiguration->vbattDividerCoeff = ((float) (10 + 33)) / 10 * 2;
engineConfiguration->map.sensor.type = MT_SUBY_DENSO;
engineConfiguration->tpsAccelLength = 12;
engineConfiguration->tpsAccelEnrichmentThreshold = 10;
// todo engineConfiguration->afr.hwChannel = EFI_ADC_3;
setEgoSensor(ES_Innovate_MTX_L PASS_CONFIG_PARAMETER_SUFFIX);
//#if EFI_FSIO
// // backup main relay pin
// setFsio(0, GPIOE_6, "1" PASS_CONFIG_PARAMETER_SUFFIX);
//#endif
engineConfiguration->triggerInputPins[1] = GPIO_UNASSIGNED;
engineConfiguration->camInputs[0] = GPIOA_5;
}

3
firmware/config/engines/mazda_626.h
View File

@ -9,6 +9,3 @@
#pragma once
#include "engine_configuration.h"
void setMazda626EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE);

8
firmware/controllers/algo/auto_generated_enginetypes.cpp
View File

@ -226,7 +226,7 @@ case HONDA_600:
return "HONDA_600";
case HONDA_ACCORD_CD_TWO_WIRES:
return "HONDA_ACCORD_CD_TWO_WIRES";
case MAZDA_626:
case UNUSED28:
return "MAZDA_626";
case MAZDA_MIATA_2003_BOARD_TEST:
return "MAZDA_MIATA_2003_BOARD_TEST";
@ -236,7 +236,7 @@ case MIATA_1996:
return "MIATA_1996";
case MIATA_PROTEUS_TCU:
return "MIATA_PROTEUS_TCU";
case MICRO_RUS_EFI:
case UNUSED60:
return "MICRO_RUS_EFI";
case MINIMAL_PINS:
return "MINIMAL_PINS";
@ -266,13 +266,13 @@ case MRE_SUBARU_EJ18:
return "MRE_SUBARU_EJ18";
case NISSAN_PRIMERA:
return "NISSAN_PRIMERA";
case PROMETHEUS_DEFAULTS:
case UNUSED100:
return "PROMETHEUS_DEFAULTS";
case PROTEUS_ANALOG_PWM_TEST:
return "PROTEUS_ANALOG_PWM_TEST";
case PROTEUS_BMW_M73:
return "PROTEUS_BMW_M73";
case PROTEUS_DEFAULTS:
case UNUSED61:
return "PROTEUS_DEFAULTS";
case PROTEUS_HONDA_ELEMENT_2003:
return "PROTEUS_HONDA_ELEMENT_2003";

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

@ -873,10 +873,10 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
* And override them with engine-specific defaults
*/
switch (engineType) {
case MICRO_RUS_EFI:
case UNUSED60:
// todo: is it time to replace MICRO_RUS_EFI, PROTEUS, PROMETHEUS_DEFAULTS with MINIMAL_PINS? maybe rename MINIMAL_PINS to DEFAULT?
case PROTEUS_DEFAULTS:
case PROMETHEUS_DEFAULTS:
case UNUSED61:
case UNUSED100:
case MINIMAL_PINS:
// all basic settings are already set in prepareVoidConfiguration(), no need to set anything here
// nothing to do - we do it all in setBoardDefaultConfiguration
@ -1080,9 +1080,7 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
setHonda600(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case UNUSED9:
case MAZDA_626:
setMazda626EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case UNUSED28:
case FORD_ESCORT_GT:
setFordEscortGt(PASS_CONFIG_PARAMETER_SIGNATURE);
break;

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

@ -89,7 +89,7 @@ typedef enum {
// see TriggerWaveform::bothFrontsRequired
TEST_ISSUE_898 = 27,
MAZDA_626 = 28,
UNUSED28 = 28,
SACHS = 29,
@ -158,9 +158,9 @@ typedef enum {
TLE8888_BENCH_ENGINE = 59,
MICRO_RUS_EFI = 60,
UNUSED60 = 60,
PROTEUS_DEFAULTS = 61,
UNUSED61 = 61,
PROTEUS_ANALOG_PWM_TEST = 106,
@ -228,7 +228,7 @@ typedef enum {
* this configuration has as few pins configured as possible
*/
MINIMAL_PINS = 99,
PROMETHEUS_DEFAULTS = 100,
UNUSED100 = 100,
UNUSED101 = 101,
VAG_18_TURBO = 102,