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

NA6 progress

This commit is contained in:
rusefi 2020-08-02 12:08:35 -04:00
parent ede4616614
commit 1d4ebd29bc
4 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,6 +101,10 @@ static void miataNAcommonEngineSettings(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
MEMCPY(config->ignitionTable, mapBased16IgnitionTable);
#endif
engineConfiguration->silentTriggerError = false;
engineConfiguration->manIdlePosition = 34;
miataNA_setCrankingCycleBins(PASS_CONFIG_PARAMETER_SIGNATURE);
miataNA_setCrankingFuelBins(PASS_CONFIG_PARAMETER_SIGNATURE);
@ -108,6 +112,7 @@ static void miataNAcommonEngineSettings(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
miataNA_setCltIdleRpmBins(PASS_CONFIG_PARAMETER_SIGNATURE);
miataNA_setIacCoastingBins(PASS_CONFIG_PARAMETER_SIGNATURE);
setMafDecodingBins(PASS_CONFIG_PARAMETER_SIGNATURE);
miataNA_setIgnitionTable(PASS_CONFIG_PARAMETER_SIGNATURE);
engineConfiguration->idle.solenoidFrequency = 160;
engineConfiguration->ignitionMode = IM_WASTED_SPARK;

31
firmware/config/engines/mazda_miata_base_maps.cpp
View File

@ -58,3 +58,34 @@ void miataNA_setCltIdleRpmBins(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
MEMCPY(engineConfiguration->cltIdleRpmBins, hardCodedcltIdleRpmBins);
MEMCPY(engineConfiguration->cltIdleRpm, hardCodedcltIdleRpm);
}
static const float hardCodedignitionLoadBins[16] = {10.0, 24.0, 35.0, 55.0, 65.0, 75.0, 84.0, 99.0, 110.0, 125.0, 140.0, 160.0, 180.0, 200.0, 220.0, 250.0};
static const float hardCodedignitionRpmBins[16] = {500.0, 800.0, 1000.0, 1500.0, 1800.0, 2300.0, 2900.0, 3400.0, 3900.0, 4300.0, 4800.0, 5300.0, 5900.0, 6500.0, 7200.0, 8000.0};
static const float hardCodedignitionTable[16][16] = {
/* Generated by TS2C on Sun Aug 02 11:58:01 EDT 2020*/
{/* 0 10.000 *//* 0 500.0*/15.000, /* 1 800.0*/15.000, /* 2 1000.0*/20.300, /* 3 1500.0*/21.900, /* 4 1800.0*/32.900, /* 5 2300.0*/33.400, /* 6 2900.0*/34.700, /* 7 3400.0*/35.900, /* 8 3900.0*/37.300, /* 9 4300.0*/37.600, /* 10 4800.0*/38.000, /* 11 5300.0*/38.100, /* 12 5900.0*/38.800, /* 13 6500.0*/39.500, /* 14 7200.0*/40.300, /* 15 8000.0*/41.000, },
{/* 1 24.000 *//* 0 500.0*/15.000, /* 1 800.0*/15.000, /* 2 1000.0*/18.700, /* 3 1500.0*/23.600, /* 4 1800.0*/30.900, /* 5 2300.0*/34.800, /* 6 2900.0*/35.600, /* 7 3400.0*/36.400, /* 8 3900.0*/37.300, /* 9 4300.0*/37.600, /* 10 4800.0*/38.000, /* 11 5300.0*/38.100, /* 12 5900.0*/38.800, /* 13 6500.0*/39.500, /* 14 7200.0*/40.300, /* 15 8000.0*/41.000, },
{/* 2 35.000 *//* 0 500.0*/15.000, /* 1 800.0*/15.000, /* 2 1000.0*/18.700, /* 3 1500.0*/23.600, /* 4 1800.0*/30.900, /* 5 2300.0*/33.800, /* 6 2900.0*/34.400, /* 7 3400.0*/35.000, /* 8 3900.0*/35.600, /* 9 4300.0*/35.900, /* 10 4800.0*/36.300, /* 11 5300.0*/36.400, /* 12 5900.0*/37.100, /* 13 6500.0*/37.900, /* 14 7200.0*/38.600, /* 15 8000.0*/39.300, },
{/* 3 55.000 *//* 0 500.0*/15.000, /* 1 800.0*/15.000, /* 2 1000.0*/22.600, /* 3 1500.0*/24.800, /* 4 1800.0*/28.800, /* 5 2300.0*/31.900, /* 6 2900.0*/32.500, /* 7 3400.0*/33.100, /* 8 3900.0*/33.800, /* 9 4300.0*/34.200, /* 10 4800.0*/34.600, /* 11 5300.0*/34.700, /* 12 5900.0*/35.400, /* 13 6500.0*/36.100, /* 14 7200.0*/36.900, /* 15 8000.0*/37.600, },
{/* 4 65.000 *//* 0 500.0*/17.000, /* 1 800.0*/17.000, /* 2 1000.0*/22.800, /* 3 1500.0*/24.700, /* 4 1800.0*/28.100, /* 5 2300.0*/30.300, /* 6 2900.0*/32.200, /* 7 3400.0*/32.200, /* 8 3900.0*/32.200, /* 9 4300.0*/32.700, /* 10 4800.0*/33.100, /* 11 5300.0*/33.200, /* 12 5900.0*/33.900, /* 13 6500.0*/34.700, /* 14 7200.0*/35.400, /* 15 8000.0*/36.100, },
{/* 5 75.000 *//* 0 500.0*/18.500, /* 1 800.0*/18.700, /* 2 1000.0*/24.300, /* 3 1500.0*/26.100, /* 4 1800.0*/27.600, /* 5 2300.0*/28.700, /* 6 2900.0*/29.300, /* 7 3400.0*/29.200, /* 8 3900.0*/28.800, /* 9 4300.0*/29.700, /* 10 4800.0*/30.600, /* 11 5300.0*/31.100, /* 12 5900.0*/31.800, /* 13 6500.0*/32.500, /* 14 7200.0*/33.300, /* 15 8000.0*/34.000, },
{/* 6 84.000 *//* 0 500.0*/19.600, /* 1 800.0*/19.900, /* 2 1000.0*/24.500, /* 3 1500.0*/27.800, /* 4 1800.0*/27.700, /* 5 2300.0*/27.700, /* 6 2900.0*/28.200, /* 7 3400.0*/28.100, /* 8 3900.0*/27.700, /* 9 4300.0*/28.800, /* 10 4800.0*/29.900, /* 11 5300.0*/30.700, /* 12 5900.0*/31.400, /* 13 6500.0*/32.100, /* 14 7200.0*/32.900, /* 15 8000.0*/33.600, },
{/* 7 99.000 *//* 0 500.0*/19.000, /* 1 800.0*/19.600, /* 2 1000.0*/23.900, /* 3 1500.0*/26.700, /* 4 1800.0*/26.600, /* 5 2300.0*/26.500, /* 6 2900.0*/26.900, /* 7 3400.0*/26.800, /* 8 3900.0*/26.800, /* 9 4300.0*/27.900, /* 10 4800.0*/29.100, /* 11 5300.0*/29.800, /* 12 5900.0*/30.500, /* 13 6500.0*/31.300, /* 14 7200.0*/32.000, /* 15 8000.0*/32.700, },
{/* 8 110.000 *//* 0 500.0*/19.000, /* 1 800.0*/19.100, /* 2 1000.0*/23.100, /* 3 1500.0*/26.200, /* 4 1800.0*/26.600, /* 5 2300.0*/25.500, /* 6 2900.0*/26.100, /* 7 3400.0*/26.000, /* 8 3900.0*/25.400, /* 9 4300.0*/26.500, /* 10 4800.0*/27.600, /* 11 5300.0*/28.300, /* 12 5900.0*/29.100, /* 13 6500.0*/29.800, /* 14 7200.0*/30.500, /* 15 8000.0*/31.300, },
{/* 9 125.000 *//* 0 500.0*/17.200, /* 1 800.0*/18.500, /* 2 1000.0*/21.800, /* 3 1500.0*/25.400, /* 4 1800.0*/26.700, /* 5 2300.0*/27.300, /* 6 2900.0*/26.900, /* 7 3400.0*/25.700, /* 8 3900.0*/24.900, /* 9 4300.0*/25.300, /* 10 4800.0*/25.700, /* 11 5300.0*/26.100, /* 12 5900.0*/26.800, /* 13 6500.0*/27.900, /* 14 7200.0*/28.900, /* 15 8000.0*/29.600, },
{/* 10 140.000 *//* 0 500.0*/15.000, /* 1 800.0*/17.200, /* 2 1000.0*/20.800, /* 3 1500.0*/24.200, /* 4 1800.0*/26.900, /* 5 2300.0*/26.800, /* 6 2900.0*/25.600, /* 7 3400.0*/24.900, /* 8 3900.0*/24.100, /* 9 4300.0*/24.000, /* 10 4800.0*/24.000, /* 11 5300.0*/24.100, /* 12 5900.0*/24.800, /* 13 6500.0*/24.900, /* 14 7200.0*/25.900, /* 15 8000.0*/24.700, },
{/* 11 160.000 *//* 0 500.0*/13.000, /* 1 800.0*/15.200, /* 2 1000.0*/18.700, /* 3 1500.0*/22.000, /* 4 1800.0*/22.800, /* 5 2300.0*/22.200, /* 6 2900.0*/21.100, /* 7 3400.0*/19.800, /* 8 3900.0*/18.900, /* 9 4300.0*/18.800, /* 10 4800.0*/18.800, /* 11 5300.0*/18.900, /* 12 5900.0*/19.700, /* 13 6500.0*/20.200, /* 14 7200.0*/20.600, /* 15 8000.0*/21.400, },
{/* 12 180.000 *//* 0 500.0*/13.000, /* 1 800.0*/15.200, /* 2 1000.0*/17.300, /* 3 1500.0*/19.300, /* 4 1800.0*/21.200, /* 5 2300.0*/21.300, /* 6 2900.0*/20.400, /* 7 3400.0*/18.700, /* 8 3900.0*/16.300, /* 9 4300.0*/16.300, /* 10 4800.0*/16.900, /* 11 5300.0*/17.200, /* 12 5900.0*/17.200, /* 13 6500.0*/17.500, /* 14 7200.0*/17.700, /* 15 8000.0*/17.700, },
{/* 13 200.000 *//* 0 500.0*/14.100, /* 1 800.0*/15.100, /* 2 1000.0*/16.400, /* 3 1500.0*/18.000, /* 4 1800.0*/19.800, /* 5 2300.0*/20.300, /* 6 2900.0*/19.500, /* 7 3400.0*/17.500, /* 8 3900.0*/14.900, /* 9 4300.0*/15.100, /* 10 4800.0*/15.800, /* 11 5300.0*/16.200, /* 12 5900.0*/16.300, /* 13 6500.0*/16.600, /* 14 7200.0*/16.700, /* 15 8000.0*/16.800, },
{/* 14 220.000 *//* 0 500.0*/15.000, /* 1 800.0*/15.000, /* 2 1000.0*/15.700, /* 3 1500.0*/16.900, /* 4 1800.0*/18.600, /* 5 2300.0*/19.200, /* 6 2900.0*/18.300, /* 7 3400.0*/16.100, /* 8 3900.0*/14.100, /* 9 4300.0*/14.300, /* 10 4800.0*/15.000, /* 11 5300.0*/15.200, /* 12 5900.0*/15.400, /* 13 6500.0*/15.600, /* 14 7200.0*/15.600, /* 15 8000.0*/15.600, },
{/* 15 250.000 *//* 0 500.0*/15.000, /* 1 800.0*/15.000, /* 2 1000.0*/15.000, /* 3 1500.0*/15.600, /* 4 1800.0*/17.800, /* 5 2300.0*/18.000, /* 6 2900.0*/16.800, /* 7 3400.0*/14.700, /* 8 3900.0*/13.300, /* 9 4300.0*/13.600, /* 10 4800.0*/14.000, /* 11 5300.0*/13.800, /* 12 5900.0*/13.900, /* 13 6500.0*/13.700, /* 14 7200.0*/13.400, /* 15 8000.0*/13.400, }
};
/* Generated by TS2C on Sun Aug 02 11:58:01 EDT 2020*/
void miataNA_setIgnitionTable(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
MEMCPY(config->ignitionLoadBins, hardCodedignitionLoadBins);
MEMCPY(config->ignitionRpmBins, hardCodedignitionRpmBins);
MEMCPY(config->ignitionTable, hardCodedignitionTable);
}

1
firmware/config/engines/mazda_miata_base_maps.h
View File

@ -14,3 +14,4 @@ void miataNA_setCrankingFuelBins(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void miataNA_setIacCoastingBins(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void miataNA_setCltIdleCorrBins(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void miataNA_setCltIdleRpmBins(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void miataNA_setIgnitionTable(DECLARE_CONFIG_PARAMETER_SIGNATURE);

2
java_console/models/src/main/java/com/rusefi/tools/tune/TS2CRunner.java
View File

@ -16,8 +16,10 @@ public class TS2CRunner {
TS2C.main(new String[]{tuneFileName, "crankingFuelBins", "crankingFuelCoef"});
TS2C.main(new String[]{tuneFileName, "iacCoastingBins", "iacCoasting"});
TS2C.main(new String[]{tuneFileName, "cltFuelCorrBins", "cltFuelCorr"});
TS2C.main(new String[]{tuneFileName, "veLoadBins", "veRpmBins", "veTable"});
TS2C.main(new String[]{tuneFileName, "ignitionLoadBins", "ignitionRpmBins", "ignitionTable"});
// TS2C.main(new String[]{tuneFileName, "afrLoadBins", "afrRpmBins", "afrTable"});
// TS2C.main(new String[]{tuneFileName, "fuelLoadBins", "fuelRpmBins", "fuelTable"});