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

auto-sync

This commit is contained in:
rusEfi 2015-02-27 23:07:18 -06:00
parent 7b92b4babc
commit 63939ca917
23 changed files with 94 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,9 @@
#include "global.h"
#include "bmw_e34.h"
void setBmwE34(engine_configuration_s *engineConfiguration) {
EXTERN_ENGINE;
void setBmwE34(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s * boardConfiguration = &engineConfiguration->bc;
boardConfiguration->tunerStudioThreadPeriod = 50;

4
firmware/config/engines/bmw_e34.h
View File

@ -8,8 +8,8 @@
#ifndef BMW_E34_H_
#define BMW_E34_H_
#include "engine_configuration.h"
#include "engine.h"
void setBmwE34(engine_configuration_s *engineConfiguration);
void setBmwE34(DECLARE_ENGINE_PARAMETER_F);
#endif /* BMW_E34_H_ */

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

@ -66,8 +66,9 @@ static const ignition_table_t tps_advance_table = {
static const float rpmSteps[16] = {800, 1200, 1600, 2000, 2500, 2800,
3280, 3693.0, 4106.0, 4520.0, 4933.0, 5346.0, 5760.0, 6173.0, 6586.0, 7000.0};
void setCitroenBerlingoTU3JPConfiguration(persistent_config_s *config) {
engine_configuration_s *engineConfiguration = &config->engineConfiguration;
EXTERN_ENGINE;
void setCitroenBerlingoTU3JPConfiguration(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s *boardConfiguration = &engineConfiguration->bc;
engineConfiguration->engineType = CITROEN_TU3JP;

4
firmware/config/engines/citroenBerlingoTU3JP.h
View File

@ -8,8 +8,8 @@
#ifndef CITROENBERLINGOTU3JP_H_
#define CITROENBERLINGOTU3JP_H_
#include "engine_configuration.h"
#include "engine.h"
void setCitroenBerlingoTU3JPConfiguration(persistent_config_s *config);
void setCitroenBerlingoTU3JPConfiguration(DECLARE_ENGINE_PARAMETER_F);
#endif /* CITROENBERLINGOTU3JP_H_ */

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

@ -11,7 +11,9 @@
#include "honda_accord.h"
#include "allsensors.h"
void setCustomEngineConfiguration(engine_configuration_s *engineConfiguration) {
EXTERN_ENGINE;
void setCustomEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->trigger.type = TT_ONE_PLUS_ONE;
board_configuration_s * boardConfiguration = &engineConfiguration->bc;

4
firmware/config/engines/custom_engine.h
View File

@ -7,8 +7,8 @@
#ifndef CONFIG_ENGINES_CUSTOM_ENGINE_H_
#define CONFIG_ENGINES_CUSTOM_ENGINE_H_
#include "engine_configuration.h"
#include "engine.h"
void setCustomEngineConfiguration(engine_configuration_s *engineConfiguration);
void setCustomEngineConfiguration(DECLARE_ENGINE_PARAMETER_F);
#endif /* CONFIG_ENGINES_CUSTOM_ENGINE_H_ */

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

@ -89,8 +89,9 @@ static float dodge_map_advance_table[16][16] = {
{/*15 engineLoad=4.3999950000000005*//*0 800.0*/-4.85, /*1 1213.0*/-12.24, /*2 1626.0*/-24.091, /*3 2040.0*/-25.394, /*4 2453.0*/-25.323, /*5 2866.0*/-25.544, /*6 3280.0*/-29.915, /*7 3693.0*/-33.104, /*8 4106.0*/-36.016, /*9 4520.0*/-37.933, /*10 4933.0*/-36.254, /*11 5346.0*/-29.712, /*12 5760.0*/-28.651, /*13 6173.0*/-28.045, /*14 6586.0*/-27.228, /*15 7000.0*/-27.784}
};
EXTERN_ENGINE;
void setDodgeNeon1995EngineConfiguration(engine_configuration_s *engineConfiguration) {
void setDodgeNeon1995EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s * boardConfiguration = &engineConfiguration->bc;
engineConfiguration->trigger.type = TT_DODGE_NEON_1995;
@ -181,7 +182,7 @@ void setDodgeNeon1995EngineConfiguration(engine_configuration_s *engineConfigura
engineConfiguration->analogChartFrequency = 7;
}
void setDodgeNeonNGCEngineConfiguration(engine_configuration_s *engineConfiguration) {
void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s * boardConfiguration = &engineConfiguration->bc;
engineConfiguration->trigger.type = TT_DODGE_NEON_2003;
setFrankenso_01_LCD(boardConfiguration);

6
firmware/config/engines/dodge_neon.h
View File

@ -11,11 +11,11 @@
#if EFI_SUPPORT_DODGE_NEON
#include "engine_configuration.h"
#include "engine.h"
void setDodgeNeon1995EngineConfiguration(engine_configuration_s *engineConfiguration);
void setDodgeNeon1995EngineConfiguration(DECLARE_ENGINE_PARAMETER_F);
void setDodgeNeonNGCEngineConfiguration(engine_configuration_s *engineConfiguration);
void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_F);
#endif /* EFI_SUPPORT_DODGE_NEON */

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

@ -64,6 +64,8 @@ static const ignition_table_t default_aspire_timing_table = {
/* Load 4.400000 */{ -0.350000, -5.590000, -0.502000, -0.910000, -0.864000, -0.954000, -1.324000, +7.436000, -1.170000, -1.054000, -2.058000, -2.098000, -2.636000, +12.352000, +12.352000, +12.352000}
};
EXTERN_ENGINE;
static void setDefaultAspireMaps(engine_configuration_s *engineConfiguration) {
setFuelLoadBin(engineConfiguration, 1.2, 4.4);
@ -75,7 +77,7 @@ static void setDefaultAspireMaps(engine_configuration_s *engineConfiguration) {
copyTimingTable(default_aspire_timing_table, engineConfiguration->ignitionTable);
}
void setFordAspireEngineConfiguration(engine_configuration_s *engineConfiguration) {
void setFordAspireEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s * boardConfiguration = &engineConfiguration->bc;
engineConfiguration->tpsMin = 100;
engineConfiguration->tpsMax = 750;

4
firmware/config/engines/ford_aspire.h
View File

@ -12,8 +12,8 @@
#ifndef FORD_ASPIRE_H_
#define FORD_ASPIRE_H_
#include "engine_configuration.h"
#include "engine.h"
void setFordAspireEngineConfiguration(engine_configuration_s *engineConfiguration);
void setFordAspireEngineConfiguration(DECLARE_ENGINE_PARAMETER_F);
#endif /* FORD_ASPIRE_H_ */

18
firmware/config/engines/honda_accord.cpp
View File

@ -27,7 +27,11 @@ void setFrankenso_01_LCD(board_configuration_s *boardConfiguration) {
boardConfiguration->HD44780_db7 = GPIOB_10;
}
static void setHondaAccordConfigurationCommon(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration) {
EXTERN_ENGINE;
static void setHondaAccordConfigurationCommon(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s *boardConfiguration = &engineConfiguration->bc;
engineConfiguration->map.sensor.type = MT_DENSO183;
boardConfiguration->isFastAdcEnabled = true;
@ -181,20 +185,20 @@ static void setHondaAccordConfigurationCommon(engine_configuration_s *engineConf
boardConfiguration->idleSolenoidFrequency = 500;
}
void setHondaAccordConfigurationTwoWires(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration) {
void setHondaAccordConfigurationTwoWires(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->engineType = HONDA_ACCORD_CD_TWO_WIRES;
engineConfiguration->trigger.type = TT_HONDA_ACCORD_CD_TWO_WIRES;
setHondaAccordConfigurationCommon(engineConfiguration, boardConfiguration);
setHondaAccordConfigurationCommon(PASS_ENGINE_PARAMETER_F);
}
void setHondaAccordConfigurationThreeWires(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration) {
void setHondaAccordConfigurationThreeWires(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->engineType = HONDA_ACCORD_CD;
engineConfiguration->trigger.type = TT_HONDA_ACCORD_CD;
setHondaAccordConfigurationCommon(engineConfiguration, boardConfiguration);
setHondaAccordConfigurationCommon(PASS_ENGINE_PARAMETER_F);
}
void setHondaAccordConfigurationDip(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration) {
void setHondaAccordConfigurationDip(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->engineType = HONDA_ACCORD_CD_DIP;
engineConfiguration->trigger.type = TT_HONDA_ACCORD_CD_DIP;
setHondaAccordConfigurationCommon(engineConfiguration, boardConfiguration);
setHondaAccordConfigurationCommon(PASS_ENGINE_PARAMETER_F);
}

8
firmware/config/engines/honda_accord.h
View File

@ -8,11 +8,11 @@
#ifndef HONDA_ACCORD_H_
#define HONDA_ACCORD_H_
#include "engine_configuration.h"
#include "engine.h"
void setFrankenso_01_LCD(board_configuration_s *boardConfiguration);
void setHondaAccordConfigurationTwoWires(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration);
void setHondaAccordConfigurationThreeWires(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration);
void setHondaAccordConfigurationDip(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration);
void setHondaAccordConfigurationTwoWires(DECLARE_ENGINE_PARAMETER_F);
void setHondaAccordConfigurationThreeWires(DECLARE_ENGINE_PARAMETER_F);
void setHondaAccordConfigurationDip(DECLARE_ENGINE_PARAMETER_F);
#endif /* HONDA_ACCORD_H_ */

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

@ -14,8 +14,10 @@
#include "custom_engine.h"
#include "allsensors.h"
void setMazda626EngineConfiguration(engine_configuration_s *engineConfiguration) {
setCustomEngineConfiguration(engineConfiguration);
EXTERN_ENGINE;
void setMazda626EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
setCustomEngineConfiguration(PASS_ENGINE_PARAMETER_F);
board_configuration_s *boardConfiguration = &engineConfiguration->bc;
engineConfiguration->trigger.type = TT_MAZDA_DOHC_1_4;

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

@ -9,8 +9,8 @@
#ifndef CONFIG_ENGINES_MAZDA_626_H_
#define CONFIG_ENGINES_MAZDA_626_H_
#include "engine_configuration.h"
#include "engine.h"
void setMazda626EngineConfiguration(engine_configuration_s *engineConfiguration);
void setMazda626EngineConfiguration(DECLARE_ENGINE_PARAMETER_F);
#endif /* CONFIG_ENGINES_MAZDA_626_H_ */

12
firmware/config/engines/mazda_miata.cpp
View File

@ -125,6 +125,8 @@ static void setDefaultCrankingFuel(engine_configuration_s *engineConfiguration)
engineConfiguration->cranking.baseFuel = 5;
}
EXTERN_ENGINE;
static void commonMiataNa(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration) {
engineConfiguration->trigger.type = TT_MAZDA_MIATA_NA;
engineConfiguration->digitalChartSize = 100;
@ -198,7 +200,7 @@ static void common079721_2351(engine_configuration_s *engineConfiguration, board
}
void setMiata1990(engine_configuration_s *engineConfiguration) {
void setMiata1990(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s *boardConfiguration = &engineConfiguration->bc;
common079721_2351(engineConfiguration, boardConfiguration);
@ -234,7 +236,7 @@ void setMiata1990(engine_configuration_s *engineConfiguration) {
* pin 1I/W9 - extra +5v
* set_engine_type 14
*/
void setFordEscortGt(engine_configuration_s *engineConfiguration) {
void setFordEscortGt(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s *boardConfiguration = &engineConfiguration->bc;
engineConfiguration->trigger.type = TT_MAZDA_DOHC_1_4;
@ -434,7 +436,7 @@ static void setMiata1994_common(engine_configuration_s *engineConfiguration,
* Frankenso board
* set_engine_type 20
*/
void setMiata1994_d(engine_configuration_s *engineConfiguration) {
void setMiata1994_d(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s *boardConfiguration = &engineConfiguration->bc;
setMiata1994_common(engineConfiguration, boardConfiguration);
engineConfiguration->vbattDividerCoeff = ((float) (8.2 + 33)) / 8.2 * 2;
@ -450,7 +452,7 @@ void setMiata1994_d(engine_configuration_s *engineConfiguration) {
boardConfiguration->idleValvePin = GPIO_UNASSIGNED;
}
void setMiata1994_s(engine_configuration_s *engineConfiguration) {
void setMiata1994_s(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s *boardConfiguration = &engineConfiguration->bc;
setMiata1994_common(engineConfiguration, boardConfiguration);
engineConfiguration->vbattDividerCoeff = ((float) (10.0 + 33)) / 10 * 2;
@ -493,7 +495,7 @@ void setMiata1994_s(engine_configuration_s *engineConfiguration) {
/**
* Tom tomiata, Frankenstein board
*/
void setMiata1996(engine_configuration_s *engineConfiguration) {
void setMiata1996(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s *boardConfiguration = &engineConfiguration->bc;
commonMiataNa(engineConfiguration, boardConfiguration);
engineConfiguration->specs.displacement = 1.839;

12
firmware/config/engines/mazda_miata.h
View File

@ -12,12 +12,12 @@
#ifndef MAZDA_MIATA_H_
#define MAZDA_MIATA_H_
#include "engine_configuration.h"
#include "engine.h"
void setFordEscortGt(engine_configuration_s *engineConfiguration);
void setMiata1990(engine_configuration_s *engineConfiguration);
void setMiata1994_d(engine_configuration_s *engineConfiguration);
void setMiata1994_s(engine_configuration_s *engineConfiguration);
void setMiata1996(engine_configuration_s *engineConfiguration);
void setFordEscortGt(DECLARE_ENGINE_PARAMETER_F);
void setMiata1990(DECLARE_ENGINE_PARAMETER_F);
void setMiata1994_d(DECLARE_ENGINE_PARAMETER_F);
void setMiata1994_s(DECLARE_ENGINE_PARAMETER_F);
void setMiata1996(DECLARE_ENGINE_PARAMETER_F);
#endif /* MAZDA_MIATA_H_ */

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

@ -10,7 +10,9 @@
#include "mazda_miata_nb.h"
#include "thermistors.h"
void setMazdaMiataNbEngineConfiguration(engine_configuration_s *engineConfiguration) {
EXTERN_ENGINE;
void setMazdaMiataNbEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s *boardConfiguration = &engineConfiguration->bc;
// set_rpm_hard_limit 3000
engineConfiguration->rpmHardLimit = 3000; // yes, 3k. let's play it safe for now

5
firmware/config/engines/mazda_miata_nb.h
View File

@ -8,9 +8,8 @@
#ifndef MAZDA_MIATA_NB_H_
#define MAZDA_MIATA_NB_H_
#include "main.h"
#include "engine_configuration.h"
#include "engine.h"
void setMazdaMiataNbEngineConfiguration(engine_configuration_s *engineConfiguration);
void setMazdaMiataNbEngineConfiguration(DECLARE_ENGINE_PARAMETER_F);
#endif /* MAZDA_MIATA_NB_H_ */

5
firmware/config/engines/mitsubishi.cpp
View File

@ -13,7 +13,10 @@
#include "mitsubishi.h"
#include "allsensors.h"
void setMitsubishiConfiguration(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration) {
EXTERN_ENGINE;
void setMitsubishiConfiguration(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s *boardConfiguration = &engineConfiguration->bc;
engineConfiguration->engineType = MITSU_4G93;
engineConfiguration->trigger.type = TT_MITSU;

6
firmware/config/engines/mitsubishi.h
View File

@ -7,10 +7,8 @@
#ifndef MITSUBISHI_H_
#define MITSUBISHI_H_
#include "main.h"
#include "engine.h"
#include "engine_configuration.h"
void setMitsubishiConfiguration(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration);
void setMitsubishiConfiguration(DECLARE_ENGINE_PARAMETER_F);
#endif /* MITSUBISHI_H_ */

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

@ -23,7 +23,9 @@ void setFrankenstein_01_LCD(board_configuration_s *boardConfiguration) {
boardConfiguration->HD44780_db7 = GPIOB_13;
}
void setRoverv8(engine_configuration_s *engineConfiguration) {
EXTERN_ENGINE;
void setRoverv8(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s *boardConfiguration = &engineConfiguration->bc;
setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR);

4
firmware/config/engines/rover_v8.h
View File

@ -7,9 +7,9 @@
#ifndef ROVER_V8_H_
#define ROVER_V8_H_
#include "engine_configuration.h"
#include "engine.h"
void setFrankenstein_01_LCD(board_configuration_s *boardConfiguration);
void setRoverv8(engine_configuration_s *engineConfiguration);
void setRoverv8(DECLARE_ENGINE_PARAMETER_F);
#endif /* ROVER_V8_H_ */

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

@ -554,22 +554,22 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN
*/
switch (engineType) {
case CUSTOM_ENGINE:
setCustomEngineConfiguration(engineConfiguration);
setCustomEngineConfiguration(PASS_ENGINE_PARAMETER_F);
break;
case ACURA_RSX:
setAcuraRSX(engineConfiguration);
break;
#if EFI_SUPPORT_DODGE_NEON || defined(__DOXYGEN__)
case DODGE_NEON_1995:
setDodgeNeon1995EngineConfiguration(engineConfiguration);
setDodgeNeon1995EngineConfiguration(PASS_ENGINE_PARAMETER_F);
break;
case DODGE_NEON_2003:
setDodgeNeonNGCEngineConfiguration(engineConfiguration);
setDodgeNeonNGCEngineConfiguration(PASS_ENGINE_PARAMETER_F);
break;
#endif /* EFI_SUPPORT_DODGE_NEON */
#if EFI_SUPPORT_FORD_ASPIRE || defined(__DOXYGEN__)
case FORD_ASPIRE_1996:
setFordAspireEngineConfiguration(engineConfiguration);
setFordAspireEngineConfiguration(PASS_ENGINE_PARAMETER_F);
break;
#endif /* EFI_SUPPORT_FORD_ASPIRE */
#if EFI_SUPPORT_FORD_FIESTA || defined(__DOXYGEN__)
@ -583,16 +583,16 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN
break;
#endif
case HONDA_ACCORD_CD:
setHondaAccordConfigurationThreeWires(engineConfiguration, boardConfiguration);
setHondaAccordConfigurationThreeWires(PASS_ENGINE_PARAMETER_F);
break;
case HONDA_ACCORD_CD_TWO_WIRES:
setHondaAccordConfigurationTwoWires(engineConfiguration, boardConfiguration);
setHondaAccordConfigurationTwoWires(PASS_ENGINE_PARAMETER_F);
break;
case HONDA_ACCORD_CD_DIP:
setHondaAccordConfigurationDip(engineConfiguration, boardConfiguration);
setHondaAccordConfigurationDip(PASS_ENGINE_PARAMETER_F);
break;
case MITSU_4G93:
setMitsubishiConfiguration(engineConfiguration, boardConfiguration);
setMitsubishiConfiguration(PASS_ENGINE_PARAMETER_F);
break;
#if EFI_SUPPORT_1995_FORD_INLINE_6 || defined(__DOXYGEN__)
case FORD_INLINE_6_1995:
@ -603,13 +603,13 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN
setGy6139qmbDefaultEngineConfiguration(engineConfiguration);
break;
case MAZDA_MIATA_NB:
setMazdaMiataNbEngineConfiguration(engineConfiguration);
setMazdaMiataNbEngineConfiguration(PASS_ENGINE_PARAMETER_F);
break;
case MAZDA_323:
setMazda323EngineConfiguration(engineConfiguration);
break;
case MAZDA_626:
setMazda626EngineConfiguration(engineConfiguration);
setMazda626EngineConfiguration(PASS_ENGINE_PARAMETER_F);
break;
case SATURN_ION_2004:
setSaturnIonEngineConfiguration(engineConfiguration);
@ -618,31 +618,31 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN
setMiniCooperR50(engineConfiguration);
break;
case FORD_ESCORT_GT:
setFordEscortGt(engineConfiguration);
setFordEscortGt(PASS_ENGINE_PARAMETER_F);
break;
case MIATA_1990:
setMiata1990(engineConfiguration);
setMiata1990(PASS_ENGINE_PARAMETER_F);
break;
case MIATA_1994_DEVIATOR:
setMiata1994_d(engineConfiguration);
setMiata1994_d(PASS_ENGINE_PARAMETER_F);
break;
case MIATA_1994_SPAGS:
setMiata1994_s(engineConfiguration);
setMiata1994_s(PASS_ENGINE_PARAMETER_F);
break;
case MIATA_1996:
setMiata1996(engineConfiguration);
setMiata1996(PASS_ENGINE_PARAMETER_F);
break;
case CITROEN_TU3JP:
setCitroenBerlingoTU3JPConfiguration(config);
setCitroenBerlingoTU3JPConfiguration(PASS_ENGINE_PARAMETER_F);
break;
case ROVER_V8:
setRoverv8(engineConfiguration);
setRoverv8(PASS_ENGINE_PARAMETER_F);
break;
case SUBARU_2003_WRX:
setSubaru2003Wrx(engineConfiguration);
break;
case BMW_E34:
setBmwE34(engineConfiguration);
setBmwE34(PASS_ENGINE_PARAMETER_F);
break;
case TEST_ENGINE:
setTestEngineConfiguration(engineConfiguration);