From 2c859361aa00d8a251e0391f9109a269c8e61246 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 13 Jan 2019 19:42:08 -0500 Subject: [PATCH] minor standard miata progress --- firmware/config/engines/mazda_miata.cpp | 12 ++++++------ firmware/config/engines/mazda_miata_1_6.cpp | 6 +++++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/firmware/config/engines/mazda_miata.cpp b/firmware/config/engines/mazda_miata.cpp index 4651b4855c..dcd02aca3e 100644 --- a/firmware/config/engines/mazda_miata.cpp +++ b/firmware/config/engines/mazda_miata.cpp @@ -22,7 +22,7 @@ #include "allsensors.h" #include "custom_engine.h" -static const fuel_table_t miata_maf_fuel_table = { {/*0 engineLoad=1.2*//*0 800.0*/1.53, /*1 1213.0*/0.92, /*2 1626.0*/ +static const fuel_table_t miataNA8_maf_fuel_table = { {/*0 engineLoad=1.2*//*0 800.0*/1.53, /*1 1213.0*/0.92, /*2 1626.0*/ 0.74, /*3 2040.0*/0.69, /*4 2453.0*/0.69, /*5 2866.0*/0.67, /*6 3280.0*/0.67, /*7 3693.0*/0.67, /*8 4106.0*/ 0.67, /*9 4520.0*/1.02, /*10 4933.0*/0.98, /*11 5346.0*/0.98, /*12 5760.0*/0.92, /*13 6173.0*/0.89, /*14 6586.0*/ 0.82, /*15 7000.0*/0.87 }, {/*1 engineLoad=1.413333*//*0 800.0*/2.98, /*1 1213.0*/2.07, /*2 1626.0*/1.74, /*3 2040.0*/ @@ -68,7 +68,7 @@ static const fuel_table_t miata_maf_fuel_table = { {/*0 engineLoad=1.2*//*0 800. 12.97, /*9 4520.0*/13.53, /*10 4933.0*/14.87, /*11 5346.0*/15.48, /*12 5760.0*/16.1, /*13 6173.0*/16.18, /*14 6586.0*/ 15.93, /*15 7000.0*/0.0 } }; -static const ignition_table_t miata_maf_advance_table = { {/*0 engineLoad=1.200*//*0 800.0*/+4.498, /*1 1213.0*/+11.905, /*2 1626.0*/ +static const ignition_table_t miataNA8_maf_advance_table = { {/*0 engineLoad=1.200*//*0 800.0*/+4.498, /*1 1213.0*/+11.905, /*2 1626.0*/ +23.418, /*3 2040.0*/+25.357, /*4 2453.0*/+25.441, /*5 2866.0*/+25.468, /*6 3280.0*/+29.425, /*7 3693.0*/ +32.713, /*8 4106.0*/+35.556, /*9 4520.0*/+37.594, /*10 4933.0*/+36.165, /*11 5346.0*/+30.578, /*12 5760.0*/ +29.145, /*13 6173.0*/+29.065, /*14 6586.0*/+27.071, /*15 7000.0*/+28.282 }, {/*1 engineLoad=1.413*//*0 800.0*/ @@ -240,9 +240,9 @@ static void setMiata1994_common(DECLARE_ENGINE_PARAMETER_SIGNATURE) { engineConfiguration->crankingChargeAngle = 70; - copyFuelTable(miata_maf_fuel_table, config->fuelTable); + copyFuelTable(miataNA8_maf_fuel_table, config->fuelTable); - copyTimingTable(miata_maf_advance_table, config->ignitionTable); + copyTimingTable(miataNA8_maf_advance_table, config->ignitionTable); // boardConfiguration->triggerSimulatorPins[0] = GPIOD_2; // 2G - YEL/BLU // boardConfiguration->triggerSimulatorPins[1] = GPIOB_3; // 2E - WHT - four times @@ -368,8 +368,8 @@ void setMiata1996(DECLARE_ENGINE_PARAMETER_SIGNATURE) { commonMiataNa(PASS_ENGINE_PARAMETER_SIGNATURE); engineConfiguration->specs.displacement = 1.839; - copyFuelTable(miata_maf_fuel_table, config->fuelTable); - copyTimingTable(miata_maf_advance_table, config->ignitionTable); + copyFuelTable(miataNA8_maf_fuel_table, config->fuelTable); + copyTimingTable(miataNA8_maf_advance_table, config->ignitionTable); // upside down boardConfiguration->triggerInputPins[0] = GPIOA_5; diff --git a/firmware/config/engines/mazda_miata_1_6.cpp b/firmware/config/engines/mazda_miata_1_6.cpp index e8a08fbc0d..60eeacf4f2 100644 --- a/firmware/config/engines/mazda_miata_1_6.cpp +++ b/firmware/config/engines/mazda_miata_1_6.cpp @@ -72,7 +72,7 @@ static const ignition_table_t mapBased16IgnitionTable = { {/* 15 120.000 *//* 0 650.0*/5.000, /* 1 1100.0*/5.780, /* 2 1550.0*/6.559, /* 3 2000.0*/7.339, /* 4 2450.0*/8.118, /* 5 2900.0*/8.898, /* 6 3350.0*/9.677, /* 7 3800.0*/10.457, /* 8 4250.0*/11.236, /* 9 4700.0*/12.016, /* 10 5150.0*/12.795, /* 11 5650.0*/13.661, /* 12 6100.0*/14.441, /* 13 6550.0*/15.220, /* 14 7000.0*/16.000, /* 15 7450.0*/16.000, }, }; -static const fuel_table_t mafBased16FuelTable = { +static const fuel_table_t miataNA6_maf_fuel_table = { /* Generated by TS2C on Thu Jun 16 22:54:32 EDT 2016*/ {/* 0 1.200 *//* 0 800.0*/9.000, /* 1 1213.33*/10.846, /* 2 1626.6599*/11.574, /* 3 2040.0*/11.420, /* 4 2453.3298*/8.813, /* 5 2866.66*/6.000, /* 6 3280.0*/6.000, /* 7 3693.3298*/6.000, /* 8 4106.6597*/6.000, /* 9 4520.0*/6.000, /* 10 4933.33*/6.000, /* 11 5346.6597*/6.000, /* 12 5760.0*/6.000, /* 13 6173.33*/6.000, /* 14 6586.6597*/6.000, /* 15 7000.0*/6.000, }, {/* 1 1.410 *//* 0 800.0*/8.276, /* 1 1213.33*/10.727, /* 2 1626.6599*/9.000, /* 3 2040.0*/6.118, /* 4 2453.3298*/5.913, /* 5 2866.66*/6.000, /* 6 3280.0*/6.000, /* 7 3693.3298*/6.000, /* 8 4106.6597*/6.000, /* 9 4520.0*/6.000, /* 10 4933.33*/6.000, /* 11 5346.6597*/6.000, /* 12 5760.0*/6.000, /* 13 6173.33*/6.000, /* 14 6586.6597*/6.000, /* 15 7000.0*/6.000, }, @@ -204,7 +204,11 @@ void setMiataNA_1_6_Configuration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { boardConfiguration->injectionPins[2] = GPIO_UNASSIGNED; boardConfiguration->injectionPins[3] = GPIO_UNASSIGNED; + boardConfiguration->malfunctionIndicatorPin = GPIOD_5; + engineConfiguration->injectionMode = IM_BATCH; miataNAcommon(PASS_ENGINE_PARAMETER_SIGNATURE); + // todo: MAF-based ignition table? + copyFuelTable(miataNA6_maf_fuel_table, config->fuelTable); }