diff --git a/simulator/generated/canned-tunes/COUPE-BK1-comparing-against-current-COUPE-BK1-default.md b/simulator/generated/canned-tunes/COUPE-BK1-comparing-against-current-COUPE-BK1-default.md index cb0f269ca7..aa93a6a6c2 100644 --- a/simulator/generated/canned-tunes/COUPE-BK1-comparing-against-current-COUPE-BK1-default.md +++ b/simulator/generated/canned-tunes/COUPE-BK1-comparing-against-current-COUPE-BK1-default.md @@ -125,12 +125,33 @@ engineConfiguration->etb.dFactor = 0.0892407; + coupleBK1cannedprimeBins(); + coupleBK1cannedprimeValues(); + coupleBK1cannedmafDecodingBins(); + coupleBK1cannedcltRevLimitRpmBins(); + coupleBK1cannedcltIdleCorrBins(); + coupleBK1cannedcltIdleCorr(); + coupleBK1cannedcltIdleRpm(); + coupleBK1cannedidleAdvanceBins(); + coupleBK1cannedidleAdvance(); + coupleBK1cannedfuelLevelBins(); + coupleBK1cannedboostRpmBins(); coupleBK1cannedboostTableOpenLoop(); coupleBK1cannedvvtTable1(); coupleBK1cannedvvtTable2(); + coupleBK1cannedscriptTable4RpmBins(); coupleBK1cannedscriptTable4(); + coupleBK1cannedignitionRpmBins(); + coupleBK1cannedignitionLoadBins(); coupleBK1cannedignitionTable(); + coupleBK1cannedfuelTrimRpmBins(); + coupleBK1cannedfuelTrimLoadBins(); + coupleBK1cannedignTrimRpmBins(); + coupleBK1cannedignTrimLoadBins(); + coupleBK1cannedpedalToTpsRpmBins(); coupleBK1cannedlambdaTable(); coupleBK1cannedtcuSolenoidTable(); + coupleBK1cannedhpfpTargetRpmBins(); + coupleBK1cannedhpfpCompensationRpmBins(); coupleBK1cannedpostCrankingFactor(); ``` diff --git a/simulator/generated/canned-tunes/COUPE-BK1-comparing-against-current-COUPE-BK1-default_methods.md b/simulator/generated/canned-tunes/COUPE-BK1-comparing-against-current-COUPE-BK1-default_methods.md index 73e13924d9..732fa32102 100644 --- a/simulator/generated/canned-tunes/COUPE-BK1-comparing-against-current-COUPE-BK1-default_methods.md +++ b/simulator/generated/canned-tunes/COUPE-BK1-comparing-against-current-COUPE-BK1-default_methods.md @@ -1,4 +1,59 @@ ``` +static void coupleBK1cannedprimeBins() { + static const float hardCodedprimeBins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(engineConfiguration->primeBins, hardCodedprimeBins); +} + +static void coupleBK1cannedprimeValues() { + static const float hardCodedprimeValues[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(engineConfiguration->primeValues, hardCodedprimeValues); +} + +static void coupleBK1cannedmafDecodingBins() { + static const float hardCodedmafDecodingBins[32] = {0.0, 0.78125, 1.3867188, 2.9101562, 4.2578125, 4.9804688, 2016.0, 2017.0, 2018.0, 2019.0, 2020.0, 2021.0, 2022.0, 2023.0, 2024.0, 2025.0, 2026.0, 2027.0, 2028.0, 2029.0, 2030.0, 2031.0, 2032.0, 2033.0, 2034.0, 2035.0, 2036.0, 2037.0, 2038.0, 2039.0, 2040.0, 2041.0}; + copyArray(config->mafDecodingBins, hardCodedmafDecodingBins); +} + +static void coupleBK1cannedcltRevLimitRpmBins() { + static const float hardCodedcltRevLimitRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->cltRevLimitRpmBins, hardCodedcltRevLimitRpmBins); +} + +static void coupleBK1cannedcltIdleCorrBins() { + static const float hardCodedcltIdleCorrBins[16] = {-40.45, -30.45, -20.45, -10.45, -0.45, 9.55, 19.55, 29.55, 39.55, 49.55, 59.55, 69.55, 79.55, 89.55, 99.55, 109.55}; + copyArray(config->cltIdleCorrBins, hardCodedcltIdleCorrBins); +} + +static void coupleBK1cannedcltIdleCorr() { + static const float hardCodedcltIdleCorr[16] = {1.05, 1.05, 0.8833, 0.8833, 0.8833, 0.8833, 0.8833, 0.8833, 0.8833, 0.7833, 0.7167, 0.65, 0.55, 0.55, 0.55, 0.55}; + copyArray(config->cltIdleCorr, hardCodedcltIdleCorr); +} + +static void coupleBK1cannedcltIdleRpm() { + static const float hardCodedcltIdleRpm[16] = {1260.0, 1260.0, 1200.0, 1100.0, 1060.0, 1000.0, 960.0, 900.0, 900.0, 860.0, 860.0, 840.0, 800.0, 800.0, 900.0, 1000.0}; + copyArray(config->cltIdleRpm, hardCodedcltIdleRpm); +} + +static void coupleBK1cannedidleAdvanceBins() { + static const float hardCodedidleAdvanceBins[8] = {500.0, 650.0, 800.0, 950.0, 1050.0, 1200.0, 1350.0, 1500.0}; + copyArray(config->idleAdvanceBins, hardCodedidleAdvanceBins); +} + +static void coupleBK1cannedidleAdvance() { + static const float hardCodedidleAdvance[8] = {10.0, 10.571428, 11.142858, 11.714286, 12.285714, 12.857142, 13.428572, 14.0}; + copyArray(config->idleAdvance, hardCodedidleAdvance); +} + +static void coupleBK1cannedfuelLevelBins() { + static const float hardCodedfuelLevelBins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelLevelBins, hardCodedfuelLevelBins); +} + +static void coupleBK1cannedboostRpmBins() { + static const float hardCodedboostRpmBins[8] = {0.0, 1100.0, 2300.0, 3400.0, 4600.0, 5700.0, 6900.0, 8000.0}; + copyArray(config->boostRpmBins, hardCodedboostRpmBins); +} + static void coupleBK1cannedboostTableOpenLoop() { static const float hardCodedboostTableOpenLoop[8][8] = { {25.000, 25.000, 25.000, 25.000, 25.000, 25.000, 25.000, 25.000, }, @@ -41,6 +96,11 @@ static void coupleBK1cannedvvtTable2() { copyTable(config->vvtTable2, hardCodedvvtTable2); } +static void coupleBK1cannedscriptTable4RpmBins() { + static const float hardCodedscriptTable4RpmBins[10] = {650.0, 800.0, 1700.0, 2600.0, 3500.0, 4400.0, 5300.0, 7000.0, 0.0, 0.0}; + copyArray(config->scriptTable4RpmBins, hardCodedscriptTable4RpmBins); +} + static void coupleBK1cannedscriptTable4() { static const float hardCodedscriptTable4[8][10] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -55,6 +115,16 @@ static void coupleBK1cannedscriptTable4() { copyTable(config->scriptTable4, hardCodedscriptTable4); } +static void coupleBK1cannedignitionRpmBins() { + static const float hardCodedignitionRpmBins[16] = {650.0, 800.0, 1100.0, 1500.0, 2000.0, 2500.0, 3000.0, 3500.0, 4000.0, 4500.0, 5000.0, 5500.0, 6000.0, 6500.0, 7000.0, 8000.0}; + copyArray(config->ignitionRpmBins, hardCodedignitionRpmBins); +} + +static void coupleBK1cannedignitionLoadBins() { + static const float hardCodedignitionLoadBins[16] = {30.0, 35.0, 45.0, 55.0, 60.0, 75.0, 90.0, 100.0, 125.0, 150.0, 175.0, 200.0, 225.0, 250.0, 275.0, 300.0}; + copyArray(config->ignitionLoadBins, hardCodedignitionLoadBins); +} + static void coupleBK1cannedignitionTable() { static const float hardCodedignitionTable[16][16] = { {12.100, 14.000, 17.800, 22.900, 29.300, 33.600, -20.000, -20.000, -20.000, -20.000, -20.000, -20.000, 42.000, 42.000, 42.000, 42.000, }, @@ -77,6 +147,31 @@ static void coupleBK1cannedignitionTable() { copyTable(config->ignitionTable, hardCodedignitionTable); } +static void coupleBK1cannedfuelTrimRpmBins() { + static const float hardCodedfuelTrimRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelTrimRpmBins, hardCodedfuelTrimRpmBins); +} + +static void coupleBK1cannedfuelTrimLoadBins() { + static const float hardCodedfuelTrimLoadBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelTrimLoadBins, hardCodedfuelTrimLoadBins); +} + +static void coupleBK1cannedignTrimRpmBins() { + static const float hardCodedignTrimRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->ignTrimRpmBins, hardCodedignTrimRpmBins); +} + +static void coupleBK1cannedignTrimLoadBins() { + static const float hardCodedignTrimLoadBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->ignTrimLoadBins, hardCodedignTrimLoadBins); +} + +static void coupleBK1cannedpedalToTpsRpmBins() { + static const float hardCodedpedalToTpsRpmBins[8] = {0.0, 1100.0, 2300.0, 3400.0, 4600.0, 5700.0, 6900.0, 8000.0}; + copyArray(config->pedalToTpsRpmBins, hardCodedpedalToTpsRpmBins); +} + static void coupleBK1cannedlambdaTable() { static const float hardCodedlambdaTable[16][16] = { {14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, }, @@ -111,6 +206,16 @@ static void coupleBK1cannedtcuSolenoidTable() { copyTable(config->tcuSolenoidTable, hardCodedtcuSolenoidTable); } +static void coupleBK1cannedhpfpTargetRpmBins() { + static const float hardCodedhpfpTargetRpmBins[10] = {0.0, 900.0, 1800.0, 2650.0, 3550.0, 4450.0, 5350.0, 6200.0, 7100.0, 8000.0}; + copyArray(config->hpfpTargetRpmBins, hardCodedhpfpTargetRpmBins); +} + +static void coupleBK1cannedhpfpCompensationRpmBins() { + static const float hardCodedhpfpCompensationRpmBins[10] = {0.0, 900.0, 1800.0, 2650.0, 3550.0, 4450.0, 5350.0, 6200.0, 7100.0, 8000.0}; + copyArray(config->hpfpCompensationRpmBins, hardCodedhpfpCompensationRpmBins); +} + static void coupleBK1cannedpostCrankingFactor() { static const float hardCodedpostCrankingFactor[6][6] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, diff --git a/simulator/generated/canned-tunes/COUPE-BK1-comparing-against-global-defaults.md b/simulator/generated/canned-tunes/COUPE-BK1-comparing-against-global-defaults.md index 6fb2c00d48..bad438007e 100644 --- a/simulator/generated/canned-tunes/COUPE-BK1-comparing-against-global-defaults.md +++ b/simulator/generated/canned-tunes/COUPE-BK1-comparing-against-global-defaults.md @@ -149,13 +149,34 @@ engineConfiguration->etb.dFactor = 0.0892407; + coupleBK1cannedprimeBins(); + coupleBK1cannedprimeValues(); + coupleBK1cannedmafDecodingBins(); + coupleBK1cannedcltRevLimitRpmBins(); + coupleBK1cannedcltIdleCorrBins(); + coupleBK1cannedcltIdleCorr(); + coupleBK1cannedcltIdleRpm(); + coupleBK1cannedidleAdvanceBins(); + coupleBK1cannedidleAdvance(); + coupleBK1cannedfuelLevelBins(); + coupleBK1cannedboostRpmBins(); coupleBK1cannedboostTableOpenLoop(); coupleBK1cannedvvtTable1(); coupleBK1cannedvvtTable2(); + coupleBK1cannedscriptTable4RpmBins(); coupleBK1cannedscriptTable4(); + coupleBK1cannedignitionRpmBins(); + coupleBK1cannedignitionLoadBins(); coupleBK1cannedignitionTable(); coupleBK1cannedveTable(); + coupleBK1cannedfuelTrimRpmBins(); + coupleBK1cannedfuelTrimLoadBins(); + coupleBK1cannedignTrimRpmBins(); + coupleBK1cannedignTrimLoadBins(); + coupleBK1cannedpedalToTpsRpmBins(); coupleBK1cannedlambdaTable(); coupleBK1cannedtcuSolenoidTable(); + coupleBK1cannedhpfpTargetRpmBins(); + coupleBK1cannedhpfpCompensationRpmBins(); coupleBK1cannedpostCrankingFactor(); ``` diff --git a/simulator/generated/canned-tunes/COUPE-BK1-comparing-against-global-defaults_methods.md b/simulator/generated/canned-tunes/COUPE-BK1-comparing-against-global-defaults_methods.md index 61073b03bc..d6ef432cc8 100644 --- a/simulator/generated/canned-tunes/COUPE-BK1-comparing-against-global-defaults_methods.md +++ b/simulator/generated/canned-tunes/COUPE-BK1-comparing-against-global-defaults_methods.md @@ -1,4 +1,59 @@ ``` +static void coupleBK1cannedprimeBins() { + static const float hardCodedprimeBins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(engineConfiguration->primeBins, hardCodedprimeBins); +} + +static void coupleBK1cannedprimeValues() { + static const float hardCodedprimeValues[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(engineConfiguration->primeValues, hardCodedprimeValues); +} + +static void coupleBK1cannedmafDecodingBins() { + static const float hardCodedmafDecodingBins[32] = {0.0, 0.78125, 1.3867188, 2.9101562, 4.2578125, 4.9804688, 2016.0, 2017.0, 2018.0, 2019.0, 2020.0, 2021.0, 2022.0, 2023.0, 2024.0, 2025.0, 2026.0, 2027.0, 2028.0, 2029.0, 2030.0, 2031.0, 2032.0, 2033.0, 2034.0, 2035.0, 2036.0, 2037.0, 2038.0, 2039.0, 2040.0, 2041.0}; + copyArray(config->mafDecodingBins, hardCodedmafDecodingBins); +} + +static void coupleBK1cannedcltRevLimitRpmBins() { + static const float hardCodedcltRevLimitRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->cltRevLimitRpmBins, hardCodedcltRevLimitRpmBins); +} + +static void coupleBK1cannedcltIdleCorrBins() { + static const float hardCodedcltIdleCorrBins[16] = {-40.45, -30.45, -20.45, -10.45, -0.45, 9.55, 19.55, 29.55, 39.55, 49.55, 59.55, 69.55, 79.55, 89.55, 99.55, 109.55}; + copyArray(config->cltIdleCorrBins, hardCodedcltIdleCorrBins); +} + +static void coupleBK1cannedcltIdleCorr() { + static const float hardCodedcltIdleCorr[16] = {1.05, 1.05, 0.8833, 0.8833, 0.8833, 0.8833, 0.8833, 0.8833, 0.8833, 0.7833, 0.7167, 0.65, 0.55, 0.55, 0.55, 0.55}; + copyArray(config->cltIdleCorr, hardCodedcltIdleCorr); +} + +static void coupleBK1cannedcltIdleRpm() { + static const float hardCodedcltIdleRpm[16] = {1260.0, 1260.0, 1200.0, 1100.0, 1060.0, 1000.0, 960.0, 900.0, 900.0, 860.0, 860.0, 840.0, 800.0, 800.0, 900.0, 1000.0}; + copyArray(config->cltIdleRpm, hardCodedcltIdleRpm); +} + +static void coupleBK1cannedidleAdvanceBins() { + static const float hardCodedidleAdvanceBins[8] = {500.0, 650.0, 800.0, 950.0, 1050.0, 1200.0, 1350.0, 1500.0}; + copyArray(config->idleAdvanceBins, hardCodedidleAdvanceBins); +} + +static void coupleBK1cannedidleAdvance() { + static const float hardCodedidleAdvance[8] = {10.0, 10.571428, 11.142858, 11.714286, 12.285714, 12.857142, 13.428572, 14.0}; + copyArray(config->idleAdvance, hardCodedidleAdvance); +} + +static void coupleBK1cannedfuelLevelBins() { + static const float hardCodedfuelLevelBins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelLevelBins, hardCodedfuelLevelBins); +} + +static void coupleBK1cannedboostRpmBins() { + static const float hardCodedboostRpmBins[8] = {0.0, 1100.0, 2300.0, 3400.0, 4600.0, 5700.0, 6900.0, 8000.0}; + copyArray(config->boostRpmBins, hardCodedboostRpmBins); +} + static void coupleBK1cannedboostTableOpenLoop() { static const float hardCodedboostTableOpenLoop[8][8] = { {25.000, 25.000, 25.000, 25.000, 25.000, 25.000, 25.000, 25.000, }, @@ -41,6 +96,11 @@ static void coupleBK1cannedvvtTable2() { copyTable(config->vvtTable2, hardCodedvvtTable2); } +static void coupleBK1cannedscriptTable4RpmBins() { + static const float hardCodedscriptTable4RpmBins[10] = {650.0, 800.0, 1700.0, 2600.0, 3500.0, 4400.0, 5300.0, 7000.0, 0.0, 0.0}; + copyArray(config->scriptTable4RpmBins, hardCodedscriptTable4RpmBins); +} + static void coupleBK1cannedscriptTable4() { static const float hardCodedscriptTable4[8][10] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -55,6 +115,16 @@ static void coupleBK1cannedscriptTable4() { copyTable(config->scriptTable4, hardCodedscriptTable4); } +static void coupleBK1cannedignitionRpmBins() { + static const float hardCodedignitionRpmBins[16] = {650.0, 800.0, 1100.0, 1500.0, 2000.0, 2500.0, 3000.0, 3500.0, 4000.0, 4500.0, 5000.0, 5500.0, 6000.0, 6500.0, 7000.0, 8000.0}; + copyArray(config->ignitionRpmBins, hardCodedignitionRpmBins); +} + +static void coupleBK1cannedignitionLoadBins() { + static const float hardCodedignitionLoadBins[16] = {30.0, 35.0, 45.0, 55.0, 60.0, 75.0, 90.0, 100.0, 125.0, 150.0, 175.0, 200.0, 225.0, 250.0, 275.0, 300.0}; + copyArray(config->ignitionLoadBins, hardCodedignitionLoadBins); +} + static void coupleBK1cannedignitionTable() { static const float hardCodedignitionTable[16][16] = { {12.100, 14.000, 17.800, 22.900, 29.300, 33.600, -20.000, -20.000, -20.000, -20.000, -20.000, -20.000, 42.000, 42.000, 42.000, 42.000, }, @@ -99,6 +169,31 @@ static void coupleBK1cannedveTable() { copyTable(config->veTable, hardCodedveTable); } +static void coupleBK1cannedfuelTrimRpmBins() { + static const float hardCodedfuelTrimRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelTrimRpmBins, hardCodedfuelTrimRpmBins); +} + +static void coupleBK1cannedfuelTrimLoadBins() { + static const float hardCodedfuelTrimLoadBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelTrimLoadBins, hardCodedfuelTrimLoadBins); +} + +static void coupleBK1cannedignTrimRpmBins() { + static const float hardCodedignTrimRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->ignTrimRpmBins, hardCodedignTrimRpmBins); +} + +static void coupleBK1cannedignTrimLoadBins() { + static const float hardCodedignTrimLoadBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->ignTrimLoadBins, hardCodedignTrimLoadBins); +} + +static void coupleBK1cannedpedalToTpsRpmBins() { + static const float hardCodedpedalToTpsRpmBins[8] = {0.0, 1100.0, 2300.0, 3400.0, 4600.0, 5700.0, 6900.0, 8000.0}; + copyArray(config->pedalToTpsRpmBins, hardCodedpedalToTpsRpmBins); +} + static void coupleBK1cannedlambdaTable() { static const float hardCodedlambdaTable[16][16] = { {14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, }, @@ -133,6 +228,16 @@ static void coupleBK1cannedtcuSolenoidTable() { copyTable(config->tcuSolenoidTable, hardCodedtcuSolenoidTable); } +static void coupleBK1cannedhpfpTargetRpmBins() { + static const float hardCodedhpfpTargetRpmBins[10] = {0.0, 900.0, 1800.0, 2650.0, 3550.0, 4450.0, 5350.0, 6200.0, 7100.0, 8000.0}; + copyArray(config->hpfpTargetRpmBins, hardCodedhpfpTargetRpmBins); +} + +static void coupleBK1cannedhpfpCompensationRpmBins() { + static const float hardCodedhpfpCompensationRpmBins[10] = {0.0, 900.0, 1800.0, 2650.0, 3550.0, 4450.0, 5350.0, 6200.0, 7100.0, 8000.0}; + copyArray(config->hpfpCompensationRpmBins, hardCodedhpfpCompensationRpmBins); +} + static void coupleBK1cannedpostCrankingFactor() { static const float hardCodedpostCrankingFactor[6][6] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, diff --git a/simulator/generated/canned-tunes/COUPE-BK2-comparing-against-current-COUPE-BK2-default.md b/simulator/generated/canned-tunes/COUPE-BK2-comparing-against-current-COUPE-BK2-default.md index 580e8b50ed..77a37fb9d9 100644 --- a/simulator/generated/canned-tunes/COUPE-BK2-comparing-against-current-COUPE-BK2-default.md +++ b/simulator/generated/canned-tunes/COUPE-BK2-comparing-against-current-COUPE-BK2-default.md @@ -49,11 +49,36 @@ engineConfiguration->boostControlMinMap = 0; + coupleBK2cannedtpsTspCorrValuesBins(); + coupleBK2cannedtpsTspCorrValues(); + coupleBK2cannedprimeBins(); + coupleBK2cannedprimeValues(); + coupleBK2cannedmafDecodingBins(); + coupleBK2cannedcltRevLimitRpmBins(); + coupleBK2cannedcltIdleCorrBins(); + coupleBK2cannedcltIdleCorr(); + coupleBK2cannedcltCrankingCorr(); + coupleBK2cannedcltIdleRpm(); + coupleBK2cannedidleAdvanceBins(); + coupleBK2cannedidleAdvance(); coupleBK2cannedtpsTpsAccelTable(); + coupleBK2cannedboostRpmBins(); coupleBK2cannedboostTableOpenLoop(); + coupleBK2cannedscriptTable4RpmBins(); coupleBK2cannedscriptTable4(); + coupleBK2cannedignitionRpmBins(); + coupleBK2cannedignitionLoadBins(); + coupleBK2cannedveRpmBins(); + coupleBK2cannedveLoadBins(); + coupleBK2cannedfuelTrimRpmBins(); + coupleBK2cannedfuelTrimLoadBins(); + coupleBK2cannedignTrimRpmBins(); + coupleBK2cannedignTrimLoadBins(); + coupleBK2cannedpedalToTpsRpmBins(); coupleBK2cannedpedalToTpsTable(); coupleBK2cannedlambdaTable(); coupleBK2cannedtcuSolenoidTable(); + coupleBK2cannedhpfpTargetRpmBins(); + coupleBK2cannedhpfpCompensationRpmBins(); coupleBK2cannedpostCrankingFactor(); ``` diff --git a/simulator/generated/canned-tunes/COUPE-BK2-comparing-against-current-COUPE-BK2-default_methods.md b/simulator/generated/canned-tunes/COUPE-BK2-comparing-against-current-COUPE-BK2-default_methods.md index c159f02d8f..9b60340ab3 100644 --- a/simulator/generated/canned-tunes/COUPE-BK2-comparing-against-current-COUPE-BK2-default_methods.md +++ b/simulator/generated/canned-tunes/COUPE-BK2-comparing-against-current-COUPE-BK2-default_methods.md @@ -1,4 +1,64 @@ ``` +static void coupleBK2cannedtpsTspCorrValuesBins() { + static const float hardCodedtpsTspCorrValuesBins[4] = {1000.0, 3000.0, 5000.0, 7000.0}; + copyArray(config->tpsTspCorrValuesBins, hardCodedtpsTspCorrValuesBins); +} + +static void coupleBK2cannedtpsTspCorrValues() { + static const float hardCodedtpsTspCorrValues[4] = {1.0, 0.7, 0.3, 0.1}; + copyArray(config->tpsTspCorrValues, hardCodedtpsTspCorrValues); +} + +static void coupleBK2cannedprimeBins() { + static const float hardCodedprimeBins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(engineConfiguration->primeBins, hardCodedprimeBins); +} + +static void coupleBK2cannedprimeValues() { + static const float hardCodedprimeValues[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(engineConfiguration->primeValues, hardCodedprimeValues); +} + +static void coupleBK2cannedmafDecodingBins() { + static const float hardCodedmafDecodingBins[32] = {0.0, 0.78125, 1.3867188, 2.9101562, 4.2578125, 4.9804688, 2016.0, 2017.0, 2018.0, 2019.0, 2020.0, 2021.0, 2022.0, 2023.0, 2024.0, 2025.0, 2026.0, 2027.0, 2028.0, 2029.0, 2030.0, 2031.0, 2032.0, 2033.0, 2034.0, 2035.0, 2036.0, 2037.0, 2038.0, 2039.0, 2040.0, 2041.0}; + copyArray(config->mafDecodingBins, hardCodedmafDecodingBins); +} + +static void coupleBK2cannedcltRevLimitRpmBins() { + static const float hardCodedcltRevLimitRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->cltRevLimitRpmBins, hardCodedcltRevLimitRpmBins); +} + +static void coupleBK2cannedcltIdleCorrBins() { + static const float hardCodedcltIdleCorrBins[16] = {-40.13, -30.13, -20.13, -10.13, -0.13, 9.87, 19.87, 29.87, 39.87, 49.87, 59.87, 69.87, 79.87, 89.87, 99.87, 109.87}; + copyArray(config->cltIdleCorrBins, hardCodedcltIdleCorrBins); +} + +static void coupleBK2cannedcltIdleCorr() { + static const float hardCodedcltIdleCorr[16] = {0.87, 0.87, 0.7033, 0.7033, 0.7033, 0.7033, 0.7033, 0.7033, 0.7033, 0.6033, 0.5367, 0.5, 0.5, 0.5, 0.5, 0.6}; + copyArray(config->cltIdleCorr, hardCodedcltIdleCorr); +} + +static void coupleBK2cannedcltCrankingCorr() { + static const float hardCodedcltCrankingCorr[8] = {0.8, 0.8, 0.8, 0.8, 0.7, 0.64, 0.6, 0.6}; + copyArray(config->cltCrankingCorr, hardCodedcltCrankingCorr); +} + +static void coupleBK2cannedcltIdleRpm() { + static const float hardCodedcltIdleRpm[16] = {1360.0, 1360.0, 1300.0, 1200.0, 1160.0, 1100.0, 1060.0, 1000.0, 1000.0, 960.0, 960.0, 940.0, 900.0, 800.0, 860.0, 1100.0}; + copyArray(config->cltIdleRpm, hardCodedcltIdleRpm); +} + +static void coupleBK2cannedidleAdvanceBins() { + static const float hardCodedidleAdvanceBins[8] = {500.0, 650.0, 800.0, 950.0, 1050.0, 1200.0, 1350.0, 1500.0}; + copyArray(config->idleAdvanceBins, hardCodedidleAdvanceBins); +} + +static void coupleBK2cannedidleAdvance() { + static const float hardCodedidleAdvance[8] = {10.0, 10.285714, 10.571428, 10.857142, 11.142858, 11.428572, 11.714286, 12.0}; + copyArray(config->idleAdvance, hardCodedidleAdvance); +} + static void coupleBK2cannedtpsTpsAccelTable() { static const float hardCodedtpsTpsAccelTable[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -13,6 +73,11 @@ static void coupleBK2cannedtpsTpsAccelTable() { copyTable(config->tpsTpsAccelTable, hardCodedtpsTpsAccelTable); } +static void coupleBK2cannedboostRpmBins() { + static const float hardCodedboostRpmBins[8] = {0.0, 1100.0, 2300.0, 3400.0, 4600.0, 5700.0, 6900.0, 8000.0}; + copyArray(config->boostRpmBins, hardCodedboostRpmBins); +} + static void coupleBK2cannedboostTableOpenLoop() { static const float hardCodedboostTableOpenLoop[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -27,6 +92,11 @@ static void coupleBK2cannedboostTableOpenLoop() { copyTable(config->boostTableOpenLoop, hardCodedboostTableOpenLoop); } +static void coupleBK2cannedscriptTable4RpmBins() { + static const float hardCodedscriptTable4RpmBins[10] = {650.0, 800.0, 1700.0, 2600.0, 3500.0, 4400.0, 5300.0, 7000.0, 0.0, 0.0}; + copyArray(config->scriptTable4RpmBins, hardCodedscriptTable4RpmBins); +} + static void coupleBK2cannedscriptTable4() { static const float hardCodedscriptTable4[8][10] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -41,6 +111,51 @@ static void coupleBK2cannedscriptTable4() { copyTable(config->scriptTable4, hardCodedscriptTable4); } +static void coupleBK2cannedignitionRpmBins() { + static const float hardCodedignitionRpmBins[16] = {650.0, 800.0, 1100.0, 1500.0, 2000.0, 2500.0, 3000.0, 3500.0, 4000.0, 4500.0, 5000.0, 5500.0, 6000.0, 6500.0, 7000.0, 8000.0}; + copyArray(config->ignitionRpmBins, hardCodedignitionRpmBins); +} + +static void coupleBK2cannedignitionLoadBins() { + static const float hardCodedignitionLoadBins[16] = {30.0, 35.0, 45.0, 55.0, 60.0, 75.0, 90.0, 100.0, 125.0, 150.0, 175.0, 200.0, 225.0, 250.0, 275.0, 300.0}; + copyArray(config->ignitionLoadBins, hardCodedignitionLoadBins); +} + +static void coupleBK2cannedveRpmBins() { + static const float hardCodedveRpmBins[16] = {600.0, 900.0, 1100.0, 1500.0, 1900.0, 2400.0, 3000.0, 3700.0, 4200.0, 4700.0, 5200.0, 5800.0, 6300.0, 6800.0, 7000.0, 7600.0}; + copyArray(config->veRpmBins, hardCodedveRpmBins); +} + +static void coupleBK2cannedveLoadBins() { + static const float hardCodedveLoadBins[16] = {30.0, 35.0, 45.0, 55.0, 60.0, 75.0, 90.0, 100.0, 125.0, 150.0, 175.0, 200.0, 225.0, 250.0, 275.0, 300.0}; + copyArray(config->veLoadBins, hardCodedveLoadBins); +} + +static void coupleBK2cannedfuelTrimRpmBins() { + static const float hardCodedfuelTrimRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelTrimRpmBins, hardCodedfuelTrimRpmBins); +} + +static void coupleBK2cannedfuelTrimLoadBins() { + static const float hardCodedfuelTrimLoadBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelTrimLoadBins, hardCodedfuelTrimLoadBins); +} + +static void coupleBK2cannedignTrimRpmBins() { + static const float hardCodedignTrimRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->ignTrimRpmBins, hardCodedignTrimRpmBins); +} + +static void coupleBK2cannedignTrimLoadBins() { + static const float hardCodedignTrimLoadBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->ignTrimLoadBins, hardCodedignTrimLoadBins); +} + +static void coupleBK2cannedpedalToTpsRpmBins() { + static const float hardCodedpedalToTpsRpmBins[8] = {0.0, 1100.0, 2300.0, 3400.0, 4600.0, 5700.0, 6900.0, 8000.0}; + copyArray(config->pedalToTpsRpmBins, hardCodedpedalToTpsRpmBins); +} + static void coupleBK2cannedpedalToTpsTable() { static const float hardCodedpedalToTpsTable[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -89,6 +204,16 @@ static void coupleBK2cannedtcuSolenoidTable() { copyTable(config->tcuSolenoidTable, hardCodedtcuSolenoidTable); } +static void coupleBK2cannedhpfpTargetRpmBins() { + static const float hardCodedhpfpTargetRpmBins[10] = {0.0, 900.0, 1800.0, 2650.0, 3550.0, 4450.0, 5350.0, 6200.0, 7100.0, 8000.0}; + copyArray(config->hpfpTargetRpmBins, hardCodedhpfpTargetRpmBins); +} + +static void coupleBK2cannedhpfpCompensationRpmBins() { + static const float hardCodedhpfpCompensationRpmBins[10] = {0.0, 900.0, 1800.0, 2650.0, 3550.0, 4450.0, 5350.0, 6200.0, 7100.0, 8000.0}; + copyArray(config->hpfpCompensationRpmBins, hardCodedhpfpCompensationRpmBins); +} + static void coupleBK2cannedpostCrankingFactor() { static const float hardCodedpostCrankingFactor[6][6] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, diff --git a/simulator/generated/canned-tunes/COUPE-BK2-comparing-against-global-defaults.md b/simulator/generated/canned-tunes/COUPE-BK2-comparing-against-global-defaults.md index e0c440cf18..c8703990a9 100644 --- a/simulator/generated/canned-tunes/COUPE-BK2-comparing-against-global-defaults.md +++ b/simulator/generated/canned-tunes/COUPE-BK2-comparing-against-global-defaults.md @@ -147,13 +147,38 @@ engineConfiguration->etb.dFactor = 0.1855; + coupleBK2cannedtpsTspCorrValuesBins(); + coupleBK2cannedtpsTspCorrValues(); + coupleBK2cannedprimeBins(); + coupleBK2cannedprimeValues(); + coupleBK2cannedmafDecodingBins(); + coupleBK2cannedcltRevLimitRpmBins(); + coupleBK2cannedcltIdleCorrBins(); + coupleBK2cannedcltIdleCorr(); + coupleBK2cannedcltCrankingCorr(); + coupleBK2cannedcltIdleRpm(); + coupleBK2cannedidleAdvanceBins(); + coupleBK2cannedidleAdvance(); coupleBK2cannedtpsTpsAccelTable(); + coupleBK2cannedboostRpmBins(); coupleBK2cannedboostTableOpenLoop(); + coupleBK2cannedscriptTable4RpmBins(); coupleBK2cannedscriptTable4(); + coupleBK2cannedignitionRpmBins(); + coupleBK2cannedignitionLoadBins(); coupleBK2cannedignitionTable(); + coupleBK2cannedveRpmBins(); + coupleBK2cannedveLoadBins(); coupleBK2cannedveTable(); + coupleBK2cannedfuelTrimRpmBins(); + coupleBK2cannedfuelTrimLoadBins(); + coupleBK2cannedignTrimRpmBins(); + coupleBK2cannedignTrimLoadBins(); + coupleBK2cannedpedalToTpsRpmBins(); coupleBK2cannedpedalToTpsTable(); coupleBK2cannedlambdaTable(); coupleBK2cannedtcuSolenoidTable(); + coupleBK2cannedhpfpTargetRpmBins(); + coupleBK2cannedhpfpCompensationRpmBins(); coupleBK2cannedpostCrankingFactor(); ``` diff --git a/simulator/generated/canned-tunes/COUPE-BK2-comparing-against-global-defaults_methods.md b/simulator/generated/canned-tunes/COUPE-BK2-comparing-against-global-defaults_methods.md index 3b086d6d9d..f690d423cc 100644 --- a/simulator/generated/canned-tunes/COUPE-BK2-comparing-against-global-defaults_methods.md +++ b/simulator/generated/canned-tunes/COUPE-BK2-comparing-against-global-defaults_methods.md @@ -1,4 +1,64 @@ ``` +static void coupleBK2cannedtpsTspCorrValuesBins() { + static const float hardCodedtpsTspCorrValuesBins[4] = {1000.0, 3000.0, 5000.0, 7000.0}; + copyArray(config->tpsTspCorrValuesBins, hardCodedtpsTspCorrValuesBins); +} + +static void coupleBK2cannedtpsTspCorrValues() { + static const float hardCodedtpsTspCorrValues[4] = {1.0, 0.7, 0.3, 0.1}; + copyArray(config->tpsTspCorrValues, hardCodedtpsTspCorrValues); +} + +static void coupleBK2cannedprimeBins() { + static const float hardCodedprimeBins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(engineConfiguration->primeBins, hardCodedprimeBins); +} + +static void coupleBK2cannedprimeValues() { + static const float hardCodedprimeValues[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(engineConfiguration->primeValues, hardCodedprimeValues); +} + +static void coupleBK2cannedmafDecodingBins() { + static const float hardCodedmafDecodingBins[32] = {0.0, 0.78125, 1.3867188, 2.9101562, 4.2578125, 4.9804688, 2016.0, 2017.0, 2018.0, 2019.0, 2020.0, 2021.0, 2022.0, 2023.0, 2024.0, 2025.0, 2026.0, 2027.0, 2028.0, 2029.0, 2030.0, 2031.0, 2032.0, 2033.0, 2034.0, 2035.0, 2036.0, 2037.0, 2038.0, 2039.0, 2040.0, 2041.0}; + copyArray(config->mafDecodingBins, hardCodedmafDecodingBins); +} + +static void coupleBK2cannedcltRevLimitRpmBins() { + static const float hardCodedcltRevLimitRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->cltRevLimitRpmBins, hardCodedcltRevLimitRpmBins); +} + +static void coupleBK2cannedcltIdleCorrBins() { + static const float hardCodedcltIdleCorrBins[16] = {-40.13, -30.13, -20.13, -10.13, -0.13, 9.87, 19.87, 29.87, 39.87, 49.87, 59.87, 69.87, 79.87, 89.87, 99.87, 109.87}; + copyArray(config->cltIdleCorrBins, hardCodedcltIdleCorrBins); +} + +static void coupleBK2cannedcltIdleCorr() { + static const float hardCodedcltIdleCorr[16] = {0.87, 0.87, 0.7033, 0.7033, 0.7033, 0.7033, 0.7033, 0.7033, 0.7033, 0.6033, 0.5367, 0.5, 0.5, 0.5, 0.5, 0.6}; + copyArray(config->cltIdleCorr, hardCodedcltIdleCorr); +} + +static void coupleBK2cannedcltCrankingCorr() { + static const float hardCodedcltCrankingCorr[8] = {0.8, 0.8, 0.8, 0.8, 0.7, 0.64, 0.6, 0.6}; + copyArray(config->cltCrankingCorr, hardCodedcltCrankingCorr); +} + +static void coupleBK2cannedcltIdleRpm() { + static const float hardCodedcltIdleRpm[16] = {1360.0, 1360.0, 1300.0, 1200.0, 1160.0, 1100.0, 1060.0, 1000.0, 1000.0, 960.0, 960.0, 940.0, 900.0, 800.0, 860.0, 1100.0}; + copyArray(config->cltIdleRpm, hardCodedcltIdleRpm); +} + +static void coupleBK2cannedidleAdvanceBins() { + static const float hardCodedidleAdvanceBins[8] = {500.0, 650.0, 800.0, 950.0, 1050.0, 1200.0, 1350.0, 1500.0}; + copyArray(config->idleAdvanceBins, hardCodedidleAdvanceBins); +} + +static void coupleBK2cannedidleAdvance() { + static const float hardCodedidleAdvance[8] = {10.0, 10.285714, 10.571428, 10.857142, 11.142858, 11.428572, 11.714286, 12.0}; + copyArray(config->idleAdvance, hardCodedidleAdvance); +} + static void coupleBK2cannedtpsTpsAccelTable() { static const float hardCodedtpsTpsAccelTable[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -13,6 +73,11 @@ static void coupleBK2cannedtpsTpsAccelTable() { copyTable(config->tpsTpsAccelTable, hardCodedtpsTpsAccelTable); } +static void coupleBK2cannedboostRpmBins() { + static const float hardCodedboostRpmBins[8] = {0.0, 1100.0, 2300.0, 3400.0, 4600.0, 5700.0, 6900.0, 8000.0}; + copyArray(config->boostRpmBins, hardCodedboostRpmBins); +} + static void coupleBK2cannedboostTableOpenLoop() { static const float hardCodedboostTableOpenLoop[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -27,6 +92,11 @@ static void coupleBK2cannedboostTableOpenLoop() { copyTable(config->boostTableOpenLoop, hardCodedboostTableOpenLoop); } +static void coupleBK2cannedscriptTable4RpmBins() { + static const float hardCodedscriptTable4RpmBins[10] = {650.0, 800.0, 1700.0, 2600.0, 3500.0, 4400.0, 5300.0, 7000.0, 0.0, 0.0}; + copyArray(config->scriptTable4RpmBins, hardCodedscriptTable4RpmBins); +} + static void coupleBK2cannedscriptTable4() { static const float hardCodedscriptTable4[8][10] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -41,6 +111,16 @@ static void coupleBK2cannedscriptTable4() { copyTable(config->scriptTable4, hardCodedscriptTable4); } +static void coupleBK2cannedignitionRpmBins() { + static const float hardCodedignitionRpmBins[16] = {650.0, 800.0, 1100.0, 1500.0, 2000.0, 2500.0, 3000.0, 3500.0, 4000.0, 4500.0, 5000.0, 5500.0, 6000.0, 6500.0, 7000.0, 8000.0}; + copyArray(config->ignitionRpmBins, hardCodedignitionRpmBins); +} + +static void coupleBK2cannedignitionLoadBins() { + static const float hardCodedignitionLoadBins[16] = {30.0, 35.0, 45.0, 55.0, 60.0, 75.0, 90.0, 100.0, 125.0, 150.0, 175.0, 200.0, 225.0, 250.0, 275.0, 300.0}; + copyArray(config->ignitionLoadBins, hardCodedignitionLoadBins); +} + static void coupleBK2cannedignitionTable() { static const float hardCodedignitionTable[16][16] = { {12.100, 14.000, 17.800, 22.900, 29.300, 35.600, -20.000, -20.000, -20.000, -20.000, -20.000, -20.000, 42.000, 42.000, 42.000, 42.000, }, @@ -63,6 +143,16 @@ static void coupleBK2cannedignitionTable() { copyTable(config->ignitionTable, hardCodedignitionTable); } +static void coupleBK2cannedveRpmBins() { + static const float hardCodedveRpmBins[16] = {600.0, 900.0, 1100.0, 1500.0, 1900.0, 2400.0, 3000.0, 3700.0, 4200.0, 4700.0, 5200.0, 5800.0, 6300.0, 6800.0, 7000.0, 7600.0}; + copyArray(config->veRpmBins, hardCodedveRpmBins); +} + +static void coupleBK2cannedveLoadBins() { + static const float hardCodedveLoadBins[16] = {30.0, 35.0, 45.0, 55.0, 60.0, 75.0, 90.0, 100.0, 125.0, 150.0, 175.0, 200.0, 225.0, 250.0, 275.0, 300.0}; + copyArray(config->veLoadBins, hardCodedveLoadBins); +} + static void coupleBK2cannedveTable() { static const float hardCodedveTable[16][16] = { {52.000, 54.000, 54.000, 56.000, 61.000, 55.000, 55.000, 65.000, 65.000, 60.000, 60.000, 60.000, 60.000, 60.000, 60.000, 60.000, }, @@ -85,6 +175,31 @@ static void coupleBK2cannedveTable() { copyTable(config->veTable, hardCodedveTable); } +static void coupleBK2cannedfuelTrimRpmBins() { + static const float hardCodedfuelTrimRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelTrimRpmBins, hardCodedfuelTrimRpmBins); +} + +static void coupleBK2cannedfuelTrimLoadBins() { + static const float hardCodedfuelTrimLoadBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelTrimLoadBins, hardCodedfuelTrimLoadBins); +} + +static void coupleBK2cannedignTrimRpmBins() { + static const float hardCodedignTrimRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->ignTrimRpmBins, hardCodedignTrimRpmBins); +} + +static void coupleBK2cannedignTrimLoadBins() { + static const float hardCodedignTrimLoadBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->ignTrimLoadBins, hardCodedignTrimLoadBins); +} + +static void coupleBK2cannedpedalToTpsRpmBins() { + static const float hardCodedpedalToTpsRpmBins[8] = {0.0, 1100.0, 2300.0, 3400.0, 4600.0, 5700.0, 6900.0, 8000.0}; + copyArray(config->pedalToTpsRpmBins, hardCodedpedalToTpsRpmBins); +} + static void coupleBK2cannedpedalToTpsTable() { static const float hardCodedpedalToTpsTable[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -133,6 +248,16 @@ static void coupleBK2cannedtcuSolenoidTable() { copyTable(config->tcuSolenoidTable, hardCodedtcuSolenoidTable); } +static void coupleBK2cannedhpfpTargetRpmBins() { + static const float hardCodedhpfpTargetRpmBins[10] = {0.0, 900.0, 1800.0, 2650.0, 3550.0, 4450.0, 5350.0, 6200.0, 7100.0, 8000.0}; + copyArray(config->hpfpTargetRpmBins, hardCodedhpfpTargetRpmBins); +} + +static void coupleBK2cannedhpfpCompensationRpmBins() { + static const float hardCodedhpfpCompensationRpmBins[10] = {0.0, 900.0, 1800.0, 2650.0, 3550.0, 4450.0, 5350.0, 6200.0, 7100.0, 8000.0}; + copyArray(config->hpfpCompensationRpmBins, hardCodedhpfpCompensationRpmBins); +} + static void coupleBK2cannedpostCrankingFactor() { static const float hardCodedpostCrankingFactor[6][6] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, diff --git a/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-current-Honda-OBD1-default.md b/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-current-Honda-OBD1-default.md index 584a262b3f..70a630fe84 100644 --- a/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-current-Honda-OBD1-default.md +++ b/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-current-Honda-OBD1-default.md @@ -63,6 +63,8 @@ engineConfiguration->gppwm[0].offBelowDuty = 10; + cannedmafDecodingBins(); + cannedcltIdleCorr(); cannedboostTableOpenLoop(); cannedscriptTable4(); cannedignitionTable(); diff --git a/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-current-Honda-OBD1-default_methods.md b/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-current-Honda-OBD1-default_methods.md index b43a1129ee..db274430a7 100644 --- a/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-current-Honda-OBD1-default_methods.md +++ b/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-current-Honda-OBD1-default_methods.md @@ -1,4 +1,14 @@ ``` +static void cannedmafDecodingBins() { + static const float hardCodedmafDecodingBins[32] = {0.0, 0.78125, 1.3867188, 2.9101562, 4.2578125, 4.9804688, 2016.0, 2017.0, 2018.0, 2019.0, 2020.0, 2021.0, 2022.0, 2023.0, 2024.0, 2025.0, 2026.0, 2027.0, 2028.0, 2029.0, 2030.0, 2031.0, 2032.0, 2033.0, 2034.0, 2035.0, 2036.0, 2037.0, 2038.0, 2039.0, 2040.0, 2041.0}; + copyArray(config->mafDecodingBins, hardCodedmafDecodingBins); +} + +static void cannedcltIdleCorr() { + static const float hardCodedcltIdleCorr[16] = {1.5, 1.5, 1.3333334, 1.3333334, 1.3333334, 1.3333334, 1.3333334, 1.3333334, 1.3333334, 1.2333333, 1.1666666, 1.1, 1.0, 1.0, 1.0, 1.0}; + copyArray(config->cltIdleCorr, hardCodedcltIdleCorr); +} + static void cannedboostTableOpenLoop() { static const float hardCodedboostTableOpenLoop[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, diff --git a/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-global-defaults.md b/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-global-defaults.md index cde894f4bb..013d8f8cbe 100644 --- a/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-global-defaults.md +++ b/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-global-defaults.md @@ -83,6 +83,8 @@ engineConfiguration->gppwm[0].loadAxis = GPPWM_Map; + cannedmafDecodingBins(); + cannedcltIdleCorr(); cannedboostTableOpenLoop(); cannedscriptTable4(); cannedignitionTable(); diff --git a/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-global-defaults_methods.md b/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-global-defaults_methods.md index b43a1129ee..db274430a7 100644 --- a/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-global-defaults_methods.md +++ b/simulator/generated/canned-tunes/Honda-OBD1-comparing-against-global-defaults_methods.md @@ -1,4 +1,14 @@ ``` +static void cannedmafDecodingBins() { + static const float hardCodedmafDecodingBins[32] = {0.0, 0.78125, 1.3867188, 2.9101562, 4.2578125, 4.9804688, 2016.0, 2017.0, 2018.0, 2019.0, 2020.0, 2021.0, 2022.0, 2023.0, 2024.0, 2025.0, 2026.0, 2027.0, 2028.0, 2029.0, 2030.0, 2031.0, 2032.0, 2033.0, 2034.0, 2035.0, 2036.0, 2037.0, 2038.0, 2039.0, 2040.0, 2041.0}; + copyArray(config->mafDecodingBins, hardCodedmafDecodingBins); +} + +static void cannedcltIdleCorr() { + static const float hardCodedcltIdleCorr[16] = {1.5, 1.5, 1.3333334, 1.3333334, 1.3333334, 1.3333334, 1.3333334, 1.3333334, 1.3333334, 1.2333333, 1.1666666, 1.1, 1.0, 1.0, 1.0, 1.0}; + copyArray(config->cltIdleCorr, hardCodedcltIdleCorr); +} + static void cannedboostTableOpenLoop() { static const float hardCodedboostTableOpenLoop[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, diff --git a/simulator/generated/canned-tunes/M52-comparing-against-current-M52-default.md b/simulator/generated/canned-tunes/M52-comparing-against-current-M52-default.md index 44bea34eb5..2e746ae915 100644 --- a/simulator/generated/canned-tunes/M52-comparing-against-current-M52-default.md +++ b/simulator/generated/canned-tunes/M52-comparing-against-current-M52-default.md @@ -189,13 +189,47 @@ engineConfiguration->hpfpPidI = 0; + cannedsparkDwellRpmBins(); + cannedsparkDwellValues(); + canneddwellVoltageCorrVoltBins(); + canneddwellVoltageCorrValues(); + cannedtpsTspCorrValuesBins(); + cannedtpsTspCorrValues(); + cannedprimeBins(); + cannedprimeValues(); + cannedmafDecodingBins(); + cannedcltFuelCorr(); + cannedcrankingFuelCoef(); + cannedcltRevLimitRpmBins(); + cannedcrankingCycleCoef(); + cannedcltIdleCorr(); + cannedcltCrankingCorr(); + cannedcltIdleRpm(); + cannedidleAdvanceBins(); + cannedidleAdvance(); + cannedfuelLevelBins(); cannedtpsTpsAccelTable(); + cannedboostRpmBins(); cannedboostTableOpenLoop(); + cannedscriptTable4RpmBins(); cannedscriptTable4(); + cannedignitionRpmBins(); + cannedignitionLoadBins(); cannedignitionTable(); + cannedveRpmBins(); + cannedveLoadBins(); cannedveTable(); + cannedfuelTrimRpmBins(); + cannedfuelTrimLoadBins(); + cannedignTrimRpmBins(); + cannedignTrimLoadBins(); + cannedmapEstimateRpmBins(); + cannedmapEstimateTpsBins(); cannedmapEstimateTable(); + cannedpedalToTpsRpmBins(); cannedlambdaTable(); cannedtcuSolenoidTable(); + cannedhpfpTargetRpmBins(); + cannedhpfpCompensationRpmBins(); cannedpostCrankingFactor(); ``` diff --git a/simulator/generated/canned-tunes/M52-comparing-against-current-M52-default_methods.md b/simulator/generated/canned-tunes/M52-comparing-against-current-M52-default_methods.md index de79881e35..f532fb9cfe 100644 --- a/simulator/generated/canned-tunes/M52-comparing-against-current-M52-default_methods.md +++ b/simulator/generated/canned-tunes/M52-comparing-against-current-M52-default_methods.md @@ -1,4 +1,99 @@ ``` +static void cannedsparkDwellRpmBins() { + static const float hardCodedsparkDwellRpmBins[8] = {0.0, 500.0, 2000.0, 3000.0, 4000.0, 5000.0, 6000.0, 7000.0}; + copyArray(config->sparkDwellRpmBins, hardCodedsparkDwellRpmBins); +} + +static void cannedsparkDwellValues() { + static const float hardCodedsparkDwellValues[8] = {5.4, 3.1, 3.05, 3.0, 2.95, 2.9, 2.85, 2.8}; + copyArray(config->sparkDwellValues, hardCodedsparkDwellValues); +} + +static void canneddwellVoltageCorrVoltBins() { + static const float hardCodeddwellVoltageCorrVoltBins[8] = {8.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0}; + copyArray(config->dwellVoltageCorrVoltBins, hardCodeddwellVoltageCorrVoltBins); +} + +static void canneddwellVoltageCorrValues() { + static const float hardCodeddwellVoltageCorrValues[8] = {1.4, 1.32, 1.24, 1.12, 1.08, 1.02, 0.92, 0.84}; + copyArray(config->dwellVoltageCorrValues, hardCodeddwellVoltageCorrValues); +} + +static void cannedtpsTspCorrValuesBins() { + static const float hardCodedtpsTspCorrValuesBins[4] = {3000.0, 5000.0, 7000.0, 9000.0}; + copyArray(config->tpsTspCorrValuesBins, hardCodedtpsTspCorrValuesBins); +} + +static void cannedtpsTspCorrValues() { + static const float hardCodedtpsTspCorrValues[4] = {1.0, 0.4, 0.2, 0.02}; + copyArray(config->tpsTspCorrValues, hardCodedtpsTspCorrValues); +} + +static void cannedprimeBins() { + static const float hardCodedprimeBins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(engineConfiguration->primeBins, hardCodedprimeBins); +} + +static void cannedprimeValues() { + static const float hardCodedprimeValues[8] = {50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0}; + copyArray(engineConfiguration->primeValues, hardCodedprimeValues); +} + +static void cannedmafDecodingBins() { + static const float hardCodedmafDecodingBins[32] = {0.0, 0.78125, 1.3867188, 2.9101562, 4.2578125, 4.9804688, 2016.0, 2017.0, 2018.0, 2019.0, 2020.0, 2021.0, 2022.0, 2023.0, 2024.0, 2025.0, 2026.0, 2027.0, 2028.0, 2029.0, 2030.0, 2031.0, 2032.0, 2033.0, 2034.0, 2035.0, 2036.0, 2037.0, 2038.0, 2039.0, 2040.0, 2041.0}; + copyArray(config->mafDecodingBins, hardCodedmafDecodingBins); +} + +static void cannedcltFuelCorr() { + static const float hardCodedcltFuelCorr[16] = {1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0}; + copyArray(config->cltFuelCorr, hardCodedcltFuelCorr); +} + +static void cannedcrankingFuelCoef() { + static const float hardCodedcrankingFuelCoef[8] = {1.2, 1.2, 1.2, 1.2, 1.1333333, 1.0666667, 1.0, 1.0}; + copyArray(config->crankingFuelCoef, hardCodedcrankingFuelCoef); +} + +static void cannedcltRevLimitRpmBins() { + static const float hardCodedcltRevLimitRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->cltRevLimitRpmBins, hardCodedcltRevLimitRpmBins); +} + +static void cannedcrankingCycleCoef() { + static const float hardCodedcrankingCycleCoef[8] = {2.5, 1.8, 1.5, 1.0, 1.0, 1.0, 1.0, 1.0}; + copyArray(config->crankingCycleCoef, hardCodedcrankingCycleCoef); +} + +static void cannedcltIdleCorr() { + static const float hardCodedcltIdleCorr[16] = {1.2, 1.2, 1.2, 2.0, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.2, 1.2, 1.0, 1.0, 1.2}; + copyArray(config->cltIdleCorr, hardCodedcltIdleCorr); +} + +static void cannedcltCrankingCorr() { + static const float hardCodedcltCrankingCorr[8] = {1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2}; + copyArray(config->cltCrankingCorr, hardCodedcltCrankingCorr); +} + +static void cannedcltIdleRpm() { + static const float hardCodedcltIdleRpm[16] = {2200.0, 2200.0, 2200.0, 2200.0, 2200.0, 2200.0, 2200.0, 2200.0, 2200.0, 2200.0, 2200.0, 2200.0, 2200.0, 2200.0, 2200.0, 2200.0}; + copyArray(config->cltIdleRpm, hardCodedcltIdleRpm); +} + +static void cannedidleAdvanceBins() { + static const float hardCodedidleAdvanceBins[8] = {1000.0, 1200.0, 1450.0, 1650.0, 1850.0, 2050.0, 2300.0, 2500.0}; + copyArray(config->idleAdvanceBins, hardCodedidleAdvanceBins); +} + +static void cannedidleAdvance() { + static const float hardCodedidleAdvance[8] = {0.0, 0.2857, 0.5714, 0.8571, 1.1429, 1.4286, 1.7143, 2.0}; + copyArray(config->idleAdvance, hardCodedidleAdvance); +} + +static void cannedfuelLevelBins() { + static const float hardCodedfuelLevelBins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelLevelBins, hardCodedfuelLevelBins); +} + static void cannedtpsTpsAccelTable() { static const float hardCodedtpsTpsAccelTable[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -13,6 +108,11 @@ static void cannedtpsTpsAccelTable() { copyTable(config->tpsTpsAccelTable, hardCodedtpsTpsAccelTable); } +static void cannedboostRpmBins() { + static const float hardCodedboostRpmBins[8] = {0.0, 1100.0, 2300.0, 3400.0, 4600.0, 5700.0, 6900.0, 8000.0}; + copyArray(config->boostRpmBins, hardCodedboostRpmBins); +} + static void cannedboostTableOpenLoop() { static const float hardCodedboostTableOpenLoop[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -27,6 +127,11 @@ static void cannedboostTableOpenLoop() { copyTable(config->boostTableOpenLoop, hardCodedboostTableOpenLoop); } +static void cannedscriptTable4RpmBins() { + static const float hardCodedscriptTable4RpmBins[10] = {650.0, 767.0, 1300.0, 2000.0, 2700.0, 3400.0, 4100.0, 4800.0, 5678.0, 7000.0}; + copyArray(config->scriptTable4RpmBins, hardCodedscriptTable4RpmBins); +} + static void cannedscriptTable4() { static const float hardCodedscriptTable4[8][10] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -41,6 +146,16 @@ static void cannedscriptTable4() { copyTable(config->scriptTable4, hardCodedscriptTable4); } +static void cannedignitionRpmBins() { + static const float hardCodedignitionRpmBins[16] = {1200.0, 1500.0, 2000.0, 3000.0, 4000.0, 4500.0, 5000.0, 5500.0, 6000.0, 6500.0, 7000.0, 7500.0, 8000.0, 8500.0, 9000.0, 10000.0}; + copyArray(config->ignitionRpmBins, hardCodedignitionRpmBins); +} + +static void cannedignitionLoadBins() { + static const float hardCodedignitionLoadBins[16] = {0.0, 2.0, 4.0, 6.0, 8.0, 10.0, 20.0, 25.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0}; + copyArray(config->ignitionLoadBins, hardCodedignitionLoadBins); +} + static void cannedignitionTable() { static const float hardCodedignitionTable[16][16] = { {10.000, 5.000, -5.000, 0.000, 2.100, 2.900, -20.000, -20.000, -20.000, -20.000, -20.000, -20.000, 0.200, 20.600, 41.000, 41.000, }, @@ -63,6 +178,16 @@ static void cannedignitionTable() { copyTable(config->ignitionTable, hardCodedignitionTable); } +static void cannedveRpmBins() { + static const float hardCodedveRpmBins[16] = {1200.0, 1500.0, 2000.0, 3000.0, 4000.0, 4500.0, 5000.0, 5500.0, 6000.0, 6500.0, 7000.0, 7500.0, 8000.0, 8500.0, 9000.0, 10000.0}; + copyArray(config->veRpmBins, hardCodedveRpmBins); +} + +static void cannedveLoadBins() { + static const float hardCodedveLoadBins[16] = {0.0, 2.0, 4.0, 6.0, 8.0, 10.0, 20.0, 25.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0}; + copyArray(config->veLoadBins, hardCodedveLoadBins); +} + static void cannedveTable() { static const float hardCodedveTable[16][16] = { {20.000, 20.000, 20.000, 20.000, 25.000, 25.000, 10.000, 10.000, 10.000, 10.000, 10.000, 10.000, 10.000, 15.000, 15.000, 15.000, }, @@ -85,6 +210,36 @@ static void cannedveTable() { copyTable(config->veTable, hardCodedveTable); } +static void cannedfuelTrimRpmBins() { + static const float hardCodedfuelTrimRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelTrimRpmBins, hardCodedfuelTrimRpmBins); +} + +static void cannedfuelTrimLoadBins() { + static const float hardCodedfuelTrimLoadBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelTrimLoadBins, hardCodedfuelTrimLoadBins); +} + +static void cannedignTrimRpmBins() { + static const float hardCodedignTrimRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->ignTrimRpmBins, hardCodedignTrimRpmBins); +} + +static void cannedignTrimLoadBins() { + static const float hardCodedignTrimLoadBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->ignTrimLoadBins, hardCodedignTrimLoadBins); +} + +static void cannedmapEstimateRpmBins() { + static const float hardCodedmapEstimateRpmBins[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->mapEstimateRpmBins, hardCodedmapEstimateRpmBins); +} + +static void cannedmapEstimateTpsBins() { + static const float hardCodedmapEstimateTpsBins[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->mapEstimateTpsBins, hardCodedmapEstimateTpsBins); +} + static void cannedmapEstimateTable() { static const float hardCodedmapEstimateTable[16][16] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -107,6 +262,11 @@ static void cannedmapEstimateTable() { copyTable(config->mapEstimateTable, hardCodedmapEstimateTable); } +static void cannedpedalToTpsRpmBins() { + static const float hardCodedpedalToTpsRpmBins[8] = {0.0, 1100.0, 2300.0, 3400.0, 4600.0, 5700.0, 6900.0, 8000.0}; + copyArray(config->pedalToTpsRpmBins, hardCodedpedalToTpsRpmBins); +} + static void cannedlambdaTable() { static const float hardCodedlambdaTable[16][16] = { {14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, }, @@ -141,6 +301,16 @@ static void cannedtcuSolenoidTable() { copyTable(config->tcuSolenoidTable, hardCodedtcuSolenoidTable); } +static void cannedhpfpTargetRpmBins() { + static const float hardCodedhpfpTargetRpmBins[10] = {0.0, 900.0, 1800.0, 2650.0, 3550.0, 4450.0, 5350.0, 6200.0, 7100.0, 8000.0}; + copyArray(config->hpfpTargetRpmBins, hardCodedhpfpTargetRpmBins); +} + +static void cannedhpfpCompensationRpmBins() { + static const float hardCodedhpfpCompensationRpmBins[10] = {0.0, 900.0, 1800.0, 2650.0, 3550.0, 4450.0, 5350.0, 6200.0, 7100.0, 8000.0}; + copyArray(config->hpfpCompensationRpmBins, hardCodedhpfpCompensationRpmBins); +} + static void cannedpostCrankingFactor() { static const float hardCodedpostCrankingFactor[6][6] = { {1.200, 1.000, 1.000, 1.000, 1.000, 1.000, }, diff --git a/simulator/generated/canned-tunes/M52-comparing-against-global-defaults.md b/simulator/generated/canned-tunes/M52-comparing-against-global-defaults.md index 9f972aefa4..a15d871541 100644 --- a/simulator/generated/canned-tunes/M52-comparing-against-global-defaults.md +++ b/simulator/generated/canned-tunes/M52-comparing-against-global-defaults.md @@ -195,13 +195,47 @@ engineConfiguration->hpfpPidI = 0; + cannedsparkDwellRpmBins(); + cannedsparkDwellValues(); + canneddwellVoltageCorrVoltBins(); + canneddwellVoltageCorrValues(); + cannedtpsTspCorrValuesBins(); + cannedtpsTspCorrValues(); + cannedprimeBins(); + cannedprimeValues(); + cannedmafDecodingBins(); + cannedcltFuelCorr(); + cannedcrankingFuelCoef(); + cannedcltRevLimitRpmBins(); + cannedcrankingCycleCoef(); + cannedcltIdleCorr(); + cannedcltCrankingCorr(); + cannedcltIdleRpm(); + cannedidleAdvanceBins(); + cannedidleAdvance(); + cannedfuelLevelBins(); cannedtpsTpsAccelTable(); + cannedboostRpmBins(); cannedboostTableOpenLoop(); + cannedscriptTable4RpmBins(); cannedscriptTable4(); + cannedignitionRpmBins(); + cannedignitionLoadBins(); cannedignitionTable(); + cannedveRpmBins(); + cannedveLoadBins(); cannedveTable(); + cannedfuelTrimRpmBins(); + cannedfuelTrimLoadBins(); + cannedignTrimRpmBins(); + cannedignTrimLoadBins(); + cannedmapEstimateRpmBins(); + cannedmapEstimateTpsBins(); cannedmapEstimateTable(); + cannedpedalToTpsRpmBins(); cannedlambdaTable(); cannedtcuSolenoidTable(); + cannedhpfpTargetRpmBins(); + cannedhpfpCompensationRpmBins(); cannedpostCrankingFactor(); ``` diff --git a/simulator/generated/canned-tunes/M52-comparing-against-global-defaults_methods.md b/simulator/generated/canned-tunes/M52-comparing-against-global-defaults_methods.md index de79881e35..f532fb9cfe 100644 --- a/simulator/generated/canned-tunes/M52-comparing-against-global-defaults_methods.md +++ b/simulator/generated/canned-tunes/M52-comparing-against-global-defaults_methods.md @@ -1,4 +1,99 @@ ``` +static void cannedsparkDwellRpmBins() { + static const float hardCodedsparkDwellRpmBins[8] = {0.0, 500.0, 2000.0, 3000.0, 4000.0, 5000.0, 6000.0, 7000.0}; + copyArray(config->sparkDwellRpmBins, hardCodedsparkDwellRpmBins); +} + +static void cannedsparkDwellValues() { + static const float hardCodedsparkDwellValues[8] = {5.4, 3.1, 3.05, 3.0, 2.95, 2.9, 2.85, 2.8}; + copyArray(config->sparkDwellValues, hardCodedsparkDwellValues); +} + +static void canneddwellVoltageCorrVoltBins() { + static const float hardCodeddwellVoltageCorrVoltBins[8] = {8.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0}; + copyArray(config->dwellVoltageCorrVoltBins, hardCodeddwellVoltageCorrVoltBins); +} + +static void canneddwellVoltageCorrValues() { + static const float hardCodeddwellVoltageCorrValues[8] = {1.4, 1.32, 1.24, 1.12, 1.08, 1.02, 0.92, 0.84}; + copyArray(config->dwellVoltageCorrValues, hardCodeddwellVoltageCorrValues); +} + +static void cannedtpsTspCorrValuesBins() { + static const float hardCodedtpsTspCorrValuesBins[4] = {3000.0, 5000.0, 7000.0, 9000.0}; + copyArray(config->tpsTspCorrValuesBins, hardCodedtpsTspCorrValuesBins); +} + +static void cannedtpsTspCorrValues() { + static const float hardCodedtpsTspCorrValues[4] = {1.0, 0.4, 0.2, 0.02}; + copyArray(config->tpsTspCorrValues, hardCodedtpsTspCorrValues); +} + +static void cannedprimeBins() { + static const float hardCodedprimeBins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(engineConfiguration->primeBins, hardCodedprimeBins); +} + +static void cannedprimeValues() { + static const float hardCodedprimeValues[8] = {50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0}; + copyArray(engineConfiguration->primeValues, hardCodedprimeValues); +} + +static void cannedmafDecodingBins() { + static const float hardCodedmafDecodingBins[32] = {0.0, 0.78125, 1.3867188, 2.9101562, 4.2578125, 4.9804688, 2016.0, 2017.0, 2018.0, 2019.0, 2020.0, 2021.0, 2022.0, 2023.0, 2024.0, 2025.0, 2026.0, 2027.0, 2028.0, 2029.0, 2030.0, 2031.0, 2032.0, 2033.0, 2034.0, 2035.0, 2036.0, 2037.0, 2038.0, 2039.0, 2040.0, 2041.0}; + copyArray(config->mafDecodingBins, hardCodedmafDecodingBins); +} + +static void cannedcltFuelCorr() { + static const float hardCodedcltFuelCorr[16] = {1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0}; + copyArray(config->cltFuelCorr, hardCodedcltFuelCorr); +} + +static void cannedcrankingFuelCoef() { + static const float hardCodedcrankingFuelCoef[8] = {1.2, 1.2, 1.2, 1.2, 1.1333333, 1.0666667, 1.0, 1.0}; + copyArray(config->crankingFuelCoef, hardCodedcrankingFuelCoef); +} + +static void cannedcltRevLimitRpmBins() { + static const float hardCodedcltRevLimitRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->cltRevLimitRpmBins, hardCodedcltRevLimitRpmBins); +} + +static void cannedcrankingCycleCoef() { + static const float hardCodedcrankingCycleCoef[8] = {2.5, 1.8, 1.5, 1.0, 1.0, 1.0, 1.0, 1.0}; + copyArray(config->crankingCycleCoef, hardCodedcrankingCycleCoef); +} + +static void cannedcltIdleCorr() { + static const float hardCodedcltIdleCorr[16] = {1.2, 1.2, 1.2, 2.0, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.2, 1.2, 1.0, 1.0, 1.2}; + copyArray(config->cltIdleCorr, hardCodedcltIdleCorr); +} + +static void cannedcltCrankingCorr() { + static const float hardCodedcltCrankingCorr[8] = {1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2}; + copyArray(config->cltCrankingCorr, hardCodedcltCrankingCorr); +} + +static void cannedcltIdleRpm() { + static const float hardCodedcltIdleRpm[16] = {2200.0, 2200.0, 2200.0, 2200.0, 2200.0, 2200.0, 2200.0, 2200.0, 2200.0, 2200.0, 2200.0, 2200.0, 2200.0, 2200.0, 2200.0, 2200.0}; + copyArray(config->cltIdleRpm, hardCodedcltIdleRpm); +} + +static void cannedidleAdvanceBins() { + static const float hardCodedidleAdvanceBins[8] = {1000.0, 1200.0, 1450.0, 1650.0, 1850.0, 2050.0, 2300.0, 2500.0}; + copyArray(config->idleAdvanceBins, hardCodedidleAdvanceBins); +} + +static void cannedidleAdvance() { + static const float hardCodedidleAdvance[8] = {0.0, 0.2857, 0.5714, 0.8571, 1.1429, 1.4286, 1.7143, 2.0}; + copyArray(config->idleAdvance, hardCodedidleAdvance); +} + +static void cannedfuelLevelBins() { + static const float hardCodedfuelLevelBins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelLevelBins, hardCodedfuelLevelBins); +} + static void cannedtpsTpsAccelTable() { static const float hardCodedtpsTpsAccelTable[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -13,6 +108,11 @@ static void cannedtpsTpsAccelTable() { copyTable(config->tpsTpsAccelTable, hardCodedtpsTpsAccelTable); } +static void cannedboostRpmBins() { + static const float hardCodedboostRpmBins[8] = {0.0, 1100.0, 2300.0, 3400.0, 4600.0, 5700.0, 6900.0, 8000.0}; + copyArray(config->boostRpmBins, hardCodedboostRpmBins); +} + static void cannedboostTableOpenLoop() { static const float hardCodedboostTableOpenLoop[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -27,6 +127,11 @@ static void cannedboostTableOpenLoop() { copyTable(config->boostTableOpenLoop, hardCodedboostTableOpenLoop); } +static void cannedscriptTable4RpmBins() { + static const float hardCodedscriptTable4RpmBins[10] = {650.0, 767.0, 1300.0, 2000.0, 2700.0, 3400.0, 4100.0, 4800.0, 5678.0, 7000.0}; + copyArray(config->scriptTable4RpmBins, hardCodedscriptTable4RpmBins); +} + static void cannedscriptTable4() { static const float hardCodedscriptTable4[8][10] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -41,6 +146,16 @@ static void cannedscriptTable4() { copyTable(config->scriptTable4, hardCodedscriptTable4); } +static void cannedignitionRpmBins() { + static const float hardCodedignitionRpmBins[16] = {1200.0, 1500.0, 2000.0, 3000.0, 4000.0, 4500.0, 5000.0, 5500.0, 6000.0, 6500.0, 7000.0, 7500.0, 8000.0, 8500.0, 9000.0, 10000.0}; + copyArray(config->ignitionRpmBins, hardCodedignitionRpmBins); +} + +static void cannedignitionLoadBins() { + static const float hardCodedignitionLoadBins[16] = {0.0, 2.0, 4.0, 6.0, 8.0, 10.0, 20.0, 25.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0}; + copyArray(config->ignitionLoadBins, hardCodedignitionLoadBins); +} + static void cannedignitionTable() { static const float hardCodedignitionTable[16][16] = { {10.000, 5.000, -5.000, 0.000, 2.100, 2.900, -20.000, -20.000, -20.000, -20.000, -20.000, -20.000, 0.200, 20.600, 41.000, 41.000, }, @@ -63,6 +178,16 @@ static void cannedignitionTable() { copyTable(config->ignitionTable, hardCodedignitionTable); } +static void cannedveRpmBins() { + static const float hardCodedveRpmBins[16] = {1200.0, 1500.0, 2000.0, 3000.0, 4000.0, 4500.0, 5000.0, 5500.0, 6000.0, 6500.0, 7000.0, 7500.0, 8000.0, 8500.0, 9000.0, 10000.0}; + copyArray(config->veRpmBins, hardCodedveRpmBins); +} + +static void cannedveLoadBins() { + static const float hardCodedveLoadBins[16] = {0.0, 2.0, 4.0, 6.0, 8.0, 10.0, 20.0, 25.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0}; + copyArray(config->veLoadBins, hardCodedveLoadBins); +} + static void cannedveTable() { static const float hardCodedveTable[16][16] = { {20.000, 20.000, 20.000, 20.000, 25.000, 25.000, 10.000, 10.000, 10.000, 10.000, 10.000, 10.000, 10.000, 15.000, 15.000, 15.000, }, @@ -85,6 +210,36 @@ static void cannedveTable() { copyTable(config->veTable, hardCodedveTable); } +static void cannedfuelTrimRpmBins() { + static const float hardCodedfuelTrimRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelTrimRpmBins, hardCodedfuelTrimRpmBins); +} + +static void cannedfuelTrimLoadBins() { + static const float hardCodedfuelTrimLoadBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelTrimLoadBins, hardCodedfuelTrimLoadBins); +} + +static void cannedignTrimRpmBins() { + static const float hardCodedignTrimRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->ignTrimRpmBins, hardCodedignTrimRpmBins); +} + +static void cannedignTrimLoadBins() { + static const float hardCodedignTrimLoadBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->ignTrimLoadBins, hardCodedignTrimLoadBins); +} + +static void cannedmapEstimateRpmBins() { + static const float hardCodedmapEstimateRpmBins[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->mapEstimateRpmBins, hardCodedmapEstimateRpmBins); +} + +static void cannedmapEstimateTpsBins() { + static const float hardCodedmapEstimateTpsBins[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->mapEstimateTpsBins, hardCodedmapEstimateTpsBins); +} + static void cannedmapEstimateTable() { static const float hardCodedmapEstimateTable[16][16] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -107,6 +262,11 @@ static void cannedmapEstimateTable() { copyTable(config->mapEstimateTable, hardCodedmapEstimateTable); } +static void cannedpedalToTpsRpmBins() { + static const float hardCodedpedalToTpsRpmBins[8] = {0.0, 1100.0, 2300.0, 3400.0, 4600.0, 5700.0, 6900.0, 8000.0}; + copyArray(config->pedalToTpsRpmBins, hardCodedpedalToTpsRpmBins); +} + static void cannedlambdaTable() { static const float hardCodedlambdaTable[16][16] = { {14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, }, @@ -141,6 +301,16 @@ static void cannedtcuSolenoidTable() { copyTable(config->tcuSolenoidTable, hardCodedtcuSolenoidTable); } +static void cannedhpfpTargetRpmBins() { + static const float hardCodedhpfpTargetRpmBins[10] = {0.0, 900.0, 1800.0, 2650.0, 3550.0, 4450.0, 5350.0, 6200.0, 7100.0, 8000.0}; + copyArray(config->hpfpTargetRpmBins, hardCodedhpfpTargetRpmBins); +} + +static void cannedhpfpCompensationRpmBins() { + static const float hardCodedhpfpCompensationRpmBins[10] = {0.0, 900.0, 1800.0, 2650.0, 3550.0, 4450.0, 5350.0, 6200.0, 7100.0, 8000.0}; + copyArray(config->hpfpCompensationRpmBins, hardCodedhpfpCompensationRpmBins); +} + static void cannedpostCrankingFactor() { static const float hardCodedpostCrankingFactor[6][6] = { {1.200, 1.000, 1.000, 1.000, 1.000, 1.000, }, diff --git a/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-current-MazdaMiataNB2-default.md b/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-current-MazdaMiataNB2-default.md index e90d9fea0c..d34334892d 100644 --- a/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-current-MazdaMiataNB2-default.md +++ b/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-current-MazdaMiataNB2-default.md @@ -269,18 +269,69 @@ engineConfiguration->hpfpPidI = 0; + nb2cannedknockNoiseRpmBins(); + nb2cannedknockBaseNoise(); + nb2cannedscriptCurve5Bins(); + nb2cannedscriptCurve6Bins(); + nb2cannedsparkDwellRpmBins(); + nb2cannedsparkDwellValues(); + nb2canneddwellVoltageCorrVoltBins(); + nb2canneddwellVoltageCorrValues(); + nb2cannedprimeBins(); + nb2cannedprimeValues(); + nb2cannedmafDecodingBins(); + nb2cannedcltFuelCorr(); + nb2cannedcrankingFuelCoef(); + nb2cannedcrankingFuelCoefE100(); + nb2cannedcltRevLimitRpmBins(); + nb2cannedcrankingCycleCoef(); + nb2cannedcltIdleCorrBins(); + nb2cannedcltIdleCorr(); + nb2cannedcltCrankingCorr(); + nb2cannedcltIdleRpmBins(); + nb2cannedcltIdleRpm(); + nb2cannedidleAdvanceBins(); + nb2cannedidleAdvance(); + nb2cannedfuelLevelBins(); + nb2cannedhpfpLobeProfileQuantityBins(); + nb2cannedhpfpLobeProfileAngle(); + nb2cannedhpfpDeadtimeVoltsBins(); nb2cannedtpsTpsAccelTable(); + nb2cannedboostRpmBins(); + nb2cannedboostTpsBins(); nb2cannedboostTableOpenLoop(); nb2cannedboostTableClosedLoop(); + nb2cannedvvtTable1RpmBins(); nb2cannedvvtTable1(); + nb2cannedscriptTable4RpmBins(); nb2cannedscriptTable4(); + nb2cannedignitionRpmBins(); + nb2cannedignitionLoadBins(); nb2cannedignitionTable(); + nb2cannedignitionIatCorrLoadBins(); nb2cannedignitionIatCorrTable(); + nb2cannedveRpmBins(); + nb2cannedveLoadBins(); nb2cannedveTable(); + nb2cannedidleVeRpmBins(); + nb2cannedidleVeLoadBins(); nb2cannedidleVeTable(); + nb2cannedfuelTrimRpmBins(); + nb2cannedfuelTrimLoadBins(); + nb2cannedignTrimRpmBins(); + nb2cannedignTrimLoadBins(); + nb2cannedmapEstimateRpmBins(); + nb2cannedmapEstimateTpsBins(); nb2cannedmapEstimateTable(); nb2cannedinjectionPhase(); + nb2cannedpedalToTpsRpmBins(); + nb2cannedlambdaRpmBins(); + nb2cannedlambdaLoadBins(); nb2cannedlambdaTable(); nb2cannedtcuSolenoidTable(); + nb2cannedhpfpTargetRpmBins(); + nb2cannedhpfpTargetLoadBins(); + nb2cannedhpfpCompensationRpmBins(); + nb2cannedhpfpCompensationLoadBins(); nb2cannedpostCrankingFactor(); ``` diff --git a/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-current-MazdaMiataNB2-default_methods.md b/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-current-MazdaMiataNB2-default_methods.md index 1a633f0438..18125593c9 100644 --- a/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-current-MazdaMiataNB2-default_methods.md +++ b/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-current-MazdaMiataNB2-default_methods.md @@ -1,4 +1,139 @@ ``` +static void nb2cannedknockNoiseRpmBins() { + static const float hardCodedknockNoiseRpmBins[16] = {650.0, 700.0, 800.0, 1150.0, 1600.0, 2000.0, 2400.0, 2850.0, 3250.0, 3700.0, 4100.0, 4500.0, 4950.0, 5400.0, 6200.0, 7000.0}; + copyArray(config->knockNoiseRpmBins, hardCodedknockNoiseRpmBins); +} + +static void nb2cannedknockBaseNoise() { + static const float hardCodedknockBaseNoise[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->knockBaseNoise, hardCodedknockBaseNoise); +} + +static void nb2cannedscriptCurve5Bins() { + static const float hardCodedscriptCurve5Bins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->scriptCurve5Bins, hardCodedscriptCurve5Bins); +} + +static void nb2cannedscriptCurve6Bins() { + static const float hardCodedscriptCurve6Bins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->scriptCurve6Bins, hardCodedscriptCurve6Bins); +} + +static void nb2cannedsparkDwellRpmBins() { + static const float hardCodedsparkDwellRpmBins[8] = {500.0, 1200.0, 2000.0, 3000.0, 4000.0, 5000.0, 6000.0, 7200.0}; + copyArray(config->sparkDwellRpmBins, hardCodedsparkDwellRpmBins); +} + +static void nb2cannedsparkDwellValues() { + static const float hardCodedsparkDwellValues[8] = {2.5, 2.4, 2.3, 2.2, 2.1, 2.1, 2.0, 1.9}; + copyArray(config->sparkDwellValues, hardCodedsparkDwellValues); +} + +static void nb2canneddwellVoltageCorrVoltBins() { + static const float hardCodeddwellVoltageCorrVoltBins[8] = {8.0, 9.0, 10.0, 11.0, 12.0, 14.0, 16.0, 18.0}; + copyArray(config->dwellVoltageCorrVoltBins, hardCodeddwellVoltageCorrVoltBins); +} + +static void nb2canneddwellVoltageCorrValues() { + static const float hardCodeddwellVoltageCorrValues[8] = {2.28, 2.0, 1.7, 1.54, 1.36, 1.0, 0.86, 0.8}; + copyArray(config->dwellVoltageCorrValues, hardCodeddwellVoltageCorrValues); +} + +static void nb2cannedprimeBins() { + static const float hardCodedprimeBins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(engineConfiguration->primeBins, hardCodedprimeBins); +} + +static void nb2cannedprimeValues() { + static const float hardCodedprimeValues[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(engineConfiguration->primeValues, hardCodedprimeValues); +} + +static void nb2cannedmafDecodingBins() { + static const float hardCodedmafDecodingBins[32] = {0.5, 0.86999893, 1.0699997, 1.5299988, 1.8499985, 2.1099854, 2.4599915, 3.0, 3.5100098, 4.5, 4.5999756, 4.6099854, 4.619995, 4.630005, 4.6400146, 4.6500244, 4.659973, 4.669983, 4.6799927, 4.6900024, 4.700012, 4.710022, 4.7199707, 4.7299805, 4.73999, 4.75, 4.76001, 4.7700195, 4.7800293, 4.789978, 4.799988, 4.8099976}; + copyArray(config->mafDecodingBins, hardCodedmafDecodingBins); +} + +static void nb2cannedcltFuelCorr() { + static const float hardCodedcltFuelCorr[16] = {1.5, 1.5, 1.4199982, 1.3600006, 1.2799988, 1.199997, 1.1800003, 1.1500015, 1.1, 1.1, 1.1, 1.1, 1.1, 1.1, 1.1, 1.1}; + copyArray(config->cltFuelCorr, hardCodedcltFuelCorr); +} + +static void nb2cannedcrankingFuelCoef() { + static const float hardCodedcrankingFuelCoef[8] = {2.7999878, 2.2000122, 1.800003, 1.550003, 1.199997, 1.1, 1.1, 1.1}; + copyArray(config->crankingFuelCoef, hardCodedcrankingFuelCoef); +} + +static void nb2cannedcrankingFuelCoefE100() { + static const float hardCodedcrankingFuelCoefE100[8] = {0.02, 0.02, 0.01, 0.01, 0.01, 0.01, 0.01, 0.01}; + copyArray(config->crankingFuelCoefE100, hardCodedcrankingFuelCoefE100); +} + +static void nb2cannedcltRevLimitRpmBins() { + static const float hardCodedcltRevLimitRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->cltRevLimitRpmBins, hardCodedcltRevLimitRpmBins); +} + +static void nb2cannedcrankingCycleCoef() { + static const float hardCodedcrankingCycleCoef[8] = {2.0, 1.300003, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0}; + copyArray(config->crankingCycleCoef, hardCodedcrankingCycleCoef); +} + +static void nb2cannedcltIdleCorrBins() { + static const float hardCodedcltIdleCorrBins[16] = {-40.0, -30.0, -20.0, -10.0, 0.0, 9.439941, 19.120117, 30.810059, 42.509766, 54.529785, 64.21973, 71.90039, 80.0, 90.0, 100.0, 110.0}; + copyArray(config->cltIdleCorrBins, hardCodedcltIdleCorrBins); +} + +static void nb2cannedcltIdleCorr() { + static const float hardCodedcltIdleCorr[16] = {1.300003, 1.25, 1.2200012, 1.1900024, 1.1399994, 1.1, 1.08, 1.08, 1.08, 1.08, 1.08, 1.08, 1.08, 1.08, 1.08, 1.08}; + copyArray(config->cltIdleCorr, hardCodedcltIdleCorr); +} + +static void nb2cannedcltCrankingCorr() { + static const float hardCodedcltCrankingCorr[8] = {1.4000015, 1.35, 1.28, 1.25, 1.2, 1.15, 1.1, 1.1}; + copyArray(config->cltCrankingCorr, hardCodedcltCrankingCorr); +} + +static void nb2cannedcltIdleRpmBins() { + static const float hardCodedcltIdleRpmBins[16] = {-40.0, -30.0, -20.0, 0.0, 10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0, 110.0, 130.0}; + copyArray(config->cltIdleRpmBins, hardCodedcltIdleRpmBins); +} + +static void nb2cannedcltIdleRpm() { + static const float hardCodedcltIdleRpm[16] = {1400.0, 1400.0, 1400.0, 1400.0, 1400.0, 1350.0, 1350.0, 1250.0, 1150.0, 1000.0, 950.0, 950.0, 950.0, 950.0, 950.0, 950.0}; + copyArray(config->cltIdleRpm, hardCodedcltIdleRpm); +} + +static void nb2cannedidleAdvanceBins() { + static const float hardCodedidleAdvanceBins[8] = {500.0, 700.0, 800.0, 900.0, 1000.0, 1100.0, 1200.0, 1300.0}; + copyArray(config->idleAdvanceBins, hardCodedidleAdvanceBins); +} + +static void nb2cannedidleAdvance() { + static const float hardCodedidleAdvance[8] = {12.0, 12.0, 11.0, 10.0, 10.0, 10.0, 10.0, 10.0}; + copyArray(config->idleAdvance, hardCodedidleAdvance); +} + +static void nb2cannedfuelLevelBins() { + static const float hardCodedfuelLevelBins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelLevelBins, hardCodedfuelLevelBins); +} + +static void nb2cannedhpfpLobeProfileQuantityBins() { + static const float hardCodedhpfpLobeProfileQuantityBins[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpLobeProfileQuantityBins, hardCodedhpfpLobeProfileQuantityBins); +} + +static void nb2cannedhpfpLobeProfileAngle() { + static const float hardCodedhpfpLobeProfileAngle[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpLobeProfileAngle, hardCodedhpfpLobeProfileAngle); +} + +static void nb2cannedhpfpDeadtimeVoltsBins() { + static const float hardCodedhpfpDeadtimeVoltsBins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpDeadtimeVoltsBins, hardCodedhpfpDeadtimeVoltsBins); +} + static void nb2cannedtpsTpsAccelTable() { static const float hardCodedtpsTpsAccelTable[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -13,6 +148,16 @@ static void nb2cannedtpsTpsAccelTable() { copyTable(config->tpsTpsAccelTable, hardCodedtpsTpsAccelTable); } +static void nb2cannedboostRpmBins() { + static const float hardCodedboostRpmBins[8] = {0.0, 1150.0, 2300.0, 3450.0, 4550.0, 5700.0, 6850.0, 8000.0}; + copyArray(config->boostRpmBins, hardCodedboostRpmBins); +} + +static void nb2cannedboostTpsBins() { + static const float hardCodedboostTpsBins[8] = {0.0, 14.0, 28.0, 42.0, 58.0, 72.0, 86.0, 100.0}; + copyArray(config->boostTpsBins, hardCodedboostTpsBins); +} + static void nb2cannedboostTableOpenLoop() { static const float hardCodedboostTableOpenLoop[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -41,6 +186,11 @@ static void nb2cannedboostTableClosedLoop() { copyTable(config->boostTableClosedLoop, hardCodedboostTableClosedLoop); } +static void nb2cannedvvtTable1RpmBins() { + static const float hardCodedvvtTable1RpmBins[8] = {950.0, 1800.0, 2500.0, 3300.0, 4200.0, 5000.0, 6000.0, 7200.0}; + copyArray(config->vvtTable1RpmBins, hardCodedvvtTable1RpmBins); +} + static void nb2cannedvvtTable1() { static const float hardCodedvvtTable1[8][8] = { {0.000, 0.000, 10.000, 10.000, 10.000, 10.000, 0.000, 0.000, }, @@ -55,6 +205,11 @@ static void nb2cannedvvtTable1() { copyTable(config->vvtTable1, hardCodedvvtTable1); } +static void nb2cannedscriptTable4RpmBins() { + static const float hardCodedscriptTable4RpmBins[10] = {650.0, 800.0, 1700.0, 2600.0, 3500.0, 4400.0, 5300.0, 7000.0, 0.0, 0.0}; + copyArray(config->scriptTable4RpmBins, hardCodedscriptTable4RpmBins); +} + static void nb2cannedscriptTable4() { static const float hardCodedscriptTable4[8][10] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -69,6 +224,16 @@ static void nb2cannedscriptTable4() { copyTable(config->scriptTable4, hardCodedscriptTable4); } +static void nb2cannedignitionRpmBins() { + static const float hardCodedignitionRpmBins[16] = {700.0, 900.0, 1100.0, 1500.0, 1800.0, 2300.0, 2800.0, 3200.0, 3700.0, 4200.0, 4700.0, 5000.0, 5250.0, 5800.0, 6200.0, 7200.0}; + copyArray(config->ignitionRpmBins, hardCodedignitionRpmBins); +} + +static void nb2cannedignitionLoadBins() { + static const float hardCodedignitionLoadBins[16] = {25.0, 35.0, 45.0, 55.0, 65.0, 75.0, 85.0, 95.0, 100.0, 110.0, 130.0, 150.0, 170.0, 190.0, 205.0, 220.0}; + copyArray(config->ignitionLoadBins, hardCodedignitionLoadBins); +} + static void nb2cannedignitionTable() { static const float hardCodedignitionTable[16][16] = { {16.000, 16.000, 16.000, 16.000, 16.000, 16.000, 15.000, 6.100, -3.000, -3.000, -3.000, -3.000, -2.000, -2.000, -2.000, -2.000, }, @@ -91,6 +256,11 @@ static void nb2cannedignitionTable() { copyTable(config->ignitionTable, hardCodedignitionTable); } +static void nb2cannedignitionIatCorrLoadBins() { + static const float hardCodedignitionIatCorrLoadBins[8] = {-40.0, -30.0, -20.0, -10.0, 0.0, 10.0, 20.0, 30.0}; + copyArray(config->ignitionIatCorrLoadBins, hardCodedignitionIatCorrLoadBins); +} + static void nb2cannedignitionIatCorrTable() { static const float hardCodedignitionIatCorrTable[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -105,6 +275,16 @@ static void nb2cannedignitionIatCorrTable() { copyTable(config->ignitionIatCorrTable, hardCodedignitionIatCorrTable); } +static void nb2cannedveRpmBins() { + static const float hardCodedveRpmBins[16] = {700.0, 900.0, 1100.0, 1500.0, 1800.0, 2300.0, 2800.0, 3200.0, 3700.0, 4200.0, 4700.0, 5250.0, 5700.0, 6200.0, 6700.0, 7200.0}; + copyArray(config->veRpmBins, hardCodedveRpmBins); +} + +static void nb2cannedveLoadBins() { + static const float hardCodedveLoadBins[16] = {20.0, 25.0, 32.0, 36.0, 40.0, 45.0, 50.0, 55.0, 65.0, 75.0, 85.0, 90.0, 95.0, 100.0, 105.0, 110.0}; + copyArray(config->veLoadBins, hardCodedveLoadBins); +} + static void nb2cannedveTable() { static const float hardCodedveTable[16][16] = { {13.500, 22.000, 22.000, 19.700, 19.000, 19.000, 19.000, 21.000, 24.000, 24.000, 24.000, 23.500, 22.500, 22.800, 22.800, 22.200, }, @@ -127,6 +307,16 @@ static void nb2cannedveTable() { copyTable(config->veTable, hardCodedveTable); } +static void nb2cannedidleVeRpmBins() { + static const float hardCodedidleVeRpmBins[4] = {800.0, 900.0, 1100.0, 1200.0}; + copyArray(config->idleVeRpmBins, hardCodedidleVeRpmBins); +} + +static void nb2cannedidleVeLoadBins() { + static const float hardCodedidleVeLoadBins[4] = {30.0, 35.0, 40.0, 45.0}; + copyArray(config->idleVeLoadBins, hardCodedidleVeLoadBins); +} + static void nb2cannedidleVeTable() { static const float hardCodedidleVeTable[4][4] = { {41.000, 41.000, 41.000, 43.000, }, @@ -137,6 +327,36 @@ static void nb2cannedidleVeTable() { copyTable(config->idleVeTable, hardCodedidleVeTable); } +static void nb2cannedfuelTrimRpmBins() { + static const float hardCodedfuelTrimRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelTrimRpmBins, hardCodedfuelTrimRpmBins); +} + +static void nb2cannedfuelTrimLoadBins() { + static const float hardCodedfuelTrimLoadBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelTrimLoadBins, hardCodedfuelTrimLoadBins); +} + +static void nb2cannedignTrimRpmBins() { + static const float hardCodedignTrimRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->ignTrimRpmBins, hardCodedignTrimRpmBins); +} + +static void nb2cannedignTrimLoadBins() { + static const float hardCodedignTrimLoadBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->ignTrimLoadBins, hardCodedignTrimLoadBins); +} + +static void nb2cannedmapEstimateRpmBins() { + static const float hardCodedmapEstimateRpmBins[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->mapEstimateRpmBins, hardCodedmapEstimateRpmBins); +} + +static void nb2cannedmapEstimateTpsBins() { + static const float hardCodedmapEstimateTpsBins[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->mapEstimateTpsBins, hardCodedmapEstimateTpsBins); +} + static void nb2cannedmapEstimateTable() { static const float hardCodedmapEstimateTable[16][16] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -181,6 +401,21 @@ static void nb2cannedinjectionPhase() { copyTable(config->injectionPhase, hardCodedinjectionPhase); } +static void nb2cannedpedalToTpsRpmBins() { + static const float hardCodedpedalToTpsRpmBins[8] = {0.0, 1150.0, 2300.0, 3450.0, 4550.0, 5700.0, 6850.0, 8000.0}; + copyArray(config->pedalToTpsRpmBins, hardCodedpedalToTpsRpmBins); +} + +static void nb2cannedlambdaRpmBins() { + static const float hardCodedlambdaRpmBins[16] = {700.0, 900.0, 1100.0, 1500.0, 1700.0, 2300.0, 2800.0, 3200.0, 3700.0, 4200.0, 4700.0, 5250.0, 5700.0, 6200.0, 6700.0, 7200.0}; + copyArray(config->lambdaRpmBins, hardCodedlambdaRpmBins); +} + +static void nb2cannedlambdaLoadBins() { + static const float hardCodedlambdaLoadBins[16] = {20.0, 35.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0, 110.0, 120.0, 130.0, 150.0, 175.0, 200.0, 225.0, 250.0}; + copyArray(config->lambdaLoadBins, hardCodedlambdaLoadBins); +} + static void nb2cannedlambdaTable() { static const float hardCodedlambdaTable[16][16] = { {14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 15.400, 15.400, 15.400, 15.400, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, }, @@ -215,6 +450,26 @@ static void nb2cannedtcuSolenoidTable() { copyTable(config->tcuSolenoidTable, hardCodedtcuSolenoidTable); } +static void nb2cannedhpfpTargetRpmBins() { + static const float hardCodedhpfpTargetRpmBins[10] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpTargetRpmBins, hardCodedhpfpTargetRpmBins); +} + +static void nb2cannedhpfpTargetLoadBins() { + static const float hardCodedhpfpTargetLoadBins[10] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpTargetLoadBins, hardCodedhpfpTargetLoadBins); +} + +static void nb2cannedhpfpCompensationRpmBins() { + static const float hardCodedhpfpCompensationRpmBins[10] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpCompensationRpmBins, hardCodedhpfpCompensationRpmBins); +} + +static void nb2cannedhpfpCompensationLoadBins() { + static const float hardCodedhpfpCompensationLoadBins[10] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpCompensationLoadBins, hardCodedhpfpCompensationLoadBins); +} + static void nb2cannedpostCrankingFactor() { static const float hardCodedpostCrankingFactor[6][6] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, diff --git a/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-global-defaults.md b/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-global-defaults.md index 841fa9c0e6..ee9cbb23b8 100644 --- a/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-global-defaults.md +++ b/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-global-defaults.md @@ -327,18 +327,72 @@ engineConfiguration->hpfpPidI = 0; + nb2cannedknockNoiseRpmBins(); + nb2cannedknockBaseNoise(); + nb2cannedscriptCurve5Bins(); + nb2cannedscriptCurve6Bins(); + nb2cannedsparkDwellRpmBins(); + nb2cannedsparkDwellValues(); + nb2canneddwellVoltageCorrVoltBins(); + nb2canneddwellVoltageCorrValues(); + nb2cannedprimeBins(); + nb2cannedprimeValues(); + nb2cannedmafDecodingBins(); + nb2cannedmafDecoding(); + nb2cannedcltFuelCorr(); + nb2cannedcrankingFuelCoef(); + nb2cannedcrankingFuelCoefE100(); + nb2cannedcltRevLimitRpmBins(); + nb2cannedcrankingCycleCoef(); + nb2cannedcltIdleCorrBins(); + nb2cannedcltIdleCorr(); + nb2cannediacCoasting(); + nb2cannedcltCrankingCorr(); + nb2cannedcltIdleRpmBins(); + nb2cannedcltIdleRpm(); + nb2cannedidleAdvanceBins(); + nb2cannedidleAdvance(); + nb2cannedfuelLevelBins(); + nb2cannedhpfpLobeProfileQuantityBins(); + nb2cannedhpfpLobeProfileAngle(); + nb2cannedhpfpDeadtimeVoltsBins(); nb2cannedtpsTpsAccelTable(); + nb2cannedboostRpmBins(); + nb2cannedboostTpsBins(); nb2cannedboostTableOpenLoop(); nb2cannedboostTableClosedLoop(); + nb2cannedvvtTable1RpmBins(); + nb2cannedvvtTable1LoadBins(); nb2cannedvvtTable1(); + nb2cannedscriptTable4RpmBins(); nb2cannedscriptTable4(); + nb2cannedignitionRpmBins(); + nb2cannedignitionLoadBins(); nb2cannedignitionTable(); + nb2cannedignitionIatCorrLoadBins(); nb2cannedignitionIatCorrTable(); + nb2cannedveRpmBins(); + nb2cannedveLoadBins(); nb2cannedveTable(); + nb2cannedidleVeRpmBins(); + nb2cannedidleVeLoadBins(); nb2cannedidleVeTable(); + nb2cannedfuelTrimRpmBins(); + nb2cannedfuelTrimLoadBins(); + nb2cannedignTrimRpmBins(); + nb2cannedignTrimLoadBins(); + nb2cannedmapEstimateRpmBins(); + nb2cannedmapEstimateTpsBins(); nb2cannedmapEstimateTable(); nb2cannedinjectionPhase(); + nb2cannedpedalToTpsRpmBins(); + nb2cannedlambdaRpmBins(); + nb2cannedlambdaLoadBins(); nb2cannedlambdaTable(); nb2cannedtcuSolenoidTable(); + nb2cannedhpfpTargetRpmBins(); + nb2cannedhpfpTargetLoadBins(); + nb2cannedhpfpCompensationRpmBins(); + nb2cannedhpfpCompensationLoadBins(); nb2cannedpostCrankingFactor(); ``` diff --git a/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-global-defaults_methods.md b/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-global-defaults_methods.md index 1a633f0438..00678a0805 100644 --- a/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-global-defaults_methods.md +++ b/simulator/generated/canned-tunes/MazdaMiataNB2-comparing-against-global-defaults_methods.md @@ -1,4 +1,149 @@ ``` +static void nb2cannedknockNoiseRpmBins() { + static const float hardCodedknockNoiseRpmBins[16] = {650.0, 700.0, 800.0, 1150.0, 1600.0, 2000.0, 2400.0, 2850.0, 3250.0, 3700.0, 4100.0, 4500.0, 4950.0, 5400.0, 6200.0, 7000.0}; + copyArray(config->knockNoiseRpmBins, hardCodedknockNoiseRpmBins); +} + +static void nb2cannedknockBaseNoise() { + static const float hardCodedknockBaseNoise[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->knockBaseNoise, hardCodedknockBaseNoise); +} + +static void nb2cannedscriptCurve5Bins() { + static const float hardCodedscriptCurve5Bins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->scriptCurve5Bins, hardCodedscriptCurve5Bins); +} + +static void nb2cannedscriptCurve6Bins() { + static const float hardCodedscriptCurve6Bins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->scriptCurve6Bins, hardCodedscriptCurve6Bins); +} + +static void nb2cannedsparkDwellRpmBins() { + static const float hardCodedsparkDwellRpmBins[8] = {500.0, 1200.0, 2000.0, 3000.0, 4000.0, 5000.0, 6000.0, 7200.0}; + copyArray(config->sparkDwellRpmBins, hardCodedsparkDwellRpmBins); +} + +static void nb2cannedsparkDwellValues() { + static const float hardCodedsparkDwellValues[8] = {2.5, 2.4, 2.3, 2.2, 2.1, 2.1, 2.0, 1.9}; + copyArray(config->sparkDwellValues, hardCodedsparkDwellValues); +} + +static void nb2canneddwellVoltageCorrVoltBins() { + static const float hardCodeddwellVoltageCorrVoltBins[8] = {8.0, 9.0, 10.0, 11.0, 12.0, 14.0, 16.0, 18.0}; + copyArray(config->dwellVoltageCorrVoltBins, hardCodeddwellVoltageCorrVoltBins); +} + +static void nb2canneddwellVoltageCorrValues() { + static const float hardCodeddwellVoltageCorrValues[8] = {2.28, 2.0, 1.7, 1.54, 1.36, 1.0, 0.86, 0.8}; + copyArray(config->dwellVoltageCorrValues, hardCodeddwellVoltageCorrValues); +} + +static void nb2cannedprimeBins() { + static const float hardCodedprimeBins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(engineConfiguration->primeBins, hardCodedprimeBins); +} + +static void nb2cannedprimeValues() { + static const float hardCodedprimeValues[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(engineConfiguration->primeValues, hardCodedprimeValues); +} + +static void nb2cannedmafDecodingBins() { + static const float hardCodedmafDecodingBins[32] = {0.5, 0.86999893, 1.0699997, 1.5299988, 1.8499985, 2.1099854, 2.4599915, 3.0, 3.5100098, 4.5, 4.5999756, 4.6099854, 4.619995, 4.630005, 4.6400146, 4.6500244, 4.659973, 4.669983, 4.6799927, 4.6900024, 4.700012, 4.710022, 4.7199707, 4.7299805, 4.73999, 4.75, 4.76001, 4.7700195, 4.7800293, 4.789978, 4.799988, 4.8099976}; + copyArray(config->mafDecodingBins, hardCodedmafDecodingBins); +} + +static void nb2cannedmafDecoding() { + static const float hardCodedmafDecoding[32] = {0.0, 0.0, 1.0, 3.0, 8.0, 19.0, 45.0, 100.0, 175.0, 350.0, 350.0, 350.0, 350.0, 350.0, 350.0, 350.0, 350.0, 350.0, 350.0, 350.0, 350.0, 350.0, 350.0, 350.0, 350.0, 350.0, 350.0, 350.0, 350.0, 350.0, 350.0, 350.0}; + copyArray(config->mafDecoding, hardCodedmafDecoding); +} + +static void nb2cannedcltFuelCorr() { + static const float hardCodedcltFuelCorr[16] = {1.5, 1.5, 1.4199982, 1.3600006, 1.2799988, 1.199997, 1.1800003, 1.1500015, 1.1, 1.1, 1.1, 1.1, 1.1, 1.1, 1.1, 1.1}; + copyArray(config->cltFuelCorr, hardCodedcltFuelCorr); +} + +static void nb2cannedcrankingFuelCoef() { + static const float hardCodedcrankingFuelCoef[8] = {2.7999878, 2.2000122, 1.800003, 1.550003, 1.199997, 1.1, 1.1, 1.1}; + copyArray(config->crankingFuelCoef, hardCodedcrankingFuelCoef); +} + +static void nb2cannedcrankingFuelCoefE100() { + static const float hardCodedcrankingFuelCoefE100[8] = {0.02, 0.02, 0.01, 0.01, 0.01, 0.01, 0.01, 0.01}; + copyArray(config->crankingFuelCoefE100, hardCodedcrankingFuelCoefE100); +} + +static void nb2cannedcltRevLimitRpmBins() { + static const float hardCodedcltRevLimitRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->cltRevLimitRpmBins, hardCodedcltRevLimitRpmBins); +} + +static void nb2cannedcrankingCycleCoef() { + static const float hardCodedcrankingCycleCoef[8] = {2.0, 1.300003, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0}; + copyArray(config->crankingCycleCoef, hardCodedcrankingCycleCoef); +} + +static void nb2cannedcltIdleCorrBins() { + static const float hardCodedcltIdleCorrBins[16] = {-40.0, -30.0, -20.0, -10.0, 0.0, 9.439941, 19.120117, 30.810059, 42.509766, 54.529785, 64.21973, 71.90039, 80.0, 90.0, 100.0, 110.0}; + copyArray(config->cltIdleCorrBins, hardCodedcltIdleCorrBins); +} + +static void nb2cannedcltIdleCorr() { + static const float hardCodedcltIdleCorr[16] = {1.300003, 1.25, 1.2200012, 1.1900024, 1.1399994, 1.1, 1.08, 1.08, 1.08, 1.08, 1.08, 1.08, 1.08, 1.08, 1.08, 1.08}; + copyArray(config->cltIdleCorr, hardCodedcltIdleCorr); +} + +static void nb2cannediacCoasting() { + static const float hardCodediacCoasting[16] = {40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0}; + copyArray(config->iacCoasting, hardCodediacCoasting); +} + +static void nb2cannedcltCrankingCorr() { + static const float hardCodedcltCrankingCorr[8] = {1.4000015, 1.35, 1.28, 1.25, 1.2, 1.15, 1.1, 1.1}; + copyArray(config->cltCrankingCorr, hardCodedcltCrankingCorr); +} + +static void nb2cannedcltIdleRpmBins() { + static const float hardCodedcltIdleRpmBins[16] = {-40.0, -30.0, -20.0, 0.0, 10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0, 110.0, 130.0}; + copyArray(config->cltIdleRpmBins, hardCodedcltIdleRpmBins); +} + +static void nb2cannedcltIdleRpm() { + static const float hardCodedcltIdleRpm[16] = {1400.0, 1400.0, 1400.0, 1400.0, 1400.0, 1350.0, 1350.0, 1250.0, 1150.0, 1000.0, 950.0, 950.0, 950.0, 950.0, 950.0, 950.0}; + copyArray(config->cltIdleRpm, hardCodedcltIdleRpm); +} + +static void nb2cannedidleAdvanceBins() { + static const float hardCodedidleAdvanceBins[8] = {500.0, 700.0, 800.0, 900.0, 1000.0, 1100.0, 1200.0, 1300.0}; + copyArray(config->idleAdvanceBins, hardCodedidleAdvanceBins); +} + +static void nb2cannedidleAdvance() { + static const float hardCodedidleAdvance[8] = {12.0, 12.0, 11.0, 10.0, 10.0, 10.0, 10.0, 10.0}; + copyArray(config->idleAdvance, hardCodedidleAdvance); +} + +static void nb2cannedfuelLevelBins() { + static const float hardCodedfuelLevelBins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelLevelBins, hardCodedfuelLevelBins); +} + +static void nb2cannedhpfpLobeProfileQuantityBins() { + static const float hardCodedhpfpLobeProfileQuantityBins[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpLobeProfileQuantityBins, hardCodedhpfpLobeProfileQuantityBins); +} + +static void nb2cannedhpfpLobeProfileAngle() { + static const float hardCodedhpfpLobeProfileAngle[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpLobeProfileAngle, hardCodedhpfpLobeProfileAngle); +} + +static void nb2cannedhpfpDeadtimeVoltsBins() { + static const float hardCodedhpfpDeadtimeVoltsBins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpDeadtimeVoltsBins, hardCodedhpfpDeadtimeVoltsBins); +} + static void nb2cannedtpsTpsAccelTable() { static const float hardCodedtpsTpsAccelTable[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -13,6 +158,16 @@ static void nb2cannedtpsTpsAccelTable() { copyTable(config->tpsTpsAccelTable, hardCodedtpsTpsAccelTable); } +static void nb2cannedboostRpmBins() { + static const float hardCodedboostRpmBins[8] = {0.0, 1150.0, 2300.0, 3450.0, 4550.0, 5700.0, 6850.0, 8000.0}; + copyArray(config->boostRpmBins, hardCodedboostRpmBins); +} + +static void nb2cannedboostTpsBins() { + static const float hardCodedboostTpsBins[8] = {0.0, 14.0, 28.0, 42.0, 58.0, 72.0, 86.0, 100.0}; + copyArray(config->boostTpsBins, hardCodedboostTpsBins); +} + static void nb2cannedboostTableOpenLoop() { static const float hardCodedboostTableOpenLoop[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -41,6 +196,16 @@ static void nb2cannedboostTableClosedLoop() { copyTable(config->boostTableClosedLoop, hardCodedboostTableClosedLoop); } +static void nb2cannedvvtTable1RpmBins() { + static const float hardCodedvvtTable1RpmBins[8] = {950.0, 1800.0, 2500.0, 3300.0, 4200.0, 5000.0, 6000.0, 7200.0}; + copyArray(config->vvtTable1RpmBins, hardCodedvvtTable1RpmBins); +} + +static void nb2cannedvvtTable1LoadBins() { + static const float hardCodedvvtTable1LoadBins[8] = {30.0, 40.0, 50.0, 60.0, 70.0, 75.0, 82.0, 85.0}; + copyArray(config->vvtTable1LoadBins, hardCodedvvtTable1LoadBins); +} + static void nb2cannedvvtTable1() { static const float hardCodedvvtTable1[8][8] = { {0.000, 0.000, 10.000, 10.000, 10.000, 10.000, 0.000, 0.000, }, @@ -55,6 +220,11 @@ static void nb2cannedvvtTable1() { copyTable(config->vvtTable1, hardCodedvvtTable1); } +static void nb2cannedscriptTable4RpmBins() { + static const float hardCodedscriptTable4RpmBins[10] = {650.0, 800.0, 1700.0, 2600.0, 3500.0, 4400.0, 5300.0, 7000.0, 0.0, 0.0}; + copyArray(config->scriptTable4RpmBins, hardCodedscriptTable4RpmBins); +} + static void nb2cannedscriptTable4() { static const float hardCodedscriptTable4[8][10] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -69,6 +239,16 @@ static void nb2cannedscriptTable4() { copyTable(config->scriptTable4, hardCodedscriptTable4); } +static void nb2cannedignitionRpmBins() { + static const float hardCodedignitionRpmBins[16] = {700.0, 900.0, 1100.0, 1500.0, 1800.0, 2300.0, 2800.0, 3200.0, 3700.0, 4200.0, 4700.0, 5000.0, 5250.0, 5800.0, 6200.0, 7200.0}; + copyArray(config->ignitionRpmBins, hardCodedignitionRpmBins); +} + +static void nb2cannedignitionLoadBins() { + static const float hardCodedignitionLoadBins[16] = {25.0, 35.0, 45.0, 55.0, 65.0, 75.0, 85.0, 95.0, 100.0, 110.0, 130.0, 150.0, 170.0, 190.0, 205.0, 220.0}; + copyArray(config->ignitionLoadBins, hardCodedignitionLoadBins); +} + static void nb2cannedignitionTable() { static const float hardCodedignitionTable[16][16] = { {16.000, 16.000, 16.000, 16.000, 16.000, 16.000, 15.000, 6.100, -3.000, -3.000, -3.000, -3.000, -2.000, -2.000, -2.000, -2.000, }, @@ -91,6 +271,11 @@ static void nb2cannedignitionTable() { copyTable(config->ignitionTable, hardCodedignitionTable); } +static void nb2cannedignitionIatCorrLoadBins() { + static const float hardCodedignitionIatCorrLoadBins[8] = {-40.0, -30.0, -20.0, -10.0, 0.0, 10.0, 20.0, 30.0}; + copyArray(config->ignitionIatCorrLoadBins, hardCodedignitionIatCorrLoadBins); +} + static void nb2cannedignitionIatCorrTable() { static const float hardCodedignitionIatCorrTable[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -105,6 +290,16 @@ static void nb2cannedignitionIatCorrTable() { copyTable(config->ignitionIatCorrTable, hardCodedignitionIatCorrTable); } +static void nb2cannedveRpmBins() { + static const float hardCodedveRpmBins[16] = {700.0, 900.0, 1100.0, 1500.0, 1800.0, 2300.0, 2800.0, 3200.0, 3700.0, 4200.0, 4700.0, 5250.0, 5700.0, 6200.0, 6700.0, 7200.0}; + copyArray(config->veRpmBins, hardCodedveRpmBins); +} + +static void nb2cannedveLoadBins() { + static const float hardCodedveLoadBins[16] = {20.0, 25.0, 32.0, 36.0, 40.0, 45.0, 50.0, 55.0, 65.0, 75.0, 85.0, 90.0, 95.0, 100.0, 105.0, 110.0}; + copyArray(config->veLoadBins, hardCodedveLoadBins); +} + static void nb2cannedveTable() { static const float hardCodedveTable[16][16] = { {13.500, 22.000, 22.000, 19.700, 19.000, 19.000, 19.000, 21.000, 24.000, 24.000, 24.000, 23.500, 22.500, 22.800, 22.800, 22.200, }, @@ -127,6 +322,16 @@ static void nb2cannedveTable() { copyTable(config->veTable, hardCodedveTable); } +static void nb2cannedidleVeRpmBins() { + static const float hardCodedidleVeRpmBins[4] = {800.0, 900.0, 1100.0, 1200.0}; + copyArray(config->idleVeRpmBins, hardCodedidleVeRpmBins); +} + +static void nb2cannedidleVeLoadBins() { + static const float hardCodedidleVeLoadBins[4] = {30.0, 35.0, 40.0, 45.0}; + copyArray(config->idleVeLoadBins, hardCodedidleVeLoadBins); +} + static void nb2cannedidleVeTable() { static const float hardCodedidleVeTable[4][4] = { {41.000, 41.000, 41.000, 43.000, }, @@ -137,6 +342,36 @@ static void nb2cannedidleVeTable() { copyTable(config->idleVeTable, hardCodedidleVeTable); } +static void nb2cannedfuelTrimRpmBins() { + static const float hardCodedfuelTrimRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelTrimRpmBins, hardCodedfuelTrimRpmBins); +} + +static void nb2cannedfuelTrimLoadBins() { + static const float hardCodedfuelTrimLoadBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelTrimLoadBins, hardCodedfuelTrimLoadBins); +} + +static void nb2cannedignTrimRpmBins() { + static const float hardCodedignTrimRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->ignTrimRpmBins, hardCodedignTrimRpmBins); +} + +static void nb2cannedignTrimLoadBins() { + static const float hardCodedignTrimLoadBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->ignTrimLoadBins, hardCodedignTrimLoadBins); +} + +static void nb2cannedmapEstimateRpmBins() { + static const float hardCodedmapEstimateRpmBins[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->mapEstimateRpmBins, hardCodedmapEstimateRpmBins); +} + +static void nb2cannedmapEstimateTpsBins() { + static const float hardCodedmapEstimateTpsBins[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->mapEstimateTpsBins, hardCodedmapEstimateTpsBins); +} + static void nb2cannedmapEstimateTable() { static const float hardCodedmapEstimateTable[16][16] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -181,6 +416,21 @@ static void nb2cannedinjectionPhase() { copyTable(config->injectionPhase, hardCodedinjectionPhase); } +static void nb2cannedpedalToTpsRpmBins() { + static const float hardCodedpedalToTpsRpmBins[8] = {0.0, 1150.0, 2300.0, 3450.0, 4550.0, 5700.0, 6850.0, 8000.0}; + copyArray(config->pedalToTpsRpmBins, hardCodedpedalToTpsRpmBins); +} + +static void nb2cannedlambdaRpmBins() { + static const float hardCodedlambdaRpmBins[16] = {700.0, 900.0, 1100.0, 1500.0, 1700.0, 2300.0, 2800.0, 3200.0, 3700.0, 4200.0, 4700.0, 5250.0, 5700.0, 6200.0, 6700.0, 7200.0}; + copyArray(config->lambdaRpmBins, hardCodedlambdaRpmBins); +} + +static void nb2cannedlambdaLoadBins() { + static const float hardCodedlambdaLoadBins[16] = {20.0, 35.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0, 110.0, 120.0, 130.0, 150.0, 175.0, 200.0, 225.0, 250.0}; + copyArray(config->lambdaLoadBins, hardCodedlambdaLoadBins); +} + static void nb2cannedlambdaTable() { static const float hardCodedlambdaTable[16][16] = { {14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 15.400, 15.400, 15.400, 15.400, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, }, @@ -215,6 +465,26 @@ static void nb2cannedtcuSolenoidTable() { copyTable(config->tcuSolenoidTable, hardCodedtcuSolenoidTable); } +static void nb2cannedhpfpTargetRpmBins() { + static const float hardCodedhpfpTargetRpmBins[10] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpTargetRpmBins, hardCodedhpfpTargetRpmBins); +} + +static void nb2cannedhpfpTargetLoadBins() { + static const float hardCodedhpfpTargetLoadBins[10] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpTargetLoadBins, hardCodedhpfpTargetLoadBins); +} + +static void nb2cannedhpfpCompensationRpmBins() { + static const float hardCodedhpfpCompensationRpmBins[10] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpCompensationRpmBins, hardCodedhpfpCompensationRpmBins); +} + +static void nb2cannedhpfpCompensationLoadBins() { + static const float hardCodedhpfpCompensationLoadBins[10] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpCompensationLoadBins, hardCodedhpfpCompensationLoadBins); +} + static void nb2cannedpostCrankingFactor() { static const float hardCodedpostCrankingFactor[6][6] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, diff --git a/simulator/generated/canned-tunes/PB-comparing-against-current-PB-default.md b/simulator/generated/canned-tunes/PB-comparing-against-current-PB-default.md index 1e96c6e94a..6f6919457c 100644 --- a/simulator/generated/canned-tunes/PB-comparing-against-current-PB-default.md +++ b/simulator/generated/canned-tunes/PB-comparing-against-current-PB-default.md @@ -121,11 +121,24 @@ engineConfiguration->hpfpPeakPos = -30; + pbcannedknockBaseNoise(); + pbcannedmafDecodingBins(); + pbcannedcltTimingBins(); + pbcannedcltTimingExtra(); + pbcannedcltIdleCorrBins(); + pbcannedcltIdleCorr(); + pbcannedcltIdleRpm(); + pbcannedidleAdvanceBins(); + pbcannedidleAdvance(); pbcannedvvtTable2(); pbcannedscriptTable4(); + pbcannedignitionRpmBins(); pbcannedignitionTable(); pbcannedveTable(); + pbcannedmaxKnockRetardRpmBins(); + pbcannedmaxKnockRetardLoadBins(); pbcannedmaxKnockRetardTable(); pbcannedlambdaTable(); pbcannedtcuSolenoidTable(); + pbcannedhpfpTargetLoadBins(); ``` diff --git a/simulator/generated/canned-tunes/PB-comparing-against-current-PB-default_methods.md b/simulator/generated/canned-tunes/PB-comparing-against-current-PB-default_methods.md index 00afc1081f..8b7a77bb79 100644 --- a/simulator/generated/canned-tunes/PB-comparing-against-current-PB-default_methods.md +++ b/simulator/generated/canned-tunes/PB-comparing-against-current-PB-default_methods.md @@ -1,4 +1,49 @@ ``` +static void pbcannedknockBaseNoise() { + static const float hardCodedknockBaseNoise[16] = {-28.0, -28.0, -24.0, -20.0, -20.0, -20.0, -20.0, -20.0, -20.0, -17.0, -17.0, -17.0, -17.0, -17.0, -17.0, -17.0}; + copyArray(config->knockBaseNoise, hardCodedknockBaseNoise); +} + +static void pbcannedmafDecodingBins() { + static const float hardCodedmafDecodingBins[32] = {0.0, 0.78125, 1.3867188, 2.9101562, 4.2578125, 4.9804688, 2016.0, 2017.0, 2018.0, 2019.0, 2020.0, 2021.0, 2022.0, 2023.0, 2024.0, 2025.0, 2026.0, 2027.0, 2028.0, 2029.0, 2030.0, 2031.0, 2032.0, 2033.0, 2034.0, 2035.0, 2036.0, 2037.0, 2038.0, 2039.0, 2040.0, 2041.0}; + copyArray(config->mafDecodingBins, hardCodedmafDecodingBins); +} + +static void pbcannedcltTimingBins() { + static const float hardCodedcltTimingBins[8] = {-40.0, -17.0, 6.0, 30.0, 40.0, 50.0, 97.0, 120.0}; + copyArray(config->cltTimingBins, hardCodedcltTimingBins); +} + +static void pbcannedcltTimingExtra() { + static const float hardCodedcltTimingExtra[8] = {0.0, 0.0, -30.0, -30.0, -30.0, 0.0, 0.0, 0.0}; + copyArray(config->cltTimingExtra, hardCodedcltTimingExtra); +} + +static void pbcannedcltIdleCorrBins() { + static const float hardCodedcltIdleCorrBins[16] = {-40.0, -30.0, -20.0, -10.0, 0.0, 10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 110.0, 120.0}; + copyArray(config->cltIdleCorrBins, hardCodedcltIdleCorrBins); +} + +static void pbcannedcltIdleCorr() { + static const float hardCodedcltIdleCorr[16] = {1.5, 1.5, 1.3333334, 1.3333334, 1.3333334, 1.3333334, 1.3333334, 1.3333334, 1.2, 1.0, 1.0, 1.0, 0.8, 0.8, 0.8, 1.0}; + copyArray(config->cltIdleCorr, hardCodedcltIdleCorr); +} + +static void pbcannedcltIdleRpm() { + static const float hardCodedcltIdleRpm[16] = {1360.0, 1360.0, 1300.0, 1200.0, 1160.0, 1100.0, 1060.0, 1000.0, 1000.0, 960.0, 960.0, 740.0, 740.0, 740.0, 860.0, 1100.0}; + copyArray(config->cltIdleRpm, hardCodedcltIdleRpm); +} + +static void pbcannedidleAdvanceBins() { + static const float hardCodedidleAdvanceBins[8] = {500.0, 650.0, 800.0, 950.0, 1050.0, 1200.0, 1350.0, 1500.0}; + copyArray(config->idleAdvanceBins, hardCodedidleAdvanceBins); +} + +static void pbcannedidleAdvance() { + static const float hardCodedidleAdvance[8] = {12.0, 12.571428, 13.142858, 13.714286, 14.285714, 14.857142, 15.428572, 16.0}; + copyArray(config->idleAdvance, hardCodedidleAdvance); +} + static void pbcannedvvtTable2() { static const float hardCodedvvtTable2[8][8] = { {45.000, 45.000, 45.000, 45.000, 45.000, 45.000, 45.000, 45.000, }, @@ -27,6 +72,11 @@ static void pbcannedscriptTable4() { copyTable(config->scriptTable4, hardCodedscriptTable4); } +static void pbcannedignitionRpmBins() { + static const float hardCodedignitionRpmBins[16] = {650.0, 800.0, 1100.0, 1400.0, 2000.0, 2500.0, 3000.0, 3500.0, 4000.0, 4500.0, 5000.0, 5500.0, 6000.0, 6500.0, 7000.0, 7500.0}; + copyArray(config->ignitionRpmBins, hardCodedignitionRpmBins); +} + static void pbcannedignitionTable() { static const float hardCodedignitionTable[16][16] = { {12.200, 14.200, 0.000, 0.000, 36.400, 39.700, -10.000, -10.000, -10.000, -10.000, -10.000, -10.000, -10.000, -10.000, -10.000, -10.000, }, @@ -71,6 +121,16 @@ static void pbcannedveTable() { copyTable(config->veTable, hardCodedveTable); } +static void pbcannedmaxKnockRetardRpmBins() { + static const float hardCodedmaxKnockRetardRpmBins[6] = {1000.0, 2000.0, 3000.0, 4000.0, 5000.0, 7000.0}; + copyArray(config->maxKnockRetardRpmBins, hardCodedmaxKnockRetardRpmBins); +} + +static void pbcannedmaxKnockRetardLoadBins() { + static const float hardCodedmaxKnockRetardLoadBins[6] = {20.0, 40.0, 50.0, 60.0, 80.0, 100.0}; + copyArray(config->maxKnockRetardLoadBins, hardCodedmaxKnockRetardLoadBins); +} + static void pbcannedmaxKnockRetardTable() { static const float hardCodedmaxKnockRetardTable[6][6] = { {5.000, 5.000, 5.000, 5.000, 5.000, 5.000, }, @@ -117,4 +177,9 @@ static void pbcannedtcuSolenoidTable() { copyTable(config->tcuSolenoidTable, hardCodedtcuSolenoidTable); } +static void pbcannedhpfpTargetLoadBins() { + static const float hardCodedhpfpTargetLoadBins[10] = {20.0, 40.0, 50.0, 60.0, 80.0, 100.0, 120.0, 140.0, 160.0, 180.0}; + copyArray(config->hpfpTargetLoadBins, hardCodedhpfpTargetLoadBins); +} + ``` diff --git a/simulator/generated/canned-tunes/PB-comparing-against-global-defaults.md b/simulator/generated/canned-tunes/PB-comparing-against-global-defaults.md index 17bf002383..9ce9c417ec 100644 --- a/simulator/generated/canned-tunes/PB-comparing-against-global-defaults.md +++ b/simulator/generated/canned-tunes/PB-comparing-against-global-defaults.md @@ -187,13 +187,26 @@ engineConfiguration->mc33_hpfp_i_hold = 4; + pbcannedknockBaseNoise(); + pbcannedmafDecodingBins(); + pbcannedcltTimingBins(); + pbcannedcltTimingExtra(); + pbcannedcltIdleCorrBins(); + pbcannedcltIdleCorr(); + pbcannedcltIdleRpm(); + pbcannedidleAdvanceBins(); + pbcannedidleAdvance(); pbcannedvvtTable1(); pbcannedvvtTable2(); pbcannedscriptTable4(); + pbcannedignitionRpmBins(); pbcannedignitionTable(); pbcannedveTable(); pbcannedinjectionPhase(); + pbcannedmaxKnockRetardRpmBins(); + pbcannedmaxKnockRetardLoadBins(); pbcannedmaxKnockRetardTable(); pbcannedlambdaTable(); pbcannedtcuSolenoidTable(); + pbcannedhpfpTargetLoadBins(); ``` diff --git a/simulator/generated/canned-tunes/PB-comparing-against-global-defaults_methods.md b/simulator/generated/canned-tunes/PB-comparing-against-global-defaults_methods.md index 566d358579..71ab6fd314 100644 --- a/simulator/generated/canned-tunes/PB-comparing-against-global-defaults_methods.md +++ b/simulator/generated/canned-tunes/PB-comparing-against-global-defaults_methods.md @@ -1,4 +1,49 @@ ``` +static void pbcannedknockBaseNoise() { + static const float hardCodedknockBaseNoise[16] = {-28.0, -28.0, -24.0, -20.0, -20.0, -20.0, -20.0, -20.0, -20.0, -17.0, -17.0, -17.0, -17.0, -17.0, -17.0, -17.0}; + copyArray(config->knockBaseNoise, hardCodedknockBaseNoise); +} + +static void pbcannedmafDecodingBins() { + static const float hardCodedmafDecodingBins[32] = {0.0, 0.78125, 1.3867188, 2.9101562, 4.2578125, 4.9804688, 2016.0, 2017.0, 2018.0, 2019.0, 2020.0, 2021.0, 2022.0, 2023.0, 2024.0, 2025.0, 2026.0, 2027.0, 2028.0, 2029.0, 2030.0, 2031.0, 2032.0, 2033.0, 2034.0, 2035.0, 2036.0, 2037.0, 2038.0, 2039.0, 2040.0, 2041.0}; + copyArray(config->mafDecodingBins, hardCodedmafDecodingBins); +} + +static void pbcannedcltTimingBins() { + static const float hardCodedcltTimingBins[8] = {-40.0, -17.0, 6.0, 30.0, 40.0, 50.0, 97.0, 120.0}; + copyArray(config->cltTimingBins, hardCodedcltTimingBins); +} + +static void pbcannedcltTimingExtra() { + static const float hardCodedcltTimingExtra[8] = {0.0, 0.0, -30.0, -30.0, -30.0, 0.0, 0.0, 0.0}; + copyArray(config->cltTimingExtra, hardCodedcltTimingExtra); +} + +static void pbcannedcltIdleCorrBins() { + static const float hardCodedcltIdleCorrBins[16] = {-40.0, -30.0, -20.0, -10.0, 0.0, 10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 110.0, 120.0}; + copyArray(config->cltIdleCorrBins, hardCodedcltIdleCorrBins); +} + +static void pbcannedcltIdleCorr() { + static const float hardCodedcltIdleCorr[16] = {1.5, 1.5, 1.3333334, 1.3333334, 1.3333334, 1.3333334, 1.3333334, 1.3333334, 1.2, 1.0, 1.0, 1.0, 0.8, 0.8, 0.8, 1.0}; + copyArray(config->cltIdleCorr, hardCodedcltIdleCorr); +} + +static void pbcannedcltIdleRpm() { + static const float hardCodedcltIdleRpm[16] = {1360.0, 1360.0, 1300.0, 1200.0, 1160.0, 1100.0, 1060.0, 1000.0, 1000.0, 960.0, 960.0, 740.0, 740.0, 740.0, 860.0, 1100.0}; + copyArray(config->cltIdleRpm, hardCodedcltIdleRpm); +} + +static void pbcannedidleAdvanceBins() { + static const float hardCodedidleAdvanceBins[8] = {500.0, 650.0, 800.0, 950.0, 1050.0, 1200.0, 1350.0, 1500.0}; + copyArray(config->idleAdvanceBins, hardCodedidleAdvanceBins); +} + +static void pbcannedidleAdvance() { + static const float hardCodedidleAdvance[8] = {12.0, 12.571428, 13.142858, 13.714286, 14.285714, 14.857142, 15.428572, 16.0}; + copyArray(config->idleAdvance, hardCodedidleAdvance); +} + static void pbcannedvvtTable1() { static const float hardCodedvvtTable1[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -41,6 +86,11 @@ static void pbcannedscriptTable4() { copyTable(config->scriptTable4, hardCodedscriptTable4); } +static void pbcannedignitionRpmBins() { + static const float hardCodedignitionRpmBins[16] = {650.0, 800.0, 1100.0, 1400.0, 2000.0, 2500.0, 3000.0, 3500.0, 4000.0, 4500.0, 5000.0, 5500.0, 6000.0, 6500.0, 7000.0, 7500.0}; + copyArray(config->ignitionRpmBins, hardCodedignitionRpmBins); +} + static void pbcannedignitionTable() { static const float hardCodedignitionTable[16][16] = { {12.200, 14.200, 0.000, 0.000, 36.400, 39.700, -10.000, -10.000, -10.000, -10.000, -10.000, -10.000, -10.000, -10.000, -10.000, -10.000, }, @@ -107,6 +157,16 @@ static void pbcannedinjectionPhase() { copyTable(config->injectionPhase, hardCodedinjectionPhase); } +static void pbcannedmaxKnockRetardRpmBins() { + static const float hardCodedmaxKnockRetardRpmBins[6] = {1000.0, 2000.0, 3000.0, 4000.0, 5000.0, 7000.0}; + copyArray(config->maxKnockRetardRpmBins, hardCodedmaxKnockRetardRpmBins); +} + +static void pbcannedmaxKnockRetardLoadBins() { + static const float hardCodedmaxKnockRetardLoadBins[6] = {20.0, 40.0, 50.0, 60.0, 80.0, 100.0}; + copyArray(config->maxKnockRetardLoadBins, hardCodedmaxKnockRetardLoadBins); +} + static void pbcannedmaxKnockRetardTable() { static const float hardCodedmaxKnockRetardTable[6][6] = { {5.000, 5.000, 5.000, 5.000, 5.000, 5.000, }, @@ -153,4 +213,9 @@ static void pbcannedtcuSolenoidTable() { copyTable(config->tcuSolenoidTable, hardCodedtcuSolenoidTable); } +static void pbcannedhpfpTargetLoadBins() { + static const float hardCodedhpfpTargetLoadBins[10] = {20.0, 40.0, 50.0, 60.0, 80.0, 100.0, 120.0, 140.0, 160.0, 180.0}; + copyArray(config->hpfpTargetLoadBins, hardCodedhpfpTargetLoadBins); +} + ``` diff --git a/simulator/generated/canned-tunes/VQ-comparing-against-current-VQ-default.md b/simulator/generated/canned-tunes/VQ-comparing-against-current-VQ-default.md index 2fd7ce29ae..bca4136249 100644 --- a/simulator/generated/canned-tunes/VQ-comparing-against-current-VQ-default.md +++ b/simulator/generated/canned-tunes/VQ-comparing-against-current-VQ-default.md @@ -253,17 +253,49 @@ engineConfiguration->hpfpPidI = 0; + cannedprimeBins(); + cannedprimeValues(); + cannedmafDecodingBins(); + cannedmafDecoding(); + cannedcltFuelCorr(); + cannedcrankingFuelCoef(); + cannedcltRevLimitRpmBins(); + cannedcrankingCycleCoef(); + cannedcltIdleCorr(); + cannedcltCrankingCorr(); + cannedcltIdleRpm(); + cannedidleAdvanceBins(); + cannedidleAdvance(); + cannedfuelLevelBins(); cannedtpsTpsAccelTable(); + cannedboostRpmBins(); cannedboostTableOpenLoop(); + cannedvvtTable1RpmBins(); cannedvvtTable1(); + cannedscriptTable4RpmBins(); cannedscriptTable4(); + cannedignitionRpmBins(); + cannedignitionLoadBins(); cannedignitionTable(); + cannedignitionIatCorrLoadBins(); cannedignitionIatCorrTable(); + cannedveRpmBins(); + cannedveLoadBins(); cannedveTable(); + cannedfuelTrimRpmBins(); + cannedfuelTrimLoadBins(); + cannedignTrimRpmBins(); + cannedignTrimLoadBins(); + cannedmapEstimateRpmBins(); + cannedmapEstimateTpsBins(); cannedmapEstimateTable(); cannedinjectionPhase(); + cannedpedalToTpsRpmBins(); + cannedpedalToTpsPedalBins(); cannedpedalToTpsTable(); cannedlambdaTable(); cannedtcuSolenoidTable(); + cannedhpfpTargetRpmBins(); + cannedhpfpCompensationRpmBins(); cannedpostCrankingFactor(); ``` diff --git a/simulator/generated/canned-tunes/VQ-comparing-against-current-VQ-default_methods.md b/simulator/generated/canned-tunes/VQ-comparing-against-current-VQ-default_methods.md index b764c60193..4cc30ef1c9 100644 --- a/simulator/generated/canned-tunes/VQ-comparing-against-current-VQ-default_methods.md +++ b/simulator/generated/canned-tunes/VQ-comparing-against-current-VQ-default_methods.md @@ -1,4 +1,74 @@ ``` +static void cannedprimeBins() { + static const float hardCodedprimeBins[8] = {0.0, 14.0, 29.0, 43.0, 57.0, 71.0, 86.0, 100.0}; + copyArray(engineConfiguration->primeBins, hardCodedprimeBins); +} + +static void cannedprimeValues() { + static const float hardCodedprimeValues[8] = {10.0, 10.0, 10.0, 10.0, 10.0, 5.0, 5.0, 5.0}; + copyArray(engineConfiguration->primeValues, hardCodedprimeValues); +} + +static void cannedmafDecodingBins() { + static const float hardCodedmafDecodingBins[32] = {0.0, 18.225807, 26.451612, 34.677418, 42.903225, 51.129032, 59.35484, 67.58064, 75.80645, 84.03226, 92.258064, 100.48387, 108.70968, 116.935486, 125.16129, 133.3871, 141.6129, 149.83871, 158.06451, 166.29033, 174.51613, 182.74193, 190.96774, 199.19354, 207.41936, 215.64516, 223.87097, 232.09677, 240.32259, 248.54839, 256.7742, 265.0}; + copyArray(config->mafDecodingBins, hardCodedmafDecodingBins); +} + +static void cannedmafDecoding() { + static const float hardCodedmafDecoding[32] = {-34.5, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0}; + copyArray(config->mafDecoding, hardCodedmafDecoding); +} + +static void cannedcltFuelCorr() { + static const float hardCodedcltFuelCorr[16] = {1.5, 1.5, 1.42, 1.36, 1.28, 1.19, 1.12, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0}; + copyArray(config->cltFuelCorr, hardCodedcltFuelCorr); +} + +static void cannedcrankingFuelCoef() { + static const float hardCodedcrankingFuelCoef[8] = {2.8, 2.2, 1.8, 1.8, 1.6, 1.5, 1.0, 1.0}; + copyArray(config->crankingFuelCoef, hardCodedcrankingFuelCoef); +} + +static void cannedcltRevLimitRpmBins() { + static const float hardCodedcltRevLimitRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->cltRevLimitRpmBins, hardCodedcltRevLimitRpmBins); +} + +static void cannedcrankingCycleCoef() { + static const float hardCodedcrankingCycleCoef[8] = {1.5, 1.25, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0}; + copyArray(config->crankingCycleCoef, hardCodedcrankingCycleCoef); +} + +static void cannedcltIdleCorr() { + static const float hardCodedcltIdleCorr[16] = {2.0, 2.0, 2.0, 2.0, 1.6, 1.6, 1.6, 1.2, 1.2, 0.8, 0.5, 0.45, 0.45, 0.45, 0.45, 0.76}; + copyArray(config->cltIdleCorr, hardCodedcltIdleCorr); +} + +static void cannedcltCrankingCorr() { + static const float hardCodedcltCrankingCorr[8] = {1.2, 1.2, 1.0, 0.85, 0.8, 0.35, 0.35, 0.35}; + copyArray(config->cltCrankingCorr, hardCodedcltCrankingCorr); +} + +static void cannedcltIdleRpm() { + static const float hardCodedcltIdleRpm[16] = {1360.0, 1360.0, 1300.0, 1200.0, 1160.0, 1100.0, 1060.0, 1000.0, 1000.0, 860.0, 860.0, 800.0, 800.0, 800.0, 1000.0, 1100.0}; + copyArray(config->cltIdleRpm, hardCodedcltIdleRpm); +} + +static void cannedidleAdvanceBins() { + static const float hardCodedidleAdvanceBins[8] = {500.0, 650.0, 750.0, 900.0, 1000.0, 1150.0, 1250.0, 1400.0}; + copyArray(config->idleAdvanceBins, hardCodedidleAdvanceBins); +} + +static void cannedidleAdvance() { + static const float hardCodedidleAdvance[8] = {8.0, 10.0, 12.0, 14.0, 15.0, 16.0, 18.0, 20.0}; + copyArray(config->idleAdvance, hardCodedidleAdvance); +} + +static void cannedfuelLevelBins() { + static const float hardCodedfuelLevelBins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelLevelBins, hardCodedfuelLevelBins); +} + static void cannedtpsTpsAccelTable() { static const float hardCodedtpsTpsAccelTable[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -13,6 +83,11 @@ static void cannedtpsTpsAccelTable() { copyTable(config->tpsTpsAccelTable, hardCodedtpsTpsAccelTable); } +static void cannedboostRpmBins() { + static const float hardCodedboostRpmBins[8] = {0.0, 1100.0, 2300.0, 3400.0, 4600.0, 5700.0, 6900.0, 8000.0}; + copyArray(config->boostRpmBins, hardCodedboostRpmBins); +} + static void cannedboostTableOpenLoop() { static const float hardCodedboostTableOpenLoop[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -27,6 +102,11 @@ static void cannedboostTableOpenLoop() { copyTable(config->boostTableOpenLoop, hardCodedboostTableOpenLoop); } +static void cannedvvtTable1RpmBins() { + static const float hardCodedvvtTable1RpmBins[8] = {1000.0, 1700.0, 2000.0, 4400.0, 4500.0, 5000.0, 6000.0, 7000.0}; + copyArray(config->vvtTable1RpmBins, hardCodedvvtTable1RpmBins); +} + static void cannedvvtTable1() { static const float hardCodedvvtTable1[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -41,6 +121,11 @@ static void cannedvvtTable1() { copyTable(config->vvtTable1, hardCodedvvtTable1); } +static void cannedscriptTable4RpmBins() { + static const float hardCodedscriptTable4RpmBins[10] = {650.0, 767.0, 1300.0, 2000.0, 2700.0, 3400.0, 4100.0, 4800.0, 5678.0, 7000.0}; + copyArray(config->scriptTable4RpmBins, hardCodedscriptTable4RpmBins); +} + static void cannedscriptTable4() { static const float hardCodedscriptTable4[8][10] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -55,6 +140,16 @@ static void cannedscriptTable4() { copyTable(config->scriptTable4, hardCodedscriptTable4); } +static void cannedignitionRpmBins() { + static const float hardCodedignitionRpmBins[16] = {650.0, 800.0, 1100.0, 1500.0, 2000.0, 2500.0, 3000.0, 3500.0, 4000.0, 4500.0, 5000.0, 5500.0, 6000.0, 6500.0, 7000.0, 8000.0}; + copyArray(config->ignitionRpmBins, hardCodedignitionRpmBins); +} + +static void cannedignitionLoadBins() { + static const float hardCodedignitionLoadBins[16] = {0.0, 2.0, 4.0, 6.0, 8.0, 11.0, 12.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0}; + copyArray(config->ignitionLoadBins, hardCodedignitionLoadBins); +} + static void cannedignitionTable() { static const float hardCodedignitionTable[16][16] = { {12.100, 10.000, 10.000, 10.000, 29.300, 16.600, 30.000, 40.000, 40.000, 40.000, 41.000, 42.000, 42.000, 42.000, 42.000, 42.000, }, @@ -77,6 +172,11 @@ static void cannedignitionTable() { copyTable(config->ignitionTable, hardCodedignitionTable); } +static void cannedignitionIatCorrLoadBins() { + static const float hardCodedignitionIatCorrLoadBins[8] = {5.0, 15.0, 25.0, 35.0, 45.0, 65.0, 90.0, 110.0}; + copyArray(config->ignitionIatCorrLoadBins, hardCodedignitionIatCorrLoadBins); +} + static void cannedignitionIatCorrTable() { static const float hardCodedignitionIatCorrTable[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -91,6 +191,16 @@ static void cannedignitionIatCorrTable() { copyTable(config->ignitionIatCorrTable, hardCodedignitionIatCorrTable); } +static void cannedveRpmBins() { + static const float hardCodedveRpmBins[16] = {600.0, 900.0, 1100.0, 1500.0, 1900.0, 2400.0, 3000.0, 3700.0, 4200.0, 4700.0, 5200.0, 5800.0, 6300.0, 6800.0, 7000.0, 7200.0}; + copyArray(config->veRpmBins, hardCodedveRpmBins); +} + +static void cannedveLoadBins() { + static const float hardCodedveLoadBins[16] = {0.0, 2.0, 4.0, 6.0, 8.0, 10.0, 15.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0}; + copyArray(config->veLoadBins, hardCodedveLoadBins); +} + static void cannedveTable() { static const float hardCodedveTable[16][16] = { {15.400, 15.400, 21.000, 15.500, 13.100, 10.000, 10.000, 10.000, 10.000, 10.000, 10.000, 10.000, 10.000, 10.000, 10.000, 10.000, }, @@ -113,6 +223,36 @@ static void cannedveTable() { copyTable(config->veTable, hardCodedveTable); } +static void cannedfuelTrimRpmBins() { + static const float hardCodedfuelTrimRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelTrimRpmBins, hardCodedfuelTrimRpmBins); +} + +static void cannedfuelTrimLoadBins() { + static const float hardCodedfuelTrimLoadBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelTrimLoadBins, hardCodedfuelTrimLoadBins); +} + +static void cannedignTrimRpmBins() { + static const float hardCodedignTrimRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->ignTrimRpmBins, hardCodedignTrimRpmBins); +} + +static void cannedignTrimLoadBins() { + static const float hardCodedignTrimLoadBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->ignTrimLoadBins, hardCodedignTrimLoadBins); +} + +static void cannedmapEstimateRpmBins() { + static const float hardCodedmapEstimateRpmBins[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->mapEstimateRpmBins, hardCodedmapEstimateRpmBins); +} + +static void cannedmapEstimateTpsBins() { + static const float hardCodedmapEstimateTpsBins[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->mapEstimateTpsBins, hardCodedmapEstimateTpsBins); +} + static void cannedmapEstimateTable() { static const float hardCodedmapEstimateTable[16][16] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -157,6 +297,16 @@ static void cannedinjectionPhase() { copyTable(config->injectionPhase, hardCodedinjectionPhase); } +static void cannedpedalToTpsRpmBins() { + static const float hardCodedpedalToTpsRpmBins[8] = {700.0, 900.0, 3000.0, 3200.0, 4000.0, 5700.0, 6900.0, 8000.0}; + copyArray(config->pedalToTpsRpmBins, hardCodedpedalToTpsRpmBins); +} + +static void cannedpedalToTpsPedalBins() { + static const float hardCodedpedalToTpsPedalBins[8] = {1.0, 5.0, 10.0, 20.0, 40.0, 50.0, 70.0, 90.0}; + copyArray(config->pedalToTpsPedalBins, hardCodedpedalToTpsPedalBins); +} + static void cannedpedalToTpsTable() { static const float hardCodedpedalToTpsTable[8][8] = { {0.000, 0.000, 0.000, 0.000, 6.000, 6.000, 3.000, 1.000, }, @@ -205,6 +355,16 @@ static void cannedtcuSolenoidTable() { copyTable(config->tcuSolenoidTable, hardCodedtcuSolenoidTable); } +static void cannedhpfpTargetRpmBins() { + static const float hardCodedhpfpTargetRpmBins[10] = {0.0, 900.0, 1800.0, 2650.0, 3550.0, 4450.0, 5350.0, 6200.0, 7100.0, 8000.0}; + copyArray(config->hpfpTargetRpmBins, hardCodedhpfpTargetRpmBins); +} + +static void cannedhpfpCompensationRpmBins() { + static const float hardCodedhpfpCompensationRpmBins[10] = {0.0, 900.0, 1800.0, 2650.0, 3550.0, 4450.0, 5350.0, 6200.0, 7100.0, 8000.0}; + copyArray(config->hpfpCompensationRpmBins, hardCodedhpfpCompensationRpmBins); +} + static void cannedpostCrankingFactor() { static const float hardCodedpostCrankingFactor[6][6] = { {1.200, 1.000, 1.000, 1.000, 1.000, 1.000, }, diff --git a/simulator/generated/canned-tunes/VQ-comparing-against-global-defaults.md b/simulator/generated/canned-tunes/VQ-comparing-against-global-defaults.md index fe21a81c6f..dfa063a1af 100644 --- a/simulator/generated/canned-tunes/VQ-comparing-against-global-defaults.md +++ b/simulator/generated/canned-tunes/VQ-comparing-against-global-defaults.md @@ -261,17 +261,49 @@ engineConfiguration->hpfpPidI = 0; + cannedprimeBins(); + cannedprimeValues(); + cannedmafDecodingBins(); + cannedmafDecoding(); + cannedcltFuelCorr(); + cannedcrankingFuelCoef(); + cannedcltRevLimitRpmBins(); + cannedcrankingCycleCoef(); + cannedcltIdleCorr(); + cannedcltCrankingCorr(); + cannedcltIdleRpm(); + cannedidleAdvanceBins(); + cannedidleAdvance(); + cannedfuelLevelBins(); cannedtpsTpsAccelTable(); + cannedboostRpmBins(); cannedboostTableOpenLoop(); + cannedvvtTable1RpmBins(); cannedvvtTable1(); + cannedscriptTable4RpmBins(); cannedscriptTable4(); + cannedignitionRpmBins(); + cannedignitionLoadBins(); cannedignitionTable(); + cannedignitionIatCorrLoadBins(); cannedignitionIatCorrTable(); + cannedveRpmBins(); + cannedveLoadBins(); cannedveTable(); + cannedfuelTrimRpmBins(); + cannedfuelTrimLoadBins(); + cannedignTrimRpmBins(); + cannedignTrimLoadBins(); + cannedmapEstimateRpmBins(); + cannedmapEstimateTpsBins(); cannedmapEstimateTable(); cannedinjectionPhase(); + cannedpedalToTpsRpmBins(); + cannedpedalToTpsPedalBins(); cannedpedalToTpsTable(); cannedlambdaTable(); cannedtcuSolenoidTable(); + cannedhpfpTargetRpmBins(); + cannedhpfpCompensationRpmBins(); cannedpostCrankingFactor(); ``` diff --git a/simulator/generated/canned-tunes/VQ-comparing-against-global-defaults_methods.md b/simulator/generated/canned-tunes/VQ-comparing-against-global-defaults_methods.md index b764c60193..4cc30ef1c9 100644 --- a/simulator/generated/canned-tunes/VQ-comparing-against-global-defaults_methods.md +++ b/simulator/generated/canned-tunes/VQ-comparing-against-global-defaults_methods.md @@ -1,4 +1,74 @@ ``` +static void cannedprimeBins() { + static const float hardCodedprimeBins[8] = {0.0, 14.0, 29.0, 43.0, 57.0, 71.0, 86.0, 100.0}; + copyArray(engineConfiguration->primeBins, hardCodedprimeBins); +} + +static void cannedprimeValues() { + static const float hardCodedprimeValues[8] = {10.0, 10.0, 10.0, 10.0, 10.0, 5.0, 5.0, 5.0}; + copyArray(engineConfiguration->primeValues, hardCodedprimeValues); +} + +static void cannedmafDecodingBins() { + static const float hardCodedmafDecodingBins[32] = {0.0, 18.225807, 26.451612, 34.677418, 42.903225, 51.129032, 59.35484, 67.58064, 75.80645, 84.03226, 92.258064, 100.48387, 108.70968, 116.935486, 125.16129, 133.3871, 141.6129, 149.83871, 158.06451, 166.29033, 174.51613, 182.74193, 190.96774, 199.19354, 207.41936, 215.64516, 223.87097, 232.09677, 240.32259, 248.54839, 256.7742, 265.0}; + copyArray(config->mafDecodingBins, hardCodedmafDecodingBins); +} + +static void cannedmafDecoding() { + static const float hardCodedmafDecoding[32] = {-34.5, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0}; + copyArray(config->mafDecoding, hardCodedmafDecoding); +} + +static void cannedcltFuelCorr() { + static const float hardCodedcltFuelCorr[16] = {1.5, 1.5, 1.42, 1.36, 1.28, 1.19, 1.12, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0}; + copyArray(config->cltFuelCorr, hardCodedcltFuelCorr); +} + +static void cannedcrankingFuelCoef() { + static const float hardCodedcrankingFuelCoef[8] = {2.8, 2.2, 1.8, 1.8, 1.6, 1.5, 1.0, 1.0}; + copyArray(config->crankingFuelCoef, hardCodedcrankingFuelCoef); +} + +static void cannedcltRevLimitRpmBins() { + static const float hardCodedcltRevLimitRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->cltRevLimitRpmBins, hardCodedcltRevLimitRpmBins); +} + +static void cannedcrankingCycleCoef() { + static const float hardCodedcrankingCycleCoef[8] = {1.5, 1.25, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0}; + copyArray(config->crankingCycleCoef, hardCodedcrankingCycleCoef); +} + +static void cannedcltIdleCorr() { + static const float hardCodedcltIdleCorr[16] = {2.0, 2.0, 2.0, 2.0, 1.6, 1.6, 1.6, 1.2, 1.2, 0.8, 0.5, 0.45, 0.45, 0.45, 0.45, 0.76}; + copyArray(config->cltIdleCorr, hardCodedcltIdleCorr); +} + +static void cannedcltCrankingCorr() { + static const float hardCodedcltCrankingCorr[8] = {1.2, 1.2, 1.0, 0.85, 0.8, 0.35, 0.35, 0.35}; + copyArray(config->cltCrankingCorr, hardCodedcltCrankingCorr); +} + +static void cannedcltIdleRpm() { + static const float hardCodedcltIdleRpm[16] = {1360.0, 1360.0, 1300.0, 1200.0, 1160.0, 1100.0, 1060.0, 1000.0, 1000.0, 860.0, 860.0, 800.0, 800.0, 800.0, 1000.0, 1100.0}; + copyArray(config->cltIdleRpm, hardCodedcltIdleRpm); +} + +static void cannedidleAdvanceBins() { + static const float hardCodedidleAdvanceBins[8] = {500.0, 650.0, 750.0, 900.0, 1000.0, 1150.0, 1250.0, 1400.0}; + copyArray(config->idleAdvanceBins, hardCodedidleAdvanceBins); +} + +static void cannedidleAdvance() { + static const float hardCodedidleAdvance[8] = {8.0, 10.0, 12.0, 14.0, 15.0, 16.0, 18.0, 20.0}; + copyArray(config->idleAdvance, hardCodedidleAdvance); +} + +static void cannedfuelLevelBins() { + static const float hardCodedfuelLevelBins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelLevelBins, hardCodedfuelLevelBins); +} + static void cannedtpsTpsAccelTable() { static const float hardCodedtpsTpsAccelTable[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -13,6 +83,11 @@ static void cannedtpsTpsAccelTable() { copyTable(config->tpsTpsAccelTable, hardCodedtpsTpsAccelTable); } +static void cannedboostRpmBins() { + static const float hardCodedboostRpmBins[8] = {0.0, 1100.0, 2300.0, 3400.0, 4600.0, 5700.0, 6900.0, 8000.0}; + copyArray(config->boostRpmBins, hardCodedboostRpmBins); +} + static void cannedboostTableOpenLoop() { static const float hardCodedboostTableOpenLoop[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -27,6 +102,11 @@ static void cannedboostTableOpenLoop() { copyTable(config->boostTableOpenLoop, hardCodedboostTableOpenLoop); } +static void cannedvvtTable1RpmBins() { + static const float hardCodedvvtTable1RpmBins[8] = {1000.0, 1700.0, 2000.0, 4400.0, 4500.0, 5000.0, 6000.0, 7000.0}; + copyArray(config->vvtTable1RpmBins, hardCodedvvtTable1RpmBins); +} + static void cannedvvtTable1() { static const float hardCodedvvtTable1[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -41,6 +121,11 @@ static void cannedvvtTable1() { copyTable(config->vvtTable1, hardCodedvvtTable1); } +static void cannedscriptTable4RpmBins() { + static const float hardCodedscriptTable4RpmBins[10] = {650.0, 767.0, 1300.0, 2000.0, 2700.0, 3400.0, 4100.0, 4800.0, 5678.0, 7000.0}; + copyArray(config->scriptTable4RpmBins, hardCodedscriptTable4RpmBins); +} + static void cannedscriptTable4() { static const float hardCodedscriptTable4[8][10] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -55,6 +140,16 @@ static void cannedscriptTable4() { copyTable(config->scriptTable4, hardCodedscriptTable4); } +static void cannedignitionRpmBins() { + static const float hardCodedignitionRpmBins[16] = {650.0, 800.0, 1100.0, 1500.0, 2000.0, 2500.0, 3000.0, 3500.0, 4000.0, 4500.0, 5000.0, 5500.0, 6000.0, 6500.0, 7000.0, 8000.0}; + copyArray(config->ignitionRpmBins, hardCodedignitionRpmBins); +} + +static void cannedignitionLoadBins() { + static const float hardCodedignitionLoadBins[16] = {0.0, 2.0, 4.0, 6.0, 8.0, 11.0, 12.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0}; + copyArray(config->ignitionLoadBins, hardCodedignitionLoadBins); +} + static void cannedignitionTable() { static const float hardCodedignitionTable[16][16] = { {12.100, 10.000, 10.000, 10.000, 29.300, 16.600, 30.000, 40.000, 40.000, 40.000, 41.000, 42.000, 42.000, 42.000, 42.000, 42.000, }, @@ -77,6 +172,11 @@ static void cannedignitionTable() { copyTable(config->ignitionTable, hardCodedignitionTable); } +static void cannedignitionIatCorrLoadBins() { + static const float hardCodedignitionIatCorrLoadBins[8] = {5.0, 15.0, 25.0, 35.0, 45.0, 65.0, 90.0, 110.0}; + copyArray(config->ignitionIatCorrLoadBins, hardCodedignitionIatCorrLoadBins); +} + static void cannedignitionIatCorrTable() { static const float hardCodedignitionIatCorrTable[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -91,6 +191,16 @@ static void cannedignitionIatCorrTable() { copyTable(config->ignitionIatCorrTable, hardCodedignitionIatCorrTable); } +static void cannedveRpmBins() { + static const float hardCodedveRpmBins[16] = {600.0, 900.0, 1100.0, 1500.0, 1900.0, 2400.0, 3000.0, 3700.0, 4200.0, 4700.0, 5200.0, 5800.0, 6300.0, 6800.0, 7000.0, 7200.0}; + copyArray(config->veRpmBins, hardCodedveRpmBins); +} + +static void cannedveLoadBins() { + static const float hardCodedveLoadBins[16] = {0.0, 2.0, 4.0, 6.0, 8.0, 10.0, 15.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0}; + copyArray(config->veLoadBins, hardCodedveLoadBins); +} + static void cannedveTable() { static const float hardCodedveTable[16][16] = { {15.400, 15.400, 21.000, 15.500, 13.100, 10.000, 10.000, 10.000, 10.000, 10.000, 10.000, 10.000, 10.000, 10.000, 10.000, 10.000, }, @@ -113,6 +223,36 @@ static void cannedveTable() { copyTable(config->veTable, hardCodedveTable); } +static void cannedfuelTrimRpmBins() { + static const float hardCodedfuelTrimRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelTrimRpmBins, hardCodedfuelTrimRpmBins); +} + +static void cannedfuelTrimLoadBins() { + static const float hardCodedfuelTrimLoadBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelTrimLoadBins, hardCodedfuelTrimLoadBins); +} + +static void cannedignTrimRpmBins() { + static const float hardCodedignTrimRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->ignTrimRpmBins, hardCodedignTrimRpmBins); +} + +static void cannedignTrimLoadBins() { + static const float hardCodedignTrimLoadBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->ignTrimLoadBins, hardCodedignTrimLoadBins); +} + +static void cannedmapEstimateRpmBins() { + static const float hardCodedmapEstimateRpmBins[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->mapEstimateRpmBins, hardCodedmapEstimateRpmBins); +} + +static void cannedmapEstimateTpsBins() { + static const float hardCodedmapEstimateTpsBins[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->mapEstimateTpsBins, hardCodedmapEstimateTpsBins); +} + static void cannedmapEstimateTable() { static const float hardCodedmapEstimateTable[16][16] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -157,6 +297,16 @@ static void cannedinjectionPhase() { copyTable(config->injectionPhase, hardCodedinjectionPhase); } +static void cannedpedalToTpsRpmBins() { + static const float hardCodedpedalToTpsRpmBins[8] = {700.0, 900.0, 3000.0, 3200.0, 4000.0, 5700.0, 6900.0, 8000.0}; + copyArray(config->pedalToTpsRpmBins, hardCodedpedalToTpsRpmBins); +} + +static void cannedpedalToTpsPedalBins() { + static const float hardCodedpedalToTpsPedalBins[8] = {1.0, 5.0, 10.0, 20.0, 40.0, 50.0, 70.0, 90.0}; + copyArray(config->pedalToTpsPedalBins, hardCodedpedalToTpsPedalBins); +} + static void cannedpedalToTpsTable() { static const float hardCodedpedalToTpsTable[8][8] = { {0.000, 0.000, 0.000, 0.000, 6.000, 6.000, 3.000, 1.000, }, @@ -205,6 +355,16 @@ static void cannedtcuSolenoidTable() { copyTable(config->tcuSolenoidTable, hardCodedtcuSolenoidTable); } +static void cannedhpfpTargetRpmBins() { + static const float hardCodedhpfpTargetRpmBins[10] = {0.0, 900.0, 1800.0, 2650.0, 3550.0, 4450.0, 5350.0, 6200.0, 7100.0, 8000.0}; + copyArray(config->hpfpTargetRpmBins, hardCodedhpfpTargetRpmBins); +} + +static void cannedhpfpCompensationRpmBins() { + static const float hardCodedhpfpCompensationRpmBins[10] = {0.0, 900.0, 1800.0, 2650.0, 3550.0, 4450.0, 5350.0, 6200.0, 7100.0, 8000.0}; + copyArray(config->hpfpCompensationRpmBins, hardCodedhpfpCompensationRpmBins); +} + static void cannedpostCrankingFactor() { static const float hardCodedpostCrankingFactor[6][6] = { {1.200, 1.000, 1.000, 1.000, 1.000, 1.000, }, diff --git a/simulator/generated/canned-tunes/m111-alex-comparing-against-current-m111-alex-default.md b/simulator/generated/canned-tunes/m111-alex-comparing-against-current-m111-alex-default.md index 45735d5015..d71cd1b86a 100644 --- a/simulator/generated/canned-tunes/m111-alex-comparing-against-current-m111-alex-default.md +++ b/simulator/generated/canned-tunes/m111-alex-comparing-against-current-m111-alex-default.md @@ -327,20 +327,87 @@ engineConfiguration->hpfpPidI = 0; + cannedknockNoiseRpmBins(); + cannedknockBaseNoise(); + cannedscriptCurve5Bins(); + cannedscriptCurve6Bins(); + cannedsparkDwellValues(); + canneddwellVoltageCorrVoltBins(); + canneddwellVoltageCorrValues(); + cannedprimeBins(); + cannedprimeValues(); + cannedmafDecodingBins(); + cannedmafDecoding(); + cannediatFuelCorr(); + cannedcltTimingBins(); + cannedcltTimingExtra(); + cannedcltFuelCorrBins(); + cannedcltFuelCorr(); + cannedcrankingFuelBins(); + cannedcrankingFuelCoef(); + cannedcrankingFuelCoefE100(); + cannedcltRevLimitRpmBins(); + cannedetbBiasBins(); + cannedetbBiasValues(); + cannedcrankingCycleCoef(); + cannedcltIdleCorrBins(); + cannedcltIdleCorr(); + cannedcltCrankingCorrBins(); + cannedcltCrankingCorr(); + cannedcltIdleRpmBins(); + cannedcltIdleRpm(); + cannedfuelLevelBins(); + cannedhpfpLobeProfileQuantityBins(); + cannedhpfpLobeProfileAngle(); + cannedhpfpDeadtimeVoltsBins(); + cannedwwTauCltValues(); + cannedwwMapBins(); + cannedwwTauMapValues(); + cannedwwBetaCltValues(); + cannedwwBetaMapValues(); + cannedtpsTpsAccelFromRpmBins(); + cannedtpsTpsAccelToRpmBins(); cannedtpsTpsAccelTable(); + cannedboostRpmBins(); + cannedboostTpsBins(); cannedboostTableOpenLoop(); cannedboostTableClosedLoop(); + cannedscriptTable1RpmBins(); + cannedscriptTable1LoadBins(); cannedscriptTable1(); + cannedscriptTable4RpmBins(); cannedscriptTable4(); + cannedignitionRpmBins(); + cannedignitionLoadBins(); cannedignitionTable(); + cannedignitionIatCorrLoadBins(); cannedignitionIatCorrTable(); + cannedveRpmBins(); + cannedveLoadBins(); cannedveTable(); + cannedfuelTrimRpmBins(); + cannedfuelTrimLoadBins(); + cannedignTrimRpmBins(); + cannedignTrimLoadBins(); + cannedmapEstimateRpmBins(); + cannedmapEstimateTpsBins(); cannedmapEstimateTable(); cannedinjectionPhase(); + cannedpedalToTpsRpmBins(); + cannedpedalToTpsPedalBins(); cannedpedalToTpsTable(); + cannedmaxKnockRetardRpmBins(); + cannedmaxKnockRetardLoadBins(); cannedmaxKnockRetardTable(); + cannedlambdaLoadBins(); cannedlambdaTable(); + cannediacPidMultRpmBins(); + cannediacPidMultLoadBins(); cannediacPidMultTable(); cannedtcuSolenoidTable(); + cannedhpfpTargetRpmBins(); + cannedhpfpTargetLoadBins(); + cannedhpfpCompensationRpmBins(); + cannedhpfpCompensationLoadBins(); cannedpostCrankingFactor(); ``` diff --git a/simulator/generated/canned-tunes/m111-alex-comparing-against-current-m111-alex-default_methods.md b/simulator/generated/canned-tunes/m111-alex-comparing-against-current-m111-alex-default_methods.md index 0ee761447b..45a31ff3be 100644 --- a/simulator/generated/canned-tunes/m111-alex-comparing-against-current-m111-alex-default_methods.md +++ b/simulator/generated/canned-tunes/m111-alex-comparing-against-current-m111-alex-default_methods.md @@ -1,4 +1,204 @@ ``` +static void cannedknockNoiseRpmBins() { + static const float hardCodedknockNoiseRpmBins[16] = {650.0, 720.0, 790.0, 1160.0, 1580.0, 2000.0, 2420.0, 2840.0, 3260.0, 3680.0, 4100.0, 4520.0, 4940.0, 5413.0, 6207.0, 7000.0}; + copyArray(config->knockNoiseRpmBins, hardCodedknockNoiseRpmBins); +} + +static void cannedknockBaseNoise() { + static const float hardCodedknockBaseNoise[16] = {-39.0, -39.0, -39.0, -34.0, -27.0, -24.0, -23.0, -22.0, -20.0, -16.0, -13.0, -12.0, -10.0, -8.0, -6.0, -2.0}; + copyArray(config->knockBaseNoise, hardCodedknockBaseNoise); +} + +static void cannedscriptCurve5Bins() { + static const float hardCodedscriptCurve5Bins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->scriptCurve5Bins, hardCodedscriptCurve5Bins); +} + +static void cannedscriptCurve6Bins() { + static const float hardCodedscriptCurve6Bins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->scriptCurve6Bins, hardCodedscriptCurve6Bins); +} + +static void cannedsparkDwellValues() { + static const float hardCodedsparkDwellValues[8] = {4.0, 3.0, 3.0, 2.6, 2.6, 2.6, 2.6, 2.6}; + copyArray(config->sparkDwellValues, hardCodedsparkDwellValues); +} + +static void canneddwellVoltageCorrVoltBins() { + static const float hardCodeddwellVoltageCorrVoltBins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->dwellVoltageCorrVoltBins, hardCodeddwellVoltageCorrVoltBins); +} + +static void canneddwellVoltageCorrValues() { + static const float hardCodeddwellVoltageCorrValues[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->dwellVoltageCorrValues, hardCodeddwellVoltageCorrValues); +} + +static void cannedprimeBins() { + static const float hardCodedprimeBins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(engineConfiguration->primeBins, hardCodedprimeBins); +} + +static void cannedprimeValues() { + static const float hardCodedprimeValues[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(engineConfiguration->primeValues, hardCodedprimeValues); +} + +static void cannedmafDecodingBins() { + static const float hardCodedmafDecodingBins[32] = {0.0, 18.013283, 26.451612, 34.677418, 42.903225, 51.129032, 59.35484, 67.580635, 75.80645, 84.03226, 92.258064, 100.48387, 108.70968, 116.935486, 125.16129, 133.3871, 141.6129, 149.83871, 158.06451, 166.29033, 174.51613, 182.74193, 190.96774, 199.19353, 207.41936, 215.64516, 223.87097, 232.09677, 240.3226, 248.54839, 256.7742, 265.0}; + copyArray(config->mafDecodingBins, hardCodedmafDecodingBins); +} + +static void cannedmafDecoding() { + static const float hardCodedmafDecoding[32] = {-34.5, 195.01631, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0}; + copyArray(config->mafDecoding, hardCodedmafDecoding); +} + +static void cannediatFuelCorr() { + static const float hardCodediatFuelCorr[16] = {1.11, 1.07, 1.05, 1.02, 1.0, 0.98, 0.95, 0.93, 0.92, 0.9, 0.87, 0.85, 0.82, 0.8066667, 0.7933333, 0.78}; + copyArray(config->iatFuelCorr, hardCodediatFuelCorr); +} + +static void cannedcltTimingBins() { + static const float hardCodedcltTimingBins[8] = {-40.0, -15.0, 10.0, 20.0, 50.0, 80.0, 97.0, 120.0}; + copyArray(config->cltTimingBins, hardCodedcltTimingBins); +} + +static void cannedcltTimingExtra() { + static const float hardCodedcltTimingExtra[8] = {11.0, 9.0, 7.0, 5.0, 2.0, 0.0, 0.0, -2.0}; + copyArray(config->cltTimingExtra, hardCodedcltTimingExtra); +} + +static void cannedcltFuelCorrBins() { + static const float hardCodedcltFuelCorrBins[16] = {-40.0, -30.0, -20.0, -10.0, 0.0, 9.71, 21.46, 31.48, 41.17, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0, 110.0}; + copyArray(config->cltFuelCorrBins, hardCodedcltFuelCorrBins); +} + +static void cannedcltFuelCorr() { + static const float hardCodedcltFuelCorr[16] = {1.53, 1.53, 1.4499981, 1.3900006, 1.3099988, 1.25, 1.1900002, 1.1500002, 1.1000001, 1.06, 1.02, 1.0000021, 1.0, 1.0, 1.0, 1.0}; + copyArray(config->cltFuelCorr, hardCodedcltFuelCorr); +} + +static void cannedcrankingFuelBins() { + static const float hardCodedcrankingFuelBins[8] = {-27.15, -3.94, 4.77, 20.0, 35.0, 50.0, 65.0, 90.0}; + copyArray(config->crankingFuelBins, hardCodedcrankingFuelBins); +} + +static void cannedcrankingFuelCoef() { + static const float hardCodedcrankingFuelCoef[8] = {3.0, 2.64, 2.13, 1.550003, 1.300003, 1.0999985, 1.0, 1.0}; + copyArray(config->crankingFuelCoef, hardCodedcrankingFuelCoef); +} + +static void cannedcrankingFuelCoefE100() { + static const float hardCodedcrankingFuelCoefE100[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->crankingFuelCoefE100, hardCodedcrankingFuelCoefE100); +} + +static void cannedcltRevLimitRpmBins() { + static const float hardCodedcltRevLimitRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->cltRevLimitRpmBins, hardCodedcltRevLimitRpmBins); +} + +static void cannedetbBiasBins() { + static const float hardCodedetbBiasBins[8] = {0.0, 2.0, 4.0, 10.0, 30.0, 50.0, 80.0, 100.0}; + copyArray(config->etbBiasBins, hardCodedetbBiasBins); +} + +static void cannedetbBiasValues() { + static const float hardCodedetbBiasValues[8] = {-18.0, -18.0, -18.0, 16.0, 17.0, 15.0, 16.0, 22.0}; + copyArray(config->etbBiasValues, hardCodedetbBiasValues); +} + +static void cannedcrankingCycleCoef() { + static const float hardCodedcrankingCycleCoef[8] = {2.0, 1.300003, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0}; + copyArray(config->crankingCycleCoef, hardCodedcrankingCycleCoef); +} + +static void cannedcltIdleCorrBins() { + static const float hardCodedcltIdleCorrBins[16] = {-40.0, -30.410034, -21.25, -9.919983, 0.11000013, 10.0, 20.0, 30.0, 39.779785, 50.52, 60.0, 70.0, 80.0, 90.0, 100.0, 110.0}; + copyArray(config->cltIdleCorrBins, hardCodedcltIdleCorrBins); +} + +static void cannedcltIdleCorr() { + static const float hardCodedcltIdleCorr[16] = {1.6900029, 1.5400014, 1.4800038, 1.4199986, 1.3700032, 1.3200002, 1.196672, 1.0933361, 1.059998, 1.0300001, 1.0000031, 0.99999666, 1.0, 1.0, 1.0, 1.0}; + copyArray(config->cltIdleCorr, hardCodedcltIdleCorr); +} + +static void cannedcltCrankingCorrBins() { + static const float hardCodedcltCrankingCorrBins[8] = {-40.0, -20.0, 0.0, 19.83, 40.0, 60.0, 80.0, 100.0}; + copyArray(config->cltCrankingCorrBins, hardCodedcltCrankingCorrBins); +} + +static void cannedcltCrankingCorr() { + static const float hardCodedcltCrankingCorr[8] = {1.5, 1.3366667, 1.1733334, 1.05, 0.96000004, 0.8100002, 0.69000024, 0.6500002}; + copyArray(config->cltCrankingCorr, hardCodedcltCrankingCorr); +} + +static void cannedcltIdleRpmBins() { + static const float hardCodedcltIdleRpmBins[16] = {-40.0, -30.0, -20.0, 0.0, 22.0, 36.0, 46.0, 56.0, 60.0, 70.0, 80.0, 90.0, 100.0, 120.0, 130.0, 140.0}; + copyArray(config->cltIdleRpmBins, hardCodedcltIdleRpmBins); +} + +static void cannedcltIdleRpm() { + static const float hardCodedcltIdleRpm[16] = {1220.0, 1200.0, 1200.0, 1000.0, 1000.0, 960.0, 900.0, 860.0, 800.0, 800.0, 800.0, 800.0, 900.0, 480.0, 0.0, 0.0}; + copyArray(config->cltIdleRpm, hardCodedcltIdleRpm); +} + +static void cannedfuelLevelBins() { + static const float hardCodedfuelLevelBins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelLevelBins, hardCodedfuelLevelBins); +} + +static void cannedhpfpLobeProfileQuantityBins() { + static const float hardCodedhpfpLobeProfileQuantityBins[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpLobeProfileQuantityBins, hardCodedhpfpLobeProfileQuantityBins); +} + +static void cannedhpfpLobeProfileAngle() { + static const float hardCodedhpfpLobeProfileAngle[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpLobeProfileAngle, hardCodedhpfpLobeProfileAngle); +} + +static void cannedhpfpDeadtimeVoltsBins() { + static const float hardCodedhpfpDeadtimeVoltsBins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpDeadtimeVoltsBins, hardCodedhpfpDeadtimeVoltsBins); +} + +static void cannedwwTauCltValues() { + static const float hardCodedwwTauCltValues[8] = {0.95, 0.8, 0.67, 0.55, 0.4, 0.32, 0.25, 0.2}; + copyArray(config->wwTauCltValues, hardCodedwwTauCltValues); +} + +static void cannedwwMapBins() { + static const float hardCodedwwMapBins[8] = {7.0, 18.0, 29.0, 40.0, 49.0, 60.0, 70.0, 88.0}; + copyArray(config->wwMapBins, hardCodedwwMapBins); +} + +static void cannedwwTauMapValues() { + static const float hardCodedwwTauMapValues[8] = {0.76, 0.83, 0.84, 0.86, 0.87, 0.92, 0.94, 0.95}; + copyArray(config->wwTauMapValues, hardCodedwwTauMapValues); +} + +static void cannedwwBetaCltValues() { + static const float hardCodedwwBetaCltValues[8] = {0.79, 0.72, 0.63, 0.52, 0.44, 0.37, 0.3, 0.25}; + copyArray(config->wwBetaCltValues, hardCodedwwBetaCltValues); +} + +static void cannedwwBetaMapValues() { + static const float hardCodedwwBetaMapValues[8] = {0.05, 0.16, 0.25, 0.7, 0.78, 0.96, 1.05, 1.18}; + copyArray(config->wwBetaMapValues, hardCodedwwBetaMapValues); +} + +static void cannedtpsTpsAccelFromRpmBins() { + static const float hardCodedtpsTpsAccelFromRpmBins[8] = {0.0, 5.0, 10.0, 20.0, 60.0, 70.0, 90.0, 100.0}; + copyArray(config->tpsTpsAccelFromRpmBins, hardCodedtpsTpsAccelFromRpmBins); +} + +static void cannedtpsTpsAccelToRpmBins() { + static const float hardCodedtpsTpsAccelToRpmBins[8] = {0.0, 5.0, 10.0, 20.0, 60.0, 70.0, 90.0, 100.0}; + copyArray(config->tpsTpsAccelToRpmBins, hardCodedtpsTpsAccelToRpmBins); +} + static void cannedtpsTpsAccelTable() { static const float hardCodedtpsTpsAccelTable[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -13,6 +213,16 @@ static void cannedtpsTpsAccelTable() { copyTable(config->tpsTpsAccelTable, hardCodedtpsTpsAccelTable); } +static void cannedboostRpmBins() { + static const float hardCodedboostRpmBins[8] = {0.0, 1200.0, 2300.0, 3500.0, 4600.0, 5700.0, 6900.0, 8000.0}; + copyArray(config->boostRpmBins, hardCodedboostRpmBins); +} + +static void cannedboostTpsBins() { + static const float hardCodedboostTpsBins[8] = {0.0, 14.0, 28.0, 42.0, 58.0, 72.0, 86.0, 100.0}; + copyArray(config->boostTpsBins, hardCodedboostTpsBins); +} + static void cannedboostTableOpenLoop() { static const float hardCodedboostTableOpenLoop[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -41,6 +251,16 @@ static void cannedboostTableClosedLoop() { copyTable(config->boostTableClosedLoop, hardCodedboostTableClosedLoop); } +static void cannedscriptTable1RpmBins() { + static const float hardCodedscriptTable1RpmBins[8] = {650.0, 800.0, 1100.0, 1500.0, 3500.0, 4400.0, 5300.0, 7000.0}; + copyArray(config->scriptTable1RpmBins, hardCodedscriptTable1RpmBins); +} + +static void cannedscriptTable1LoadBins() { + static const float hardCodedscriptTable1LoadBins[8] = {20.0, 25.0, 30.0, 40.0, 50.0, 70.0, 85.0, 100.0}; + copyArray(config->scriptTable1LoadBins, hardCodedscriptTable1LoadBins); +} + static void cannedscriptTable1() { static const float hardCodedscriptTable1[8][8] = { {0.100, 0.100, 0.100, 0.100, 0.100, 0.100, 0.100, 0.100, }, @@ -55,6 +275,11 @@ static void cannedscriptTable1() { copyTable(config->scriptTable1, hardCodedscriptTable1); } +static void cannedscriptTable4RpmBins() { + static const float hardCodedscriptTable4RpmBins[10] = {650.0, 859.0, 1353.0, 2000.0, 2700.0, 3400.0, 4100.0, 4856.0, 5777.0, 7000.0}; + copyArray(config->scriptTable4RpmBins, hardCodedscriptTable4RpmBins); +} + static void cannedscriptTable4() { static const float hardCodedscriptTable4[8][10] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -69,6 +294,16 @@ static void cannedscriptTable4() { copyTable(config->scriptTable4, hardCodedscriptTable4); } +static void cannedignitionRpmBins() { + static const float hardCodedignitionRpmBins[16] = {300.0, 700.0, 800.0, 900.0, 1100.0, 1400.0, 1700.0, 2100.0, 2500.0, 3000.0, 3500.0, 4000.0, 4500.0, 5000.0, 6500.0, 7000.0}; + copyArray(config->ignitionRpmBins, hardCodedignitionRpmBins); +} + +static void cannedignitionLoadBins() { + static const float hardCodedignitionLoadBins[16] = {30.0, 35.0, 40.0, 45.0, 50.0, 55.0, 60.0, 65.0, 70.0, 75.0, 80.0, 85.0, 90.0, 95.0, 100.0, 110.0}; + copyArray(config->ignitionLoadBins, hardCodedignitionLoadBins); +} + static void cannedignitionTable() { static const float hardCodedignitionTable[16][16] = { {0.000, 8.000, 8.000, 8.000, 8.000, 10.000, 18.400, 22.800, 23.700, 30.700, 30.700, 30.700, 30.700, 30.700, 30.700, 30.700, }, @@ -91,6 +326,11 @@ static void cannedignitionTable() { copyTable(config->ignitionTable, hardCodedignitionTable); } +static void cannedignitionIatCorrLoadBins() { + static const float hardCodedignitionIatCorrLoadBins[8] = {0.0, 5.0, 10.0, 25.0, 45.0, 65.0, 90.0, 110.0}; + copyArray(config->ignitionIatCorrLoadBins, hardCodedignitionIatCorrLoadBins); +} + static void cannedignitionIatCorrTable() { static const float hardCodedignitionIatCorrTable[8][8] = { {4.000, 4.000, 4.000, 4.000, 4.000, 4.000, 4.000, 4.000, }, @@ -105,6 +345,16 @@ static void cannedignitionIatCorrTable() { copyTable(config->ignitionIatCorrTable, hardCodedignitionIatCorrTable); } +static void cannedveRpmBins() { + static const float hardCodedveRpmBins[16] = {650.0, 800.0, 1000.0, 1200.0, 1500.0, 2000.0, 2500.0, 3000.0, 3500.0, 4000.0, 4500.0, 5000.0, 5500.0, 6000.0, 6500.0, 7000.0}; + copyArray(config->veRpmBins, hardCodedveRpmBins); +} + +static void cannedveLoadBins() { + static const float hardCodedveLoadBins[16] = {15.0, 25.0, 30.0, 35.0, 40.0, 45.0, 50.0, 55.0, 65.0, 70.0, 75.0, 80.0, 85.0, 90.0, 95.0, 100.0}; + copyArray(config->veLoadBins, hardCodedveLoadBins); +} + static void cannedveTable() { static const float hardCodedveTable[16][16] = { {27.800, 27.500, 17.300, 7.800, 5.400, 6.500, 7.200, 10.300, 11.600, 13.700, 27.600, 30.000, 23.400, 23.800, 25.700, 34.400, }, @@ -127,6 +377,36 @@ static void cannedveTable() { copyTable(config->veTable, hardCodedveTable); } +static void cannedfuelTrimRpmBins() { + static const float hardCodedfuelTrimRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelTrimRpmBins, hardCodedfuelTrimRpmBins); +} + +static void cannedfuelTrimLoadBins() { + static const float hardCodedfuelTrimLoadBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelTrimLoadBins, hardCodedfuelTrimLoadBins); +} + +static void cannedignTrimRpmBins() { + static const float hardCodedignTrimRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->ignTrimRpmBins, hardCodedignTrimRpmBins); +} + +static void cannedignTrimLoadBins() { + static const float hardCodedignTrimLoadBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->ignTrimLoadBins, hardCodedignTrimLoadBins); +} + +static void cannedmapEstimateRpmBins() { + static const float hardCodedmapEstimateRpmBins[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->mapEstimateRpmBins, hardCodedmapEstimateRpmBins); +} + +static void cannedmapEstimateTpsBins() { + static const float hardCodedmapEstimateTpsBins[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->mapEstimateTpsBins, hardCodedmapEstimateTpsBins); +} + static void cannedmapEstimateTable() { static const float hardCodedmapEstimateTable[16][16] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -171,6 +451,16 @@ static void cannedinjectionPhase() { copyTable(config->injectionPhase, hardCodedinjectionPhase); } +static void cannedpedalToTpsRpmBins() { + static const float hardCodedpedalToTpsRpmBins[8] = {0.0, 600.0, 800.0, 1000.0, 1500.0, 2000.0, 4000.0, 8000.0}; + copyArray(config->pedalToTpsRpmBins, hardCodedpedalToTpsRpmBins); +} + +static void cannedpedalToTpsPedalBins() { + static const float hardCodedpedalToTpsPedalBins[8] = {0.0, 10.0, 15.0, 20.0, 35.0, 71.0, 86.0, 100.0}; + copyArray(config->pedalToTpsPedalBins, hardCodedpedalToTpsPedalBins); +} + static void cannedpedalToTpsTable() { static const float hardCodedpedalToTpsTable[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -185,6 +475,16 @@ static void cannedpedalToTpsTable() { copyTable(config->pedalToTpsTable, hardCodedpedalToTpsTable); } +static void cannedmaxKnockRetardRpmBins() { + static const float hardCodedmaxKnockRetardRpmBins[6] = {500.0, 2000.0, 3000.0, 4000.0, 6000.0, 7000.0}; + copyArray(config->maxKnockRetardRpmBins, hardCodedmaxKnockRetardRpmBins); +} + +static void cannedmaxKnockRetardLoadBins() { + static const float hardCodedmaxKnockRetardLoadBins[6] = {0.0, 20.0, 50.0, 70.0, 90.0, 100.0}; + copyArray(config->maxKnockRetardLoadBins, hardCodedmaxKnockRetardLoadBins); +} + static void cannedmaxKnockRetardTable() { static const float hardCodedmaxKnockRetardTable[6][6] = { {2.000, 2.000, 2.000, 2.000, 2.000, 2.000, }, @@ -197,6 +497,11 @@ static void cannedmaxKnockRetardTable() { copyTable(config->maxKnockRetardTable, hardCodedmaxKnockRetardTable); } +static void cannedlambdaLoadBins() { + static const float hardCodedlambdaLoadBins[16] = {10.0, 20.0, 25.0, 30.0, 32.0, 40.0, 45.0, 50.0, 55.0, 60.0, 65.0, 70.0, 80.0, 85.0, 90.0, 100.0}; + copyArray(config->lambdaLoadBins, hardCodedlambdaLoadBins); +} + static void cannedlambdaTable() { static const float hardCodedlambdaTable[16][16] = { {14.000, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.200, 14.200, 14.200, 14.200, }, @@ -219,6 +524,16 @@ static void cannedlambdaTable() { copyTable(config->lambdaTable, hardCodedlambdaTable); } +static void cannediacPidMultRpmBins() { + static const float hardCodediacPidMultRpmBins[8] = {600.0, 800.0, 900.0, 1000.0, 1100.0, 1200.0, 1300.0, 1500.0}; + copyArray(config->iacPidMultRpmBins, hardCodediacPidMultRpmBins); +} + +static void cannediacPidMultLoadBins() { + static const float hardCodediacPidMultLoadBins[8] = {10.0, 20.0, 30.0, 35.0, 40.0, 50.0, 70.0, 100.0}; + copyArray(config->iacPidMultLoadBins, hardCodediacPidMultLoadBins); +} + static void cannediacPidMultTable() { static const float hardCodediacPidMultTable[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -245,6 +560,26 @@ static void cannedtcuSolenoidTable() { copyTable(config->tcuSolenoidTable, hardCodedtcuSolenoidTable); } +static void cannedhpfpTargetRpmBins() { + static const float hardCodedhpfpTargetRpmBins[10] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpTargetRpmBins, hardCodedhpfpTargetRpmBins); +} + +static void cannedhpfpTargetLoadBins() { + static const float hardCodedhpfpTargetLoadBins[10] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpTargetLoadBins, hardCodedhpfpTargetLoadBins); +} + +static void cannedhpfpCompensationRpmBins() { + static const float hardCodedhpfpCompensationRpmBins[10] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpCompensationRpmBins, hardCodedhpfpCompensationRpmBins); +} + +static void cannedhpfpCompensationLoadBins() { + static const float hardCodedhpfpCompensationLoadBins[10] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpCompensationLoadBins, hardCodedhpfpCompensationLoadBins); +} + static void cannedpostCrankingFactor() { static const float hardCodedpostCrankingFactor[6][6] = { {1.200, 0.000, 0.000, 0.000, 0.000, 0.000, }, diff --git a/simulator/generated/canned-tunes/m111-alex-comparing-against-global-defaults.md b/simulator/generated/canned-tunes/m111-alex-comparing-against-global-defaults.md index fd838d4122..adfa4a56bc 100644 --- a/simulator/generated/canned-tunes/m111-alex-comparing-against-global-defaults.md +++ b/simulator/generated/canned-tunes/m111-alex-comparing-against-global-defaults.md @@ -333,20 +333,87 @@ engineConfiguration->hpfpPidI = 0; + cannedknockNoiseRpmBins(); + cannedknockBaseNoise(); + cannedscriptCurve5Bins(); + cannedscriptCurve6Bins(); + cannedsparkDwellValues(); + canneddwellVoltageCorrVoltBins(); + canneddwellVoltageCorrValues(); + cannedprimeBins(); + cannedprimeValues(); + cannedmafDecodingBins(); + cannedmafDecoding(); + cannediatFuelCorr(); + cannedcltTimingBins(); + cannedcltTimingExtra(); + cannedcltFuelCorrBins(); + cannedcltFuelCorr(); + cannedcrankingFuelBins(); + cannedcrankingFuelCoef(); + cannedcrankingFuelCoefE100(); + cannedcltRevLimitRpmBins(); + cannedetbBiasBins(); + cannedetbBiasValues(); + cannedcrankingCycleCoef(); + cannedcltIdleCorrBins(); + cannedcltIdleCorr(); + cannedcltCrankingCorrBins(); + cannedcltCrankingCorr(); + cannedcltIdleRpmBins(); + cannedcltIdleRpm(); + cannedfuelLevelBins(); + cannedhpfpLobeProfileQuantityBins(); + cannedhpfpLobeProfileAngle(); + cannedhpfpDeadtimeVoltsBins(); + cannedwwTauCltValues(); + cannedwwMapBins(); + cannedwwTauMapValues(); + cannedwwBetaCltValues(); + cannedwwBetaMapValues(); + cannedtpsTpsAccelFromRpmBins(); + cannedtpsTpsAccelToRpmBins(); cannedtpsTpsAccelTable(); + cannedboostRpmBins(); + cannedboostTpsBins(); cannedboostTableOpenLoop(); cannedboostTableClosedLoop(); + cannedscriptTable1RpmBins(); + cannedscriptTable1LoadBins(); cannedscriptTable1(); + cannedscriptTable4RpmBins(); cannedscriptTable4(); + cannedignitionRpmBins(); + cannedignitionLoadBins(); cannedignitionTable(); + cannedignitionIatCorrLoadBins(); cannedignitionIatCorrTable(); + cannedveRpmBins(); + cannedveLoadBins(); cannedveTable(); + cannedfuelTrimRpmBins(); + cannedfuelTrimLoadBins(); + cannedignTrimRpmBins(); + cannedignTrimLoadBins(); + cannedmapEstimateRpmBins(); + cannedmapEstimateTpsBins(); cannedmapEstimateTable(); cannedinjectionPhase(); + cannedpedalToTpsRpmBins(); + cannedpedalToTpsPedalBins(); cannedpedalToTpsTable(); + cannedmaxKnockRetardRpmBins(); + cannedmaxKnockRetardLoadBins(); cannedmaxKnockRetardTable(); + cannedlambdaLoadBins(); cannedlambdaTable(); + cannediacPidMultRpmBins(); + cannediacPidMultLoadBins(); cannediacPidMultTable(); cannedtcuSolenoidTable(); + cannedhpfpTargetRpmBins(); + cannedhpfpTargetLoadBins(); + cannedhpfpCompensationRpmBins(); + cannedhpfpCompensationLoadBins(); cannedpostCrankingFactor(); ``` diff --git a/simulator/generated/canned-tunes/m111-alex-comparing-against-global-defaults_methods.md b/simulator/generated/canned-tunes/m111-alex-comparing-against-global-defaults_methods.md index 0ee761447b..45a31ff3be 100644 --- a/simulator/generated/canned-tunes/m111-alex-comparing-against-global-defaults_methods.md +++ b/simulator/generated/canned-tunes/m111-alex-comparing-against-global-defaults_methods.md @@ -1,4 +1,204 @@ ``` +static void cannedknockNoiseRpmBins() { + static const float hardCodedknockNoiseRpmBins[16] = {650.0, 720.0, 790.0, 1160.0, 1580.0, 2000.0, 2420.0, 2840.0, 3260.0, 3680.0, 4100.0, 4520.0, 4940.0, 5413.0, 6207.0, 7000.0}; + copyArray(config->knockNoiseRpmBins, hardCodedknockNoiseRpmBins); +} + +static void cannedknockBaseNoise() { + static const float hardCodedknockBaseNoise[16] = {-39.0, -39.0, -39.0, -34.0, -27.0, -24.0, -23.0, -22.0, -20.0, -16.0, -13.0, -12.0, -10.0, -8.0, -6.0, -2.0}; + copyArray(config->knockBaseNoise, hardCodedknockBaseNoise); +} + +static void cannedscriptCurve5Bins() { + static const float hardCodedscriptCurve5Bins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->scriptCurve5Bins, hardCodedscriptCurve5Bins); +} + +static void cannedscriptCurve6Bins() { + static const float hardCodedscriptCurve6Bins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->scriptCurve6Bins, hardCodedscriptCurve6Bins); +} + +static void cannedsparkDwellValues() { + static const float hardCodedsparkDwellValues[8] = {4.0, 3.0, 3.0, 2.6, 2.6, 2.6, 2.6, 2.6}; + copyArray(config->sparkDwellValues, hardCodedsparkDwellValues); +} + +static void canneddwellVoltageCorrVoltBins() { + static const float hardCodeddwellVoltageCorrVoltBins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->dwellVoltageCorrVoltBins, hardCodeddwellVoltageCorrVoltBins); +} + +static void canneddwellVoltageCorrValues() { + static const float hardCodeddwellVoltageCorrValues[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->dwellVoltageCorrValues, hardCodeddwellVoltageCorrValues); +} + +static void cannedprimeBins() { + static const float hardCodedprimeBins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(engineConfiguration->primeBins, hardCodedprimeBins); +} + +static void cannedprimeValues() { + static const float hardCodedprimeValues[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(engineConfiguration->primeValues, hardCodedprimeValues); +} + +static void cannedmafDecodingBins() { + static const float hardCodedmafDecodingBins[32] = {0.0, 18.013283, 26.451612, 34.677418, 42.903225, 51.129032, 59.35484, 67.580635, 75.80645, 84.03226, 92.258064, 100.48387, 108.70968, 116.935486, 125.16129, 133.3871, 141.6129, 149.83871, 158.06451, 166.29033, 174.51613, 182.74193, 190.96774, 199.19353, 207.41936, 215.64516, 223.87097, 232.09677, 240.3226, 248.54839, 256.7742, 265.0}; + copyArray(config->mafDecodingBins, hardCodedmafDecodingBins); +} + +static void cannedmafDecoding() { + static const float hardCodedmafDecoding[32] = {-34.5, 195.01631, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0, 200.0}; + copyArray(config->mafDecoding, hardCodedmafDecoding); +} + +static void cannediatFuelCorr() { + static const float hardCodediatFuelCorr[16] = {1.11, 1.07, 1.05, 1.02, 1.0, 0.98, 0.95, 0.93, 0.92, 0.9, 0.87, 0.85, 0.82, 0.8066667, 0.7933333, 0.78}; + copyArray(config->iatFuelCorr, hardCodediatFuelCorr); +} + +static void cannedcltTimingBins() { + static const float hardCodedcltTimingBins[8] = {-40.0, -15.0, 10.0, 20.0, 50.0, 80.0, 97.0, 120.0}; + copyArray(config->cltTimingBins, hardCodedcltTimingBins); +} + +static void cannedcltTimingExtra() { + static const float hardCodedcltTimingExtra[8] = {11.0, 9.0, 7.0, 5.0, 2.0, 0.0, 0.0, -2.0}; + copyArray(config->cltTimingExtra, hardCodedcltTimingExtra); +} + +static void cannedcltFuelCorrBins() { + static const float hardCodedcltFuelCorrBins[16] = {-40.0, -30.0, -20.0, -10.0, 0.0, 9.71, 21.46, 31.48, 41.17, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0, 110.0}; + copyArray(config->cltFuelCorrBins, hardCodedcltFuelCorrBins); +} + +static void cannedcltFuelCorr() { + static const float hardCodedcltFuelCorr[16] = {1.53, 1.53, 1.4499981, 1.3900006, 1.3099988, 1.25, 1.1900002, 1.1500002, 1.1000001, 1.06, 1.02, 1.0000021, 1.0, 1.0, 1.0, 1.0}; + copyArray(config->cltFuelCorr, hardCodedcltFuelCorr); +} + +static void cannedcrankingFuelBins() { + static const float hardCodedcrankingFuelBins[8] = {-27.15, -3.94, 4.77, 20.0, 35.0, 50.0, 65.0, 90.0}; + copyArray(config->crankingFuelBins, hardCodedcrankingFuelBins); +} + +static void cannedcrankingFuelCoef() { + static const float hardCodedcrankingFuelCoef[8] = {3.0, 2.64, 2.13, 1.550003, 1.300003, 1.0999985, 1.0, 1.0}; + copyArray(config->crankingFuelCoef, hardCodedcrankingFuelCoef); +} + +static void cannedcrankingFuelCoefE100() { + static const float hardCodedcrankingFuelCoefE100[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->crankingFuelCoefE100, hardCodedcrankingFuelCoefE100); +} + +static void cannedcltRevLimitRpmBins() { + static const float hardCodedcltRevLimitRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->cltRevLimitRpmBins, hardCodedcltRevLimitRpmBins); +} + +static void cannedetbBiasBins() { + static const float hardCodedetbBiasBins[8] = {0.0, 2.0, 4.0, 10.0, 30.0, 50.0, 80.0, 100.0}; + copyArray(config->etbBiasBins, hardCodedetbBiasBins); +} + +static void cannedetbBiasValues() { + static const float hardCodedetbBiasValues[8] = {-18.0, -18.0, -18.0, 16.0, 17.0, 15.0, 16.0, 22.0}; + copyArray(config->etbBiasValues, hardCodedetbBiasValues); +} + +static void cannedcrankingCycleCoef() { + static const float hardCodedcrankingCycleCoef[8] = {2.0, 1.300003, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0}; + copyArray(config->crankingCycleCoef, hardCodedcrankingCycleCoef); +} + +static void cannedcltIdleCorrBins() { + static const float hardCodedcltIdleCorrBins[16] = {-40.0, -30.410034, -21.25, -9.919983, 0.11000013, 10.0, 20.0, 30.0, 39.779785, 50.52, 60.0, 70.0, 80.0, 90.0, 100.0, 110.0}; + copyArray(config->cltIdleCorrBins, hardCodedcltIdleCorrBins); +} + +static void cannedcltIdleCorr() { + static const float hardCodedcltIdleCorr[16] = {1.6900029, 1.5400014, 1.4800038, 1.4199986, 1.3700032, 1.3200002, 1.196672, 1.0933361, 1.059998, 1.0300001, 1.0000031, 0.99999666, 1.0, 1.0, 1.0, 1.0}; + copyArray(config->cltIdleCorr, hardCodedcltIdleCorr); +} + +static void cannedcltCrankingCorrBins() { + static const float hardCodedcltCrankingCorrBins[8] = {-40.0, -20.0, 0.0, 19.83, 40.0, 60.0, 80.0, 100.0}; + copyArray(config->cltCrankingCorrBins, hardCodedcltCrankingCorrBins); +} + +static void cannedcltCrankingCorr() { + static const float hardCodedcltCrankingCorr[8] = {1.5, 1.3366667, 1.1733334, 1.05, 0.96000004, 0.8100002, 0.69000024, 0.6500002}; + copyArray(config->cltCrankingCorr, hardCodedcltCrankingCorr); +} + +static void cannedcltIdleRpmBins() { + static const float hardCodedcltIdleRpmBins[16] = {-40.0, -30.0, -20.0, 0.0, 22.0, 36.0, 46.0, 56.0, 60.0, 70.0, 80.0, 90.0, 100.0, 120.0, 130.0, 140.0}; + copyArray(config->cltIdleRpmBins, hardCodedcltIdleRpmBins); +} + +static void cannedcltIdleRpm() { + static const float hardCodedcltIdleRpm[16] = {1220.0, 1200.0, 1200.0, 1000.0, 1000.0, 960.0, 900.0, 860.0, 800.0, 800.0, 800.0, 800.0, 900.0, 480.0, 0.0, 0.0}; + copyArray(config->cltIdleRpm, hardCodedcltIdleRpm); +} + +static void cannedfuelLevelBins() { + static const float hardCodedfuelLevelBins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelLevelBins, hardCodedfuelLevelBins); +} + +static void cannedhpfpLobeProfileQuantityBins() { + static const float hardCodedhpfpLobeProfileQuantityBins[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpLobeProfileQuantityBins, hardCodedhpfpLobeProfileQuantityBins); +} + +static void cannedhpfpLobeProfileAngle() { + static const float hardCodedhpfpLobeProfileAngle[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpLobeProfileAngle, hardCodedhpfpLobeProfileAngle); +} + +static void cannedhpfpDeadtimeVoltsBins() { + static const float hardCodedhpfpDeadtimeVoltsBins[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpDeadtimeVoltsBins, hardCodedhpfpDeadtimeVoltsBins); +} + +static void cannedwwTauCltValues() { + static const float hardCodedwwTauCltValues[8] = {0.95, 0.8, 0.67, 0.55, 0.4, 0.32, 0.25, 0.2}; + copyArray(config->wwTauCltValues, hardCodedwwTauCltValues); +} + +static void cannedwwMapBins() { + static const float hardCodedwwMapBins[8] = {7.0, 18.0, 29.0, 40.0, 49.0, 60.0, 70.0, 88.0}; + copyArray(config->wwMapBins, hardCodedwwMapBins); +} + +static void cannedwwTauMapValues() { + static const float hardCodedwwTauMapValues[8] = {0.76, 0.83, 0.84, 0.86, 0.87, 0.92, 0.94, 0.95}; + copyArray(config->wwTauMapValues, hardCodedwwTauMapValues); +} + +static void cannedwwBetaCltValues() { + static const float hardCodedwwBetaCltValues[8] = {0.79, 0.72, 0.63, 0.52, 0.44, 0.37, 0.3, 0.25}; + copyArray(config->wwBetaCltValues, hardCodedwwBetaCltValues); +} + +static void cannedwwBetaMapValues() { + static const float hardCodedwwBetaMapValues[8] = {0.05, 0.16, 0.25, 0.7, 0.78, 0.96, 1.05, 1.18}; + copyArray(config->wwBetaMapValues, hardCodedwwBetaMapValues); +} + +static void cannedtpsTpsAccelFromRpmBins() { + static const float hardCodedtpsTpsAccelFromRpmBins[8] = {0.0, 5.0, 10.0, 20.0, 60.0, 70.0, 90.0, 100.0}; + copyArray(config->tpsTpsAccelFromRpmBins, hardCodedtpsTpsAccelFromRpmBins); +} + +static void cannedtpsTpsAccelToRpmBins() { + static const float hardCodedtpsTpsAccelToRpmBins[8] = {0.0, 5.0, 10.0, 20.0, 60.0, 70.0, 90.0, 100.0}; + copyArray(config->tpsTpsAccelToRpmBins, hardCodedtpsTpsAccelToRpmBins); +} + static void cannedtpsTpsAccelTable() { static const float hardCodedtpsTpsAccelTable[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -13,6 +213,16 @@ static void cannedtpsTpsAccelTable() { copyTable(config->tpsTpsAccelTable, hardCodedtpsTpsAccelTable); } +static void cannedboostRpmBins() { + static const float hardCodedboostRpmBins[8] = {0.0, 1200.0, 2300.0, 3500.0, 4600.0, 5700.0, 6900.0, 8000.0}; + copyArray(config->boostRpmBins, hardCodedboostRpmBins); +} + +static void cannedboostTpsBins() { + static const float hardCodedboostTpsBins[8] = {0.0, 14.0, 28.0, 42.0, 58.0, 72.0, 86.0, 100.0}; + copyArray(config->boostTpsBins, hardCodedboostTpsBins); +} + static void cannedboostTableOpenLoop() { static const float hardCodedboostTableOpenLoop[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -41,6 +251,16 @@ static void cannedboostTableClosedLoop() { copyTable(config->boostTableClosedLoop, hardCodedboostTableClosedLoop); } +static void cannedscriptTable1RpmBins() { + static const float hardCodedscriptTable1RpmBins[8] = {650.0, 800.0, 1100.0, 1500.0, 3500.0, 4400.0, 5300.0, 7000.0}; + copyArray(config->scriptTable1RpmBins, hardCodedscriptTable1RpmBins); +} + +static void cannedscriptTable1LoadBins() { + static const float hardCodedscriptTable1LoadBins[8] = {20.0, 25.0, 30.0, 40.0, 50.0, 70.0, 85.0, 100.0}; + copyArray(config->scriptTable1LoadBins, hardCodedscriptTable1LoadBins); +} + static void cannedscriptTable1() { static const float hardCodedscriptTable1[8][8] = { {0.100, 0.100, 0.100, 0.100, 0.100, 0.100, 0.100, 0.100, }, @@ -55,6 +275,11 @@ static void cannedscriptTable1() { copyTable(config->scriptTable1, hardCodedscriptTable1); } +static void cannedscriptTable4RpmBins() { + static const float hardCodedscriptTable4RpmBins[10] = {650.0, 859.0, 1353.0, 2000.0, 2700.0, 3400.0, 4100.0, 4856.0, 5777.0, 7000.0}; + copyArray(config->scriptTable4RpmBins, hardCodedscriptTable4RpmBins); +} + static void cannedscriptTable4() { static const float hardCodedscriptTable4[8][10] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -69,6 +294,16 @@ static void cannedscriptTable4() { copyTable(config->scriptTable4, hardCodedscriptTable4); } +static void cannedignitionRpmBins() { + static const float hardCodedignitionRpmBins[16] = {300.0, 700.0, 800.0, 900.0, 1100.0, 1400.0, 1700.0, 2100.0, 2500.0, 3000.0, 3500.0, 4000.0, 4500.0, 5000.0, 6500.0, 7000.0}; + copyArray(config->ignitionRpmBins, hardCodedignitionRpmBins); +} + +static void cannedignitionLoadBins() { + static const float hardCodedignitionLoadBins[16] = {30.0, 35.0, 40.0, 45.0, 50.0, 55.0, 60.0, 65.0, 70.0, 75.0, 80.0, 85.0, 90.0, 95.0, 100.0, 110.0}; + copyArray(config->ignitionLoadBins, hardCodedignitionLoadBins); +} + static void cannedignitionTable() { static const float hardCodedignitionTable[16][16] = { {0.000, 8.000, 8.000, 8.000, 8.000, 10.000, 18.400, 22.800, 23.700, 30.700, 30.700, 30.700, 30.700, 30.700, 30.700, 30.700, }, @@ -91,6 +326,11 @@ static void cannedignitionTable() { copyTable(config->ignitionTable, hardCodedignitionTable); } +static void cannedignitionIatCorrLoadBins() { + static const float hardCodedignitionIatCorrLoadBins[8] = {0.0, 5.0, 10.0, 25.0, 45.0, 65.0, 90.0, 110.0}; + copyArray(config->ignitionIatCorrLoadBins, hardCodedignitionIatCorrLoadBins); +} + static void cannedignitionIatCorrTable() { static const float hardCodedignitionIatCorrTable[8][8] = { {4.000, 4.000, 4.000, 4.000, 4.000, 4.000, 4.000, 4.000, }, @@ -105,6 +345,16 @@ static void cannedignitionIatCorrTable() { copyTable(config->ignitionIatCorrTable, hardCodedignitionIatCorrTable); } +static void cannedveRpmBins() { + static const float hardCodedveRpmBins[16] = {650.0, 800.0, 1000.0, 1200.0, 1500.0, 2000.0, 2500.0, 3000.0, 3500.0, 4000.0, 4500.0, 5000.0, 5500.0, 6000.0, 6500.0, 7000.0}; + copyArray(config->veRpmBins, hardCodedveRpmBins); +} + +static void cannedveLoadBins() { + static const float hardCodedveLoadBins[16] = {15.0, 25.0, 30.0, 35.0, 40.0, 45.0, 50.0, 55.0, 65.0, 70.0, 75.0, 80.0, 85.0, 90.0, 95.0, 100.0}; + copyArray(config->veLoadBins, hardCodedveLoadBins); +} + static void cannedveTable() { static const float hardCodedveTable[16][16] = { {27.800, 27.500, 17.300, 7.800, 5.400, 6.500, 7.200, 10.300, 11.600, 13.700, 27.600, 30.000, 23.400, 23.800, 25.700, 34.400, }, @@ -127,6 +377,36 @@ static void cannedveTable() { copyTable(config->veTable, hardCodedveTable); } +static void cannedfuelTrimRpmBins() { + static const float hardCodedfuelTrimRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelTrimRpmBins, hardCodedfuelTrimRpmBins); +} + +static void cannedfuelTrimLoadBins() { + static const float hardCodedfuelTrimLoadBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->fuelTrimLoadBins, hardCodedfuelTrimLoadBins); +} + +static void cannedignTrimRpmBins() { + static const float hardCodedignTrimRpmBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->ignTrimRpmBins, hardCodedignTrimRpmBins); +} + +static void cannedignTrimLoadBins() { + static const float hardCodedignTrimLoadBins[4] = {0.0, 0.0, 0.0, 0.0}; + copyArray(config->ignTrimLoadBins, hardCodedignTrimLoadBins); +} + +static void cannedmapEstimateRpmBins() { + static const float hardCodedmapEstimateRpmBins[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->mapEstimateRpmBins, hardCodedmapEstimateRpmBins); +} + +static void cannedmapEstimateTpsBins() { + static const float hardCodedmapEstimateTpsBins[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->mapEstimateTpsBins, hardCodedmapEstimateTpsBins); +} + static void cannedmapEstimateTable() { static const float hardCodedmapEstimateTable[16][16] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -171,6 +451,16 @@ static void cannedinjectionPhase() { copyTable(config->injectionPhase, hardCodedinjectionPhase); } +static void cannedpedalToTpsRpmBins() { + static const float hardCodedpedalToTpsRpmBins[8] = {0.0, 600.0, 800.0, 1000.0, 1500.0, 2000.0, 4000.0, 8000.0}; + copyArray(config->pedalToTpsRpmBins, hardCodedpedalToTpsRpmBins); +} + +static void cannedpedalToTpsPedalBins() { + static const float hardCodedpedalToTpsPedalBins[8] = {0.0, 10.0, 15.0, 20.0, 35.0, 71.0, 86.0, 100.0}; + copyArray(config->pedalToTpsPedalBins, hardCodedpedalToTpsPedalBins); +} + static void cannedpedalToTpsTable() { static const float hardCodedpedalToTpsTable[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -185,6 +475,16 @@ static void cannedpedalToTpsTable() { copyTable(config->pedalToTpsTable, hardCodedpedalToTpsTable); } +static void cannedmaxKnockRetardRpmBins() { + static const float hardCodedmaxKnockRetardRpmBins[6] = {500.0, 2000.0, 3000.0, 4000.0, 6000.0, 7000.0}; + copyArray(config->maxKnockRetardRpmBins, hardCodedmaxKnockRetardRpmBins); +} + +static void cannedmaxKnockRetardLoadBins() { + static const float hardCodedmaxKnockRetardLoadBins[6] = {0.0, 20.0, 50.0, 70.0, 90.0, 100.0}; + copyArray(config->maxKnockRetardLoadBins, hardCodedmaxKnockRetardLoadBins); +} + static void cannedmaxKnockRetardTable() { static const float hardCodedmaxKnockRetardTable[6][6] = { {2.000, 2.000, 2.000, 2.000, 2.000, 2.000, }, @@ -197,6 +497,11 @@ static void cannedmaxKnockRetardTable() { copyTable(config->maxKnockRetardTable, hardCodedmaxKnockRetardTable); } +static void cannedlambdaLoadBins() { + static const float hardCodedlambdaLoadBins[16] = {10.0, 20.0, 25.0, 30.0, 32.0, 40.0, 45.0, 50.0, 55.0, 60.0, 65.0, 70.0, 80.0, 85.0, 90.0, 100.0}; + copyArray(config->lambdaLoadBins, hardCodedlambdaLoadBins); +} + static void cannedlambdaTable() { static const float hardCodedlambdaTable[16][16] = { {14.000, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.700, 14.200, 14.200, 14.200, 14.200, }, @@ -219,6 +524,16 @@ static void cannedlambdaTable() { copyTable(config->lambdaTable, hardCodedlambdaTable); } +static void cannediacPidMultRpmBins() { + static const float hardCodediacPidMultRpmBins[8] = {600.0, 800.0, 900.0, 1000.0, 1100.0, 1200.0, 1300.0, 1500.0}; + copyArray(config->iacPidMultRpmBins, hardCodediacPidMultRpmBins); +} + +static void cannediacPidMultLoadBins() { + static const float hardCodediacPidMultLoadBins[8] = {10.0, 20.0, 30.0, 35.0, 40.0, 50.0, 70.0, 100.0}; + copyArray(config->iacPidMultLoadBins, hardCodediacPidMultLoadBins); +} + static void cannediacPidMultTable() { static const float hardCodediacPidMultTable[8][8] = { {0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, }, @@ -245,6 +560,26 @@ static void cannedtcuSolenoidTable() { copyTable(config->tcuSolenoidTable, hardCodedtcuSolenoidTable); } +static void cannedhpfpTargetRpmBins() { + static const float hardCodedhpfpTargetRpmBins[10] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpTargetRpmBins, hardCodedhpfpTargetRpmBins); +} + +static void cannedhpfpTargetLoadBins() { + static const float hardCodedhpfpTargetLoadBins[10] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpTargetLoadBins, hardCodedhpfpTargetLoadBins); +} + +static void cannedhpfpCompensationRpmBins() { + static const float hardCodedhpfpCompensationRpmBins[10] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpCompensationRpmBins, hardCodedhpfpCompensationRpmBins); +} + +static void cannedhpfpCompensationLoadBins() { + static const float hardCodedhpfpCompensationLoadBins[10] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + copyArray(config->hpfpCompensationLoadBins, hardCodedhpfpCompensationLoadBins); +} + static void cannedpostCrankingFactor() { static const float hardCodedpostCrankingFactor[6][6] = { {1.200, 0.000, 0.000, 0.000, 0.000, 0.000, },