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

cleaner DEFAULT_IGN_LOAD_COUNT protection

This commit is contained in:
rusefillc 2023-07-19 00:41:54 -04:00
parent 18df36aa48
commit ef00e28d26
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,7 @@ static const int8_t default_aspire_timing_table[16][16] = {
#endif #endif
static void setDefaultAspireMaps() { static void setDefaultAspireMaps() {
#if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT #if (IGN_RPM_COUNT == DEFAULT_FUEL_LOAD_COUNT) && (IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT)
copyTable(config->ignitionTable, default_aspire_timing_table); copyTable(config->ignitionTable, default_aspire_timing_table);
#endif #endif
} }

2
firmware/config/engines/mazda/mazda_miata.cpp
View File

@ -141,7 +141,7 @@ void setFrankensteinMiata1996() {
commonMiataNa(); commonMiataNa();
engineConfiguration->displacement = 1.839; engineConfiguration->displacement = 1.839;
#if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT #if (IGN_RPM_COUNT == DEFAULT_FUEL_LOAD_COUNT) && (IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT)
copyTable(config->ignitionTable, miataNA8_maf_advance_table); copyTable(config->ignitionTable, miataNA8_maf_advance_table);
#endif #endif

2
firmware/config/engines/mazda/mazda_miata_base_maps.cpp
View File

@ -73,7 +73,9 @@ static const uint8_t hardCodedignitionTable[16][16] = {
/* Generated by TS2C on Sun Aug 02 11:58:01 EDT 2020*/ /* Generated by TS2C on Sun Aug 02 11:58:01 EDT 2020*/
void miataNA_setIgnitionTable() { void miataNA_setIgnitionTable() {
#if (IGN_RPM_COUNT == DEFAULT_FUEL_LOAD_COUNT) && (IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT)
copyArray(config->ignitionLoadBins, hardCodedignitionLoadBins); copyArray(config->ignitionLoadBins, hardCodedignitionLoadBins);
copyArray(config->ignitionRpmBins, hardCodedignitionRpmBins); copyArray(config->ignitionRpmBins, hardCodedignitionRpmBins);
copyTable(config->ignitionTable, hardCodedignitionTable); copyTable(config->ignitionTable, hardCodedignitionTable);
#endif
} }

6
firmware/config/engines/mazda/mazda_miata_vvt.cpp
View File

@ -101,14 +101,14 @@ const float mazda_miata_nb2_LoadBins[FUEL_LOAD_COUNT] = {20.0, 25.0, 30.0, 35.0,
135.0, 158.0, 185.0, 220.0} 135.0, 158.0, 185.0, 220.0}
; ;
static const float ignition18vvtRpmBins[FUEL_RPM_COUNT] = { static const float ignition18vvtRpmBins[IGN_RPM_COUNT] = {
700.0, 850.0 , 943.0 , 700.0, 850.0 , 943.0 ,
1112.0 , 1310.0 , 1545.0 , 1112.0 , 1310.0 , 1545.0 ,
1821.0, 2146.0, 2530.0, 1821.0, 2146.0, 2530.0,
2982.0, 3515.0 , 4144.0 , 2982.0, 3515.0 , 4144.0 ,
4884.0 , 5757.0 , 6787.0, 8000.0}; 4884.0 , 5757.0 , 6787.0, 8000.0};
static const float ignition18vvtLoadBins[FUEL_LOAD_COUNT] = { static const float ignition18vvtLoadBins[IGN_LOAD_COUNT] = {
25.0 , 29.10009765625 , 34.0 , 39.60009765625 , 25.0 , 29.10009765625 , 34.0 , 39.60009765625 ,
46.2001953125 , 53.89990234375 , 62.7998046875 , 46.2001953125 , 53.89990234375 , 62.7998046875 ,
73.2001953125 , 85.400390625 , 99.5 , 116.0 , 73.2001953125 , 85.400390625 , 99.5 , 116.0 ,
@ -303,9 +303,9 @@ static void setCommonMazdaNB() {
copyArray(config->veLoadBins, mazda_miata_nb2_LoadBins); copyArray(config->veLoadBins, mazda_miata_nb2_LoadBins);
copyTable(config->veTable, mapBased18vvtVeTable_NB_fuel_rail); copyTable(config->veTable, mapBased18vvtVeTable_NB_fuel_rail);
#if (IGN_RPM_COUNT == DEFAULT_FUEL_LOAD_COUNT) && (IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT)
copyArray(config->ignitionRpmBins, ignition18vvtRpmBins); copyArray(config->ignitionRpmBins, ignition18vvtRpmBins);
copyArray(config->ignitionLoadBins, ignition18vvtLoadBins); copyArray(config->ignitionLoadBins, ignition18vvtLoadBins);
#if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT
copyTable(config->ignitionTable, mapBased18vvtTimingTable); copyTable(config->ignitionTable, mapBased18vvtTimingTable);
#endif #endif