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

setDefaultBoardConfiguration shouldn't have Frankenso pinout #852

This commit is contained in:
rusefi 2019-07-24 22:33:30 -04:00
parent 00ff37947d
commit d4c28ecc69
7 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -679,8 +679,8 @@ case CHEVY_C20_1973:
return "CHEVY_C20_1973"; return "CHEVY_C20_1973";
case CITROEN_TU3JP: case CITROEN_TU3JP:
return "CITROEN_TU3JP"; return "CITROEN_TU3JP";
case CUSTOM_ENGINE: case DEFAULT_FRANKENSO:
return "CUSTOM_ENGINE"; return "DEFAULT_FRANKENSO";
case DAIHATSU: case DAIHATSU:
return "DAIHATSU"; return "DAIHATSU";
case DODGE_NEON_1995: case DODGE_NEON_1995:

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

@ -965,7 +965,7 @@ static void setDefaultEngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
/** /**
* @brief Hardware board-specific default configuration (GPIO pins, ADC channels, SPI configs etc.) * @brief Hardware board-specific default configuration (GPIO pins, ADC channels, SPI configs etc.)
*/ */
void setDefaultBoardConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { void setDefaultFrankensoConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
setCanFrankensoDefaults(PASS_ENGINE_PARAMETER_SIGNATURE); setCanFrankensoDefaults(PASS_ENGINE_PARAMETER_SIGNATURE);
@ -1039,17 +1039,6 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN
// set initial pin groups // set initial pin groups
setDefaultBasePins(PASS_CONFIG_PARAMETER_SIGNATURE); setDefaultBasePins(PASS_CONFIG_PARAMETER_SIGNATURE);
/**
* Let's apply global board defaults too, for most of the boards
*/
if (engineType != MINIMAL_PINS
/* this is a bit nasty */
&& engineType != ETB_BENCH_ENGINE
&& engineType != MICRO_RUS_EFI
&& engineType != TLE8888_BENCH_ENGINE) {
setDefaultBoardConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE);
}
#if EFI_PROD_CODE #if EFI_PROD_CODE
// call overrided board-specific configuration setup, if needed (for custom boards only) // call overrided board-specific configuration setup, if needed (for custom boards only)
setBoardConfigurationOverrides(); setBoardConfigurationOverrides();
@ -1064,7 +1053,8 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN
* And override them with engine-specific defaults * And override them with engine-specific defaults
*/ */
switch (engineType) { switch (engineType) {
case CUSTOM_ENGINE: case DEFAULT_FRANKENSO:
setDefaultFrankensoConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE);
setCustomEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setCustomEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case MINIMAL_PINS: case MINIMAL_PINS:
@ -1110,12 +1100,15 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN
setZil130(PASS_CONFIG_PARAMETER_SIGNATURE); setZil130(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case MIATA_NA6_MAP: case MIATA_NA6_MAP:
setDefaultFrankensoConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE);
setMiataNA6_MAP_Configuration(PASS_CONFIG_PARAMETER_SIGNATURE); setMiataNA6_MAP_Configuration(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case MIATA_NA6_VAF: case MIATA_NA6_VAF:
setDefaultFrankensoConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE);
setMiataNA6_VAF_Configuration(PASS_CONFIG_PARAMETER_SIGNATURE); setMiataNA6_VAF_Configuration(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case ETB_BENCH_ENGINE: case ETB_BENCH_ENGINE:
setDefaultFrankensoConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE);
setEtbTestConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setEtbTestConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case MICRO_RUS_EFI: case MICRO_RUS_EFI:
@ -1123,6 +1116,7 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN
setTle8888TestConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setTle8888TestConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case MAZDA_MIATA_NA8: case MAZDA_MIATA_NA8:
setDefaultFrankensoConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE);
setMazdaMiataNA8Configuration(PASS_CONFIG_PARAMETER_SIGNATURE); setMazdaMiataNA8Configuration(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case TEST_CIVIC_4_0_BOTH: case TEST_CIVIC_4_0_BOTH:
@ -1138,6 +1132,7 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN
setHondaAccordConfiguration1_24_shifted(PASS_CONFIG_PARAMETER_SIGNATURE); setHondaAccordConfiguration1_24_shifted(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case FRANKENSO_QA_ENGINE: case FRANKENSO_QA_ENGINE:
setDefaultFrankensoConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE);
setFrankensoBoardTestConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setFrankensoBoardTestConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case HONDA_ACCORD_CD_DIP: case HONDA_ACCORD_CD_DIP:
@ -1155,9 +1150,11 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN
setGy6139qmbDefaultEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setGy6139qmbDefaultEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case HONDA_600: case HONDA_600:
setDefaultFrankensoConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE);
setHonda600(PASS_CONFIG_PARAMETER_SIGNATURE); setHonda600(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case MAZDA_MIATA_NB1: case MAZDA_MIATA_NB1:
setDefaultFrankensoConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE);
setMazdaMiataNb1EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setMazdaMiataNb1EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case MAZDA_323: case MAZDA_323:
@ -1176,18 +1173,23 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN
setMiniCooperR50(engineConfiguration); setMiniCooperR50(engineConfiguration);
break; break;
case FORD_ESCORT_GT: case FORD_ESCORT_GT:
setDefaultFrankensoConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE);
setFordEscortGt(PASS_CONFIG_PARAMETER_SIGNATURE); setFordEscortGt(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case MIATA_1990: case MIATA_1990:
setDefaultFrankensoConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE);
setMiata1990(PASS_CONFIG_PARAMETER_SIGNATURE); setMiata1990(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case MIATA_1994_DEVIATOR: case MIATA_1994_DEVIATOR:
setDefaultFrankensoConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE);
setMiata1994_d(PASS_CONFIG_PARAMETER_SIGNATURE); setMiata1994_d(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case MIATA_1994_SPAGS: case MIATA_1994_SPAGS:
setDefaultFrankensoConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE);
setMiata1994_s(PASS_CONFIG_PARAMETER_SIGNATURE); setMiata1994_s(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case MIATA_1996: case MIATA_1996:
setDefaultFrankensoConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE);
setMiata1996(PASS_CONFIG_PARAMETER_SIGNATURE); setMiata1996(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case CITROEN_TU3JP: case CITROEN_TU3JP:
@ -1212,6 +1214,7 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN
setDodgeStratus(PASS_CONFIG_PARAMETER_SIGNATURE); setDodgeStratus(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case VW_ABA: case VW_ABA:
setDefaultFrankensoConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE);
setVwAba(PASS_CONFIG_PARAMETER_SIGNATURE); setVwAba(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
#if EFI_UNIT_TEST #if EFI_UNIT_TEST
@ -1227,15 +1230,19 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN
#endif #endif
case TEST_ENGINE: case TEST_ENGINE:
setDefaultFrankensoConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE);
setTestEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setTestEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case MAZDA_MIATA_2003: case MAZDA_MIATA_2003:
setDefaultFrankensoConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE);
setMazdaMiata2003EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setMazdaMiata2003EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case MAZDA_MIATA_2003_NA_RAIL: case MAZDA_MIATA_2003_NA_RAIL:
setDefaultFrankensoConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE);
setMazdaMiata2003EngineConfigurationNaFuelRail(PASS_CONFIG_PARAMETER_SIGNATURE); setMazdaMiata2003EngineConfigurationNaFuelRail(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case MAZDA_MIATA_2003_BOARD_TEST: case MAZDA_MIATA_2003_BOARD_TEST:
setDefaultFrankensoConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE);
setMazdaMiata2003EngineConfigurationBoardTest(PASS_CONFIG_PARAMETER_SIGNATURE); setMazdaMiata2003EngineConfigurationBoardTest(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case PROMETHEUS_DEFAULTS: case PROMETHEUS_DEFAULTS:
@ -1245,6 +1252,7 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN
setSubaruEJ20GDefaults(PASS_CONFIG_PARAMETER_SIGNATURE); setSubaruEJ20GDefaults(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case TEST_ENGINE_VVT: case TEST_ENGINE_VVT:
setDefaultFrankensoConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE);
setTestVVTEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setTestVVTEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case SACHS: case SACHS:

2
firmware/controllers/algo/engine_configuration.h
View File

@ -15,7 +15,7 @@
#include "globalaccess.h" #include "globalaccess.h"
#ifndef DEFAULT_ENGINE_TYPE #ifndef DEFAULT_ENGINE_TYPE
#define DEFAULT_ENGINE_TYPE CUSTOM_ENGINE #define DEFAULT_ENGINE_TYPE DEFAULT_FRANKENSO
#endif #endif
#define CLT_MANUAL_IDLE_CORRECTION config->cltIdleCorrBins, config->cltIdleCorr, CLT_CURVE_SIZE #define CLT_MANUAL_IDLE_CORRECTION config->cltIdleCorrBins, config->cltIdleCorr, CLT_CURVE_SIZE

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

@ -42,7 +42,7 @@
* http://rusefi.com/wiki/index.php?title=Manual:Engine_Type * http://rusefi.com/wiki/index.php?title=Manual:Engine_Type
*/ */
typedef enum { typedef enum {
CUSTOM_ENGINE = 0, DEFAULT_FRANKENSO = 0,
AUDI_AAN = 1, AUDI_AAN = 1,
/** /**
* 1995 Dodge Neon * 1995 Dodge Neon

4
firmware/controllers/settings.cpp
View File

@ -123,8 +123,8 @@ static void printOutputs(const engine_configuration_s *engineConfiguration) {
*/ */
const char* getConfigurationName(engine_type_e engineType) { const char* getConfigurationName(engine_type_e engineType) {
switch (engineType) { switch (engineType) {
case CUSTOM_ENGINE: case DEFAULT_FRANKENSO:
return "CUSTOM"; return "DEFAULT_FRANKENSO";
#if EFI_SUPPORT_DODGE_NEON #if EFI_SUPPORT_DODGE_NEON
case DODGE_NEON_1995: case DODGE_NEON_1995:
return "Neon95"; return "Neon95";

2
unit_tests/tests/test_trigger_decoder.cpp
View File

@ -489,7 +489,7 @@ TEST(misc, testTriggerDecoder) {
testTriggerDecoder2("NISSAN_PRIMERA", NISSAN_PRIMERA, 2, 0.9611, 0.0); testTriggerDecoder2("NISSAN_PRIMERA", NISSAN_PRIMERA, 2, 0.9611, 0.0);
testTriggerDecoder2("test1+1", CUSTOM_ENGINE, 0, 0.7500, 0.2500); testTriggerDecoder2("test1+1", DEFAULT_FRANKENSO, 0, 0.7500, 0.2500);
testTriggerDecoder2("testCitroen", CITROEN_TU3JP, 0, 0.4833, 0); testTriggerDecoder2("testCitroen", CITROEN_TU3JP, 0, 0.4833, 0);
testTriggerDecoder2("testAccordCd 3w", HONDA_ACCORD_CD, 12, 0.8146, 0.5000); testTriggerDecoder2("testAccordCd 3w", HONDA_ACCORD_CD, 12, 0.8146, 0.5000);

4
unit_tests/tests/test_util.cpp
View File

@ -504,7 +504,7 @@ TEST(util, datalogging) {
char LOGGING_BUFFER[1000]; char LOGGING_BUFFER[1000];
Logging logger("settings control", LOGGING_BUFFER, sizeof(LOGGING_BUFFER)); Logging logger("settings control", LOGGING_BUFFER, sizeof(LOGGING_BUFFER));
printCurrentState(&logger, 239, "CUSTOM_ENGINE", "ID"); printCurrentState(&logger, 239, "DEFAULT_FRANKENSO", "ID");
// printf("Got [%s]\r\n", LOGGING_BUFFER); // printf("Got [%s]\r\n", LOGGING_BUFFER);
// ASSERT_STREQ("rusEfiVersion,776655@321ID CUSTOM_ENGINE 239,", LOGGING_BUFFER); // ASSERT_STREQ("rusEfiVersion,776655@321ID DEFAULT_FRANKENSO 239,", LOGGING_BUFFER);
} }