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

default engine make/code

This commit is contained in:
rusefi 2020-05-08 17:31:03 -04:00
parent 17f2ebe626
commit 4082a53f56
12 changed files with 64 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Thu May 07 09:06:40 EDT 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Fri May 08 16:32:39 EDT 2020
// by class com.rusefi.output.CHeaderConsumer
// begin
#ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@ -1894,17 +1894,28 @@ struct engine_configuration_s {
*/
etb_io etbIo2[ETB_COUNT];
/**
* For example, BMW, GM or Chevrolet
* REQUIRED for rusEFI Online
* offset 1096
*/
vehicle_info_t engineMake;
/**
* For example, LS1 or NB2
* REQUIRED for rusEFI Online
* offset 1128
*/
vehicle_info_t engineCode;
/**
* For example, Hunchback or Orange Miata
* Vehicle name has to be unique between your vehicles.
* REQUIRED for rusEFI Online
* offset 1160
*/
int unusedAtOldBoardConfigurationEnd[76];
vehicle_info_t vehicleName;
/**
* offset 1192
*/
int unusedAtOldBoardConfigurationEnd[68];
/**
offset 1464 bit 0 */
bool vvtDisplayInverted : 1;
@ -3441,4 +3452,4 @@ typedef struct persistent_config_s persistent_config_s;
#endif
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Thu May 07 09:06:40 EDT 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Fri May 08 16:32:39 EDT 2020

10
firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
View File

@ -553,6 +553,10 @@
#define enableVerboseCanTx_offset 744
#define enableVerboseCanTx_offset_hex 2e8
#define engine_load_mode_e_enum "MAF", "Alpha-N/TPS", "INVALID", "SPEED DENSITY", "MAF Air Charge"
#define ENGINE_MAKE_BMW "BMW"
#define ENGINE_MAKE_GM "GM"
#define ENGINE_MAKE_LADA "Lada"
#define ENGINE_MAKE_MAZDA "Mazda"
#define ENGINE_NOISE_CURVE_SIZE 8
#define engineChartSize_offset 1480
#define engineChartSize_offset_hex 5c8
@ -2297,8 +2301,8 @@
#define unused_former_warmup_target_afr_offset_hex 834
#define unusedAntilagTimeout_offset 820
#define unusedAntilagTimeout_offset_hex 334
#define unusedAtOldBoardConfigurationEnd_offset 1160
#define unusedAtOldBoardConfigurationEnd_offset_hex 488
#define unusedAtOldBoardConfigurationEnd_offset 1192
#define unusedAtOldBoardConfigurationEnd_offset_hex 4a8
#define unusedBit4_1476_offset 1476
#define unusedBit4_1476_offset_hex 5c4
#define unusedBit_251_11_offset 976
@ -2447,6 +2451,8 @@
#define vbattDividerCoeff_offset 464
#define vbattDividerCoeff_offset_hex 1d0
#define VEHICLE_INFO_SIZE 32
#define vehicleName_offset 1160
#define vehicleName_offset_hex 488
#define vehicleSpeedCoef_offset 476
#define vehicleSpeedCoef_offset_hex 1dc
#define vehicleSpeedSensorInputPin_offset 968

4
firmware/config/engines/bmw_m73.cpp
View File

