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

Merge remote-tracking branch 'upstream/master' into obd2-lambda

This commit is contained in:
Matthew Kennedy 2020-07-29 03:00:12 -07:00
parent 6d68829ee4 aaa3d6bcd9
commit 2a0aada862
17 changed files with 33 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,7 +125,7 @@ void setEngineBMW_M73_microRusEfi(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
CONFIG(crankingTimingAngle) = 15; CONFIG(crankingTimingAngle) = 15;
// I am too lazy to add MAP sensor // I am too lazy to add MAP sensor
engineConfiguration->fuelAlgorithm = LM_ALPHA_N; engineConfiguration->fuelAlgorithm = LM_ALPHA_N_2;
// set cranking_fuel 15 // set cranking_fuel 15
engineConfiguration->cranking.baseFuel = 15; engineConfiguration->cranking.baseFuel = 15;

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

@ -95,7 +95,7 @@ void setCitroenBerlingoTU3JPConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
/** /**
* Algorithm Alpha-N setting * Algorithm Alpha-N setting
*/ */
setAlgorithm(LM_ALPHA_N PASS_CONFIG_PARAMETER_SUFFIX); setAlgorithm(LM_ALPHA_N_2 PASS_CONFIG_PARAMETER_SUFFIX);
setFuelLoadBin(0, 100 PASS_CONFIG_PARAMETER_SUFFIX); setFuelLoadBin(0, 100 PASS_CONFIG_PARAMETER_SUFFIX);
setFuelRpmBin(800, 7000 PASS_CONFIG_PARAMETER_SUFFIX); setFuelRpmBin(800, 7000 PASS_CONFIG_PARAMETER_SUFFIX);
setTimingRpmBin(800, 7000 PASS_CONFIG_PARAMETER_SUFFIX); setTimingRpmBin(800, 7000 PASS_CONFIG_PARAMETER_SUFFIX);

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

@ -147,7 +147,7 @@ void setDodgeNeon1995EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->trigger.type = TT_DODGE_NEON_1995; engineConfiguration->trigger.type = TT_DODGE_NEON_1995;
engineConfiguration->fuelAlgorithm = LM_ALPHA_N; engineConfiguration->fuelAlgorithm = LM_ALPHA_N_2;
// engineConfiguration->spi2SckMode = PAL_STM32_OTYPE_OPENDRAIN; // 4 // engineConfiguration->spi2SckMode = PAL_STM32_OTYPE_OPENDRAIN; // 4
// engineConfiguration->spi2MosiMode = PAL_STM32_OTYPE_OPENDRAIN; // 4 // engineConfiguration->spi2MosiMode = PAL_STM32_OTYPE_OPENDRAIN; // 4
@ -299,8 +299,6 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
*/ */
engineConfiguration->injector.flow = 199; engineConfiguration->injector.flow = 199;
//engineConfiguration->fuelAlgorithm = LM_ALPHA_N; // I want to start with a simple Alpha-N
setFuelLoadBin(0, 100 PASS_CONFIG_PARAMETER_SUFFIX); setFuelLoadBin(0, 100 PASS_CONFIG_PARAMETER_SUFFIX);
setLinearCurve(config->ignitionLoadBins, 20, 120, 1); setLinearCurve(config->ignitionLoadBins, 20, 120, 1);

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

@ -66,7 +66,7 @@ static void setDefaultCustomMaps(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
void setHonda600(DECLARE_CONFIG_PARAMETER_SIGNATURE) { void setHonda600(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
engineConfiguration->trigger.type = TT_HONDA_CBR_600_CUSTOM; engineConfiguration->trigger.type = TT_HONDA_CBR_600_CUSTOM;
engineConfiguration->fuelAlgorithm = LM_ALPHA_N; engineConfiguration->fuelAlgorithm = LM_ALPHA_N_2;
// upside down wiring // upside down wiring
engineConfiguration->triggerInputPins[0] = GPIOA_5; engineConfiguration->triggerInputPins[0] = GPIOA_5;
@ -150,7 +150,7 @@ void setHonda600(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->injectionPins[3] = GPIOB_8; // #4 engineConfiguration->injectionPins[3] = GPIOB_8; // #4
setDefaultCustomMaps(PASS_CONFIG_PARAMETER_SIGNATURE); setDefaultCustomMaps(PASS_CONFIG_PARAMETER_SIGNATURE);
setAlgorithm(LM_ALPHA_N PASS_CONFIG_PARAMETER_SUFFIX); setAlgorithm(LM_ALPHA_N_2 PASS_CONFIG_PARAMETER_SUFFIX);
engineConfiguration->injectionPins[4] = GPIO_UNASSIGNED; engineConfiguration->injectionPins[4] = GPIO_UNASSIGNED;
engineConfiguration->injectionPins[5] = GPIO_UNASSIGNED; engineConfiguration->injectionPins[5] = GPIO_UNASSIGNED;

2
firmware/controllers/algo/auto_generated_enums.cpp
View File

@ -725,8 +725,6 @@ const char *getEngine_load_mode_e(engine_load_mode_e value){
switch(value) { switch(value) {
case Force_4_bytes_size_engine_load_mode: case Force_4_bytes_size_engine_load_mode:
return "Force_4_bytes_size_engine_load_mode"; return "Force_4_bytes_size_engine_load_mode";
case LM_ALPHA_N:
return "LM_ALPHA_N";
case LM_PLAIN_MAF: case LM_PLAIN_MAF:
return "LM_PLAIN_MAF"; return "LM_PLAIN_MAF";
case LM_REAL_MAF: case LM_REAL_MAF:

4
firmware/controllers/algo/rusefi_enums.h
View File

@ -428,10 +428,6 @@ typedef enum {
* raw Mass Air Flow sensor value algorithm. http://en.wikipedia.org/wiki/Mass_flow_sensor * raw Mass Air Flow sensor value algorithm. http://en.wikipedia.org/wiki/Mass_flow_sensor
*/ */
LM_PLAIN_MAF = 0, LM_PLAIN_MAF = 0,
/**
* Throttle Position Sensor value is used as engine load. http://en.wikipedia.org/wiki/Throttle_position_sensor
*/
LM_ALPHA_N = 1,
/** /**
* Speed Density algorithm - Engine Load is a function of MAP, VE and target AFR * Speed Density algorithm - Engine Load is a function of MAP, VE and target AFR
* http://articles.sae.org/8539/ * http://articles.sae.org/8539/

6
firmware/controllers/generated/signature_all.h
View File

@ -3,6 +3,6 @@
// //
#define SIGNATURE_BOARD all #define SIGNATURE_BOARD all
#define SIGNATURE_DATE 2020.07.28 #define SIGNATURE_DATE 2020.07.29
#define SIGNATURE_HASH 1542883429 #define SIGNATURE_HASH 714281655
#define TS_SIGNATURE "rusEFI 2020.07.28.all.1542883429" #define TS_SIGNATURE "rusEFI 2020.07.29.all.714281655"

6
firmware/controllers/generated/signature_frankenso_na6.h
View File

@ -3,6 +3,6 @@
// //
#define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_BOARD frankenso_na6
#define SIGNATURE_DATE 2020.07.28 #define SIGNATURE_DATE 2020.07.29
#define SIGNATURE_HASH 2238833798 #define SIGNATURE_HASH 4094983764
#define TS_SIGNATURE "rusEFI 2020.07.28.frankenso_na6.2238833798" #define TS_SIGNATURE "rusEFI 2020.07.29.frankenso_na6.4094983764"

6
firmware/controllers/generated/signature_kin.h
View File

@ -3,6 +3,6 @@
// //
#define SIGNATURE_BOARD kin #define SIGNATURE_BOARD kin
#define SIGNATURE_DATE 2020.07.28 #define SIGNATURE_DATE 2020.07.29
#define SIGNATURE_HASH 2529711359 #define SIGNATURE_HASH 3886927405
#define TS_SIGNATURE "rusEFI 2020.07.28.kin.2529711359" #define TS_SIGNATURE "rusEFI 2020.07.29.kin.3886927405"

6
firmware/controllers/generated/signature_mre_f4.h
View File

@ -3,6 +3,6 @@
// //
#define SIGNATURE_BOARD mre_f4 #define SIGNATURE_BOARD mre_f4
#define SIGNATURE_DATE 2020.07.28 #define SIGNATURE_DATE 2020.07.29
#define SIGNATURE_HASH 302538475 #define SIGNATURE_HASH 1668138041
#define TS_SIGNATURE "rusEFI 2020.07.28.mre_f4.302538475" #define TS_SIGNATURE "rusEFI 2020.07.29.mre_f4.1668138041"

6
firmware/controllers/generated/signature_mre_f7.h
View File

@ -3,6 +3,6 @@
// //
#define SIGNATURE_BOARD mre_f7 #define SIGNATURE_BOARD mre_f7
#define SIGNATURE_DATE 2020.07.28 #define SIGNATURE_DATE 2020.07.29
#define SIGNATURE_HASH 302538475 #define SIGNATURE_HASH 1668138041
#define TS_SIGNATURE "rusEFI 2020.07.28.mre_f7.302538475" #define TS_SIGNATURE "rusEFI 2020.07.29.mre_f7.1668138041"

6
firmware/controllers/generated/signature_prometheus_405.h
View File

@ -3,6 +3,6 @@
// //
#define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_BOARD prometheus_405
#define SIGNATURE_DATE 2020.07.28 #define SIGNATURE_DATE 2020.07.29
#define SIGNATURE_HASH 2934591713 #define SIGNATURE_HASH 3750742579
#define TS_SIGNATURE "rusEFI 2020.07.28.prometheus_405.2934591713" #define TS_SIGNATURE "rusEFI 2020.07.29.prometheus_405.3750742579"

6
firmware/controllers/generated/signature_prometheus_469.h
View File

@ -3,6 +3,6 @@
// //
#define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_BOARD prometheus_469
#define SIGNATURE_DATE 2020.07.28 #define SIGNATURE_DATE 2020.07.29
#define SIGNATURE_HASH 2934591713 #define SIGNATURE_HASH 3750742579
#define TS_SIGNATURE "rusEFI 2020.07.28.prometheus_469.2934591713" #define TS_SIGNATURE "rusEFI 2020.07.29.prometheus_469.3750742579"

6
firmware/controllers/generated/signature_proteus_f4.h
View File

@ -3,6 +3,6 @@
// //
#define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_BOARD proteus_f4
#define SIGNATURE_DATE 2020.07.28 #define SIGNATURE_DATE 2020.07.29
#define SIGNATURE_HASH 3597138346 #define SIGNATURE_HASH 2801951608
#define TS_SIGNATURE "rusEFI 2020.07.28.proteus_f4.3597138346" #define TS_SIGNATURE "rusEFI 2020.07.29.proteus_f4.2801951608"

6
firmware/controllers/generated/signature_proteus_f7.h
View File

@ -3,6 +3,6 @@
// //
#define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_BOARD proteus_f7
#define SIGNATURE_DATE 2020.07.28 #define SIGNATURE_DATE 2020.07.29
#define SIGNATURE_HASH 3597138346 #define SIGNATURE_HASH 2801951608
#define TS_SIGNATURE "rusEFI 2020.07.28.proteus_f7.3597138346" #define TS_SIGNATURE "rusEFI 2020.07.29.proteus_f7.2801951608"

5
firmware/controllers/math/engine_math.cpp
View File

@ -74,7 +74,6 @@ float getEngineLoadT(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
return getMafVoltage(PASS_ENGINE_PARAMETER_SIGNATURE); return getMafVoltage(PASS_ENGINE_PARAMETER_SIGNATURE);
case LM_SPEED_DENSITY: case LM_SPEED_DENSITY:
return getMap(PASS_ENGINE_PARAMETER_SIGNATURE); return getMap(PASS_ENGINE_PARAMETER_SIGNATURE);
case LM_ALPHA_N:
case LM_ALPHA_N_2: case LM_ALPHA_N_2:
return Sensor::get(SensorType::Tps1).value_or(0); return Sensor::get(SensorType::Tps1).value_or(0);
case LM_REAL_MAF: case LM_REAL_MAF:
@ -446,9 +445,7 @@ void setTimingLoadBin(float from, float to DECLARE_CONFIG_PARAMETER_SUFFIX) {
*/ */
void setAlgorithm(engine_load_mode_e algo DECLARE_CONFIG_PARAMETER_SUFFIX) { void setAlgorithm(engine_load_mode_e algo DECLARE_CONFIG_PARAMETER_SUFFIX) {
engineConfiguration->fuelAlgorithm = algo; engineConfiguration->fuelAlgorithm = algo;
if (algo == LM_ALPHA_N) { if (algo == LM_SPEED_DENSITY) {
setTimingLoadBin(20, 120 PASS_CONFIG_PARAMETER_SUFFIX);
} else if (algo == LM_SPEED_DENSITY) {
setLinearCurve(config->ignitionLoadBins, 20, 120, 3); setLinearCurve(config->ignitionLoadBins, 20, 120, 3);
buildTimingMap(35 PASS_CONFIG_PARAMETER_SUFFIX); buildTimingMap(35 PASS_CONFIG_PARAMETER_SUFFIX);
} }

2
firmware/tunerstudio/rusefi.input
View File

@ -355,7 +355,6 @@ enable2ndByteCanID = false
; todo: generate this section programatically ; todo: generate this section programatically
LM_PLAIN_MAF = {0}, LM_PLAIN_MAF = {0},
LM_ALPHA_N = {1},
LM_SPEED_DENSITY = {3}, LM_SPEED_DENSITY = {3},
LM_REAL_MAF = {4} LM_REAL_MAF = {4}
@ -1517,7 +1516,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
[UserDefined] [UserDefined]
dialog = fuelTableBottomDialog, "", card dialog = fuelTableBottomDialog, "", card
panel = fuelTableMAFTbl, Center, {fuelAlgorithm==LM_PLAIN_MAF} panel = fuelTableMAFTbl, Center, {fuelAlgorithm==LM_PLAIN_MAF}
panel = fuelTableTPSTbl, Center, {fuelAlgorithm==LM_ALPHA_N}
panel = fuelTableELTbl, Center panel = fuelTableELTbl, Center
dialog = fuelTableRight, "", yAxis dialog = fuelTableRight, "", yAxis