@ -78,6 +78,8 @@ void m73engine(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->specs.cylindersCount = 12;
engineConfiguration->specs.displacement = 5.4;
strcpy(CONFIG(engineMake), ENGINE_MAKE_BMW);
strcpy(CONFIG(engineCode), "M73");
engineConfiguration->specs.firingOrder = FO_1_7_5_11_3_9_6_12_2_8_4_10;
CONFIG(isFasterEngineSpinUpEnabled) = true;
@ -265,6 +267,8 @@ void setEngineBMW_M73_Proteus(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
// set_analog_input_pin pps pa4
engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_4;
strcpy(CONFIG(vehicleName), "Using Proteus");
// set vbatt_divider 8.16
// engineConfiguration->vbattDividerCoeff = (49.0f / 10.0f) * 16.8f / 10.0f;
// todo: figure out exact values from TLE8888 breakout board used by Manhattan

2
firmware/config/engines/bmw_m73_mre.cpp
View File

@ -71,6 +71,8 @@ void setEngineBMW_M73_microRusEfi(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
CONFIG(isFasterEngineSpinUpEnabled) = true;
strcpy(CONFIG(vehicleName), "microRusEFIx2");
engineConfiguration->globalTriggerAngleOffset = 90;
engineConfiguration->specs.cylindersCount = 6;
engineConfiguration->specs.displacement = 5.4 / 2;

1
firmware/config/engines/chevrolet_camaro_4.cpp
View File

@ -22,6 +22,7 @@ void setCamaro4(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->specs.displacement = 5.7;
engineConfiguration->specs.cylindersCount = 8;
strcpy(CONFIG(engineMake), ENGINE_MAKE_GM);
engineConfiguration->specs.firingOrder = FO_1_8_7_2_6_5_4_3;
engineConfiguration->triggerInputPins[0] = GPIOA_5;

2
firmware/config/engines/mazda_miata_1_6.cpp
View File

@ -185,6 +185,8 @@ static void setMiataNA6_settings(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
config->crankingFuelBins[7] = 90;
engineConfiguration->specs.displacement = 1.6;
strcpy(CONFIG(engineMake), ENGINE_MAKE_MAZDA);
strcpy(CONFIG(engineCode), "NA6");
// my car was originally a manual so proper TPS
engineConfiguration->tpsMin = 93; // convert 12to10 bit (ADC/4)

2
firmware/config/engines/mazda_miata_na8.cpp
View File

@ -36,6 +36,8 @@ void setMazdaMiataNA8Configuration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->injector.flow = 265;
engineConfiguration->specs.displacement = 1.839;
strcpy(CONFIG(engineMake), ENGINE_MAKE_MAZDA);
strcpy(CONFIG(engineCode), "NA8");
engineConfiguration->vbattDividerCoeff = 9.75;// ((float) (8.2 + 33)) / 8.2 * 2;

4
firmware/config/engines/mazda_miata_vvt.cpp
View File

@ -222,7 +222,9 @@ static void setMazdaMiataEngineNB2Defaults(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->trigger.type = TT_MIATA_VVT;
setOperationMode(engineConfiguration, FOUR_STROKE_SYMMETRICAL_CRANK_SENSOR);
engineConfiguration->specs.displacement = 1.8;
engineConfiguration->specs.displacement = 1.839;
strcpy(CONFIG(engineMake), ENGINE_MAKE_MAZDA);
strcpy(CONFIG(engineCode), "NB2");
engineConfiguration->map.sensor.type = MT_GM_3_BAR;
setEgoSensor(ES_Innovate_MTX_L PASS_CONFIG_PARAMETER_SUFFIX);

4
firmware/controllers/generated/rusefi_generated.h
View File

@ -553,6 +553,10 @@
#define enableVerboseCanTx_offset 744
#define enableVerboseCanTx_offset_hex 2e8
#define engine_load_mode_e_enum "MAF", "Alpha-N/TPS", "INVALID", "SPEED DENSITY", "MAF Air Charge"
#define ENGINE_MAKE_BMW "BMW"
#define ENGINE_MAKE_GM "GM"
#define ENGINE_MAKE_LADA "Lada"
#define ENGINE_MAKE_MAZDA "Mazda"
#define ENGINE_NOISE_CURVE_SIZE 8
#define engineChartSize_offset 1480
#define engineChartSize_offset_hex 5c8

4
firmware/integration/rusefi_config.txt
View File

@ -1476,6 +1476,10 @@ end_struct
#define GAUGE_NAME_DEBUG_I4 "debug i4"
#define GAUGE_NAME_DEBUG_I5 "debug i5"
#define ENGINE_MAKE_MAZDA "Mazda"
#define ENGINE_MAKE_LADA "Lada"
#define ENGINE_MAKE_GM "GM"
#define ENGINE_MAKE_BMW "BMW"
#define CMD_PINS "pins"
#define CMD_CALIBRATE_PEDAL_UP "calibrate_pedal_up"

24
firmware/tunerstudio/rusefi_kinetis.ini
View File

@ -89,7 +89,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Thu May 07 09:06:40 EDT 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Fri May 08 16:32:39 EDT 2020
pageSize = 20000
page = 1
@ -635,7 +635,8 @@ page = 1
etbIo22_disablePin = bits, U08, 1095, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16"
engineMake = string, ASCII, 1096, 32
engineCode = string, ASCII, 1128, 32
;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1160
vehicleName = string, ASCII, 1160, 32
;no TS info - skipping unusedAtOldBoardConfigurationEnd offset 1192
vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true"
fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true"
isVerboseIAC = bits, U32, 1464, [2:2], "false", "true"
@ -1246,6 +1247,9 @@ page = 1
stft_minAfr = "Below this AFR, correction is paused"
stft_maxAfr = "Above this AFR, correction is paused"
stft_startupDelay = "Delay after starting the engine before beginning closed loop correction."
engineMake = "For example, BMW, GM or Chevrolet\nREQUIRED for rusEFI Online"
engineCode = "For example, LS1 or NB2\nREQUIRED for rusEFI Online"
vehicleName = "For example, Hunchback or Orange Miata\nVehicle name has to be unique between your vehicles.\nREQUIRED for rusEFI Online"
fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling."
isVerboseIAC = "Print details into rusEfi console"
isVerboseETB = "Prints ETB details to rusEFI console"
@ -1995,12 +1999,12 @@ fileVersion = { 20200310 }
yBins = tpsTpsAccelToRpmBins, TPSValue
zBins = tpsTpsAccelTable
table = boostTableTbl, boostMapOpen, "", 1
table = boostTableTbl, boostMapOpen, "Boost Open", 1
xBins = boostRpmBins, RPMValue
yBins = boostTpsBins, TPSValue
zBins = boostTableOpenLoop
table = boostTable2Tbl, boostMapClosed, "", 1
table = boostTable2Tbl, boostMapClosed, "Boost Closed", 1
xBins = boostRpmBins, RPMValue
yBins = boostTpsBins, TPSValue
zBins = boostTableClosedLoop
@ -2123,25 +2127,25 @@ fileVersion = { 20200310 }
gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees.
upDownLabel = "(Later)", "(Sooner)"
table = gppwm1Tbl, gppwm1Map, "", 1
table = gppwm1Tbl, gppwm1Map, "GP#1", 1
xyLabels = "RPM", ""
xBins = gppwm1_rpmBins, RPMValue
yBins = gppwm1_loadBins, gppwm1_load
zBins = gppwm1_table
table = gppwm2Tbl, gppwm2Map, "", 1
table = gppwm2Tbl, gppwm2Map, "GP#2", 1
xyLabels = "RPM", ""
xBins = gppwm2_rpmBins, RPMValue
yBins = gppwm2_loadBins, gppwm2_load
zBins = gppwm2_table
table = gppwm3Tbl, gppwm3Map, "", 1
table = gppwm3Tbl, gppwm3Map, "GP#3", 1
xyLabels = "RPM", ""
xBins = gppwm3_rpmBins, RPMValue
yBins = gppwm3_loadBins, gppwm3_load
zBins = gppwm3_table
table = gppwm4Tbl, gppwm4Map, "", 1
table = gppwm4Tbl, gppwm4Map, "GP#4", 1
xyLabels = "RPM", ""
xBins = gppwm4_rpmBins, RPMValue
yBins = gppwm4_loadBins, gppwm4_load
@ -2886,7 +2890,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
; this field is useful for rusEFI online catalog
field = "Engine Make", engineMake
; this field is useful for rusEFI online catalog
field = "Engine Code", engineCode
field = "Manufacturer Engine Code", engineCode
; this field is useful for rusEFI online catalog
field = "Vehicle Name", vehicleName
field = "Number of Cylinders", cylindersCount
field = "Engine Displacement", displacement
field = "Firing Order", firingOrder

6
java_console/models/src/com/rusefi/config/generated/Fields.java
View File

@ -1,6 +1,6 @@
package com.rusefi.config.generated;
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu May 07 13:45:58 EDT 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Fri May 08 17:02:39 EDT 2020
// by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*;
@ -358,6 +358,10 @@ public class Fields {
public static final int enableLaunchBoost_offset = 976;
public static final int enableLaunchRetard_offset = 976;
public static final int enableVerboseCanTx_offset = 744;
public static final String ENGINE_MAKE_BMW = "BMW";
public static final String ENGINE_MAKE_GM = "GM";
public static final String ENGINE_MAKE_LADA = "Lada";
public static final String ENGINE_MAKE_MAZDA = "Mazda";
public static final int ENGINE_NOISE_CURVE_SIZE = 8;
public static final int engineChartSize_offset = 1480;
public static final int engineCode_offset = 1128;