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

shrink canned tables (#2651) 

* helper

* use it miata

* do type safe copy

* miata vvt

* etb

* default iat correction

* magic is afoot here

* hunchback

* misc

* neon

* neon

* aspire

* citroen

* neon

* missed one

* dead

* festiva

* remove andreyism

* very dead

* no need for copy of that function

* cleanup
This commit is contained in:
Matthew Kennedy 2021-05-09 11:37:16 -07:00 committed by GitHub
parent 3f36d488bf
commit dd6105cfa3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 405 additions and 477 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,23 +16,23 @@
#include "settings.h"
#if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT
static const ignition_table_t default_tps_advance_table = {
{/*0 engineLoad=0.00*/ /*0 800.0*/+15.00, /*1 1213.0*/+16.33, /*2 1626.0*/+17.67, /*3 2040.0*/+19.00, /*4 2453.0*/+20.33, /*5 2866.0*/+21.67, /*6 3280.0*/+23.00, /*7 3693.0*/+24.33, /*8 4106.0*/+25.67, /*9 4520.0*/+27.00, /*10 4933.0*/+28.33, /*11 5346.0*/+29.67, /*12 5760.0*/+31.00, /*13 6173.0*/+32.33, /*14 6586.0*/+33.67, /*15 7000.0*/+35.00},
{/*1 engineLoad=6.66*/ /*0 800.0*/+14.80, /*1 1213.0*/+16.12, /*2 1626.0*/+17.45, /*3 2040.0*/+18.77, /*4 2453.0*/+20.10, /*5 2866.0*/+21.42, /*6 3280.0*/+22.75, /*7 3693.0*/+24.07, /*8 4106.0*/+25.40, /*9 4520.0*/+26.72, /*10 4933.0*/+28.04, /*11 5346.0*/+29.37, /*12 5760.0*/+30.69, /*13 6173.0*/+32.02, /*14 6586.0*/+33.34, /*15 7000.0*/+34.67},
{/*2 engineLoad=13.33*/ /*0 800.0*/+14.60, /*1 1213.0*/+15.92, /*2 1626.0*/+17.23, /*3 2040.0*/+18.55, /*4 2453.0*/+19.86, /*5 2866.0*/+21.18, /*6 3280.0*/+22.49, /*7 3693.0*/+23.81, /*8 4106.0*/+25.12, /*9 4520.0*/+26.44, /*10 4933.0*/+27.76, /*11 5346.0*/+29.07, /*12 5760.0*/+30.39, /*13 6173.0*/+31.70, /*14 6586.0*/+33.02, /*15 7000.0*/+34.33},
{/*3 engineLoad=20.00*/ /*0 800.0*/+14.40, /*1 1213.0*/+15.71, /*2 1626.0*/+17.01, /*3 2040.0*/+18.32, /*4 2453.0*/+19.63, /*5 2866.0*/+20.93, /*6 3280.0*/+22.24, /*7 3693.0*/+23.55, /*8 4106.0*/+24.85, /*9 4520.0*/+26.16, /*10 4933.0*/+27.47, /*11 5346.0*/+28.77, /*12 5760.0*/+30.08, /*13 6173.0*/+31.39, /*14 6586.0*/+32.69, /*15 7000.0*/+34.00},
{/*4 engineLoad=26.66*/ /*0 800.0*/+14.20, /*1 1213.0*/+15.50, /*2 1626.0*/+16.80, /*3 2040.0*/+18.09, /*4 2453.0*/+19.39, /*5 2866.0*/+20.69, /*6 3280.0*/+21.99, /*7 3693.0*/+23.28, /*8 4106.0*/+24.58, /*9 4520.0*/+25.88, /*10 4933.0*/+27.18, /*11 5346.0*/+28.48, /*12 5760.0*/+29.77, /*13 6173.0*/+31.07, /*14 6586.0*/+32.37, /*15 7000.0*/+33.67},
{/*5 engineLoad=33.33*/ /*0 800.0*/+14.00, /*1 1213.0*/+15.29, /*2 1626.0*/+16.58, /*3 2040.0*/+17.87, /*4 2453.0*/+19.16, /*5 2866.0*/+20.44, /*6 3280.0*/+21.73, /*7 3693.0*/+23.02, /*8 4106.0*/+24.31, /*9 4520.0*/+25.60, /*10 4933.0*/+26.89, /*11 5346.0*/+28.18, /*12 5760.0*/+29.47, /*13 6173.0*/+30.76, /*14 6586.0*/+32.04, /*15 7000.0*/+33.33},
{/*6 engineLoad=40.00*/ /*0 800.0*/+13.80, /*1 1213.0*/+15.08, /*2 1626.0*/+16.36, /*3 2040.0*/+17.64, /*4 2453.0*/+18.92, /*5 2866.0*/+20.20, /*6 3280.0*/+21.48, /*7 3693.0*/+22.76, /*8 4106.0*/+24.04, /*9 4520.0*/+25.32, /*10 4933.0*/+26.60, /*11 5346.0*/+27.88, /*12 5760.0*/+29.16, /*13 6173.0*/+30.44, /*14 6586.0*/+31.72, /*15 7000.0*/+33.00},
{/*7 engineLoad=46.66*/ /*0 800.0*/+13.60, /*1 1213.0*/+14.87, /*2 1626.0*/+16.14, /*3 2040.0*/+17.41, /*4 2453.0*/+18.68, /*5 2866.0*/+19.96, /*6 3280.0*/+21.23, /*7 3693.0*/+22.50, /*8 4106.0*/+23.77, /*9 4520.0*/+25.04, /*10 4933.0*/+26.31, /*11 5346.0*/+27.58, /*12 5760.0*/+28.85, /*13 6173.0*/+30.12, /*14 6586.0*/+31.40, /*15 7000.0*/+32.67},
{/*8 engineLoad=53.33*/ /*0 800.0*/+13.40, /*1 1213.0*/+14.66, /*2 1626.0*/+15.92, /*3 2040.0*/+17.19, /*4 2453.0*/+18.45, /*5 2866.0*/+19.71, /*6 3280.0*/+20.97, /*7 3693.0*/+22.24, /*8 4106.0*/+23.50, /*9 4520.0*/+24.76, /*10 4933.0*/+26.02, /*11 5346.0*/+27.28, /*12 5760.0*/+28.55, /*13 6173.0*/+29.81, /*14 6586.0*/+31.07, /*15 7000.0*/+32.33},
{/*9 engineLoad=60.00*/ /*0 800.0*/+13.20, /*1 1213.0*/+14.45, /*2 1626.0*/+15.71, /*3 2040.0*/+16.96, /*4 2453.0*/+18.21, /*5 2866.0*/+19.47, /*6 3280.0*/+20.72, /*7 3693.0*/+21.97, /*8 4106.0*/+23.23, /*9 4520.0*/+24.48, /*10 4933.0*/+25.73, /*11 5346.0*/+26.99, /*12 5760.0*/+28.24, /*13 6173.0*/+29.49, /*14 6586.0*/+30.75, /*15 7000.0*/+32.00},
{/*10 engineLoad=66.66*/ /*0 800.0*/+13.00, /*1 1213.0*/+14.24, /*2 1626.0*/+15.49, /*3 2040.0*/+16.73, /*4 2453.0*/+17.98, /*5 2866.0*/+19.22, /*6 3280.0*/+20.47, /*7 3693.0*/+21.71, /*8 4106.0*/+22.96, /*9 4520.0*/+24.20, /*10 4933.0*/+25.44, /*11 5346.0*/+26.69, /*12 5760.0*/+27.93, /*13 6173.0*/+29.18, /*14 6586.0*/+30.42, /*15 7000.0*/+31.67},
{/*11 engineLoad=73.33*/ /*0 800.0*/+12.80, /*1 1213.0*/+14.04, /*2 1626.0*/+15.27, /*3 2040.0*/+16.51, /*4 2453.0*/+17.74, /*5 2866.0*/+18.98, /*6 3280.0*/+20.21, /*7 3693.0*/+21.45, /*8 4106.0*/+22.68, /*9 4520.0*/+23.92, /*10 4933.0*/+25.16, /*11 5346.0*/+26.39, /*12 5760.0*/+27.63, /*13 6173.0*/+28.86, /*14 6586.0*/+30.10, /*15 7000.0*/+31.33},
{/*12 engineLoad=80.00*/ /*0 800.0*/+12.60, /*1 1213.0*/+13.83, /*2 1626.0*/+15.05, /*3 2040.0*/+16.28, /*4 2453.0*/+17.51, /*5 2866.0*/+18.73, /*6 3280.0*/+19.96, /*7 3693.0*/+21.19, /*8 4106.0*/+22.41, /*9 4520.0*/+23.64, /*10 4933.0*/+24.87, /*11 5346.0*/+26.09, /*12 5760.0*/+27.32, /*13 6173.0*/+28.55, /*14 6586.0*/+29.77, /*15 7000.0*/+31.00},
{/*13 engineLoad=86.66*/ /*0 800.0*/+12.40, /*1 1213.0*/+13.62, /*2 1626.0*/+14.84, /*3 2040.0*/+16.05, /*4 2453.0*/+17.27, /*5 2866.0*/+18.49, /*6 3280.0*/+19.71, /*7 3693.0*/+20.92, /*8 4106.0*/+22.14, /*9 4520.0*/+23.36, /*10 4933.0*/+24.58, /*11 5346.0*/+25.80, /*12 5760.0*/+27.01, /*13 6173.0*/+28.23, /*14 6586.0*/+29.45, /*15 7000.0*/+30.67},
{/*14 engineLoad=93.33*/ /*0 800.0*/+12.20, /*1 1213.0*/+13.41, /*2 1626.0*/+14.62, /*3 2040.0*/+15.83, /*4 2453.0*/+17.04, /*5 2866.0*/+18.24, /*6 3280.0*/+19.45, /*7 3693.0*/+20.66, /*8 4106.0*/+21.87, /*9 4520.0*/+23.08, /*10 4933.0*/+24.29, /*11 5346.0*/+25.50, /*12 5760.0*/+26.71, /*13 6173.0*/+27.92, /*14 6586.0*/+29.12, /*15 7000.0*/+30.33},
{/*15 engineLoad=100.00*/ /*0 800.0*/+12.00, /*1 1213.0*/+13.20, /*2 1626.0*/+14.40, /*3 2040.0*/+15.60, /*4 2453.0*/+16.80, /*5 2866.0*/+18.00, /*6 3280.0*/+19.20, /*7 3693.0*/+20.40, /*8 4106.0*/+21.60, /*9 4520.0*/+22.80, /*10 4933.0*/+24.00, /*11 5346.0*/+25.20, /*12 5760.0*/+26.40, /*13 6173.0*/+27.60, /*14 6586.0*/+28.80, /*15 7000.0*/+30.00}
static const uint8_t default_tps_advance_table[16][16] = {
{/*0 engineLoad=0.00*/ /*0 800.0*/+15, /*1 1213.0*/+16, /*2 1626.0*/+17, /*3 2040.0*/+19, /*4 2453.0*/+20, /*5 2866.0*/+21, /*6 3280.0*/+23, /*7 3693.0*/+24, /*8 4106.0*/+25, /*9 4520.0*/+27, /*10 4933.0*/+28, /*11 5346.0*/+29, /*12 5760.0*/+31, /*13 6173.0*/+32, /*14 6586.0*/+33, /*15 7000.0*/+35},
{/*1 engineLoad=6.66*/ /*0 800.0*/+14, /*1 1213.0*/+16, /*2 1626.0*/+17, /*3 2040.0*/+18, /*4 2453.0*/+20, /*5 2866.0*/+21, /*6 3280.0*/+22, /*7 3693.0*/+24, /*8 4106.0*/+25, /*9 4520.0*/+26, /*10 4933.0*/+28, /*11 5346.0*/+29, /*12 5760.0*/+30, /*13 6173.0*/+32, /*14 6586.0*/+33, /*15 7000.0*/+34},
{/*2 engineLoad=13.33*/ /*0 800.0*/+14, /*1 1213.0*/+15, /*2 1626.0*/+17, /*3 2040.0*/+18, /*4 2453.0*/+19, /*5 2866.0*/+21, /*6 3280.0*/+22, /*7 3693.0*/+23, /*8 4106.0*/+25, /*9 4520.0*/+26, /*10 4933.0*/+27, /*11 5346.0*/+29, /*12 5760.0*/+30, /*13 6173.0*/+31, /*14 6586.0*/+33, /*15 7000.0*/+34},
{/*3 engineLoad=20.00*/ /*0 800.0*/+14, /*1 1213.0*/+15, /*2 1626.0*/+17, /*3 2040.0*/+18, /*4 2453.0*/+19, /*5 2866.0*/+20, /*6 3280.0*/+22, /*7 3693.0*/+23, /*8 4106.0*/+24, /*9 4520.0*/+26, /*10 4933.0*/+27, /*11 5346.0*/+28, /*12 5760.0*/+30, /*13 6173.0*/+31, /*14 6586.0*/+32, /*15 7000.0*/+34},
{/*4 engineLoad=26.66*/ /*0 800.0*/+14, /*1 1213.0*/+15, /*2 1626.0*/+16, /*3 2040.0*/+18, /*4 2453.0*/+19, /*5 2866.0*/+20, /*6 3280.0*/+21, /*7 3693.0*/+23, /*8 4106.0*/+24, /*9 4520.0*/+25, /*10 4933.0*/+27, /*11 5346.0*/+28, /*12 5760.0*/+29, /*13 6173.0*/+31, /*14 6586.0*/+32, /*15 7000.0*/+33},
{/*5 engineLoad=33.33*/ /*0 800.0*/+14, /*1 1213.0*/+15, /*2 1626.0*/+16, /*3 2040.0*/+17, /*4 2453.0*/+19, /*5 2866.0*/+20, /*6 3280.0*/+21, /*7 3693.0*/+23, /*8 4106.0*/+24, /*9 4520.0*/+25, /*10 4933.0*/+26, /*11 5346.0*/+28, /*12 5760.0*/+29, /*13 6173.0*/+30, /*14 6586.0*/+32, /*15 7000.0*/+33},
{/*6 engineLoad=40.00*/ /*0 800.0*/+13, /*1 1213.0*/+15, /*2 1626.0*/+16, /*3 2040.0*/+17, /*4 2453.0*/+18, /*5 2866.0*/+20, /*6 3280.0*/+21, /*7 3693.0*/+22, /*8 4106.0*/+24, /*9 4520.0*/+25, /*10 4933.0*/+26, /*11 5346.0*/+27, /*12 5760.0*/+29, /*13 6173.0*/+30, /*14 6586.0*/+31, /*15 7000.0*/+33},
{/*7 engineLoad=46.66*/ /*0 800.0*/+13, /*1 1213.0*/+14, /*2 1626.0*/+16, /*3 2040.0*/+17, /*4 2453.0*/+18, /*5 2866.0*/+19, /*6 3280.0*/+21, /*7 3693.0*/+22, /*8 4106.0*/+23, /*9 4520.0*/+25, /*10 4933.0*/+26, /*11 5346.0*/+27, /*12 5760.0*/+28, /*13 6173.0*/+30, /*14 6586.0*/+31, /*15 7000.0*/+32},
{/*8 engineLoad=53.33*/ /*0 800.0*/+13, /*1 1213.0*/+14, /*2 1626.0*/+15, /*3 2040.0*/+17, /*4 2453.0*/+18, /*5 2866.0*/+19, /*6 3280.0*/+20, /*7 3693.0*/+22, /*8 4106.0*/+23, /*9 4520.0*/+24, /*10 4933.0*/+26, /*11 5346.0*/+27, /*12 5760.0*/+28, /*13 6173.0*/+29, /*14 6586.0*/+31, /*15 7000.0*/+32},
{/*9 engineLoad=60.00*/ /*0 800.0*/+13, /*1 1213.0*/+14, /*2 1626.0*/+15, /*3 2040.0*/+16, /*4 2453.0*/+18, /*5 2866.0*/+19, /*6 3280.0*/+20, /*7 3693.0*/+21, /*8 4106.0*/+23, /*9 4520.0*/+24, /*10 4933.0*/+25, /*11 5346.0*/+26, /*12 5760.0*/+28, /*13 6173.0*/+29, /*14 6586.0*/+30, /*15 7000.0*/+32},
{/*10 engineLoad=66.66*/ /*0 800.0*/+13, /*1 1213.0*/+14, /*2 1626.0*/+15, /*3 2040.0*/+16, /*4 2453.0*/+17, /*5 2866.0*/+19, /*6 3280.0*/+20, /*7 3693.0*/+21, /*8 4106.0*/+22, /*9 4520.0*/+24, /*10 4933.0*/+25, /*11 5346.0*/+26, /*12 5760.0*/+27, /*13 6173.0*/+29, /*14 6586.0*/+30, /*15 7000.0*/+31},
{/*11 engineLoad=73.33*/ /*0 800.0*/+12, /*1 1213.0*/+14, /*2 1626.0*/+15, /*3 2040.0*/+16, /*4 2453.0*/+17, /*5 2866.0*/+18, /*6 3280.0*/+20, /*7 3693.0*/+21, /*8 4106.0*/+22, /*9 4520.0*/+23, /*10 4933.0*/+25, /*11 5346.0*/+26, /*12 5760.0*/+27, /*13 6173.0*/+28, /*14 6586.0*/+30, /*15 7000.0*/+31},
{/*12 engineLoad=80.00*/ /*0 800.0*/+12, /*1 1213.0*/+13, /*2 1626.0*/+15, /*3 2040.0*/+16, /*4 2453.0*/+17, /*5 2866.0*/+18, /*6 3280.0*/+19, /*7 3693.0*/+21, /*8 4106.0*/+22, /*9 4520.0*/+23, /*10 4933.0*/+24, /*11 5346.0*/+26, /*12 5760.0*/+27, /*13 6173.0*/+28, /*14 6586.0*/+29, /*15 7000.0*/+31},
{/*13 engineLoad=86.66*/ /*0 800.0*/+12, /*1 1213.0*/+13, /*2 1626.0*/+14, /*3 2040.0*/+16, /*4 2453.0*/+17, /*5 2866.0*/+18, /*6 3280.0*/+19, /*7 3693.0*/+20, /*8 4106.0*/+22, /*9 4520.0*/+23, /*10 4933.0*/+24, /*11 5346.0*/+25, /*12 5760.0*/+27, /*13 6173.0*/+28, /*14 6586.0*/+29, /*15 7000.0*/+30},
{/*14 engineLoad=93.33*/ /*0 800.0*/+12, /*1 1213.0*/+13, /*2 1626.0*/+14, /*3 2040.0*/+15, /*4 2453.0*/+17, /*5 2866.0*/+18, /*6 3280.0*/+19, /*7 3693.0*/+20, /*8 4106.0*/+21, /*9 4520.0*/+23, /*10 4933.0*/+24, /*11 5346.0*/+25, /*12 5760.0*/+26, /*13 6173.0*/+27, /*14 6586.0*/+29, /*15 7000.0*/+30},
{/*15 engineLoad=100.00*/ /*0 800.0*/+12, /*1 1213.0*/+13, /*2 1626.0*/+14, /*3 2040.0*/+15, /*4 2453.0*/+16, /*5 2866.0*/+18, /*6 3280.0*/+19, /*7 3693.0*/+20, /*8 4106.0*/+21, /*9 4520.0*/+22, /*10 4933.0*/+24, /*11 5346.0*/+25, /*12 5760.0*/+26, /*13 6173.0*/+27, /*14 6586.0*/+28, /*15 7000.0*/+30}
};
#endif
@ -177,6 +177,6 @@ void setCitroenBerlingoTU3JPConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
// engineConfiguration->mafAdcChannel = GPIO_UNASSIGNED;
#if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT
MEMCPY(config->ignitionTable, default_tps_advance_table);
copyTable(config->ignitionTable, default_tps_advance_table);
#endif
}

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

@ -18,44 +18,29 @@
#include "engine_configuration.h"
#include "thermistors.h"
#include "engine_math.h"
#include "fsio_impl.h"
#include "allsensors.h"
#include "custom_engine.h"
#define xxxxx 12
static const fsio_table_8x8_f32t vBattTarget = {
/* Generated by TS2C on Sat Jul 02 16:13:34 EDT 2016*/
{/* 0 20.000 *//* 0 650.0*/12.000, /* 1 800.0*/12.000, /* 2 1650.0*/13.000, /* 3 2500.0*/14.000, /* 4 3350.0*/15.000, /* 5 4200.0*/15.000, /* 6 5050.0*/15.000, /* 7 7000.0*/15.000, },
{/* 1 30.000 *//* 0 650.0*/12.000, /* 1 800.0*/12.000, /* 2 1650.0*/13.000, /* 3 2500.0*/14.000, /* 4 3350.0*/15.000, /* 5 4200.0*/15.000, /* 6 5050.0*/15.000, /* 7 7000.0*/15.000, },
{/* 2 40.000 *//* 0 650.0*/12.000, /* 1 800.0*/12.000, /* 2 1650.0*/13.000, /* 3 2500.0*/14.000, /* 4 3350.0*/15.000, /* 5 4200.0*/15.000, /* 6 5050.0*/15.000, /* 7 7000.0*/15.000, },
{/* 3 60.000 *//* 0 650.0*/12.000, /* 1 800.0*/12.000, /* 2 1650.0*/13.000, /* 3 2500.0*/14.000, /* 4 3350.0*/15.000, /* 5 4200.0*/15.000, /* 6 5050.0*/15.000, /* 7 7000.0*/15.000, },
{/* 4 70.000 *//* 0 650.0*/12.000, /* 1 800.0*/12.000, /* 2 1650.0*/13.000, /* 3 2500.0*/14.000, /* 4 3350.0*/15.000, /* 5 4200.0*/15.000, /* 6 5050.0*/15.000, /* 7 7000.0*/15.000, },
{/* 5 90.000 *//* 0 650.0*/12.000, /* 1 800.0*/12.000, /* 2 1650.0*/13.000, /* 3 2500.0*/14.000, /* 4 3350.0*/15.000, /* 5 4200.0*/15.000, /* 6 5050.0*/15.000, /* 7 7000.0*/15.000, },
{/* 6 100.000 *//* 0 650.0*/12.000, /* 1 800.0*/12.000, /* 2 1650.0*/13.000, /* 3 2500.0*/14.000, /* 4 3350.0*/15.000, /* 5 4200.0*/15.000, /* 6 5050.0*/15.000, /* 7 7000.0*/15.000, },
{/* 7 120.000 *//* 0 650.0*/12.000, /* 1 800.0*/12.000, /* 2 1650.0*/13.000, /* 3 2500.0*/14.000, /* 4 3350.0*/15.000, /* 5 4200.0*/15.000, /* 6 5050.0*/15.000, /* 7 7000.0*/15.000, },
};
#if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT
static const ignition_table_t fromODB = {
static const int8_t fromODB[16][16] = {
/* Generated by OBD2C on Tue Jun 30 18:47:52 EDT 2015*/
{/* 0 0.000 *//* 0 800.0*/10.000, /* 1 1213.0*/22.000, /* 2 1626.0*/22.000, /* 3 2040.0*/22.000, /* 4 2453.0*/24.000, /* 5 2866.0*/22.000, /* 6 3280.0*/23.000, /* 7 3693.0*/23.000, /* 8 4106.0*/22.000, /* 9 4520.0*/22.000, /* 10 4933.0*/22.000, /* 11 5346.0*/32.000, /* 12 5760.0*/22.000, /* 13 6173.0*/22.000, /* 14 6586.0*/20.000, /* 15 7000.0*/20.000, },
{/* 1 6.667 *//* 0 800.0*/10.000, /* 1 1213.0*/22.000, /* 2 1626.0*/22.000, /* 3 2040.0*/22.000, /* 4 2453.0*/24.000, /* 5 2866.0*/22.000, /* 6 3280.0*/22.500, /* 7 3693.0*/22.500, /* 8 4106.0*/22.500, /* 9 4520.0*/22.500, /* 10 4933.0*/22.500, /* 11 5346.0*/32.000, /* 12 5760.0*/22.500, /* 13 6173.0*/22.000, /* 14 6586.0*/20.000, /* 15 7000.0*/20.000, },
{/* 2 13.333 *//* 0 800.0*/10.000, /* 1 1213.0*/22.000, /* 2 1626.0*/22.500, /* 3 2040.0*/22.861, /* 4 2453.0*/24.243, /* 5 2866.0*/22.806, /* 6 3280.0*/24.270, /* 7 3693.0*/23.280, /* 8 4106.0*/21.143, /* 9 4520.0*/19.857, /* 10 4933.0*/18.000, /* 11 5346.0*/32.667, /* 12 5760.0*/22.500, /* 13 6173.0*/22.500, /* 14 6586.0*/22.500, /* 15 7000.0*/20.000, },
{/* 3 20.000 *//* 0 800.0*/10.000, /* 1 1213.0*/22.897, /* 2 1626.0*/21.810, /* 3 2040.0*/21.643, /* 4 2453.0*/22.500, /* 5 2866.0*/19.400, /* 6 3280.0*/13.750, /* 7 3693.0*/26.000, /* 8 4106.0*/35.000, /* 9 4520.0*/41.214, /* 10 4933.0*/45.125, /* 11 5346.0*/52.750, /* 12 5760.0*/51.000, /* 13 6173.0*/43.000, /* 14 6586.0*/40.000, /* 15 7000.0*/40.000, },
{/* 4 26.667 *//* 0 800.0*/11.912, /* 1 1213.0*/17.390, /* 2 1626.0*/26.200, /* 3 2040.0*/32.950, /* 4 2453.0*/35.111, /* 5 2866.0*/40.000, /* 6 3280.0*/49.711, /* 7 3693.0*/45.273, /* 8 4106.0*/43.500, /* 9 4520.0*/49.000, /* 10 4933.0*/46.176, /* 11 5346.0*/52.500, /* 12 5760.0*/45.500, /* 13 6173.0*/50.333, /* 14 6586.0*/40.000, /* 15 7000.0*/40.000, },
{/* 5 33.333 *//* 0 800.0*/7.373, /* 1 1213.0*/17.786, /* 2 1626.0*/26.923, /* 3 2040.0*/39.900, /* 4 2453.0*/29.500, /* 5 2866.0*/49.306, /* 6 3280.0*/49.861, /* 7 3693.0*/43.056, /* 8 4106.0*/44.708, /* 9 4520.0*/45.800, /* 10 4933.0*/43.375, /* 11 5346.0*/52.000, /* 12 5760.0*/48.667, /* 13 6173.0*/50.000, /* 14 6586.0*/40.000, /* 15 7000.0*/40.000, },
{/* 6 40.000 *//* 0 800.0*/8.224, /* 1 1213.0*/19.667, /* 2 1626.0*/35.318, /* 3 2040.0*/35.846, /* 4 2453.0*/39.857, /* 5 2866.0*/40.250, /* 6 3280.0*/43.000, /* 7 3693.0*/37.750, /* 8 4106.0*/42.250, /* 9 4520.0*/36.167, /* 10 4933.0*/43.000, /* 11 5346.0*/44.250, /* 12 5760.0*/47.500, /* 13 6173.0*/49.000, /* 14 6586.0*/40.000, /* 15 7000.0*/40.000, },
{/* 7 46.667 *//* 0 800.0*/8.930, /* 1 1213.0*/26.429, /* 2 1626.0*/30.750, /* 3 2040.0*/35.700, /* 4 2453.0*/41.000, /* 5 2866.0*/32.667, /* 6 3280.0*/30.500, /* 7 3693.0*/39.500, /* 8 4106.0*/38.000, /* 9 4520.0*/30.167, /* 10 4933.0*/41.583, /* 11 5346.0*/44.000, /* 12 5760.0*/45.500, /* 13 6173.0*/49.000, /* 14 6586.0*/49.000, /* 15 7000.0*/40.000, },
{/* 8 53.333 *//* 0 800.0*/7.568, /* 1 1213.0*/28.611, /* 2 1626.0*/29.850, /* 3 2040.0*/32.667, /* 4 2453.0*/27.333, /* 5 2866.0*/26.500, /* 6 3280.0*/43.000, /* 7 3693.0*/29.250, /* 8 4106.0*/39.400, /* 9 4520.0*/39.500, /* 10 4933.0*/41.000, /* 11 5346.0*/37.667, /* 12 5760.0*/42.750, /* 13 6173.0*/45.500, /* 14 6586.0*/46.500, /* 15 7000.0*/40.000, },
{/* 9 60.000 *//* 0 800.0*/7.500, /* 1 1213.0*/18.000, /* 2 1626.0*/23.938, /* 3 2040.0*/30.929, /* 4 2453.0*/24.500, /* 5 2866.0*/23.000, /* 6 3280.0*/39.167, /* 7 3693.0*/32.000, /* 8 4106.0*/29.333, /* 9 4520.0*/30.000, /* 10 4933.0*/40.000, /* 11 5346.0*/37.000, /* 12 5760.0*/40.000, /* 13 6173.0*/43.250, /* 14 6586.0*/40.000, /* 15 7000.0*/40.000, },
{/* 10 66.667 *//* 0 800.0*/8.000, /* 1 1213.0*/17.200, /* 2 1626.0*/23.917, /* 3 2040.0*/25.200, /* 4 2453.0*/23.000, /* 5 2866.0*/18.000, /* 6 3280.0*/34.000, /* 7 3693.0*/30.250, /* 8 4106.0*/28.000, /* 9 4520.0*/31.000, /* 10 4933.0*/38.000, /* 11 5346.0*/37.000, /* 12 5760.0*/40.000, /* 13 6173.0*/42.000, /* 14 6586.0*/43.000, /* 15 7000.0*/51.500, },
{/* 11 73.333 *//* 0 800.0*/15.250, /* 1 1213.0*/13.600, /* 2 1626.0*/15.583, /* 3 2040.0*/23.100, /* 4 2453.0*/21.500, /* 5 2866.0*/25.750, /* 6 3280.0*/29.750, /* 7 3693.0*/31.750, /* 8 4106.0*/28.000, /* 9 4520.0*/31.000, /* 10 4933.0*/38.000, /* 11 5346.0*/35.000, /* 12 5760.0*/40.000, /* 13 6173.0*/41.000, /* 14 6586.0*/30.750, /* 15 7000.0*/40.000, },
{/* 12 80.000 *//* 0 800.0*/12.250, /* 1 1213.0*/7.750, /* 2 1626.0*/16.750, /* 3 2040.0*/18.000, /* 4 2453.0*/25.250, /* 5 2866.0*/25.667, /* 6 3280.0*/27.500, /* 7 3693.0*/28.500, /* 8 4106.0*/24.500, /* 9 4520.0*/25.500, /* 10 4933.0*/36.000, /* 11 5346.0*/32.000, /* 12 5760.0*/37.000, /* 13 6173.0*/38.000, /* 14 6586.0*/37.750, /* 15 7000.0*/40.000, },
{/* 13 86.667 *//* 0 800.0*/4.000, /* 1 1213.0*/-2.750, /* 2 1626.0*/13.833, /* 3 2040.0*/7.500, /* 4 2453.0*/21.000, /* 5 2866.0*/25.000, /* 6 3280.0*/27.500, /* 7 3693.0*/26.000, /* 8 4106.0*/23.000, /* 9 4520.0*/23.000, /* 10 4933.0*/30.000, /* 11 5346.0*/30.000, /* 12 5760.0*/36.000, /* 13 6173.0*/33.000, /* 14 6586.0*/33.000, /* 15 7000.0*/33.000, },
{/* 14 93.333 *//* 0 800.0*/-7.500, /* 1 1213.0*/-1.167, /* 2 1626.0*/7.000, /* 3 2040.0*/11.750, /* 4 2453.0*/31.000, /* 5 2866.0*/18.167, /* 6 3280.0*/23.167, /* 7 3693.0*/23.500, /* 8 4106.0*/20.000, /* 9 4520.0*/25.000, /* 10 4933.0*/25.667, /* 11 5346.0*/28.000, /* 12 5760.0*/30.000, /* 13 6173.0*/30.500, /* 14 6586.0*/33.000, /* 15 7000.0*/33.000, },
{/* 15 100.000 *//* 0 800.0*/-5.714, /* 1 1213.0*/-2.694, /* 2 1626.0*/1.818, /* 3 2040.0*/4.891, /* 4 2453.0*/9.543, /* 5 2866.0*/12.825, /* 6 3280.0*/17.861, /* 7 3693.0*/19.500, /* 8 4106.0*/17.833, /* 9 4520.0*/17.857, /* 10 4933.0*/20.125, /* 11 5346.0*/21.000, /* 12 5760.0*/24.125, /* 13 6173.0*/31.000, /* 14 6586.0*/28.500, /* 15 7000.0*/33.000 }
{/* 0 0.000 *//* 0 800.0*/10, /* 1 1213.0*/22, /* 2 1626.0*/22, /* 3 2040.0*/22, /* 4 2453.0*/24, /* 5 2866.0*/22, /* 6 3280.0*/23, /* 7 3693.0*/23, /* 8 4106.0*/22, /* 9 4520.0*/22, /* 10 4933.0*/22, /* 11 5346.0*/32, /* 12 5760.0*/22, /* 13 6173.0*/22, /* 14 6586.0*/20, /* 15 7000.0*/20, },
{/* 1 6.667 *//* 0 800.0*/10, /* 1 1213.0*/22, /* 2 1626.0*/22, /* 3 2040.0*/22, /* 4 2453.0*/24, /* 5 2866.0*/22, /* 6 3280.0*/22, /* 7 3693.0*/22, /* 8 4106.0*/22, /* 9 4520.0*/22, /* 10 4933.0*/22, /* 11 5346.0*/32, /* 12 5760.0*/22, /* 13 6173.0*/22, /* 14 6586.0*/20, /* 15 7000.0*/20, },
{/* 2 13.333 *//* 0 800.0*/10, /* 1 1213.0*/22, /* 2 1626.0*/22, /* 3 2040.0*/22, /* 4 2453.0*/24, /* 5 2866.0*/22, /* 6 3280.0*/24, /* 7 3693.0*/23, /* 8 4106.0*/21, /* 9 4520.0*/19, /* 10 4933.0*/18, /* 11 5346.0*/32, /* 12 5760.0*/22, /* 13 6173.0*/22, /* 14 6586.0*/22, /* 15 7000.0*/20, },
{/* 3 20.000 *//* 0 800.0*/10, /* 1 1213.0*/22, /* 2 1626.0*/21, /* 3 2040.0*/21, /* 4 2453.0*/22, /* 5 2866.0*/19, /* 6 3280.0*/13, /* 7 3693.0*/26, /* 8 4106.0*/35, /* 9 4520.0*/41, /* 10 4933.0*/45, /* 11 5346.0*/52, /* 12 5760.0*/51, /* 13 6173.0*/43, /* 14 6586.0*/40, /* 15 7000.0*/40, },
{/* 4 26.667 *//* 0 800.0*/11, /* 1 1213.0*/17, /* 2 1626.0*/26, /* 3 2040.0*/32, /* 4 2453.0*/35, /* 5 2866.0*/40, /* 6 3280.0*/49, /* 7 3693.0*/45, /* 8 4106.0*/43, /* 9 4520.0*/49, /* 10 4933.0*/46, /* 11 5346.0*/52, /* 12 5760.0*/45, /* 13 6173.0*/50, /* 14 6586.0*/40, /* 15 7000.0*/40, },
{/* 5 33.333 *//* 0 800.0*/7, /* 1 1213.0*/17, /* 2 1626.0*/26, /* 3 2040.0*/39, /* 4 2453.0*/29, /* 5 2866.0*/49, /* 6 3280.0*/49, /* 7 3693.0*/43, /* 8 4106.0*/44, /* 9 4520.0*/45, /* 10 4933.0*/43, /* 11 5346.0*/52, /* 12 5760.0*/48, /* 13 6173.0*/50, /* 14 6586.0*/40, /* 15 7000.0*/40, },
{/* 6 40.000 *//* 0 800.0*/8, /* 1 1213.0*/19, /* 2 1626.0*/35, /* 3 2040.0*/35, /* 4 2453.0*/39, /* 5 2866.0*/40, /* 6 3280.0*/43, /* 7 3693.0*/37, /* 8 4106.0*/42, /* 9 4520.0*/36, /* 10 4933.0*/43, /* 11 5346.0*/44, /* 12 5760.0*/47, /* 13 6173.0*/49, /* 14 6586.0*/40, /* 15 7000.0*/40, },
{/* 7 46.667 *//* 0 800.0*/8, /* 1 1213.0*/26, /* 2 1626.0*/30, /* 3 2040.0*/35, /* 4 2453.0*/41, /* 5 2866.0*/32, /* 6 3280.0*/30, /* 7 3693.0*/39, /* 8 4106.0*/38, /* 9 4520.0*/30, /* 10 4933.0*/41, /* 11 5346.0*/44, /* 12 5760.0*/45, /* 13 6173.0*/49, /* 14 6586.0*/49, /* 15 7000.0*/40, },
{/* 8 53.333 *//* 0 800.0*/7, /* 1 1213.0*/28, /* 2 1626.0*/29, /* 3 2040.0*/32, /* 4 2453.0*/27, /* 5 2866.0*/26, /* 6 3280.0*/43, /* 7 3693.0*/29, /* 8 4106.0*/39, /* 9 4520.0*/39, /* 10 4933.0*/41, /* 11 5346.0*/37, /* 12 5760.0*/42, /* 13 6173.0*/45, /* 14 6586.0*/46, /* 15 7000.0*/40, },
{/* 9 60.000 *//* 0 800.0*/7, /* 1 1213.0*/18, /* 2 1626.0*/23, /* 3 2040.0*/30, /* 4 2453.0*/24, /* 5 2866.0*/23, /* 6 3280.0*/39, /* 7 3693.0*/32, /* 8 4106.0*/29, /* 9 4520.0*/30, /* 10 4933.0*/40, /* 11 5346.0*/37, /* 12 5760.0*/40, /* 13 6173.0*/43, /* 14 6586.0*/40, /* 15 7000.0*/40, },
{/* 10 66.667 *//* 0 800.0*/8, /* 1 1213.0*/17, /* 2 1626.0*/23, /* 3 2040.0*/25, /* 4 2453.0*/23, /* 5 2866.0*/18, /* 6 3280.0*/34, /* 7 3693.0*/30, /* 8 4106.0*/28, /* 9 4520.0*/31, /* 10 4933.0*/38, /* 11 5346.0*/37, /* 12 5760.0*/40, /* 13 6173.0*/42, /* 14 6586.0*/43, /* 15 7000.0*/51, },
{/* 11 73.333 *//* 0 800.0*/15, /* 1 1213.0*/13, /* 2 1626.0*/15, /* 3 2040.0*/23, /* 4 2453.0*/21, /* 5 2866.0*/25, /* 6 3280.0*/29, /* 7 3693.0*/31, /* 8 4106.0*/28, /* 9 4520.0*/31, /* 10 4933.0*/38, /* 11 5346.0*/35, /* 12 5760.0*/40, /* 13 6173.0*/41, /* 14 6586.0*/30, /* 15 7000.0*/40, },
{/* 12 80.000 *//* 0 800.0*/12, /* 1 1213.0*/7, /* 2 1626.0*/16, /* 3 2040.0*/18, /* 4 2453.0*/25, /* 5 2866.0*/25, /* 6 3280.0*/27, /* 7 3693.0*/28, /* 8 4106.0*/24, /* 9 4520.0*/25, /* 10 4933.0*/36, /* 11 5346.0*/32, /* 12 5760.0*/37, /* 13 6173.0*/38, /* 14 6586.0*/37, /* 15 7000.0*/40, },
{/* 13 86.667 *//* 0 800.0*/4, /* 1 1213.0*/-2, /* 2 1626.0*/13, /* 3 2040.0*/7, /* 4 2453.0*/21, /* 5 2866.0*/25, /* 6 3280.0*/27, /* 7 3693.0*/26, /* 8 4106.0*/23, /* 9 4520.0*/23, /* 10 4933.0*/30, /* 11 5346.0*/30, /* 12 5760.0*/36, /* 13 6173.0*/33, /* 14 6586.0*/33, /* 15 7000.0*/33, },
{/* 14 93.333 *//* 0 800.0*/-7, /* 1 1213.0*/-1, /* 2 1626.0*/7, /* 3 2040.0*/11, /* 4 2453.0*/31, /* 5 2866.0*/18, /* 6 3280.0*/23, /* 7 3693.0*/23, /* 8 4106.0*/20, /* 9 4520.0*/25, /* 10 4933.0*/25, /* 11 5346.0*/28, /* 12 5760.0*/30, /* 13 6173.0*/30, /* 14 6586.0*/33, /* 15 7000.0*/33, },
{/* 15 100.000 *//* 0 800.0*/-5, /* 1 1213.0*/-2, /* 2 1626.0*/1, /* 3 2040.0*/4, /* 4 2453.0*/9, /* 5 2866.0*/12, /* 6 3280.0*/17, /* 7 3693.0*/19, /* 8 4106.0*/17, /* 9 4520.0*/17, /* 10 4933.0*/20, /* 11 5346.0*/21, /* 12 5760.0*/24, /* 13 6173.0*/31, /* 14 6586.0*/28, /* 15 7000.0*/33 }
};
#endif
@ -80,24 +65,24 @@ static const ignition_table_t fromODB = {
//{/*15 engineLoad=4.3999950000000005*//*0 800.0*/-4.85, /*1 1213.0*/-12.24, /*2 1626.0*/-24.091, /*3 2040.0*/-25.394, /*4 2453.0*/-25.323, /*5 2866.0*/-25.544, /*6 3280.0*/-29.915, /*7 3693.0*/-33.104, /*8 4106.0*/-36.016, /*9 4520.0*/-37.933, /*10 4933.0*/-36.254, /*11 5346.0*/-29.712, /*12 5760.0*/-28.651, /*13 6173.0*/-28.045, /*14 6586.0*/-27.228, /*15 7000.0*/-27.784}
//};
static const fuel_table_t veDodgeNeon2003Table = {
static const uint8_t veDodgeNeon2003Table[16][16] = {
/* Generated by TS2C on Sat Feb 27 12:27:00 EST 2016*/
{/* 0 20.000 *//* 0 650.0*/50.000, /* 1 800.0*/50.000, /* 2 1050.0*/45.711, /* 3 1300.0*/37.745, /* 4 1550.0*/35.271, /* 5 1800.0*/36.824, /* 6 2050.0*/38.181, /* 7 2300.0*/38.348, /* 8 2550.0*/38.456, /* 9 2800.0*/37.169, /* 10 3050.0*/40.770, /* 11 3300.0*/44.283, /* 12 3550.0*/45.523, /* 13 3800.0*/49.706, /* 14 4050.0*/58.258, /* 15 7000.0*/50.124, },
{/* 1 26.000 *//* 0 650.0*/48.551, /* 1 800.0*/43.180, /* 2 1050.0*/43.855, /* 3 1300.0*/41.292, /* 4 1550.0*/37.709, /* 5 1800.0*/40.769, /* 6 2050.0*/46.820, /* 7 2300.0*/49.151, /* 8 2550.0*/44.705, /* 9 2800.0*/38.873, /* 10 3050.0*/40.612, /* 11 3300.0*/47.016, /* 12 3550.0*/53.681, /* 13 3800.0*/56.231, /* 14 4050.0*/58.261, /* 15 7000.0*/56.832, },
{/* 2 33.000 *//* 0 650.0*/47.201, /* 1 800.0*/43.725, /* 2 1050.0*/43.626, /* 3 1300.0*/42.762, /* 4 1550.0*/46.438, /* 5 1800.0*/49.134, /* 6 2050.0*/50.562, /* 7 2300.0*/52.906, /* 8 2550.0*/50.900, /* 9 2800.0*/47.589, /* 10 3050.0*/50.796, /* 11 3300.0*/56.770, /* 12 3550.0*/63.191, /* 13 3800.0*/63.661, /* 14 4050.0*/62.993, /* 15 7000.0*/62.514, },
{/* 3 40.000 *//* 0 650.0*/50.000, /* 1 800.0*/50.929, /* 2 1050.0*/57.976, /* 3 1300.0*/57.464, /* 4 1550.0*/56.629, /* 5 1800.0*/58.909, /* 6 2050.0*/59.538, /* 7 2300.0*/60.754, /* 8 2550.0*/56.594, /* 9 2800.0*/55.017, /* 10 3050.0*/58.128, /* 11 3300.0*/64.483, /* 12 3550.0*/68.120, /* 13 3800.0*/67.438, /* 14 4050.0*/67.265, /* 15 7000.0*/64.521, },
{/* 4 46.000 *//* 0 650.0*/50.626, /* 1 800.0*/57.269, /* 2 1050.0*/61.330, /* 3 1300.0*/63.462, /* 4 1550.0*/63.386, /* 5 1800.0*/60.610, /* 6 2050.0*/59.559, /* 7 2300.0*/60.810, /* 8 2550.0*/61.005, /* 9 2800.0*/60.509, /* 10 3050.0*/63.020, /* 11 3300.0*/66.838, /* 12 3550.0*/70.760, /* 13 3800.0*/69.104, /* 14 4050.0*/67.212, /* 15 7000.0*/63.882, },
{/* 5 53.000 *//* 0 650.0*/52.141, /* 1 800.0*/63.334, /* 2 1050.0*/68.863, /* 3 1300.0*/65.282, /* 4 1550.0*/67.854, /* 5 1800.0*/66.751, /* 6 2050.0*/64.979, /* 7 2300.0*/65.521, /* 8 2550.0*/64.146, /* 9 2800.0*/65.208, /* 10 3050.0*/65.548, /* 11 3300.0*/68.049, /* 12 3550.0*/71.905, /* 13 3800.0*/70.726, /* 14 4050.0*/71.159, /* 15 7000.0*/62.932, },
{/* 6 60.000 *//* 0 650.0*/50.510, /* 1 800.0*/58.092, /* 2 1050.0*/62.755, /* 3 1300.0*/65.530, /* 4 1550.0*/67.684, /* 5 1800.0*/65.372, /* 6 2050.0*/68.865, /* 7 2300.0*/69.934, /* 8 2550.0*/66.011, /* 9 2800.0*/65.027, /* 10 3050.0*/68.688, /* 11 3300.0*/68.285, /* 12 3550.0*/65.666, /* 13 3800.0*/57.860, /* 14 4050.0*/73.116, /* 15 7000.0*/64.326, },
{/* 7 66.000 *//* 0 650.0*/50.000, /* 1 800.0*/53.137, /* 2 1050.0*/58.515, /* 3 1300.0*/67.194, /* 4 1550.0*/69.333, /* 5 1800.0*/69.506, /* 6 2050.0*/66.414, /* 7 2300.0*/69.887, /* 8 2550.0*/69.344, /* 9 2800.0*/65.808, /* 10 3050.0*/63.449, /* 11 3300.0*/63.330, /* 12 3550.0*/66.391, /* 13 3800.0*/67.937, /* 14 4050.0*/75.347, /* 15 7000.0*/66.520, },
{/* 8 73.000 *//* 0 650.0*/50.000, /* 1 800.0*/52.479, /* 2 1050.0*/59.415, /* 3 1300.0*/69.136, /* 4 1550.0*/71.048, /* 5 1800.0*/69.166, /* 6 2050.0*/68.745, /* 7 2300.0*/69.563, /* 8 2550.0*/70.840, /* 9 2800.0*/65.340, /* 10 3050.0*/64.019, /* 11 3300.0*/65.663, /* 12 3550.0*/72.089, /* 13 3800.0*/71.710, /* 14 4050.0*/71.818, /* 15 7000.0*/63.328, },
{/* 9 80.000 *//* 0 650.0*/50.000, /* 1 800.0*/55.606, /* 2 1050.0*/56.680, /* 3 1300.0*/64.895, /* 4 1550.0*/69.790, /* 5 1800.0*/71.390, /* 6 2050.0*/66.446, /* 7 2300.0*/67.940, /* 8 2550.0*/69.405, /* 9 2800.0*/67.392, /* 10 3050.0*/63.423, /* 11 3300.0*/65.188, /* 12 3550.0*/66.690, /* 13 3800.0*/65.273, /* 14 4050.0*/67.290, /* 15 7000.0*/62.481, },
{/* 10 86.000 *//* 0 650.0*/50.819, /* 1 800.0*/55.782, /* 2 1050.0*/57.472, /* 3 1300.0*/63.877, /* 4 1550.0*/75.693, /* 5 1800.0*/65.295, /* 6 2050.0*/64.606, /* 7 2300.0*/70.612, /* 8 2550.0*/66.363, /* 9 2800.0*/59.857, /* 10 3050.0*/62.272, /* 11 3300.0*/69.232, /* 12 3550.0*/66.103, /* 13 3800.0*/53.707, /* 14 4050.0*/68.954, /* 15 7000.0*/68.211, },
{/* 11 93.000 *//* 0 650.0*/50.893, /* 1 800.0*/60.504, /* 2 1050.0*/58.586, /* 3 1300.0*/60.000, /* 4 1550.0*/59.586, /* 5 1800.0*/61.823, /* 6 2050.0*/68.204, /* 7 2300.0*/62.324, /* 8 2550.0*/61.987, /* 9 2800.0*/61.033, /* 10 3050.0*/61.857, /* 11 3300.0*/63.566, /* 12 3550.0*/68.671, /* 13 3800.0*/64.946, /* 14 4050.0*/76.452, /* 15 7000.0*/72.967, },
{/* 12 100.000 *//* 0 650.0*/50.000, /* 1 800.0*/57.131, /* 2 1050.0*/55.322, /* 3 1300.0*/55.398, /* 4 1550.0*/52.569, /* 5 1800.0*/51.964, /* 6 2050.0*/52.396, /* 7 2300.0*/51.056, /* 8 2550.0*/50.000, /* 9 2800.0*/50.000, /* 10 3050.0*/50.000, /* 11 3300.0*/57.607, /* 12 3550.0*/60.201, /* 13 3800.0*/67.047, /* 14 4050.0*/80.092, /* 15 7000.0*/70.286, },
{/* 13 106.000 *//* 0 650.0*/50.000, /* 1 800.0*/50.000, /* 2 1050.0*/50.000, /* 3 1300.0*/50.000, /* 4 1550.0*/50.000, /* 5 1800.0*/50.000, /* 6 2050.0*/50.000, /* 7 2300.0*/50.000, /* 8 2550.0*/50.000, /* 9 2800.0*/50.000, /* 10 3050.0*/50.000, /* 11 3300.0*/50.000, /* 12 3550.0*/50.000, /* 13 3800.0*/50.515, /* 14 4050.0*/60.917, /* 15 7000.0*/54.902, },
{/* 14 113.000 *//* 0 650.0*/50.000, /* 1 800.0*/50.000, /* 2 1050.0*/50.000, /* 3 1300.0*/50.000, /* 4 1550.0*/50.000, /* 5 1800.0*/50.000, /* 6 2050.0*/50.000, /* 7 2300.0*/50.000, /* 8 2550.0*/50.000, /* 9 2800.0*/50.000, /* 10 3050.0*/50.000, /* 11 3300.0*/50.000, /* 12 3550.0*/50.000, /* 13 3800.0*/50.000, /* 14 4050.0*/50.000, /* 15 7000.0*/50.000, },
{/* 15 120.000 *//* 0 650.0*/50.000, /* 1 800.0*/50.000, /* 2 1050.0*/50.000, /* 3 1300.0*/50.000, /* 4 1550.0*/50.000, /* 5 1800.0*/50.000, /* 6 2050.0*/50.000, /* 7 2300.0*/50.000, /* 8 2550.0*/50.000, /* 9 2800.0*/50.000, /* 10 3050.0*/50.000, /* 11 3300.0*/50.000, /* 12 3550.0*/50.000, /* 13 3800.0*/50.000, /* 14 4050.0*/50.000, /* 15 7000.0*/50.000, },
{/* 0 20.000 *//* 0 650.0*/50, /* 1 800.0*/50, /* 2 1050.0*/45, /* 3 1300.0*/37, /* 4 1550.0*/35, /* 5 1800.0*/36, /* 6 2050.0*/38, /* 7 2300.0*/38, /* 8 2550.0*/38, /* 9 2800.0*/37, /* 10 3050.0*/40, /* 11 3300.0*/44, /* 12 3550.0*/45, /* 13 3800.0*/49, /* 14 4050.0*/58, /* 15 7000.0*/50, },
{/* 1 26.000 *//* 0 650.0*/48, /* 1 800.0*/43, /* 2 1050.0*/43, /* 3 1300.0*/41, /* 4 1550.0*/37, /* 5 1800.0*/40, /* 6 2050.0*/46, /* 7 2300.0*/49, /* 8 2550.0*/44, /* 9 2800.0*/38, /* 10 3050.0*/40, /* 11 3300.0*/47, /* 12 3550.0*/53, /* 13 3800.0*/56, /* 14 4050.0*/58, /* 15 7000.0*/56, },
{/* 2 33.000 *//* 0 650.0*/47, /* 1 800.0*/43, /* 2 1050.0*/43, /* 3 1300.0*/42, /* 4 1550.0*/46, /* 5 1800.0*/49, /* 6 2050.0*/50, /* 7 2300.0*/52, /* 8 2550.0*/50, /* 9 2800.0*/47, /* 10 3050.0*/50, /* 11 3300.0*/56, /* 12 3550.0*/63, /* 13 3800.0*/63, /* 14 4050.0*/62, /* 15 7000.0*/62, },
{/* 3 40.000 *//* 0 650.0*/50, /* 1 800.0*/50, /* 2 1050.0*/57, /* 3 1300.0*/57, /* 4 1550.0*/56, /* 5 1800.0*/58, /* 6 2050.0*/59, /* 7 2300.0*/60, /* 8 2550.0*/56, /* 9 2800.0*/55, /* 10 3050.0*/58, /* 11 3300.0*/64, /* 12 3550.0*/68, /* 13 3800.0*/67, /* 14 4050.0*/67, /* 15 7000.0*/64, },
{/* 4 46.000 *//* 0 650.0*/50, /* 1 800.0*/57, /* 2 1050.0*/61, /* 3 1300.0*/63, /* 4 1550.0*/63, /* 5 1800.0*/60, /* 6 2050.0*/59, /* 7 2300.0*/60, /* 8 2550.0*/61, /* 9 2800.0*/60, /* 10 3050.0*/63, /* 11 3300.0*/66, /* 12 3550.0*/70, /* 13 3800.0*/69, /* 14 4050.0*/67, /* 15 7000.0*/63, },
{/* 5 53.000 *//* 0 650.0*/52, /* 1 800.0*/63, /* 2 1050.0*/68, /* 3 1300.0*/65, /* 4 1550.0*/67, /* 5 1800.0*/66, /* 6 2050.0*/64, /* 7 2300.0*/65, /* 8 2550.0*/64, /* 9 2800.0*/65, /* 10 3050.0*/65, /* 11 3300.0*/68, /* 12 3550.0*/71, /* 13 3800.0*/70, /* 14 4050.0*/71, /* 15 7000.0*/62, },
{/* 6 60.000 *//* 0 650.0*/50, /* 1 800.0*/58, /* 2 1050.0*/62, /* 3 1300.0*/65, /* 4 1550.0*/67, /* 5 1800.0*/65, /* 6 2050.0*/68, /* 7 2300.0*/69, /* 8 2550.0*/66, /* 9 2800.0*/65, /* 10 3050.0*/68, /* 11 3300.0*/68, /* 12 3550.0*/65, /* 13 3800.0*/57, /* 14 4050.0*/73, /* 15 7000.0*/64, },
{/* 7 66.000 *//* 0 650.0*/50, /* 1 800.0*/53, /* 2 1050.0*/58, /* 3 1300.0*/67, /* 4 1550.0*/69, /* 5 1800.0*/69, /* 6 2050.0*/66, /* 7 2300.0*/69, /* 8 2550.0*/69, /* 9 2800.0*/65, /* 10 3050.0*/63, /* 11 3300.0*/63, /* 12 3550.0*/66, /* 13 3800.0*/67, /* 14 4050.0*/75, /* 15 7000.0*/66, },
{/* 8 73.000 *//* 0 650.0*/50, /* 1 800.0*/52, /* 2 1050.0*/59, /* 3 1300.0*/69, /* 4 1550.0*/71, /* 5 1800.0*/69, /* 6 2050.0*/68, /* 7 2300.0*/69, /* 8 2550.0*/70, /* 9 2800.0*/65, /* 10 3050.0*/64, /* 11 3300.0*/65, /* 12 3550.0*/72, /* 13 3800.0*/71, /* 14 4050.0*/71, /* 15 7000.0*/63, },
{/* 9 80.000 *//* 0 650.0*/50, /* 1 800.0*/55, /* 2 1050.0*/56, /* 3 1300.0*/64, /* 4 1550.0*/69, /* 5 1800.0*/71, /* 6 2050.0*/66, /* 7 2300.0*/67, /* 8 2550.0*/69, /* 9 2800.0*/67, /* 10 3050.0*/63, /* 11 3300.0*/65, /* 12 3550.0*/66, /* 13 3800.0*/65, /* 14 4050.0*/67, /* 15 7000.0*/62, },
{/* 10 86.000 *//* 0 650.0*/50, /* 1 800.0*/55, /* 2 1050.0*/57, /* 3 1300.0*/63, /* 4 1550.0*/75, /* 5 1800.0*/65, /* 6 2050.0*/64, /* 7 2300.0*/70, /* 8 2550.0*/66, /* 9 2800.0*/59, /* 10 3050.0*/62, /* 11 3300.0*/69, /* 12 3550.0*/66, /* 13 3800.0*/53, /* 14 4050.0*/68, /* 15 7000.0*/68, },
{/* 11 93.000 *//* 0 650.0*/50, /* 1 800.0*/60, /* 2 1050.0*/58, /* 3 1300.0*/60, /* 4 1550.0*/59, /* 5 1800.0*/61, /* 6 2050.0*/68, /* 7 2300.0*/62, /* 8 2550.0*/61, /* 9 2800.0*/61, /* 10 3050.0*/61, /* 11 3300.0*/63, /* 12 3550.0*/68, /* 13 3800.0*/64, /* 14 4050.0*/76, /* 15 7000.0*/72, },
{/* 12 100.000 *//* 0 650.0*/50, /* 1 800.0*/57, /* 2 1050.0*/55, /* 3 1300.0*/55, /* 4 1550.0*/52, /* 5 1800.0*/51, /* 6 2050.0*/52, /* 7 2300.0*/51, /* 8 2550.0*/50, /* 9 2800.0*/50, /* 10 3050.0*/50, /* 11 3300.0*/57, /* 12 3550.0*/60, /* 13 3800.0*/67, /* 14 4050.0*/80, /* 15 7000.0*/70, },
{/* 13 106.000 *//* 0 650.0*/50, /* 1 800.0*/50, /* 2 1050.0*/50, /* 3 1300.0*/50, /* 4 1550.0*/50, /* 5 1800.0*/50, /* 6 2050.0*/50, /* 7 2300.0*/50, /* 8 2550.0*/50, /* 9 2800.0*/50, /* 10 3050.0*/50, /* 11 3300.0*/50, /* 12 3550.0*/50, /* 13 3800.0*/50, /* 14 4050.0*/60, /* 15 7000.0*/54, },
{/* 14 113.000 *//* 0 650.0*/50, /* 1 800.0*/50, /* 2 1050.0*/50, /* 3 1300.0*/50, /* 4 1550.0*/50, /* 5 1800.0*/50, /* 6 2050.0*/50, /* 7 2300.0*/50, /* 8 2550.0*/50, /* 9 2800.0*/50, /* 10 3050.0*/50, /* 11 3300.0*/50, /* 12 3550.0*/50, /* 13 3800.0*/50, /* 14 4050.0*/50, /* 15 7000.0*/50, },
{/* 15 120.000 *//* 0 650.0*/50, /* 1 800.0*/50, /* 2 1050.0*/50, /* 3 1300.0*/50, /* 4 1550.0*/50, /* 5 1800.0*/50, /* 6 2050.0*/50, /* 7 2300.0*/50, /* 8 2550.0*/50, /* 9 2800.0*/50, /* 10 3050.0*/50, /* 11 3300.0*/50, /* 12 3550.0*/50, /* 13 3800.0*/50, /* 14 4050.0*/50, /* 15 7000.0*/50, },
};
@ -231,12 +216,10 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
*/
//setWholeTimingTable_d(12 PASS_CONFIG_PARAMETER_SUFFIX);
#if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT
MEMCPY(config->ignitionTable, fromODB);
copyTable(config->ignitionTable, fromODB);
#endif
copy2DTable<FSIO_TABLE_8, FSIO_TABLE_8, float, float>(vBattTarget, config->fsioTable1);
MEMCPY(config->veTable, veDodgeNeon2003Table);
copyTable(config->veTable, veDodgeNeon2003Table);
//setMap(config->veTable, 50);
// set cranking_charge_angle 70
@ -386,15 +369,6 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->auxPid[0].iFactor = 0.1;
engineConfiguration->auxPid[0].dFactor = 0.1;
#if EFI_FSIO
// /**
// * set_fsio_setting 1 0.55
// */
// engineConfiguration->fsio_setting[0] = 0.55;
// setFsioExt(0, GPIOE_5, "0 fsio_setting", 400 PASS_CONFIG_PARAMETER_SUFFIX);
#endif
engineConfiguration->vehicleSpeedSensorInputPin = GPIOA_8;
engineConfiguration->fanOnTemperature = 92;

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

@ -19,24 +19,24 @@
#include "engine_configuration.h"
#if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT
static const ignition_table_t default_aspire_timing_table = {
static const int8_t default_aspire_timing_table[16][16] = {
/* RPM 800.000000 1213.333374 1626.666748 2040.000000 2453.333496 2866.666748 3280.000000 3693.333496 4106.666992 4520.000000 4933.333496 5346.666992 5760.000000 6173.333496 6586.666992 7000.000000*/
/* Load 1.200000 */{ -0.662000, +7.730000, +16.722000, +23.139999, +29.398001, +31.268000, +32.108002, +30.436001, +30.896000, +26.656000, +24.704000, +25.108000, +25.132000, +25.459999, +25.459999, +25.459999},
/* Load 1.413333 */{ -0.546000, +7.662000, +16.882000, +23.482000, +29.520000, +31.323999, +32.108002, +30.656000, +30.468000, +26.879999, +24.746000, +24.742001, +29.032000, +25.562000, +25.562000, +25.562000},
/* Load 1.626667 */{ -0.584000, +7.870000, +16.714001, +23.025999, +29.542000, +31.166000, +32.175999, +30.540001, +30.268000, +26.416000, +24.134001, +25.007999, +24.698000, +26.167999, +26.167999, +26.167999},
/* Load 1.840000 */{ -0.584000, +7.658000, +16.714001, +23.254000, +29.351999, +30.978001, +32.141998, +30.874001, +30.896000, +26.507999, +24.558001, +24.389999, +25.761999, +35.492001, +35.492001, +35.492001},
/* Load 2.053333 */{ -0.584000, +7.862000, +16.538000, +23.254000, +29.232000, +31.296000, +32.520000, +30.142000, +30.388000, +25.903999, +24.370001, +24.082001, +24.792000, +24.351999, +24.351999, +24.351999},
/* Load 2.266667 */{ +1.364000, +7.726000, +16.806000, +23.254000, +29.639999, +31.006001, +32.298000, +30.912001, +29.882000, +26.392000, +24.664000, +27.233999, +25.374001, +25.417999, +25.417999, +25.417999},
/* Load 2.480000 */{ -1.364000, +10.490000, +16.705999, +22.441999, +28.101999, +30.238001, +32.363998, +30.719999, +30.896000, +26.608000, +24.664000, +24.431999, +24.500000, +25.510000, +25.510000, +25.510000},
/* Load 2.693333 */{ -9.864000, +10.416000, +11.680000, +19.150000, +25.754000, +27.936001, +32.554001, +30.656000, +30.153999, +27.184000, +25.252001, +22.812000, +24.452000, +25.219999, +25.219999, +25.219999},
/* Load 2.906667 */{ -9.866000, -5.452000, -2.854000, +17.212000, +17.552000, +20.688000, +25.660000, +27.809999, +27.691999, +27.224001, +25.882000, +25.360001, +26.100000, +27.992001, +27.992001, +27.992001},
/* Load 3.120000 */{ -9.864000, -5.452000, -2.854000, +0.342000, +12.526000, +16.218000, +21.364000, +27.590000, +25.780001, +24.170000, +24.664000, +25.584000, +26.490000, +31.968000, +31.968000, +31.968000},
/* Load 3.333333 */{ -9.864000, -5.516000, -2.854000, +0.226000, +2.738000, +3.816000, +11.924000, +18.808001, +21.038000, +21.538000, +21.209999, +22.228001, +25.046000, +25.156000, +25.156000, +25.156000},
/* Load 3.546667 */{ -9.866000, -5.518000, -2.854000, -0.000000, +3.022000, +3.816000, +6.428000, +7.788000, +19.426001, +20.860001, +19.966000, +21.030001, +21.396000, +21.570000, +21.570000, +21.570000},
/* Load 3.760000 */{ -9.864000, -5.516000, -2.772000, +0.226000, +2.732000, +3.500000, +6.798000, +8.102000, +8.660000, +9.500000, +11.788000, +20.132000, +20.072001, +20.510000, +20.510000, +20.510000},
/* Load 3.973333 */{ -9.864000, -5.518000, -2.854000, -0.000000, +2.880000, +3.816000, +6.420000, +8.320000, +8.426000, +8.532000, +11.470000, +11.442000, +13.610000, +12.022000, +12.022000, +12.022000},
/* Load 4.186667 */{ -9.750000, -5.518000, -2.604000, -0.000000, +2.880000, +3.654000, +6.050000, +6.888000, +8.372000, +9.364000, +11.764000, +11.732000, +11.864000, +12.376000, +12.376000, +12.376000},
/* Load 4.400000 */{ -0.350000, -5.590000, -0.502000, -0.910000, -0.864000, -0.954000, -1.324000, +7.436000, -1.170000, -1.054000, -2.058000, -2.098000, -2.636000, +12.352000, +12.352000, +12.352000}
/* Load 1.200000 */{ -0, +7, +16, +23, +29, +31, +32, +30, +30, +26, +24, +25, +25, +25, +25, +25},
/* Load 1.413333 */{ -0, +7, +16, +23, +29, +31, +32, +30, +30, +26, +24, +24, +29, +25, +25, +25},
/* Load 1.626667 */{ -0, +7, +16, +23, +29, +31, +32, +30, +30, +26, +24, +25, +24, +26, +26, +26},
/* Load 1.840000 */{ -0, +7, +16, +23, +29, +30, +32, +30, +30, +26, +24, +24, +25, +35, +35, +35},
/* Load 2.053333 */{ -0, +7, +16, +23, +29, +31, +32, +30, +30, +25, +24, +24, +24, +24, +24, +24},
/* Load 2.266667 */{ +1, +7, +16, +23, +29, +31, +32, +30, +29, +26, +24, +27, +25, +25, +25, +25},
/* Load 2.480000 */{ -1, +10, +16, +22, +28, +30, +32, +30, +30, +26, +24, +24, +24, +25, +25, +25},
/* Load 2.693333 */{ -9, +10, +11, +19, +25, +27, +32, +30, +30, +27, +25, +22, +24, +25, +25, +25},
/* Load 2.906667 */{ -9, -5, -2, +17, +17, +20, +25, +27, +27, +27, +25, +25, +26, +27, +27, +27},
/* Load 3.120000 */{ -9, -5, -2, +0, +12, +16, +21, +27, +25, +24, +24, +25, +26, +31, +31, +31},
/* Load 3.333333 */{ -9, -5, -2, +0, +2, +3, +11, +18, +21, +21, +21, +22, +25, +25, +25, +25},
/* Load 3.546667 */{ -9, -5, -2, -0, +3, +3, +6, +7, +19, +20, +19, +21, +21, +21, +21, +21},
/* Load 3.760000 */{ -9, -5, -2, +0, +2, +3, +6, +8, +8, +9, +11, +20, +20, +20, +20, +20},
/* Load 3.973333 */{ -9, -5, -2, -0, +2, +3, +6, +8, +8, +8, +11, +11, +13, +12, +12, +12},
/* Load 4.186667 */{ -9, -5, -2, -0, +2, +3, +6, +6, +8, +9, +11, +11, +11, +12, +12, +12},
/* Load 4.400000 */{ -0, -5, -0, -0, -0, -0, -1, +7, -1, -1, -2, -2, -2, +12, +12, +12}
};
#endif
@ -47,7 +47,7 @@ static void setDefaultAspireMaps(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setTimingRpmBin(800, 7000 PASS_CONFIG_PARAMETER_SUFFIX);
#if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT
MEMCPY(config->ignitionTable, default_aspire_timing_table);
copyTable(config->ignitionTable, default_aspire_timing_table);
#endif
}

72
firmware/config/engines/ford_festiva.cpp
View File

@ -21,45 +21,45 @@
#include "custom_engine.h"
#if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT
static const ignition_table_t racingFestivaIgnitionTable = {
static const uint8_t racingFestivaIgnitionTable[16][16] = {
/* Generated by TS2C on Mon Feb 08 13:59:57 EST 2016*/
{/* 0 10.000 *//* 0 800.0*/13.000, /* 1 1213.3281*/12.900, /* 2 1626.6562*/10.500, /* 3 2040.0*/10.500, /* 4 2453.3438*/10.500, /* 5 2866.6562*/10.500, /* 6 3280.0*/11.500, /* 7 3693.3438*/11.500, /* 8 4106.6875*/11.500, /* 9 4520.0*/12.000, /* 10 4933.3125*/12.000, /* 11 5346.6875*/12.000, /* 12 5760.0*/12.000, /* 13 6173.3125*/12.000, /* 14 6586.6875*/12.000, /* 15 7000.0*/12.000, },
{/* 1 16.000 *//* 0 800.0*/13.000, /* 1 1213.3281*/12.900, /* 2 1626.6562*/10.500, /* 3 2040.0*/10.500, /* 4 2453.3438*/10.500, /* 5 2866.6562*/10.500, /* 6 3280.0*/11.500, /* 7 3693.3438*/11.500, /* 8 4106.6875*/11.500, /* 9 4520.0*/12.000, /* 10 4933.3125*/12.000, /* 11 5346.6875*/12.000, /* 12 5760.0*/12.000, /* 13 6173.3125*/12.000, /* 14 6586.6875*/12.000, /* 15 7000.0*/12.000, },
{/* 2 22.000 *//* 0 800.0*/14.600, /* 1 1213.3281*/14.000, /* 2 1626.6562*/14.900, /* 3 2040.0*/12.400, /* 4 2453.3438*/12.300, /* 5 2866.6562*/12.300, /* 6 3280.0*/12.200, /* 7 3693.3438*/12.200, /* 8 4106.6875*/12.100, /* 9 4520.0*/12.000, /* 10 4933.3125*/12.000, /* 11 5346.6875*/12.000, /* 12 5760.0*/12.000, /* 13 6173.3125*/12.000, /* 14 6586.6875*/12.000, /* 15 7000.0*/12.000, },
{/* 3 28.000 *//* 0 800.0*/14.600, /* 1 1213.3281*/14.000, /* 2 1626.6562*/14.900, /* 3 2040.0*/12.400, /* 4 2453.3438*/12.300, /* 5 2866.6562*/12.300, /* 6 3280.0*/12.200, /* 7 3693.3438*/12.200, /* 8 4106.6875*/12.100, /* 9 4520.0*/12.000, /* 10 4933.3125*/12.000, /* 11 5346.6875*/12.000, /* 12 5760.0*/12.000, /* 13 6173.3125*/12.000, /* 14 6586.6875*/12.000, /* 15 7000.0*/12.000, },
{/* 4 31.000 *//* 0 800.0*/15.200, /* 1 1213.3281*/15.400, /* 2 1626.6562*/15.400, /* 3 2040.0*/15.400, /* 4 2453.3438*/15.400, /* 5 2866.6562*/16.800, /* 6 3280.0*/16.800, /* 7 3693.3438*/23.000, /* 8 4106.6875*/23.000, /* 9 4520.0*/26.000, /* 10 4933.3125*/26.000, /* 11 5346.6875*/26.000, /* 12 5760.0*/26.000, /* 13 6173.3125*/26.000, /* 14 6586.6875*/26.000, /* 15 7000.0*/26.000, },
{/* 5 35.000 *//* 0 800.0*/15.200, /* 1 1213.3281*/15.400, /* 2 1626.6562*/15.400, /* 3 2040.0*/15.400, /* 4 2453.3438*/15.400, /* 5 2866.6562*/16.800, /* 6 3280.0*/16.800, /* 7 3693.3438*/23.000, /* 8 4106.6875*/23.000, /* 9 4520.0*/26.000, /* 10 4933.3125*/26.000, /* 11 5346.6875*/26.000, /* 12 5760.0*/26.000, /* 13 6173.3125*/26.000, /* 14 6586.6875*/26.000, /* 15 7000.0*/26.000, },
{/* 6 38.000 *//* 0 800.0*/16.700, /* 1 1213.3281*/16.700, /* 2 1626.6562*/17.000, /* 3 2040.0*/19.000, /* 4 2453.3438*/19.000, /* 5 2866.6562*/21.500, /* 6 3280.0*/21.500, /* 7 3693.3438*/25.800, /* 8 4106.6875*/25.800, /* 9 4520.0*/26.000, /* 10 4933.3125*/26.000, /* 11 5346.6875*/26.000, /* 12 5760.0*/26.000, /* 13 6173.3125*/26.000, /* 14 6586.6875*/26.000, /* 15 7000.0*/26.000, },
{/* 7 41.000 *//* 0 800.0*/16.700, /* 1 1213.3281*/16.700, /* 2 1626.6562*/17.000, /* 3 2040.0*/19.000, /* 4 2453.3438*/19.000, /* 5 2866.6562*/21.500, /* 6 3280.0*/21.500, /* 7 3693.3438*/25.800, /* 8 4106.6875*/25.800, /* 9 4520.0*/26.000, /* 10 4933.3125*/26.000, /* 11 5346.6875*/26.000, /* 12 5760.0*/26.000, /* 13 6173.3125*/26.000, /* 14 6586.6875*/26.000, /* 15 7000.0*/26.000, },
{/* 8 48.000 *//* 0 800.0*/16.900, /* 1 1213.3281*/17.000, /* 2 1626.6562*/17.000, /* 3 2040.0*/19.700, /* 4 2453.3438*/19.700, /* 5 2866.6562*/22.200, /* 6 3280.0*/22.500, /* 7 3693.3438*/22.500, /* 8 4106.6875*/30.000, /* 9 4520.0*/30.000, /* 10 4933.3125*/30.000, /* 11 5346.6875*/30.000, /* 12 5760.0*/30.000, /* 13 6173.3125*/30.000, /* 14 6586.6875*/30.000, /* 15 7000.0*/30.000, },
{/* 9 52.000 *//* 0 800.0*/17.000, /* 1 1213.3281*/17.100, /* 2 1626.6562*/17.000, /* 3 2040.0*/20.100, /* 4 2453.3438*/20.100, /* 5 2866.6562*/22.600, /* 6 3280.0*/23.000, /* 7 3693.3438*/23.000, /* 8 4106.6875*/30.000, /* 9 4520.0*/30.000, /* 10 4933.3125*/30.000, /* 11 5346.6875*/30.000, /* 12 5760.0*/30.000, /* 13 6173.3125*/30.000, /* 14 6586.6875*/30.000, /* 15 7000.0*/30.000, },
{/* 10 59.000 *//* 0 800.0*/17.200, /* 1 1213.3281*/17.400, /* 2 1626.6562*/17.000, /* 3 2040.0*/21.000, /* 4 2453.3438*/21.000, /* 5 2866.6562*/23.400, /* 6 3280.0*/23.900, /* 7 3693.3438*/23.900, /* 8 4106.6875*/30.000, /* 9 4520.0*/30.000, /* 10 4933.3125*/30.000, /* 11 5346.6875*/30.000, /* 12 5760.0*/30.000, /* 13 6173.3125*/30.000, /* 14 6586.6875*/30.000, /* 15 7000.0*/30.000, },
{/* 11 65.000 *//* 0 800.0*/16.200, /* 1 1213.3281*/16.400, /* 2 1626.6562*/16.400, /* 3 2040.0*/21.000, /* 4 2453.3438*/21.000, /* 5 2866.6562*/23.800, /* 6 3280.0*/24.000, /* 7 3693.3438*/24.000, /* 8 4106.6875*/30.000, /* 9 4520.0*/30.000, /* 10 4933.3125*/30.000, /* 11 5346.6875*/30.000, /* 12 5760.0*/30.000, /* 13 6173.3125*/30.000, /* 14 6586.6875*/30.000, /* 15 7000.0*/30.000, },
{/* 12 74.000 *//* 0 800.0*/15.300, /* 1 1213.3281*/15.900, /* 2 1626.6562*/15.900, /* 3 2040.0*/19.500, /* 4 2453.3438*/19.100, /* 5 2866.6562*/23.100, /* 6 3280.0*/23.900, /* 7 3693.3438*/23.900, /* 8 4106.6875*/29.200, /* 9 4520.0*/28.600, /* 10 4933.3125*/30.000, /* 11 5346.6875*/30.000, /* 12 5760.0*/30.000, /* 13 6173.3125*/30.000, /* 14 6586.6875*/30.000, /* 15 7000.0*/30.000, },
{/* 13 85.000 *//* 0 800.0*/20.000, /* 1 1213.3281*/15.900, /* 2 1626.6562*/15.900, /* 3 2040.0*/19.500, /* 4 2453.3438*/19.500, /* 5 2866.6562*/24.800, /* 6 3280.0*/26.000, /* 7 3693.3438*/26.000, /* 8 4106.6875*/26.900, /* 9 4520.0*/27.500, /* 10 4933.3125*/27.600, /* 11 5346.6875*/28.100, /* 12 5760.0*/28.000, /* 13 6173.3125*/28.700, /* 14 6586.6875*/28.500, /* 15 7000.0*/30.000, },
{/* 14 94.000 *//* 0 800.0*/20.000, /* 1 1213.3281*/16.000, /* 2 1626.6562*/16.000, /* 3 2040.0*/19.500, /* 4 2453.3438*/19.700, /* 5 2866.6562*/25.000, /* 6 3280.0*/26.200, /* 7 3693.3438*/26.200, /* 8 4106.6875*/26.900, /* 9 4520.0*/27.500, /* 10 4933.3125*/27.600, /* 11 5346.6875*/28.100, /* 12 5760.0*/28.000, /* 13 6173.3125*/28.700, /* 14 6586.6875*/28.900, /* 15 7000.0*/30.200, },
{/* 15 101.000 *//* 0 800.0*/20.000, /* 1 1213.3281*/16.200, /* 2 1626.6562*/16.200, /* 3 2040.0*/19.500, /* 4 2453.3438*/19.500, /* 5 2866.6562*/23.100, /* 6 3280.0*/24.000, /* 7 3693.3438*/24.000, /* 8 4106.6875*/26.900, /* 9 4520.0*/27.500, /* 10 4933.3125*/27.600, /* 11 5346.6875*/28.100, /* 12 5760.0*/28.000, /* 13 6173.3125*/30.000, /* 14 6586.6875*/30.900, /* 15 7000.0*/30.200, },
{/* 0 10.000 *//* 0 800.0*/13, /* 1 1213.3281*/12, /* 2 1626.6562*/10, /* 3 2040.0*/10, /* 4 2453.3438*/10, /* 5 2866.6562*/10, /* 6 3280.0*/11, /* 7 3693.3438*/11, /* 8 4106.6875*/11, /* 9 4520.0*/12, /* 10 4933.3125*/12, /* 11 5346.6875*/12, /* 12 5760.0*/12, /* 13 6173.3125*/12, /* 14 6586.6875*/12, /* 15 7000.0*/12, },
{/* 1 16.000 *//* 0 800.0*/13, /* 1 1213.3281*/12, /* 2 1626.6562*/10, /* 3 2040.0*/10, /* 4 2453.3438*/10, /* 5 2866.6562*/10, /* 6 3280.0*/11, /* 7 3693.3438*/11, /* 8 4106.6875*/11, /* 9 4520.0*/12, /* 10 4933.3125*/12, /* 11 5346.6875*/12, /* 12 5760.0*/12, /* 13 6173.3125*/12, /* 14 6586.6875*/12, /* 15 7000.0*/12, },
{/* 2 22.000 *//* 0 800.0*/14, /* 1 1213.3281*/14, /* 2 1626.6562*/14, /* 3 2040.0*/12, /* 4 2453.3438*/12, /* 5 2866.6562*/12, /* 6 3280.0*/12, /* 7 3693.3438*/12, /* 8 4106.6875*/12, /* 9 4520.0*/12, /* 10 4933.3125*/12, /* 11 5346.6875*/12, /* 12 5760.0*/12, /* 13 6173.3125*/12, /* 14 6586.6875*/12, /* 15 7000.0*/12, },
{/* 3 28.000 *//* 0 800.0*/14, /* 1 1213.3281*/14, /* 2 1626.6562*/14, /* 3 2040.0*/12, /* 4 2453.3438*/12, /* 5 2866.6562*/12, /* 6 3280.0*/12, /* 7 3693.3438*/12, /* 8 4106.6875*/12, /* 9 4520.0*/12, /* 10 4933.3125*/12, /* 11 5346.6875*/12, /* 12 5760.0*/12, /* 13 6173.3125*/12, /* 14 6586.6875*/12, /* 15 7000.0*/12, },
{/* 4 31.000 *//* 0 800.0*/15, /* 1 1213.3281*/15, /* 2 1626.6562*/15, /* 3 2040.0*/15, /* 4 2453.3438*/15, /* 5 2866.6562*/16, /* 6 3280.0*/16, /* 7 3693.3438*/23, /* 8 4106.6875*/23, /* 9 4520.0*/26, /* 10 4933.3125*/26, /* 11 5346.6875*/26, /* 12 5760.0*/26, /* 13 6173.3125*/26, /* 14 6586.6875*/26, /* 15 7000.0*/26, },
{/* 5 35.000 *//* 0 800.0*/15, /* 1 1213.3281*/15, /* 2 1626.6562*/15, /* 3 2040.0*/15, /* 4 2453.3438*/15, /* 5 2866.6562*/16, /* 6 3280.0*/16, /* 7 3693.3438*/23, /* 8 4106.6875*/23, /* 9 4520.0*/26, /* 10 4933.3125*/26, /* 11 5346.6875*/26, /* 12 5760.0*/26, /* 13 6173.3125*/26, /* 14 6586.6875*/26, /* 15 7000.0*/26, },
{/* 6 38.000 *//* 0 800.0*/16, /* 1 1213.3281*/16, /* 2 1626.6562*/17, /* 3 2040.0*/19, /* 4 2453.3438*/19, /* 5 2866.6562*/21, /* 6 3280.0*/21, /* 7 3693.3438*/25, /* 8 4106.6875*/25, /* 9 4520.0*/26, /* 10 4933.3125*/26, /* 11 5346.6875*/26, /* 12 5760.0*/26, /* 13 6173.3125*/26, /* 14 6586.6875*/26, /* 15 7000.0*/26, },
{/* 7 41.000 *//* 0 800.0*/16, /* 1 1213.3281*/16, /* 2 1626.6562*/17, /* 3 2040.0*/19, /* 4 2453.3438*/19, /* 5 2866.6562*/21, /* 6 3280.0*/21, /* 7 3693.3438*/25, /* 8 4106.6875*/25, /* 9 4520.0*/26, /* 10 4933.3125*/26, /* 11 5346.6875*/26, /* 12 5760.0*/26, /* 13 6173.3125*/26, /* 14 6586.6875*/26, /* 15 7000.0*/26, },
{/* 8 48.000 *//* 0 800.0*/16, /* 1 1213.3281*/17, /* 2 1626.6562*/17, /* 3 2040.0*/19, /* 4 2453.3438*/19, /* 5 2866.6562*/22, /* 6 3280.0*/22, /* 7 3693.3438*/22, /* 8 4106.6875*/30, /* 9 4520.0*/30, /* 10 4933.3125*/30, /* 11 5346.6875*/30, /* 12 5760.0*/30, /* 13 6173.3125*/30, /* 14 6586.6875*/30, /* 15 7000.0*/30, },
{/* 9 52.000 *//* 0 800.0*/17, /* 1 1213.3281*/17, /* 2 1626.6562*/17, /* 3 2040.0*/20, /* 4 2453.3438*/20, /* 5 2866.6562*/22, /* 6 3280.0*/23, /* 7 3693.3438*/23, /* 8 4106.6875*/30, /* 9 4520.0*/30, /* 10 4933.3125*/30, /* 11 5346.6875*/30, /* 12 5760.0*/30, /* 13 6173.3125*/30, /* 14 6586.6875*/30, /* 15 7000.0*/30, },
{/* 10 59.000 *//* 0 800.0*/17, /* 1 1213.3281*/17, /* 2 1626.6562*/17, /* 3 2040.0*/21, /* 4 2453.3438*/21, /* 5 2866.6562*/23, /* 6 3280.0*/23, /* 7 3693.3438*/23, /* 8 4106.6875*/30, /* 9 4520.0*/30, /* 10 4933.3125*/30, /* 11 5346.6875*/30, /* 12 5760.0*/30, /* 13 6173.3125*/30, /* 14 6586.6875*/30, /* 15 7000.0*/30, },
{/* 11 65.000 *//* 0 800.0*/16, /* 1 1213.3281*/16, /* 2 1626.6562*/16, /* 3 2040.0*/21, /* 4 2453.3438*/21, /* 5 2866.6562*/23, /* 6 3280.0*/24, /* 7 3693.3438*/24, /* 8 4106.6875*/30, /* 9 4520.0*/30, /* 10 4933.3125*/30, /* 11 5346.6875*/30, /* 12 5760.0*/30, /* 13 6173.3125*/30, /* 14 6586.6875*/30, /* 15 7000.0*/30, },
{/* 12 74.000 *//* 0 800.0*/15, /* 1 1213.3281*/15, /* 2 1626.6562*/15, /* 3 2040.0*/19, /* 4 2453.3438*/19, /* 5 2866.6562*/23, /* 6 3280.0*/23, /* 7 3693.3438*/23, /* 8 4106.6875*/29, /* 9 4520.0*/28, /* 10 4933.3125*/30, /* 11 5346.6875*/30, /* 12 5760.0*/30, /* 13 6173.3125*/30, /* 14 6586.6875*/30, /* 15 7000.0*/30, },
{/* 13 85.000 *//* 0 800.0*/20, /* 1 1213.3281*/15, /* 2 1626.6562*/15, /* 3 2040.0*/19, /* 4 2453.3438*/19, /* 5 2866.6562*/24, /* 6 3280.0*/26, /* 7 3693.3438*/26, /* 8 4106.6875*/26, /* 9 4520.0*/27, /* 10 4933.3125*/27, /* 11 5346.6875*/28, /* 12 5760.0*/28, /* 13 6173.3125*/28, /* 14 6586.6875*/28, /* 15 7000.0*/30, },
{/* 14 94.000 *//* 0 800.0*/20, /* 1 1213.3281*/16, /* 2 1626.6562*/16, /* 3 2040.0*/19, /* 4 2453.3438*/19, /* 5 2866.6562*/25, /* 6 3280.0*/26, /* 7 3693.3438*/26, /* 8 4106.6875*/26, /* 9 4520.0*/27, /* 10 4933.3125*/27, /* 11 5346.6875*/28, /* 12 5760.0*/28, /* 13 6173.3125*/28, /* 14 6586.6875*/28, /* 15 7000.0*/30, },
{/* 15 101.000 *//* 0 800.0*/20, /* 1 1213.3281*/16, /* 2 1626.6562*/16, /* 3 2040.0*/19, /* 4 2453.3438*/19, /* 5 2866.6562*/23, /* 6 3280.0*/24, /* 7 3693.3438*/24, /* 8 4106.6875*/26, /* 9 4520.0*/27, /* 10 4933.3125*/27, /* 11 5346.6875*/28, /* 12 5760.0*/28, /* 13 6173.3125*/30, /* 14 6586.6875*/30, /* 15 7000.0*/30, },
};
#endif
static const fuel_table_t racingFestivaVeTable = {
static const uint8_t racingFestivaVeTable[16][16] = {
/* Generated by TS2C on Mon Feb 08 13:58:49 EST 2016*/
{/* 0 10.000 *//* 0 800.0*/110.000, /* 1 1200.0*/105.384, /* 2 1600.0*/94.188, /* 3 2000.0*/104.591, /* 4 2400.0*/108.557, /* 5 2800.0*/102.816, /* 6 3200.0*/104.492, /* 7 3600.0*/106.760, /* 8 4100.0*/130.328, /* 9 4500.0*/130.600, /* 10 4900.0*/110.748, /* 11 5300.0*/110.622, /* 12 5700.0*/110.000, /* 13 6100.0*/110.000, /* 14 6500.0*/110.000, /* 15 7000.0*/110.000, },
{/* 1 20.000 *//* 0 800.0*/92.912, /* 1 1200.0*/88.219, /* 2 1600.0*/87.050, /* 3 2000.0*/94.294, /* 4 2400.0*/100.350, /* 5 2800.0*/101.178, /* 6 3200.0*/99.942, /* 7 3600.0*/108.697, /* 8 4100.0*/110.794, /* 9 4500.0*/107.359, /* 10 4900.0*/107.412, /* 11 5300.0*/110.000, /* 12 5700.0*/110.000, /* 13 6100.0*/110.000, /* 14 6500.0*/110.000, /* 15 7000.0*/110.000, },
{/* 2 30.000 *//* 0 800.0*/93.691, /* 1 1200.0*/90.029, /* 2 1600.0*/94.296, /* 3 2000.0*/98.011, /* 4 2400.0*/104.727, /* 5 2800.0*/111.653, /* 6 3200.0*/113.626, /* 7 3600.0*/117.779, /* 8 4100.0*/119.690, /* 9 4500.0*/118.623, /* 10 4900.0*/114.264, /* 11 5300.0*/115.000, /* 12 5700.0*/115.000, /* 13 6100.0*/115.000, /* 14 6500.0*/115.000, /* 15 7000.0*/115.000, },
{/* 3 40.000 *//* 0 800.0*/99.005, /* 1 1200.0*/100.483, /* 2 1600.0*/102.497, /* 3 2000.0*/107.411, /* 4 2400.0*/110.811, /* 5 2800.0*/116.596, /* 6 3200.0*/116.402, /* 7 3600.0*/117.253, /* 8 4100.0*/121.555, /* 9 4500.0*/121.311, /* 10 4900.0*/115.000, /* 11 5300.0*/115.000, /* 12 5700.0*/115.000, /* 13 6100.0*/115.000, /* 14 6500.0*/115.000, /* 15 7000.0*/115.000, },
{/* 4 50.000 *//* 0 800.0*/106.376, /* 1 1200.0*/112.563, /* 2 1600.0*/103.710, /* 3 2000.0*/106.785, /* 4 2400.0*/111.187, /* 5 2800.0*/121.104, /* 6 3200.0*/120.854, /* 7 3600.0*/122.625, /* 8 4100.0*/125.261, /* 9 4500.0*/120.702, /* 10 4900.0*/115.000, /* 11 5300.0*/115.000, /* 12 5700.0*/115.000, /* 13 6100.0*/115.000, /* 14 6500.0*/115.000, /* 15 7000.0*/115.000, },
{/* 5 60.000 *//* 0 800.0*/108.366, /* 1 1200.0*/107.741, /* 2 1600.0*/105.713, /* 3 2000.0*/107.654, /* 4 2400.0*/113.228, /* 5 2800.0*/124.786, /* 6 3200.0*/121.577, /* 7 3600.0*/119.707, /* 8 4100.0*/121.255, /* 9 4500.0*/120.000, /* 10 4900.0*/115.000, /* 11 5300.0*/115.000, /* 12 5700.0*/115.000, /* 13 6100.0*/115.000, /* 14 6500.0*/115.000, /* 15 7000.0*/115.000, },
{/* 6 70.000 *//* 0 800.0*/106.030, /* 1 1200.0*/108.577, /* 2 1600.0*/112.935, /* 3 2000.0*/113.187, /* 4 2400.0*/113.910, /* 5 2800.0*/109.719, /* 6 3200.0*/97.090, /* 7 3600.0*/120.000, /* 8 4100.0*/120.000, /* 9 4500.0*/120.000, /* 10 4900.0*/120.000, /* 11 5300.0*/120.000, /* 12 5700.0*/120.000, /* 13 6100.0*/120.000, /* 14 6500.0*/120.000, /* 15 7000.0*/120.000, },
{/* 7 80.000 *//* 0 800.0*/109.383, /* 1 1200.0*/107.073, /* 2 1600.0*/107.386, /* 3 2000.0*/113.634, /* 4 2400.0*/113.413, /* 5 2800.0*/120.000, /* 6 3200.0*/120.000, /* 7 3600.0*/120.000, /* 8 4100.0*/120.000, /* 9 4500.0*/120.000, /* 10 4900.0*/120.000, /* 11 5300.0*/120.000, /* 12 5700.0*/120.000, /* 13 6100.0*/120.000, /* 14 6500.0*/120.000, /* 15 7000.0*/120.000, },
{/* 8 90.000 *//* 0 800.0*/107.380, /* 1 1200.0*/109.401, /* 2 1600.0*/109.114, /* 3 2000.0*/115.732, /* 4 2400.0*/110.736, /* 5 2800.0*/120.000, /* 6 3200.0*/120.000, /* 7 3600.0*/120.000, /* 8 4100.0*/120.000, /* 9 4500.0*/120.611, /* 10 4900.0*/120.000, /* 11 5300.0*/120.000, /* 12 5700.0*/120.000, /* 13 6100.0*/120.000, /* 14 6500.0*/120.000, /* 15 7000.0*/120.000, },
{/* 9 100.000 *//* 0 800.0*/97.878, /* 1 1200.0*/100.000, /* 2 1600.0*/100.000, /* 3 2000.0*/104.241, /* 4 2400.0*/100.000, /* 5 2800.0*/120.000, /* 6 3200.0*/120.000, /* 7 3600.0*/120.000, /* 8 4100.0*/120.711, /* 9 4500.0*/121.226, /* 10 4900.0*/121.317, /* 11 5300.0*/120.000, /* 12 5700.0*/120.000, /* 13 6100.0*/120.000, /* 14 6500.0*/120.000, /* 15 7000.0*/120.000, },
{/* 10 110.000 *//* 0 800.0*/100.000, /* 1 1200.0*/100.000, /* 2 1600.0*/100.000, /* 3 2000.0*/100.000, /* 4 2400.0*/100.000, /* 5 2800.0*/120.000, /* 6 3200.0*/120.000, /* 7 3600.0*/120.000, /* 8 4100.0*/120.000, /* 9 4500.0*/120.000, /* 10 4900.0*/120.000, /* 11 5300.0*/120.000, /* 12 5700.0*/120.000, /* 13 6100.0*/120.000, /* 14 6500.0*/120.000, /* 15 7000.0*/120.000, },
{/* 11 120.000 *//* 0 800.0*/100.000, /* 1 1200.0*/100.000, /* 2 1600.0*/100.000, /* 3 2000.0*/100.000, /* 4 2400.0*/100.000, /* 5 2800.0*/120.000, /* 6 3200.0*/120.000, /* 7 3600.0*/120.000, /* 8 4100.0*/120.000, /* 9 4500.0*/120.000, /* 10 4900.0*/120.000, /* 11 5300.0*/120.000, /* 12 5700.0*/120.000, /* 13 6100.0*/120.000, /* 14 6500.0*/120.000, /* 15 7000.0*/120.000, },
{/* 12 130.000 *//* 0 800.0*/100.000, /* 1 1200.0*/100.000, /* 2 1600.0*/100.000, /* 3 2000.0*/100.000, /* 4 2400.0*/100.000, /* 5 2800.0*/120.000, /* 6 3200.0*/120.000, /* 7 3600.0*/120.000, /* 8 4100.0*/120.000, /* 9 4500.0*/120.000, /* 10 4900.0*/120.000, /* 11 5300.0*/120.000, /* 12 5700.0*/120.000, /* 13 6100.0*/120.000, /* 14 6500.0*/120.000, /* 15 7000.0*/120.000, },
{/* 13 140.000 *//* 0 800.0*/100.000, /* 1 1200.0*/100.000, /* 2 1600.0*/100.000, /* 3 2000.0*/100.000, /* 4 2400.0*/100.000, /* 5 2800.0*/120.000, /* 6 3200.0*/120.000, /* 7 3600.0*/120.000, /* 8 4100.0*/120.000, /* 9 4500.0*/120.000, /* 10 4900.0*/120.000, /* 11 5300.0*/120.000, /* 12 5700.0*/120.000, /* 13 6100.0*/120.000, /* 14 6500.0*/120.000, /* 15 7000.0*/120.000, },
{/* 14 150.000 *//* 0 800.0*/100.000, /* 1 1200.0*/100.000, /* 2 1600.0*/100.000, /* 3 2000.0*/100.000, /* 4 2400.0*/100.000, /* 5 2800.0*/120.000, /* 6 3200.0*/120.000, /* 7 3600.0*/120.000, /* 8 4100.0*/120.000, /* 9 4500.0*/120.000, /* 10 4900.0*/120.000, /* 11 5300.0*/120.000, /* 12 5700.0*/120.000, /* 13 6100.0*/120.000, /* 14 6500.0*/120.000, /* 15 7000.0*/120.000, },
{/* 15 160.000 *//* 0 800.0*/100.000, /* 1 1200.0*/100.000, /* 2 1600.0*/100.000, /* 3 2000.0*/100.000, /* 4 2400.0*/100.000, /* 5 2800.0*/120.000, /* 6 3200.0*/120.000, /* 7 3600.0*/120.000, /* 8 4100.0*/120.000, /* 9 4500.0*/120.000, /* 10 4900.0*/120.000, /* 11 5300.0*/120.000, /* 12 5700.0*/120.000, /* 13 6100.0*/120.000, /* 14 6500.0*/120.000, /* 15 7000.0*/120.000, },
{/* 0 10.000 *//* 0 800.0*/110, /* 1 1200.0*/105, /* 2 1600.0*/94, /* 3 2000.0*/104, /* 4 2400.0*/108, /* 5 2800.0*/102, /* 6 3200.0*/104, /* 7 3600.0*/106, /* 8 4100.0*/130, /* 9 4500.0*/130, /* 10 4900.0*/110, /* 11 5300.0*/110, /* 12 5700.0*/110, /* 13 6100.0*/110, /* 14 6500.0*/110, /* 15 7000.0*/110, },
{/* 1 20.000 *//* 0 800.0*/92, /* 1 1200.0*/88, /* 2 1600.0*/87, /* 3 2000.0*/94, /* 4 2400.0*/100, /* 5 2800.0*/101, /* 6 3200.0*/99, /* 7 3600.0*/108, /* 8 4100.0*/110, /* 9 4500.0*/107, /* 10 4900.0*/107, /* 11 5300.0*/110, /* 12 5700.0*/110, /* 13 6100.0*/110, /* 14 6500.0*/110, /* 15 7000.0*/110, },
{/* 2 30.000 *//* 0 800.0*/93, /* 1 1200.0*/90, /* 2 1600.0*/94, /* 3 2000.0*/98, /* 4 2400.0*/104, /* 5 2800.0*/111, /* 6 3200.0*/113, /* 7 3600.0*/117, /* 8 4100.0*/119, /* 9 4500.0*/118, /* 10 4900.0*/114, /* 11 5300.0*/115, /* 12 5700.0*/115, /* 13 6100.0*/115, /* 14 6500.0*/115, /* 15 7000.0*/115, },
{/* 3 40.000 *//* 0 800.0*/99, /* 1 1200.0*/100, /* 2 1600.0*/102, /* 3 2000.0*/107, /* 4 2400.0*/110, /* 5 2800.0*/116, /* 6 3200.0*/116, /* 7 3600.0*/117, /* 8 4100.0*/121, /* 9 4500.0*/121, /* 10 4900.0*/115, /* 11 5300.0*/115, /* 12 5700.0*/115, /* 13 6100.0*/115, /* 14 6500.0*/115, /* 15 7000.0*/115, },
{/* 4 50.000 *//* 0 800.0*/106, /* 1 1200.0*/112, /* 2 1600.0*/103, /* 3 2000.0*/106, /* 4 2400.0*/111, /* 5 2800.0*/121, /* 6 3200.0*/120, /* 7 3600.0*/122, /* 8 4100.0*/125, /* 9 4500.0*/120, /* 10 4900.0*/115, /* 11 5300.0*/115, /* 12 5700.0*/115, /* 13 6100.0*/115, /* 14 6500.0*/115, /* 15 7000.0*/115, },
{/* 5 60.000 *//* 0 800.0*/108, /* 1 1200.0*/107, /* 2 1600.0*/105, /* 3 2000.0*/107, /* 4 2400.0*/113, /* 5 2800.0*/124, /* 6 3200.0*/121, /* 7 3600.0*/119, /* 8 4100.0*/121, /* 9 4500.0*/120, /* 10 4900.0*/115, /* 11 5300.0*/115, /* 12 5700.0*/115, /* 13 6100.0*/115, /* 14 6500.0*/115, /* 15 7000.0*/115, },
{/* 6 70.000 *//* 0 800.0*/106, /* 1 1200.0*/108, /* 2 1600.0*/112, /* 3 2000.0*/113, /* 4 2400.0*/113, /* 5 2800.0*/109, /* 6 3200.0*/97, /* 7 3600.0*/120, /* 8 4100.0*/120, /* 9 4500.0*/120, /* 10 4900.0*/120, /* 11 5300.0*/120, /* 12 5700.0*/120, /* 13 6100.0*/120, /* 14 6500.0*/120, /* 15 7000.0*/120, },
{/* 7 80.000 *//* 0 800.0*/109, /* 1 1200.0*/107, /* 2 1600.0*/107, /* 3 2000.0*/113, /* 4 2400.0*/113, /* 5 2800.0*/120, /* 6 3200.0*/120, /* 7 3600.0*/120, /* 8 4100.0*/120, /* 9 4500.0*/120, /* 10 4900.0*/120, /* 11 5300.0*/120, /* 12 5700.0*/120, /* 13 6100.0*/120, /* 14 6500.0*/120, /* 15 7000.0*/120, },
{/* 8 90.000 *//* 0 800.0*/107, /* 1 1200.0*/109, /* 2 1600.0*/109, /* 3 2000.0*/115, /* 4 2400.0*/110, /* 5 2800.0*/120, /* 6 3200.0*/120, /* 7 3600.0*/120, /* 8 4100.0*/120, /* 9 4500.0*/120, /* 10 4900.0*/120, /* 11 5300.0*/120, /* 12 5700.0*/120, /* 13 6100.0*/120, /* 14 6500.0*/120, /* 15 7000.0*/120, },
{/* 9 100.000 *//* 0 800.0*/97, /* 1 1200.0*/100, /* 2 1600.0*/100, /* 3 2000.0*/104, /* 4 2400.0*/100, /* 5 2800.0*/120, /* 6 3200.0*/120, /* 7 3600.0*/120, /* 8 4100.0*/120, /* 9 4500.0*/121, /* 10 4900.0*/121, /* 11 5300.0*/120, /* 12 5700.0*/120, /* 13 6100.0*/120, /* 14 6500.0*/120, /* 15 7000.0*/120, },
{/* 10 110.000 *//* 0 800.0*/100, /* 1 1200.0*/100, /* 2 1600.0*/100, /* 3 2000.0*/100, /* 4 2400.0*/100, /* 5 2800.0*/120, /* 6 3200.0*/120, /* 7 3600.0*/120, /* 8 4100.0*/120, /* 9 4500.0*/120, /* 10 4900.0*/120, /* 11 5300.0*/120, /* 12 5700.0*/120, /* 13 6100.0*/120, /* 14 6500.0*/120, /* 15 7000.0*/120, },
{/* 11 120.000 *//* 0 800.0*/100, /* 1 1200.0*/100, /* 2 1600.0*/100, /* 3 2000.0*/100, /* 4 2400.0*/100, /* 5 2800.0*/120, /* 6 3200.0*/120, /* 7 3600.0*/120, /* 8 4100.0*/120, /* 9 4500.0*/120, /* 10 4900.0*/120, /* 11 5300.0*/120, /* 12 5700.0*/120, /* 13 6100.0*/120, /* 14 6500.0*/120, /* 15 7000.0*/120, },
{/* 12 130.000 *//* 0 800.0*/100, /* 1 1200.0*/100, /* 2 1600.0*/100, /* 3 2000.0*/100, /* 4 2400.0*/100, /* 5 2800.0*/120, /* 6 3200.0*/120, /* 7 3600.0*/120, /* 8 4100.0*/120, /* 9 4500.0*/120, /* 10 4900.0*/120, /* 11 5300.0*/120, /* 12 5700.0*/120, /* 13 6100.0*/120, /* 14 6500.0*/120, /* 15 7000.0*/120, },
{/* 13 140.000 *//* 0 800.0*/100, /* 1 1200.0*/100, /* 2 1600.0*/100, /* 3 2000.0*/100, /* 4 2400.0*/100, /* 5 2800.0*/120, /* 6 3200.0*/120, /* 7 3600.0*/120, /* 8 4100.0*/120, /* 9 4500.0*/120, /* 10 4900.0*/120, /* 11 5300.0*/120, /* 12 5700.0*/120, /* 13 6100.0*/120, /* 14 6500.0*/120, /* 15 7000.0*/120, },
{/* 14 150.000 *//* 0 800.0*/100, /* 1 1200.0*/100, /* 2 1600.0*/100, /* 3 2000.0*/100, /* 4 2400.0*/100, /* 5 2800.0*/120, /* 6 3200.0*/120, /* 7 3600.0*/120, /* 8 4100.0*/120, /* 9 4500.0*/120, /* 10 4900.0*/120, /* 11 5300.0*/120, /* 12 5700.0*/120, /* 13 6100.0*/120, /* 14 6500.0*/120, /* 15 7000.0*/120, },
{/* 15 160.000 *//* 0 800.0*/100, /* 1 1200.0*/100, /* 2 1600.0*/100, /* 3 2000.0*/100, /* 4 2400.0*/100, /* 5 2800.0*/120, /* 6 3200.0*/120, /* 7 3600.0*/120, /* 8 4100.0*/120, /* 9 4500.0*/120, /* 10 4900.0*/120, /* 11 5300.0*/120, /* 12 5700.0*/120, /* 13 6100.0*/120, /* 14 6500.0*/120, /* 15 7000.0*/120, },
};
EXTERN_CONFIG;
@ -105,7 +105,7 @@ void setFordEscortGt(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
copyArray(config->veRpmBins, veRpmBins);
MEMCPY(config->veTable, racingFestivaVeTable);
copyTable(config->veTable, racingFestivaVeTable);
// engineConfiguration->triggerInputPins[0] = GPIOC_6; // 2G YEL/BLU
// engineConfiguration->triggerInputPins[1] = GPIOA_5; // 2E White CKP
@ -267,7 +267,7 @@ void setFordEscortGt(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
copyArray(config->ignitionRpmBins, ignitionRpmBins);
#if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT
MEMCPY(config->ignitionTable, racingFestivaIgnitionTable);
copyTable(config->ignitionTable, racingFestivaIgnitionTable);
#endif
engineConfiguration->tpsAccelEnrichmentThreshold = 40;

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

@ -18,7 +18,7 @@
#endif
#if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT
static const ignition_table_t default_custom_timing_table = {
static const uint8_t default_custom_timing_table[16][16] = {
/* RPM 0 500 1000 1500 2000 2500 3000 3500 4000 4500 5000 5500 6000 6500 7000 */
/* Load 0% */{ 10, 10, 10, 12, 12, 12, 12, 15, 15, 15, 15, 26, 28, 30, 32},
/* Load 10% */{ 10, 10, 10, 12, 12, 12, 12, 15, 15, 15, 15, 26, 28, 30, 32},
@ -41,7 +41,7 @@ static void setDefaultCustomMaps(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setTimingRpmBin(0,7000 PASS_CONFIG_PARAMETER_SUFFIX);
#if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT
MEMCPY(config->ignitionTable, default_custom_timing_table);
copyTable(config->ignitionTable, default_custom_timing_table);
#endif
}

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

@ -24,55 +24,55 @@
#if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT
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*/
+4.87, /*1 1213.0*/+12.138, /*2 1626.0*/+23.389, /*3 2040.0*/+25.501, /*4 2453.0*/+25.441, /*5 2866.0*/+25.468, /*6 3280.0*/
+29.125, /*7 3693.0*/+33.074, /*8 4106.0*/+34.203, /*9 4520.0*/+37.769, /*10 4933.0*/+35.899, /*11 5346.0*/
+30.519, /*12 5760.0*/+28.88, /*13 6173.0*/+28.74, /*14 6586.0*/+27.189, /*15 7000.0*/+27.826 }, {/*2 engineLoad=1.626*//*0 800.0*/
+4.817, /*1 1213.0*/+12.262, /*2 1626.0*/+23.925, /*3 2040.0*/+25.501, /*4 2453.0*/+25.5, /*5 2866.0*/+25.468, /*6 3280.0*/
+29.364, /*7 3693.0*/+33.489, /*8 4106.0*/+34.839, /*9 4520.0*/+37.545, /*10 4933.0*/+35.875, /*11 5346.0*/
+30.353, /*12 5760.0*/+29.052, /*13 6173.0*/+28.37, /*14 6586.0*/+27.072, /*15 7000.0*/+26.828 }, {/*3 engineLoad=1.839*//*0 800.0*/
+4.537, /*1 1213.0*/+12.421, /*2 1626.0*/+23.214, /*3 2040.0*/+25.394, /*4 2453.0*/+25.412, /*5 2866.0*/+25.485, /*6 3280.0*/
+29.425, /*7 3693.0*/+33.427, /*8 4106.0*/+34.091, /*9 4520.0*/+36.887, /*10 4933.0*/+36.047, /*11 5346.0*/
+30.079, /*12 5760.0*/+28.453, /*13 6173.0*/+28.074, /*14 6586.0*/+27.189, /*15 7000.0*/+26.641 }, {/*4 engineLoad=2.053*//*0 800.0*/
+4.522, /*1 1213.0*/+11.76, /*2 1626.0*/+23.915, /*3 2040.0*/+25.415, /*4 2453.0*/+25.551, /*5 2866.0*/+25.14, /*6 3280.0*/
+29.346, /*7 3693.0*/+32.917, /*8 4106.0*/+34.815, /*9 4520.0*/+37.211, /*10 4933.0*/+35.817, /*11 5346.0*/
+29.694, /*12 5760.0*/+28.799, /*13 6173.0*/+27.818, /*14 6586.0*/+28.098, /*15 7000.0*/+27.662 }, {/*5 engineLoad=2.266*//*0 800.0*/
+4.678, /*1 1213.0*/+11.912, /*2 1626.0*/+23.486, /*3 2040.0*/+25.379, /*4 2453.0*/+25.551, /*5 2866.0*/+25.527, /*6 3280.0*/
+29.856, /*7 3693.0*/+33.511, /*8 4106.0*/+34.786, /*9 4520.0*/+37.963, /*10 4933.0*/+35.917, /*11 5346.0*/
+31.073, /*12 5760.0*/+28.361, /*13 6173.0*/+28.468, /*14 6586.0*/+27.188, /*15 7000.0*/+26.729 }, {/*6 engineLoad=2.479*//*0 800.0*/
+4.517, /*1 1213.0*/+12.029, /*2 1626.0*/+23.477, /*3 2040.0*/+25.455, /*4 2453.0*/+25.382, /*5 2866.0*/+25.898, /*6 3280.0*/
+29.147, /*7 3693.0*/+33.578, /*8 4106.0*/+34.12, /*9 4520.0*/+36.279, /*10 4933.0*/+36.432, /*11 5346.0*/
+31.362, /*12 5760.0*/+28.084, /*13 6173.0*/+28.463, /*14 6586.0*/+27.691, /*15 7000.0*/+27.83 }, {/*7 engineLoad=2.693*//*0 800.0*/
+4.532, /*1 1213.0*/+12.262, /*2 1626.0*/+23.935, /*3 2040.0*/+25.489, /*4 2453.0*/+25.595, /*5 2866.0*/+26.816, /*6 3280.0*/
+30.251, /*7 3693.0*/+33.533, /*8 4106.0*/+34.794, /*9 4520.0*/+37.882, /*10 4933.0*/+36.104, /*11 5346.0*/
+30.079, /*12 5760.0*/+28.545, /*13 6173.0*/+29.304, /*14 6586.0*/+27.07, /*15 7000.0*/+28.324 }, {/*8 engineLoad=2.906*//*0 800.0*/
+4.532, /*1 1213.0*/+12.036, /*2 1626.0*/+23.418, /*3 2040.0*/+25.513, /*4 2453.0*/+25.382, /*5 2866.0*/+25.357, /*6 3280.0*/
+29.934, /*7 3693.0*/+33.467, /*8 4106.0*/+34.748, /*9 4520.0*/+37.288, /*10 4933.0*/+36.38, /*11 5346.0*/
+29.516, /*12 5760.0*/+28.799, /*13 6173.0*/+28.407, /*14 6586.0*/+26.951, /*15 7000.0*/+28.203 }, {/*9 engineLoad=3.119997*//*0 800.0*/
+4.532, /*1 1213.0*/+11.978, /*2 1626.0*/+23.73, /*3 2040.0*/+25.501, /*4 2453.0*/+25.624, /*5 2866.0*/+26.328, /*6 3280.0*/
+30.015, /*7 3693.0*/+33.187, /*8 4106.0*/+34.881, /*9 4520.0*/+38.044, /*10 4933.0*/+35.81, /*11 5346.0*/
+29.843, /*12 5760.0*/+29.306, /*13 6173.0*/+28.997, /*14 6586.0*/+27.109, /*15 7000.0*/+29.339 }, {/*10 engineLoad=3.33333*//*0 800.0*/
+4.527, /*1 1213.0*/+12.131, /*2 1626.0*/+23.486, /*3 2040.0*/+25.43, /*4 2453.0*/+25.551, /*5 2866.0*/+26.276, /*6 3280.0*/
+29.639, /*7 3693.0*/+33.005, /*8 4106.0*/+34.253, /*9 4520.0*/+37.788, /*10 4933.0*/+36.077, /*11 5346.0*/
+30.188, /*12 5760.0*/+29.087, /*13 6173.0*/+28.481, /*14 6586.0*/+27.348, /*15 7000.0*/+27.777 }, {/*11 engineLoad=3.546663*//*0 800.0*/
+4.889, /*1 1213.0*/+12.175, /*2 1626.0*/+23.271, /*3 2040.0*/+25.357, /*4 2453.0*/+25.551, /*5 2866.0*/+25.485, /*6 3280.0*/
+29.899, /*7 3693.0*/+32.802, /*8 4106.0*/+34.786, /*9 4520.0*/+38.686, /*10 4933.0*/+35.722, /*11 5346.0*/
+31.347, /*12 5760.0*/+28.891, /*13 6173.0*/+28.333, /*14 6586.0*/+27.149, /*15 7000.0*/+27.236 }, {/*12 engineLoad=3.759996*//*0 800.0*/
+4.537, /*1 1213.0*/+12.073, /*2 1626.0*/+23.896, /*3 2040.0*/+25.525, /*4 2453.0*/+25.595, /*5 2866.0*/+25.451, /*6 3280.0*/
+30.428, /*7 3693.0*/+33.714, /*8 4106.0*/+34.08, /*9 4520.0*/+37.526, /*10 4933.0*/+35.817, /*11 5346.0*/
+30.733, /*12 5760.0*/+28.718, /*13 6173.0*/+28.518, /*14 6586.0*/+27.518, /*15 7000.0*/+26.561 }, {/*13 engineLoad=3.973329*//*0 800.0*/
+4.86, /*1 1213.0*/+11.883, /*2 1626.0*/+23.428, /*3 2040.0*/+25.489, /*4 2453.0*/+25.536, /*5 2866.0*/+25.613, /*6 3280.0*/
+29.895, /*7 3693.0*/+33.648, /*8 4106.0*/+34.758, /*9 4520.0*/+37.988, /*10 4933.0*/+36.047, /*11 5346.0*/
+30.225, /*12 5760.0*/+28.698, /*13 6173.0*/+28.487, /*14 6586.0*/+27.111, /*15 7000.0*/+27.708 }, {/*14 engineLoad=4.186662*//*0 800.0*/
+4.683, /*1 1213.0*/+11.898, /*2 1626.0*/+23.506, /*3 2040.0*/+25.562, /*4 2453.0*/+25.61, /*5 2866.0*/+25.519, /*6 3280.0*/
+29.95, /*7 3693.0*/+33.582, /*8 4106.0*/+34.548, /*9 4520.0*/+36.201, /*10 4933.0*/+35.788, /*11 5346.0*/
+30.053, /*12 5760.0*/+28.292, /*13 6173.0*/+28.259, /*14 6586.0*/+27.269, /*15 7000.0*/+26.863 }, {/*15 engineLoad=4.399*//*0 800.0*/
+4.85, /*1 1213.0*/+12.24, /*2 1626.0*/+24.091, /*3 2040.0*/+25.394, /*4 2453.0*/+25.323, /*5 2866.0*/+25.544, /*6 3280.0*/
+29.915, /*7 3693.0*/+33.104, /*8 4106.0*/+36.016, /*9 4520.0*/+37.933, /*10 4933.0*/+36.254, /*11 5346.0*/
+29.712, /*12 5760.0*/+28.651, /*13 6173.0*/+28.045, /*14 6586.0*/+27.228, /*15 7000.0*/+27.784 } };
static const uint8_t miataNA8_maf_advance_table[16][16] = { {/*0 engineLoad=1.200*//*0 800.0*/+4, /*1 1213.0*/+11, /*2 1626.0*/
+23, /*3 2040.0*/+25, /*4 2453.0*/+25, /*5 2866.0*/+25, /*6 3280.0*/+29, /*7 3693.0*/
+32, /*8 4106.0*/+35, /*9 4520.0*/+37, /*10 4933.0*/+36, /*11 5346.0*/+30, /*12 5760.0*/
+29, /*13 6173.0*/+29, /*14 6586.0*/+27, /*15 7000.0*/+28 }, {/*1 engineLoad=1.413*//*0 800.0*/
+4, /*1 1213.0*/+12, /*2 1626.0*/+23, /*3 2040.0*/+25, /*4 2453.0*/+25, /*5 2866.0*/+25, /*6 3280.0*/
+29, /*7 3693.0*/+33, /*8 4106.0*/+34, /*9 4520.0*/+37, /*10 4933.0*/+35, /*11 5346.0*/
+30, /*12 5760.0*/+28, /*13 6173.0*/+28, /*14 6586.0*/+27, /*15 7000.0*/+27 }, {/*2 engineLoad=1.626*//*0 800.0*/
+4, /*1 1213.0*/+12, /*2 1626.0*/+23, /*3 2040.0*/+25, /*4 2453.0*/+25, /*5 2866.0*/+25, /*6 3280.0*/
+29, /*7 3693.0*/+33, /*8 4106.0*/+34, /*9 4520.0*/+37, /*10 4933.0*/+35, /*11 5346.0*/
+30, /*12 5760.0*/+29, /*13 6173.0*/+28, /*14 6586.0*/+27, /*15 7000.0*/+26 }, {/*3 engineLoad=1.839*//*0 800.0*/
+4, /*1 1213.0*/+12, /*2 1626.0*/+23, /*3 2040.0*/+25, /*4 2453.0*/+25, /*5 2866.0*/+25, /*6 3280.0*/
+29, /*7 3693.0*/+33, /*8 4106.0*/+34, /*9 4520.0*/+36, /*10 4933.0*/+36, /*11 5346.0*/
+30, /*12 5760.0*/+28, /*13 6173.0*/+28, /*14 6586.0*/+27, /*15 7000.0*/+26 }, {/*4 engineLoad=2.053*//*0 800.0*/
+4, /*1 1213.0*/+11, /*2 1626.0*/+23, /*3 2040.0*/+25, /*4 2453.0*/+25, /*5 2866.0*/+25, /*6 3280.0*/
+29, /*7 3693.0*/+32, /*8 4106.0*/+34, /*9 4520.0*/+37, /*10 4933.0*/+35, /*11 5346.0*/
+29, /*12 5760.0*/+28, /*13 6173.0*/+27, /*14 6586.0*/+28, /*15 7000.0*/+27 }, {/*5 engineLoad=2.266*//*0 800.0*/
+4, /*1 1213.0*/+11, /*2 1626.0*/+23, /*3 2040.0*/+25, /*4 2453.0*/+25, /*5 2866.0*/+25, /*6 3280.0*/
+29, /*7 3693.0*/+33, /*8 4106.0*/+34, /*9 4520.0*/+37, /*10 4933.0*/+35, /*11 5346.0*/
+31, /*12 5760.0*/+28, /*13 6173.0*/+28, /*14 6586.0*/+27, /*15 7000.0*/+26 }, {/*6 engineLoad=2.479*//*0 800.0*/
+4, /*1 1213.0*/+12, /*2 1626.0*/+23, /*3 2040.0*/+25, /*4 2453.0*/+25, /*5 2866.0*/+25, /*6 3280.0*/
+29, /*7 3693.0*/+33, /*8 4106.0*/+34, /*9 4520.0*/+36, /*10 4933.0*/+36, /*11 5346.0*/
+31, /*12 5760.0*/+28, /*13 6173.0*/+28, /*14 6586.0*/+27, /*15 7000.0*/+27 }, {/*7 engineLoad=2.693*//*0 800.0*/
+4, /*1 1213.0*/+12, /*2 1626.0*/+23, /*3 2040.0*/+25, /*4 2453.0*/+25, /*5 2866.0*/+26, /*6 3280.0*/
+30, /*7 3693.0*/+33, /*8 4106.0*/+34, /*9 4520.0*/+37, /*10 4933.0*/+36, /*11 5346.0*/
+30, /*12 5760.0*/+28, /*13 6173.0*/+29, /*14 6586.0*/+27, /*15 7000.0*/+28 }, {/*8 engineLoad=2.906*//*0 800.0*/
+4, /*1 1213.0*/+12, /*2 1626.0*/+23, /*3 2040.0*/+25, /*4 2453.0*/+25, /*5 2866.0*/+25, /*6 3280.0*/
+29, /*7 3693.0*/+33, /*8 4106.0*/+34, /*9 4520.0*/+37, /*10 4933.0*/+36, /*11 5346.0*/
+29, /*12 5760.0*/+28, /*13 6173.0*/+28, /*14 6586.0*/+26, /*15 7000.0*/+28 }, {/*9 engineLoad=3.119997*//*0 800.0*/
+4, /*1 1213.0*/+11, /*2 1626.0*/+23, /*3 2040.0*/+25, /*4 2453.0*/+25, /*5 2866.0*/+26, /*6 3280.0*/
+30, /*7 3693.0*/+33, /*8 4106.0*/+34, /*9 4520.0*/+38, /*10 4933.0*/+35, /*11 5346.0*/
+29, /*12 5760.0*/+29, /*13 6173.0*/+28, /*14 6586.0*/+27, /*15 7000.0*/+29 }, {/*10 engineLoad=3.33333*//*0 800.0*/
+4, /*1 1213.0*/+12, /*2 1626.0*/+23, /*3 2040.0*/+25, /*4 2453.0*/+25, /*5 2866.0*/+26, /*6 3280.0*/
+29, /*7 3693.0*/+33, /*8 4106.0*/+34, /*9 4520.0*/+37, /*10 4933.0*/+36, /*11 5346.0*/
+30, /*12 5760.0*/+29, /*13 6173.0*/+28, /*14 6586.0*/+27, /*15 7000.0*/+27 }, {/*11 engineLoad=3.546663*//*0 800.0*/
+4, /*1 1213.0*/+12, /*2 1626.0*/+23, /*3 2040.0*/+25, /*4 2453.0*/+25, /*5 2866.0*/+25, /*6 3280.0*/
+29, /*7 3693.0*/+32, /*8 4106.0*/+34, /*9 4520.0*/+38, /*10 4933.0*/+35, /*11 5346.0*/
+31, /*12 5760.0*/+28, /*13 6173.0*/+28, /*14 6586.0*/+27, /*15 7000.0*/+27 }, {/*12 engineLoad=3.759996*//*0 800.0*/
+4, /*1 1213.0*/+12, /*2 1626.0*/+23, /*3 2040.0*/+25, /*4 2453.0*/+25, /*5 2866.0*/+25, /*6 3280.0*/
+30, /*7 3693.0*/+33, /*8 4106.0*/+34, /*9 4520.0*/+37, /*10 4933.0*/+35, /*11 5346.0*/
+30, /*12 5760.0*/+28, /*13 6173.0*/+28, /*14 6586.0*/+27, /*15 7000.0*/+26 }, {/*13 engineLoad=3.973329*//*0 800.0*/
+4, /*1 1213.0*/+11, /*2 1626.0*/+23, /*3 2040.0*/+25, /*4 2453.0*/+25, /*5 2866.0*/+25, /*6 3280.0*/
+29, /*7 3693.0*/+33, /*8 4106.0*/+34, /*9 4520.0*/+37, /*10 4933.0*/+36, /*11 5346.0*/
+30, /*12 5760.0*/+28, /*13 6173.0*/+28, /*14 6586.0*/+27, /*15 7000.0*/+27 }, {/*14 engineLoad=4.186662*//*0 800.0*/
+4, /*1 1213.0*/+11, /*2 1626.0*/+23, /*3 2040.0*/+25, /*4 2453.0*/+25, /*5 2866.0*/+25, /*6 3280.0*/
+29, /*7 3693.0*/+33, /*8 4106.0*/+34, /*9 4520.0*/+36, /*10 4933.0*/+35, /*11 5346.0*/
+30, /*12 5760.0*/+28, /*13 6173.0*/+28, /*14 6586.0*/+27, /*15 7000.0*/+26 }, {/*15 engineLoad=4.399*//*0 800.0*/
+4, /*1 1213.0*/+12, /*2 1626.0*/+24, /*3 2040.0*/+25, /*4 2453.0*/+25, /*5 2866.0*/+25, /*6 3280.0*/
+29, /*7 3693.0*/+33, /*8 4106.0*/+36, /*9 4520.0*/+37, /*10 4933.0*/+36, /*11 5346.0*/
+29, /*12 5760.0*/+28, /*13 6173.0*/+28, /*14 6586.0*/+27, /*15 7000.0*/+27 } };
#endif
EXTERN_ENGINE;
@ -184,7 +184,7 @@ void setMiata1996(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->specs.displacement = 1.839;
#if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT
MEMCPY(config->ignitionTable, miataNA8_maf_advance_table);
copyTable(config->ignitionTable, miataNA8_maf_advance_table);
#endif
// upside down

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

@ -26,123 +26,122 @@ static const float hardCodedmafDecoding[256] = {570.0, 437.0, 351.5, 293.55078,
/* Generated by TS2C on Fri Jul 31 14:02:18 EDT 2020*/
static void setMafDecodingBins(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
MEMCPY(config->mafDecodingBins, hardCodedmafDecodingBins);
MEMCPY(config->mafDecoding, hardCodedmafDecoding);
copyArray(config->mafDecodingBins, hardCodedmafDecodingBins);
copyArray(config->mafDecoding, hardCodedmafDecoding);
}
static const float hardCodedveLoadBins[16] = {20.0, 30.0, 34.0, 38.0, 43.0, 48.0, 54.0, 60.0, 67.0, 74.0, 82.0, 90.0, 99.0, 108.0, 118.0, 128.0};
static const float hardCodedveRpmBins[16] = {650.0, 950.0, 1250.0, 1600.0, 1950.0, 2350.0, 2750.0, 3200.0, 3700.0, 4200.0, 4700.0, 5200.0, 5800.0, 6400.0, 7100.0, 7800.0};
static const float hardCodedveTable[16][16] = {
static const uint8_t hardCodedveTable[16][16] = {
/* Generated by TS2C on Sun Aug 02 10:02:25 EDT 2020*/
{/* 0 20.000 *//* 0 650.0*/40.592, /* 1 950.0*/42.715, /* 2 1250.0*/44.205, /* 3 1600.0*/44.998, /* 4 1950.0*/45.586, /* 5 2350.0*/45.141, /* 6 2750.0*/42.739, /* 7 3200.0*/41.176, /* 8 3700.0*/39.921, /* 9 4200.0*/41.272, /* 10 4700.0*/43.726, /* 11 5200.0*/47.937, /* 12 5800.0*/52.229, /* 13 6400.0*/55.654, /* 14 7100.0*/58.140, /* 15 7800.0*/58.763, },
{/* 1 30.000 *//* 0 650.0*/46.506, /* 1 950.0*/49.126, /* 2 1250.0*/49.847, /* 3 1600.0*/49.706, /* 4 1950.0*/49.866, /* 5 2350.0*/50.828, /* 6 2750.0*/51.849, /* 7 3200.0*/50.064, /* 8 3700.0*/48.359, /* 9 4200.0*/49.920, /* 10 4700.0*/54.116, /* 11 5200.0*/58.954, /* 12 5800.0*/64.546, /* 13 6400.0*/66.713, /* 14 7100.0*/67.738, /* 15 7800.0*/68.457, },
{/* 2 34.000 *//* 0 650.0*/51.408, /* 1 950.0*/55.035, /* 2 1250.0*/56.457, /* 3 1600.0*/55.807, /* 4 1950.0*/56.117, /* 5 2350.0*/57.554, /* 6 2750.0*/59.953, /* 7 3200.0*/58.324, /* 8 3700.0*/55.696, /* 9 4200.0*/56.141, /* 10 4700.0*/59.908, /* 11 5200.0*/65.525, /* 12 5800.0*/70.589, /* 13 6400.0*/71.985, /* 14 7100.0*/72.969, /* 15 7800.0*/73.576, },
{/* 3 38.000 *//* 0 650.0*/55.131, /* 1 950.0*/58.797, /* 2 1250.0*/60.825, /* 3 1600.0*/62.831, /* 4 1950.0*/62.511, /* 5 2350.0*/63.555, /* 6 2750.0*/66.933, /* 7 3200.0*/66.365, /* 8 3700.0*/63.211, /* 9 4200.0*/63.721, /* 10 4700.0*/67.063, /* 11 5200.0*/72.315, /* 12 5800.0*/76.385, /* 13 6400.0*/78.133, /* 14 7100.0*/78.436, /* 15 7800.0*/78.577, },
{/* 4 43.000 *//* 0 650.0*/62.427, /* 1 950.0*/64.929, /* 2 1250.0*/68.336, /* 3 1600.0*/70.803, /* 4 1950.0*/70.206, /* 5 2350.0*/71.101, /* 6 2750.0*/74.762, /* 7 3200.0*/74.345, /* 8 3700.0*/71.209, /* 9 4200.0*/70.365, /* 10 4700.0*/73.419, /* 11 5200.0*/78.221, /* 12 5800.0*/82.753, /* 13 6400.0*/83.884, /* 14 7100.0*/84.646, /* 15 7800.0*/84.760, },
{/* 5 48.000 *//* 0 650.0*/69.850, /* 1 950.0*/72.581, /* 2 1250.0*/75.672, /* 3 1600.0*/78.355, /* 4 1950.0*/78.085, /* 5 2350.0*/80.211, /* 6 2750.0*/82.045, /* 7 3200.0*/81.545, /* 8 3700.0*/78.744, /* 9 4200.0*/78.467, /* 10 4700.0*/78.896, /* 11 5200.0*/83.297, /* 12 5800.0*/87.946, /* 13 6400.0*/90.166, /* 14 7100.0*/91.174, /* 15 7800.0*/91.355, },
{/* 6 54.000 *//* 0 650.0*/75.722, /* 1 950.0*/79.103, /* 2 1250.0*/82.361, /* 3 1600.0*/84.630, /* 4 1950.0*/84.046, /* 5 2350.0*/85.438, /* 6 2750.0*/86.868, /* 7 3200.0*/86.240, /* 8 3700.0*/84.198, /* 9 4200.0*/83.970, /* 10 4700.0*/85.578, /* 11 5200.0*/89.898, /* 12 5800.0*/93.576, /* 13 6400.0*/96.423, /* 14 7100.0*/97.712, /* 15 7800.0*/98.025, },
{/* 7 60.000 *//* 0 650.0*/80.931, /* 1 950.0*/83.518, /* 2 1250.0*/86.618, /* 3 1600.0*/90.079, /* 4 1950.0*/88.666, /* 5 2350.0*/88.837, /* 6 2750.0*/90.304, /* 7 3200.0*/89.797, /* 8 3700.0*/89.359, /* 9 4200.0*/89.215, /* 10 4700.0*/91.475, /* 11 5200.0*/95.601, /* 12 5800.0*/98.813, /* 13 6400.0*/101.662, /* 14 7100.0*/103.927, /* 15 7800.0*/104.533, },
{/* 8 67.000 *//* 0 650.0*/85.475, /* 1 950.0*/87.373, /* 2 1250.0*/90.576, /* 3 1600.0*/94.341, /* 4 1950.0*/93.254, /* 5 2350.0*/92.835, /* 6 2750.0*/94.631, /* 7 3200.0*/93.803, /* 8 3700.0*/93.489, /* 9 4200.0*/95.245, /* 10 4700.0*/97.738, /* 11 5200.0*/101.731, /* 12 5800.0*/105.341, /* 13 6400.0*/107.920, /* 14 7100.0*/109.300, /* 15 7800.0*/110.264, },
{/* 9 74.000 *//* 0 650.0*/90.588, /* 1 950.0*/92.696, /* 2 1250.0*/94.371, /* 3 1600.0*/99.087, /* 4 1950.0*/98.227, /* 5 2350.0*/98.105, /* 6 2750.0*/99.515, /* 7 3200.0*/98.095, /* 8 3700.0*/99.186, /* 9 4200.0*/101.554, /* 10 4700.0*/105.278, /* 11 5200.0*/108.206, /* 12 5800.0*/111.131, /* 13 6400.0*/112.939, /* 14 7100.0*/114.120, /* 15 7800.0*/114.274, },
{/* 10 82.000 *//* 0 650.0*/96.035, /* 1 950.0*/96.933, /* 2 1250.0*/99.341, /* 3 1600.0*/102.952, /* 4 1950.0*/103.774, /* 5 2350.0*/103.973, /* 6 2750.0*/103.334, /* 7 3200.0*/105.005, /* 8 3700.0*/106.212, /* 9 4200.0*/109.098, /* 10 4700.0*/111.624, /* 11 5200.0*/114.729, /* 12 5800.0*/116.929, /* 13 6400.0*/118.501, /* 14 7100.0*/118.165, /* 15 7800.0*/118.979, },
{/* 11 90.000 *//* 0 650.0*/100.834, /* 1 950.0*/101.388, /* 2 1250.0*/103.619, /* 3 1600.0*/107.806, /* 4 1950.0*/107.164, /* 5 2350.0*/106.776, /* 6 2750.0*/106.612, /* 7 3200.0*/108.891, /* 8 3700.0*/112.385, /* 9 4200.0*/114.962, /* 10 4700.0*/117.627, /* 11 5200.0*/120.118, /* 12 5800.0*/121.564, /* 13 6400.0*/122.254, /* 14 7100.0*/122.201, /* 15 7800.0*/121.964, },
{/* 12 99.000 *//* 0 650.0*/104.415, /* 1 950.0*/105.773, /* 2 1250.0*/107.849, /* 3 1600.0*/109.719, /* 4 1950.0*/109.161, /* 5 2350.0*/108.677, /* 6 2750.0*/108.340, /* 7 3200.0*/110.866, /* 8 3700.0*/114.415, /* 9 4200.0*/117.876, /* 10 4700.0*/120.450, /* 11 5200.0*/123.946, /* 12 5800.0*/125.295, /* 13 6400.0*/124.855, /* 14 7100.0*/125.070, /* 15 7800.0*/124.014, },
{/* 13 108.000 *//* 0 650.0*/105.599, /* 1 950.0*/106.125, /* 2 1250.0*/107.606, /* 3 1600.0*/108.824, /* 4 1950.0*/109.716, /* 5 2350.0*/108.998, /* 6 2750.0*/109.269, /* 7 3200.0*/110.926, /* 8 3700.0*/114.086, /* 9 4200.0*/117.390, /* 10 4700.0*/119.910, /* 11 5200.0*/123.648, /* 12 5800.0*/124.843, /* 13 6400.0*/126.550, /* 14 7100.0*/126.680, /* 15 7800.0*/125.881, },
{/* 14 118.000 *//* 0 650.0*/105.855, /* 1 950.0*/106.603, /* 2 1250.0*/107.652, /* 3 1600.0*/109.393, /* 4 1950.0*/110.349, /* 5 2350.0*/109.481, /* 6 2750.0*/109.790, /* 7 3200.0*/111.735, /* 8 3700.0*/114.132, /* 9 4200.0*/116.603, /* 10 4700.0*/119.263, /* 11 5200.0*/121.682, /* 12 5800.0*/123.221, /* 13 6400.0*/125.171, /* 14 7100.0*/128.184, /* 15 7800.0*/128.348, },
{/* 15 128.000 *//* 0 650.0*/104.430, /* 1 950.0*/105.297, /* 2 1250.0*/107.271, /* 3 1600.0*/108.832, /* 4 1950.0*/108.953, /* 5 2350.0*/110.116, /* 6 2750.0*/111.153, /* 7 3200.0*/112.316, /* 8 3700.0*/114.148, /* 9 4200.0*/116.354, /* 10 4700.0*/118.107, /* 11 5200.0*/119.835, /* 12 5800.0*/121.332, /* 13 6400.0*/124.078, /* 14 7100.0*/127.961, /* 15 7800.0*/130.209, }
{/* 0 20.000 *//* 0 650.0*/40, /* 1 950.0*/42, /* 2 1250.0*/44, /* 3 1600.0*/44, /* 4 1950.0*/45, /* 5 2350.0*/45, /* 6 2750.0*/42, /* 7 3200.0*/41, /* 8 3700.0*/39, /* 9 4200.0*/41, /* 10 4700.0*/43, /* 11 5200.0*/47, /* 12 5800.0*/52, /* 13 6400.0*/55, /* 14 7100.0*/58, /* 15 7800.0*/58, },
{/* 1 30.000 *//* 0 650.0*/46, /* 1 950.0*/49, /* 2 1250.0*/49, /* 3 1600.0*/49, /* 4 1950.0*/49, /* 5 2350.0*/50, /* 6 2750.0*/51, /* 7 3200.0*/50, /* 8 3700.0*/48, /* 9 4200.0*/49, /* 10 4700.0*/54, /* 11 5200.0*/58, /* 12 5800.0*/64, /* 13 6400.0*/66, /* 14 7100.0*/67, /* 15 7800.0*/68, },
{/* 2 34.000 *//* 0 650.0*/51, /* 1 950.0*/55, /* 2 1250.0*/56, /* 3 1600.0*/55, /* 4 1950.0*/56, /* 5 2350.0*/57, /* 6 2750.0*/59, /* 7 3200.0*/58, /* 8 3700.0*/55, /* 9 4200.0*/56, /* 10 4700.0*/59, /* 11 5200.0*/65, /* 12 5800.0*/70, /* 13 6400.0*/71, /* 14 7100.0*/72, /* 15 7800.0*/73, },
{/* 3 38.000 *//* 0 650.0*/55, /* 1 950.0*/58, /* 2 1250.0*/60, /* 3 1600.0*/62, /* 4 1950.0*/62, /* 5 2350.0*/63, /* 6 2750.0*/66, /* 7 3200.0*/66, /* 8 3700.0*/63, /* 9 4200.0*/63, /* 10 4700.0*/67, /* 11 5200.0*/72, /* 12 5800.0*/76, /* 13 6400.0*/78, /* 14 7100.0*/78, /* 15 7800.0*/78, },
{/* 4 43.000 *//* 0 650.0*/62, /* 1 950.0*/64, /* 2 1250.0*/68, /* 3 1600.0*/70, /* 4 1950.0*/70, /* 5 2350.0*/71, /* 6 2750.0*/74, /* 7 3200.0*/74, /* 8 3700.0*/71, /* 9 4200.0*/70, /* 10 4700.0*/73, /* 11 5200.0*/78, /* 12 5800.0*/82, /* 13 6400.0*/83, /* 14 7100.0*/84, /* 15 7800.0*/84, },
{/* 5 48.000 *//* 0 650.0*/69, /* 1 950.0*/72, /* 2 1250.0*/75, /* 3 1600.0*/78, /* 4 1950.0*/78, /* 5 2350.0*/80, /* 6 2750.0*/82, /* 7 3200.0*/81, /* 8 3700.0*/78, /* 9 4200.0*/78, /* 10 4700.0*/78, /* 11 5200.0*/83, /* 12 5800.0*/87, /* 13 6400.0*/90, /* 14 7100.0*/91, /* 15 7800.0*/91, },
{/* 6 54.000 *//* 0 650.0*/75, /* 1 950.0*/79, /* 2 1250.0*/82, /* 3 1600.0*/84, /* 4 1950.0*/84, /* 5 2350.0*/85, /* 6 2750.0*/86, /* 7 3200.0*/86, /* 8 3700.0*/84, /* 9 4200.0*/83, /* 10 4700.0*/85, /* 11 5200.0*/89, /* 12 5800.0*/93, /* 13 6400.0*/96, /* 14 7100.0*/97, /* 15 7800.0*/98, },
{/* 7 60.000 *//* 0 650.0*/80, /* 1 950.0*/83, /* 2 1250.0*/86, /* 3 1600.0*/90, /* 4 1950.0*/88, /* 5 2350.0*/88, /* 6 2750.0*/90, /* 7 3200.0*/89, /* 8 3700.0*/89, /* 9 4200.0*/89, /* 10 4700.0*/91, /* 11 5200.0*/95, /* 12 5800.0*/98, /* 13 6400.0*/101, /* 14 7100.0*/103, /* 15 7800.0*/104, },
{/* 8 67.000 *//* 0 650.0*/85, /* 1 950.0*/87, /* 2 1250.0*/90, /* 3 1600.0*/94, /* 4 1950.0*/93, /* 5 2350.0*/92, /* 6 2750.0*/94, /* 7 3200.0*/93, /* 8 3700.0*/93, /* 9 4200.0*/95, /* 10 4700.0*/97, /* 11 5200.0*/101, /* 12 5800.0*/105, /* 13 6400.0*/107, /* 14 7100.0*/109, /* 15 7800.0*/110, },
{/* 9 74.000 *//* 0 650.0*/90, /* 1 950.0*/92, /* 2 1250.0*/94, /* 3 1600.0*/99, /* 4 1950.0*/98, /* 5 2350.0*/98, /* 6 2750.0*/99, /* 7 3200.0*/98, /* 8 3700.0*/99, /* 9 4200.0*/101, /* 10 4700.0*/105, /* 11 5200.0*/108, /* 12 5800.0*/111, /* 13 6400.0*/112, /* 14 7100.0*/114, /* 15 7800.0*/114, },
{/* 10 82.000 *//* 0 650.0*/96, /* 1 950.0*/96, /* 2 1250.0*/99, /* 3 1600.0*/102, /* 4 1950.0*/103, /* 5 2350.0*/103, /* 6 2750.0*/103, /* 7 3200.0*/105, /* 8 3700.0*/106, /* 9 4200.0*/109, /* 10 4700.0*/111, /* 11 5200.0*/114, /* 12 5800.0*/116, /* 13 6400.0*/118, /* 14 7100.0*/118, /* 15 7800.0*/118, },
{/* 11 90.000 *//* 0 650.0*/100, /* 1 950.0*/101, /* 2 1250.0*/103, /* 3 1600.0*/107, /* 4 1950.0*/107, /* 5 2350.0*/106, /* 6 2750.0*/106, /* 7 3200.0*/108, /* 8 3700.0*/112, /* 9 4200.0*/114, /* 10 4700.0*/117, /* 11 5200.0*/120, /* 12 5800.0*/121, /* 13 6400.0*/122, /* 14 7100.0*/122, /* 15 7800.0*/121, },
{/* 12 99.000 *//* 0 650.0*/104, /* 1 950.0*/105, /* 2 1250.0*/107, /* 3 1600.0*/109, /* 4 1950.0*/109, /* 5 2350.0*/108, /* 6 2750.0*/108, /* 7 3200.0*/110, /* 8 3700.0*/114, /* 9 4200.0*/117, /* 10 4700.0*/120, /* 11 5200.0*/123, /* 12 5800.0*/125, /* 13 6400.0*/124, /* 14 7100.0*/125, /* 15 7800.0*/124, },
{/* 13 108.000 *//* 0 650.0*/105, /* 1 950.0*/106, /* 2 1250.0*/107, /* 3 1600.0*/108, /* 4 1950.0*/109, /* 5 2350.0*/108, /* 6 2750.0*/109, /* 7 3200.0*/110, /* 8 3700.0*/114, /* 9 4200.0*/117, /* 10 4700.0*/119, /* 11 5200.0*/123, /* 12 5800.0*/124, /* 13 6400.0*/126, /* 14 7100.0*/126, /* 15 7800.0*/125, },
{/* 14 118.000 *//* 0 650.0*/105, /* 1 950.0*/106, /* 2 1250.0*/107, /* 3 1600.0*/109, /* 4 1950.0*/110, /* 5 2350.0*/109, /* 6 2750.0*/109, /* 7 3200.0*/111, /* 8 3700.0*/114, /* 9 4200.0*/116, /* 10 4700.0*/119, /* 11 5200.0*/121, /* 12 5800.0*/123, /* 13 6400.0*/125, /* 14 7100.0*/128, /* 15 7800.0*/128, },
{/* 15 128.000 *//* 0 650.0*/104, /* 1 950.0*/105, /* 2 1250.0*/107, /* 3 1600.0*/108, /* 4 1950.0*/108, /* 5 2350.0*/110, /* 6 2750.0*/111, /* 7 3200.0*/112, /* 8 3700.0*/114, /* 9 4200.0*/116, /* 10 4700.0*/118, /* 11 5200.0*/119, /* 12 5800.0*/121, /* 13 6400.0*/124, /* 14 7100.0*/127, /* 15 7800.0*/130, }
};
/* Generated by TS2C on Sun Aug 02 10:02:25 EDT 2020*/
static void setMapVeTable(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
MEMCPY(config->veLoadBins, hardCodedveLoadBins);
MEMCPY(config->veRpmBins, hardCodedveRpmBins);
MEMCPY(config->veTable, hardCodedveTable);
copyArray(config->veLoadBins, hardCodedveLoadBins);
copyArray(config->veRpmBins, hardCodedveRpmBins);
copyTable(config->veTable, hardCodedveTable);
}
static const float hardCodedVafveLoadBins[16] = {10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0, 120.0, 140.0, 160.0, 180.0, 210.0, 240.0};
static const float hardCodedVafveRpmBins[16] = {650.0, 950.0, 1250.0, 1600.0, 1950.0, 2350.0, 2750.0, 3200.0, 3700.0, 4200.0, 4700.0, 5200.0, 5800.0, 6400.0, 7100.0, 7800.0};
static const float hardCodedVafveTable[16][16] = {
static const uint8_t hardCodedVafveTable[16][16] = {
/* Generated by TS2C on Tue Aug 11 21:13:28 EDT 2020*/
{/* 0 10.000 *//* 0 650.0*/94.016, /* 1 950.0*/93.954, /* 2 1250.0*/95.236, /* 3 1600.0*/90.000, /* 4 1950.0*/90.000, /* 5 2350.0*/90.000, /* 6 2750.0*/90.000, /* 7 3200.0*/90.000, /* 8 3700.0*/90.000, /* 9 4200.0*/90.000, /* 10 4700.0*/90.000, /* 11 5200.0*/90.000, /* 12 5800.0*/100.000, /* 13 6400.0*/100.000, /* 14 7100.0*/100.000, /* 15 7800.0*/100.000, },
{/* 1 20.000 *//* 0 650.0*/94.252, /* 1 950.0*/97.953, /* 2 1250.0*/97.464, /* 3 1600.0*/93.974, /* 4 1950.0*/92.828, /* 5 2350.0*/90.537, /* 6 2750.0*/92.175, /* 7 3200.0*/95.727, /* 8 3700.0*/93.761, /* 9 4200.0*/93.135, /* 10 4700.0*/95.107, /* 11 5200.0*/97.489, /* 12 5800.0*/103.177, /* 13 6400.0*/104.594, /* 14 7100.0*/99.771, /* 15 7800.0*/100.000, },
{/* 2 30.000 *//* 0 650.0*/93.629, /* 1 950.0*/93.688, /* 2 1250.0*/96.133, /* 3 1600.0*/97.065, /* 4 1950.0*/97.139, /* 5 2350.0*/94.842, /* 6 2750.0*/92.312, /* 7 3200.0*/94.436, /* 8 3700.0*/92.063, /* 9 4200.0*/92.249, /* 10 4700.0*/98.657, /* 11 5200.0*/101.718, /* 12 5800.0*/103.337, /* 13 6400.0*/103.717, /* 14 7100.0*/99.317, /* 15 7800.0*/100.000, },
{/* 3 40.000 *//* 0 650.0*/100.501, /* 1 950.0*/97.962, /* 2 1250.0*/99.009, /* 3 1600.0*/97.556, /* 4 1950.0*/94.598, /* 5 2350.0*/91.408, /* 6 2750.0*/91.921, /* 7 3200.0*/93.813, /* 8 3700.0*/92.850, /* 9 4200.0*/91.802, /* 10 4700.0*/94.952, /* 11 5200.0*/99.911, /* 12 5800.0*/104.543, /* 13 6400.0*/104.758, /* 14 7100.0*/100.000, /* 15 7800.0*/100.000, },
{/* 4 50.000 *//* 0 650.0*/101.737, /* 1 950.0*/97.028, /* 2 1250.0*/98.010, /* 3 1600.0*/94.714, /* 4 1950.0*/92.342, /* 5 2350.0*/93.533, /* 6 2750.0*/94.615, /* 7 3200.0*/95.763, /* 8 3700.0*/94.563, /* 9 4200.0*/93.040, /* 10 4700.0*/94.561, /* 11 5200.0*/100.756, /* 12 5800.0*/104.128, /* 13 6400.0*/104.572, /* 14 7100.0*/100.000, /* 15 7800.0*/100.000, },
{/* 5 60.000 *//* 0 650.0*/102.922, /* 1 950.0*/100.975, /* 2 1250.0*/97.825, /* 3 1600.0*/95.090, /* 4 1950.0*/95.527, /* 5 2350.0*/94.089, /* 6 2750.0*/93.743, /* 7 3200.0*/95.578, /* 8 3700.0*/96.213, /* 9 4200.0*/95.254, /* 10 4700.0*/95.956, /* 11 5200.0*/101.235, /* 12 5800.0*/103.827, /* 13 6400.0*/104.644, /* 14 7100.0*/100.000, /* 15 7800.0*/100.000, },
{/* 6 70.000 *//* 0 650.0*/104.127, /* 1 950.0*/103.686, /* 2 1250.0*/99.314, /* 3 1600.0*/97.568, /* 4 1950.0*/97.018, /* 5 2350.0*/94.230, /* 6 2750.0*/94.440, /* 7 3200.0*/95.486, /* 8 3700.0*/95.658, /* 9 4200.0*/97.501, /* 10 4700.0*/97.398, /* 11 5200.0*/99.068, /* 12 5800.0*/101.898, /* 13 6400.0*/104.591, /* 14 7100.0*/99.949, /* 15 7800.0*/100.000, },
{/* 7 80.000 *//* 0 650.0*/104.298, /* 1 950.0*/104.159, /* 2 1250.0*/101.911, /* 3 1600.0*/99.695, /* 4 1950.0*/97.075, /* 5 2350.0*/94.926, /* 6 2750.0*/94.845, /* 7 3200.0*/94.111, /* 8 3700.0*/93.594, /* 9 4200.0*/95.821, /* 10 4700.0*/97.757, /* 11 5200.0*/99.181, /* 12 5800.0*/102.013, /* 13 6400.0*/104.072, /* 14 7100.0*/99.417, /* 15 7800.0*/100.000, },
{/* 8 90.000 *//* 0 650.0*/105.000, /* 1 950.0*/103.823, /* 2 1250.0*/103.648, /* 3 1600.0*/100.150, /* 4 1950.0*/97.824, /* 5 2350.0*/96.431, /* 6 2750.0*/95.481, /* 7 3200.0*/94.151, /* 8 3700.0*/90.334, /* 9 4200.0*/92.140, /* 10 4700.0*/95.487, /* 11 5200.0*/99.686, /* 12 5800.0*/103.082, /* 13 6400.0*/104.592, /* 14 7100.0*/99.531, /* 15 7800.0*/100.000, },
{/* 9 100.000 *//* 0 650.0*/105.000, /* 1 950.0*/103.188, /* 2 1250.0*/103.291, /* 3 1600.0*/103.080, /* 4 1950.0*/98.700, /* 5 2350.0*/99.850, /* 6 2750.0*/98.309, /* 7 3200.0*/92.768, /* 8 3700.0*/88.657, /* 9 4200.0*/89.541, /* 10 4700.0*/94.960, /* 11 5200.0*/100.362, /* 12 5800.0*/103.777, /* 13 6400.0*/104.583, /* 14 7100.0*/100.006, /* 15 7800.0*/100.000, },
{/* 10 120.000 *//* 0 650.0*/105.000, /* 1 950.0*/104.711, /* 2 1250.0*/104.571, /* 3 1600.0*/104.130, /* 4 1950.0*/104.417, /* 5 2350.0*/105.597, /* 6 2750.0*/103.658, /* 7 3200.0*/97.445, /* 8 3700.0*/92.979, /* 9 4200.0*/93.606, /* 10 4700.0*/100.061, /* 11 5200.0*/103.715, /* 12 5800.0*/104.756, /* 13 6400.0*/104.908, /* 14 7100.0*/100.000, /* 15 7800.0*/100.000, },
{/* 11 140.000 *//* 0 650.0*/100.000, /* 1 950.0*/100.000, /* 2 1250.0*/100.000, /* 3 1600.0*/100.000, /* 4 1950.0*/100.000, /* 5 2350.0*/100.000, /* 6 2750.0*/100.000, /* 7 3200.0*/102.931, /* 8 3700.0*/102.446, /* 9 4200.0*/100.000, /* 10 4700.0*/100.000, /* 11 5200.0*/100.000, /* 12 5800.0*/100.000, /* 13 6400.0*/100.000, /* 14 7100.0*/100.000, /* 15 7800.0*/100.000, },
{/* 12 160.000 *//* 0 650.0*/100.000, /* 1 950.0*/100.000, /* 2 1250.0*/100.000, /* 3 1600.0*/100.000, /* 4 1950.0*/100.000, /* 5 2350.0*/100.000, /* 6 2750.0*/100.000, /* 7 3200.0*/101.509, /* 8 3700.0*/101.252, /* 9 4200.0*/100.000, /* 10 4700.0*/100.000, /* 11 5200.0*/100.000, /* 12 5800.0*/100.000, /* 13 6400.0*/100.000, /* 14 7100.0*/100.000, /* 15 7800.0*/100.000, },
{/* 13 180.000 *//* 0 650.0*/100.000, /* 1 950.0*/100.000, /* 2 1250.0*/100.000, /* 3 1600.0*/100.000, /* 4 1950.0*/100.000, /* 5 2350.0*/100.000, /* 6 2750.0*/100.000, /* 7 3200.0*/100.000, /* 8 3700.0*/100.000, /* 9 4200.0*/100.000, /* 10 4700.0*/100.000, /* 11 5200.0*/100.000, /* 12 5800.0*/100.000, /* 13 6400.0*/100.000, /* 14 7100.0*/100.000, /* 15 7800.0*/100.000, },
{/* 14 210.000 *//* 0 650.0*/100.000, /* 1 950.0*/100.000, /* 2 1250.0*/100.000, /* 3 1600.0*/100.000, /* 4 1950.0*/100.000, /* 5 2350.0*/100.000, /* 6 2750.0*/100.000, /* 7 3200.0*/100.000, /* 8 3700.0*/100.000, /* 9 4200.0*/100.000, /* 10 4700.0*/100.000, /* 11 5200.0*/100.000, /* 12 5800.0*/100.000, /* 13 6400.0*/100.000, /* 14 7100.0*/100.000, /* 15 7800.0*/100.000, },
{/* 15 240.000 *//* 0 650.0*/100.000, /* 1 950.0*/100.000, /* 2 1250.0*/100.000, /* 3 1600.0*/100.000, /* 4 1950.0*/100.000, /* 5 2350.0*/100.000, /* 6 2750.0*/100.000, /* 7 3200.0*/100.000, /* 8 3700.0*/100.000, /* 9 4200.0*/100.000, /* 10 4700.0*/100.000, /* 11 5200.0*/100.000, /* 12 5800.0*/100.000, /* 13 6400.0*/100.000, /* 14 7100.0*/100.000, /* 15 7800.0*/100.000, },
{/* 0 10.000 *//* 0 650.0*/94, /* 1 950.0*/93, /* 2 1250.0*/95, /* 3 1600.0*/90, /* 4 1950.0*/90, /* 5 2350.0*/90, /* 6 2750.0*/90, /* 7 3200.0*/90, /* 8 3700.0*/90, /* 9 4200.0*/90, /* 10 4700.0*/90, /* 11 5200.0*/90, /* 12 5800.0*/100, /* 13 6400.0*/100, /* 14 7100.0*/100, /* 15 7800.0*/100, },
{/* 1 20.000 *//* 0 650.0*/94, /* 1 950.0*/97, /* 2 1250.0*/97, /* 3 1600.0*/93, /* 4 1950.0*/92, /* 5 2350.0*/90, /* 6 2750.0*/92, /* 7 3200.0*/95, /* 8 3700.0*/93, /* 9 4200.0*/93, /* 10 4700.0*/95, /* 11 5200.0*/97, /* 12 5800.0*/103, /* 13 6400.0*/104, /* 14 7100.0*/99, /* 15 7800.0*/100, },
{/* 2 30.000 *//* 0 650.0*/93, /* 1 950.0*/93, /* 2 1250.0*/96, /* 3 1600.0*/97, /* 4 1950.0*/97, /* 5 2350.0*/94, /* 6 2750.0*/92, /* 7 3200.0*/94, /* 8 3700.0*/92, /* 9 4200.0*/92, /* 10 4700.0*/98, /* 11 5200.0*/101, /* 12 5800.0*/103, /* 13 6400.0*/103, /* 14 7100.0*/99, /* 15 7800.0*/100, },
{/* 3 40.000 *//* 0 650.0*/100, /* 1 950.0*/97, /* 2 1250.0*/99, /* 3 1600.0*/97, /* 4 1950.0*/94, /* 5 2350.0*/91, /* 6 2750.0*/91, /* 7 3200.0*/93, /* 8 3700.0*/92, /* 9 4200.0*/91, /* 10 4700.0*/94, /* 11 5200.0*/99, /* 12 5800.0*/104, /* 13 6400.0*/104, /* 14 7100.0*/100, /* 15 7800.0*/100, },
{/* 4 50.000 *//* 0 650.0*/101, /* 1 950.0*/97, /* 2 1250.0*/98, /* 3 1600.0*/94, /* 4 1950.0*/92, /* 5 2350.0*/93, /* 6 2750.0*/94, /* 7 3200.0*/95, /* 8 3700.0*/94, /* 9 4200.0*/93, /* 10 4700.0*/94, /* 11 5200.0*/100, /* 12 5800.0*/104, /* 13 6400.0*/104, /* 14 7100.0*/100, /* 15 7800.0*/100, },
{/* 5 60.000 *//* 0 650.0*/102, /* 1 950.0*/100, /* 2 1250.0*/97, /* 3 1600.0*/95, /* 4 1950.0*/95, /* 5 2350.0*/94, /* 6 2750.0*/93, /* 7 3200.0*/95, /* 8 3700.0*/96, /* 9 4200.0*/95, /* 10 4700.0*/95, /* 11 5200.0*/101, /* 12 5800.0*/103, /* 13 6400.0*/104, /* 14 7100.0*/100, /* 15 7800.0*/100, },
{/* 6 70.000 *//* 0 650.0*/104, /* 1 950.0*/103, /* 2 1250.0*/99, /* 3 1600.0*/97, /* 4 1950.0*/97, /* 5 2350.0*/94, /* 6 2750.0*/94, /* 7 3200.0*/95, /* 8 3700.0*/95, /* 9 4200.0*/97, /* 10 4700.0*/97, /* 11 5200.0*/99, /* 12 5800.0*/101, /* 13 6400.0*/104, /* 14 7100.0*/99, /* 15 7800.0*/100, },
{/* 7 80.000 *//* 0 650.0*/104, /* 1 950.0*/104, /* 2 1250.0*/101, /* 3 1600.0*/99, /* 4 1950.0*/97, /* 5 2350.0*/94, /* 6 2750.0*/94, /* 7 3200.0*/94, /* 8 3700.0*/93, /* 9 4200.0*/95, /* 10 4700.0*/97, /* 11 5200.0*/99, /* 12 5800.0*/102, /* 13 6400.0*/104, /* 14 7100.0*/99, /* 15 7800.0*/100, },
{/* 8 90.000 *//* 0 650.0*/105, /* 1 950.0*/103, /* 2 1250.0*/103, /* 3 1600.0*/100, /* 4 1950.0*/97, /* 5 2350.0*/96, /* 6 2750.0*/95, /* 7 3200.0*/94, /* 8 3700.0*/90, /* 9 4200.0*/92, /* 10 4700.0*/95, /* 11 5200.0*/99, /* 12 5800.0*/103, /* 13 6400.0*/104, /* 14 7100.0*/99, /* 15 7800.0*/100, },
{/* 9 100.000 *//* 0 650.0*/105, /* 1 950.0*/103, /* 2 1250.0*/103, /* 3 1600.0*/103, /* 4 1950.0*/98, /* 5 2350.0*/99, /* 6 2750.0*/98, /* 7 3200.0*/92, /* 8 3700.0*/88, /* 9 4200.0*/89, /* 10 4700.0*/94, /* 11 5200.0*/100, /* 12 5800.0*/103, /* 13 6400.0*/104, /* 14 7100.0*/100, /* 15 7800.0*/100, },
{/* 10 120.000 *//* 0 650.0*/105, /* 1 950.0*/104, /* 2 1250.0*/104, /* 3 1600.0*/104, /* 4 1950.0*/104, /* 5 2350.0*/105, /* 6 2750.0*/103, /* 7 3200.0*/97, /* 8 3700.0*/92, /* 9 4200.0*/93, /* 10 4700.0*/100, /* 11 5200.0*/103, /* 12 5800.0*/104, /* 13 6400.0*/104, /* 14 7100.0*/100, /* 15 7800.0*/100, },
{/* 11 140.000 *//* 0 650.0*/100, /* 1 950.0*/100, /* 2 1250.0*/100, /* 3 1600.0*/100, /* 4 1950.0*/100, /* 5 2350.0*/100, /* 6 2750.0*/100, /* 7 3200.0*/102, /* 8 3700.0*/102, /* 9 4200.0*/100, /* 10 4700.0*/100, /* 11 5200.0*/100, /* 12 5800.0*/100, /* 13 6400.0*/100, /* 14 7100.0*/100, /* 15 7800.0*/100, },
{/* 12 160.000 *//* 0 650.0*/100, /* 1 950.0*/100, /* 2 1250.0*/100, /* 3 1600.0*/100, /* 4 1950.0*/100, /* 5 2350.0*/100, /* 6 2750.0*/100, /* 7 3200.0*/101, /* 8 3700.0*/101, /* 9 4200.0*/100, /* 10 4700.0*/100, /* 11 5200.0*/100, /* 12 5800.0*/100, /* 13 6400.0*/100, /* 14 7100.0*/100, /* 15 7800.0*/100, },
{/* 13 180.000 *//* 0 650.0*/100, /* 1 950.0*/100, /* 2 1250.0*/100, /* 3 1600.0*/100, /* 4 1950.0*/100, /* 5 2350.0*/100, /* 6 2750.0*/100, /* 7 3200.0*/100, /* 8 3700.0*/100, /* 9 4200.0*/100, /* 10 4700.0*/100, /* 11 5200.0*/100, /* 12 5800.0*/100, /* 13 6400.0*/100, /* 14 7100.0*/100, /* 15 7800.0*/100, },
{/* 14 210.000 *//* 0 650.0*/100, /* 1 950.0*/100, /* 2 1250.0*/100, /* 3 1600.0*/100, /* 4 1950.0*/100, /* 5 2350.0*/100, /* 6 2750.0*/100, /* 7 3200.0*/100, /* 8 3700.0*/100, /* 9 4200.0*/100, /* 10 4700.0*/100, /* 11 5200.0*/100, /* 12 5800.0*/100, /* 13 6400.0*/100, /* 14 7100.0*/100, /* 15 7800.0*/100, },
{/* 15 240.000 *//* 0 650.0*/100, /* 1 950.0*/100, /* 2 1250.0*/100, /* 3 1600.0*/100, /* 4 1950.0*/100, /* 5 2350.0*/100, /* 6 2750.0*/100, /* 7 3200.0*/100, /* 8 3700.0*/100, /* 9 4200.0*/100, /* 10 4700.0*/100, /* 11 5200.0*/100, /* 12 5800.0*/100, /* 13 6400.0*/100, /* 14 7100.0*/100, /* 15 7800.0*/100, },
};
/* Generated by TS2C on Tue Aug 11 21:13:28 EDT 2020*/
static void setVafVeTable(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
MEMCPY(config->veLoadBins, hardCodedVafveLoadBins);
MEMCPY(config->veRpmBins, hardCodedVafveRpmBins);
MEMCPY(config->veTable, hardCodedVafveTable);
copyArray(config->veLoadBins, hardCodedVafveLoadBins);
copyArray(config->veRpmBins, hardCodedVafveRpmBins);
copyTable(config->veTable, hardCodedVafveTable);
}
static const float hardCodedVafignitionLoadBins[16] = {10.0, 16.0, 21.0, 26.0, 32.0, 39.0, 47.0, 56.0, 66.0, 77.0, 89.0, 101.0, 113.0, 125.0, 137.0, 149.0};
static const float hardCodedVafignitionRpmBins[16] = {500.0, 900.0, 1200.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 hardCodedVafignitionTable[16][16] = {
static const uint8_t hardCodedVafignitionTable[16][16] = {
/* Generated by TS2C on Tue Aug 11 21:13:28 EDT 2020*/
{/* 0 10.000 *//* 0 500.0*/15.000, /* 1 900.0*/7.000, /* 2 1200.0*/14.300, /* 3 1500.0*/23.160, /* 4 1800.0*/31.500, /* 5 2300.0*/34.400, /* 6 2900.0*/35.300, /* 7 3400.0*/36.300, /* 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 16.000 *//* 0 500.0*/15.000, /* 1 900.0*/7.000, /* 2 1200.0*/14.070, /* 3 1500.0*/23.580, /* 4 1800.0*/31.500, /* 5 2300.0*/34.400, /* 6 2900.0*/35.300, /* 7 3400.0*/36.300, /* 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 21.000 *//* 0 500.0*/15.000, /* 1 900.0*/7.000, /* 2 1200.0*/13.970, /* 3 1500.0*/23.640, /* 4 1800.0*/31.297, /* 5 2300.0*/34.086, /* 6 2900.0*/34.955, /* 7 3400.0*/35.894, /* 8 3900.0*/36.826, /* 9 4300.0*/37.126, /* 10 4800.0*/37.526, /* 11 5300.0*/37.634, /* 12 5900.0*/38.334, /* 13 6500.0*/39.042, /* 14 7200.0*/39.849, /* 15 8000.0*/40.541, },
{/* 3 26.000 *//* 0 500.0*/15.000, /* 1 900.0*/7.000, /* 2 1200.0*/14.370, /* 3 1500.0*/23.800, /* 4 1800.0*/31.095, /* 5 2300.0*/33.772, /* 6 2900.0*/34.610, /* 7 3400.0*/35.488, /* 8 3900.0*/36.353, /* 9 4300.0*/36.653, /* 10 4800.0*/37.053, /* 11 5300.0*/37.167, /* 12 5900.0*/37.868, /* 13 6500.0*/38.583, /* 14 7200.0*/39.398, /* 15 8000.0*/40.082, },
{/* 4 32.000 *//* 0 500.0*/15.000, /* 1 900.0*/7.000, /* 2 1200.0*/15.180, /* 3 1500.0*/24.100, /* 4 1800.0*/30.852, /* 5 2300.0*/33.396, /* 6 2900.0*/34.196, /* 7 3400.0*/35.001, /* 8 3900.0*/35.784, /* 9 4300.0*/36.084, /* 10 4800.0*/36.484, /* 11 5300.0*/36.608, /* 12 5900.0*/37.308, /* 13 6500.0*/38.032, /* 14 7200.0*/38.856, /* 15 8000.0*/39.531, },
{/* 5 39.000 *//* 0 500.0*/15.000, /* 1 900.0*/7.000, /* 2 1200.0*/16.040, /* 3 1500.0*/24.400, /* 4 1800.0*/30.568, /* 5 2300.0*/32.956, /* 6 2900.0*/33.712, /* 7 3400.0*/34.432, /* 8 3900.0*/35.121, /* 9 4300.0*/35.421, /* 10 4800.0*/35.821, /* 11 5300.0*/35.956, /* 12 5900.0*/36.656, /* 13 6500.0*/37.390, /* 14 7200.0*/38.225, /* 15 8000.0*/38.889, },
{/* 6 47.000 *//* 0 500.0*/15.000, /* 1 900.0*/7.000, /* 2 1200.0*/17.250, /* 3 1500.0*/24.550, /* 4 1800.0*/30.244, /* 5 2300.0*/32.454, /* 6 2900.0*/33.160, /* 7 3400.0*/33.783, /* 8 3900.0*/34.363, /* 9 4300.0*/34.663, /* 10 4800.0*/35.063, /* 11 5300.0*/35.210, /* 12 5900.0*/35.910, /* 13 6500.0*/36.656, /* 14 7200.0*/37.503, /* 15 8000.0*/38.154, },
{/* 7 56.000 *//* 0 500.0*/16.000, /* 1 900.0*/8.000, /* 2 1200.0*/18.670, /* 3 1500.0*/24.640, /* 4 1800.0*/29.879, /* 5 2300.0*/31.889, /* 6 2900.0*/32.539, /* 7 3400.0*/33.052, /* 8 3900.0*/33.511, /* 9 4300.0*/33.811, /* 10 4800.0*/34.210, /* 11 5300.0*/34.371, /* 12 5900.0*/35.071, /* 13 6500.0*/35.831, /* 14 7200.0*/36.691, /* 15 8000.0*/37.328, },
{/* 8 66.000 *//* 0 500.0*/17.300, /* 1 900.0*/9.300, /* 2 1200.0*/20.020, /* 3 1500.0*/24.820, /* 4 1800.0*/29.474, /* 5 2300.0*/31.261, /* 6 2900.0*/31.849, /* 7 3400.0*/32.240, /* 8 3900.0*/32.563, /* 9 4300.0*/32.863, /* 10 4800.0*/33.263, /* 11 5300.0*/33.438, /* 12 5900.0*/34.138, /* 13 6500.0*/34.914, /* 14 7200.0*/35.789, /* 15 8000.0*/36.410, },
{/* 9 77.000 *//* 0 500.0*/18.400, /* 1 900.0*/13.290, /* 2 1200.0*/21.780, /* 3 1500.0*/25.230, /* 4 1800.0*/29.028, /* 5 2300.0*/30.570, /* 6 2900.0*/31.090, /* 7 3400.0*/31.347, /* 8 3900.0*/31.521, /* 9 4300.0*/31.821, /* 10 4800.0*/32.221, /* 11 5300.0*/32.413, /* 12 5900.0*/33.113, /* 13 6500.0*/33.904, /* 14 7200.0*/34.796, /* 15 8000.0*/35.400, },
{/* 10 89.000 *//* 0 500.0*/19.300, /* 1 900.0*/16.450, /* 2 1200.0*/23.070, /* 3 1500.0*/25.560, /* 4 1800.0*/28.542, /* 5 2300.0*/29.817, /* 6 2900.0*/30.261, /* 7 3400.0*/30.372, /* 8 3900.0*/30.384, /* 9 4300.0*/30.684, /* 10 4800.0*/31.084, /* 11 5300.0*/31.294, /* 12 5900.0*/31.994, /* 13 6500.0*/32.804, /* 14 7200.0*/33.713, /* 15 8000.0*/34.298, },
{/* 11 101.000 *//* 0 500.0*/19.400, /* 1 900.0*/20.420, /* 2 1200.0*/23.650, /* 3 1500.0*/25.710, /* 4 1800.0*/28.055, /* 5 2300.0*/29.063, /* 6 2900.0*/29.433, /* 7 3400.0*/29.398, /* 8 3900.0*/29.247, /* 9 4300.0*/29.547, /* 10 4800.0*/29.947, /* 11 5300.0*/30.175, /* 12 5900.0*/30.875, /* 13 6500.0*/31.703, /* 14 7200.0*/32.631, /* 15 8000.0*/33.197, },
{/* 12 113.000 *//* 0 500.0*/19.000, /* 1 900.0*/21.560, /* 2 1200.0*/23.900, /* 3 1500.0*/25.600, /* 4 1800.0*/27.569, /* 5 2300.0*/28.310, /* 6 2900.0*/28.605, /* 7 3400.0*/28.423, /* 8 3900.0*/28.111, /* 9 4300.0*/28.411, /* 10 4800.0*/28.811, /* 11 5300.0*/29.056, /* 12 5900.0*/29.756, /* 13 6500.0*/30.602, /* 14 7200.0*/31.548, /* 15 8000.0*/32.095, },
{/* 13 125.000 *//* 0 500.0*/19.000, /* 1 900.0*/21.390, /* 2 1200.0*/23.370, /* 3 1500.0*/25.340, /* 4 1800.0*/27.083, /* 5 2300.0*/27.557, /* 6 2900.0*/27.777, /* 7 3400.0*/27.449, /* 8 3900.0*/26.974, /* 9 4300.0*/27.274, /* 10 4800.0*/27.674, /* 11 5300.0*/27.938, /* 12 5900.0*/28.638, /* 13 6500.0*/29.501, /* 14 7200.0*/30.465, /* 15 8000.0*/30.993, },
{/* 14 137.000 *//* 0 500.0*/18.000, /* 1 900.0*/20.920, /* 2 1200.0*/23.420, /* 3 1500.0*/24.970, /* 4 1800.0*/26.596, /* 5 2300.0*/26.803, /* 6 2900.0*/26.948, /* 7 3400.0*/26.474, /* 8 3900.0*/25.837, /* 9 4300.0*/26.137, /* 10 4800.0*/26.537, /* 11 5300.0*/26.819, /* 12 5900.0*/27.519, /* 13 6500.0*/28.401, /* 14 7200.0*/29.383, /* 15 8000.0*/29.892, },
{/* 15 149.000 *//* 0 500.0*/16.800, /* 1 900.0*/20.150, /* 2 1200.0*/22.920, /* 3 1500.0*/24.390, /* 4 1800.0*/26.110, /* 5 2300.0*/26.050, /* 6 2900.0*/26.120, /* 7 3400.0*/25.500, /* 8 3900.0*/24.700, /* 9 4300.0*/25.000, /* 10 4800.0*/25.400, /* 11 5300.0*/25.700, /* 12 5900.0*/26.400, /* 13 6500.0*/27.300, /* 14 7200.0*/28.300, /* 15 8000.0*/28.790, },
{/* 0 10.000 *//* 0 500.0*/15, /* 1 900.0*/7, /* 2 1200.0*/14, /* 3 1500.0*/23, /* 4 1800.0*/31, /* 5 2300.0*/34, /* 6 2900.0*/35, /* 7 3400.0*/36, /* 8 3900.0*/37, /* 9 4300.0*/37, /* 10 4800.0*/38, /* 11 5300.0*/38, /* 12 5900.0*/38, /* 13 6500.0*/39, /* 14 7200.0*/40, /* 15 8000.0*/41, },
{/* 1 16.000 *//* 0 500.0*/15, /* 1 900.0*/7, /* 2 1200.0*/14, /* 3 1500.0*/23, /* 4 1800.0*/31, /* 5 2300.0*/34, /* 6 2900.0*/35, /* 7 3400.0*/36, /* 8 3900.0*/37, /* 9 4300.0*/37, /* 10 4800.0*/38, /* 11 5300.0*/38, /* 12 5900.0*/38, /* 13 6500.0*/39, /* 14 7200.0*/40, /* 15 8000.0*/41, },
{/* 2 21.000 *//* 0 500.0*/15, /* 1 900.0*/7, /* 2 1200.0*/13, /* 3 1500.0*/23, /* 4 1800.0*/31, /* 5 2300.0*/34, /* 6 2900.0*/34, /* 7 3400.0*/35, /* 8 3900.0*/36, /* 9 4300.0*/37, /* 10 4800.0*/37, /* 11 5300.0*/37, /* 12 5900.0*/38, /* 13 6500.0*/39, /* 14 7200.0*/39, /* 15 8000.0*/40, },
{/* 3 26.000 *//* 0 500.0*/15, /* 1 900.0*/7, /* 2 1200.0*/14, /* 3 1500.0*/23, /* 4 1800.0*/31, /* 5 2300.0*/33, /* 6 2900.0*/34, /* 7 3400.0*/35, /* 8 3900.0*/36, /* 9 4300.0*/36, /* 10 4800.0*/37, /* 11 5300.0*/37, /* 12 5900.0*/37, /* 13 6500.0*/38, /* 14 7200.0*/39, /* 15 8000.0*/40, },
{/* 4 32.000 *//* 0 500.0*/15, /* 1 900.0*/7, /* 2 1200.0*/15, /* 3 1500.0*/24, /* 4 1800.0*/30, /* 5 2300.0*/33, /* 6 2900.0*/34, /* 7 3400.0*/35, /* 8 3900.0*/35, /* 9 4300.0*/36, /* 10 4800.0*/36, /* 11 5300.0*/36, /* 12 5900.0*/37, /* 13 6500.0*/38, /* 14 7200.0*/38, /* 15 8000.0*/39, },
{/* 5 39.000 *//* 0 500.0*/15, /* 1 900.0*/7, /* 2 1200.0*/16, /* 3 1500.0*/24, /* 4 1800.0*/30, /* 5 2300.0*/32, /* 6 2900.0*/33, /* 7 3400.0*/34, /* 8 3900.0*/35, /* 9 4300.0*/35, /* 10 4800.0*/35, /* 11 5300.0*/35, /* 12 5900.0*/36, /* 13 6500.0*/37, /* 14 7200.0*/38, /* 15 8000.0*/38, },
{/* 6 47.000 *//* 0 500.0*/15, /* 1 900.0*/7, /* 2 1200.0*/17, /* 3 1500.0*/24, /* 4 1800.0*/30, /* 5 2300.0*/32, /* 6 2900.0*/33, /* 7 3400.0*/33, /* 8 3900.0*/34, /* 9 4300.0*/34, /* 10 4800.0*/35, /* 11 5300.0*/35, /* 12 5900.0*/35, /* 13 6500.0*/36, /* 14 7200.0*/37, /* 15 8000.0*/38, },
{/* 7 56.000 *//* 0 500.0*/16, /* 1 900.0*/8, /* 2 1200.0*/18, /* 3 1500.0*/24, /* 4 1800.0*/29, /* 5 2300.0*/31, /* 6 2900.0*/32, /* 7 3400.0*/33, /* 8 3900.0*/33, /* 9 4300.0*/33, /* 10 4800.0*/34, /* 11 5300.0*/34, /* 12 5900.0*/35, /* 13 6500.0*/35, /* 14 7200.0*/36, /* 15 8000.0*/37, },
{/* 8 66.000 *//* 0 500.0*/17, /* 1 900.0*/9, /* 2 1200.0*/20, /* 3 1500.0*/24, /* 4 1800.0*/29, /* 5 2300.0*/31, /* 6 2900.0*/31, /* 7 3400.0*/32, /* 8 3900.0*/32, /* 9 4300.0*/32, /* 10 4800.0*/33, /* 11 5300.0*/33, /* 12 5900.0*/34, /* 13 6500.0*/34, /* 14 7200.0*/35, /* 15 8000.0*/36, },
{/* 9 77.000 *//* 0 500.0*/18, /* 1 900.0*/13, /* 2 1200.0*/21, /* 3 1500.0*/25, /* 4 1800.0*/29, /* 5 2300.0*/30, /* 6 2900.0*/31, /* 7 3400.0*/31, /* 8 3900.0*/31, /* 9 4300.0*/31, /* 10 4800.0*/32, /* 11 5300.0*/32, /* 12 5900.0*/33, /* 13 6500.0*/33, /* 14 7200.0*/34, /* 15 8000.0*/35, },
{/* 10 89.000 *//* 0 500.0*/19, /* 1 900.0*/16, /* 2 1200.0*/23, /* 3 1500.0*/25, /* 4 1800.0*/28, /* 5 2300.0*/29, /* 6 2900.0*/30, /* 7 3400.0*/30, /* 8 3900.0*/30, /* 9 4300.0*/30, /* 10 4800.0*/31, /* 11 5300.0*/31, /* 12 5900.0*/31, /* 13 6500.0*/32, /* 14 7200.0*/33, /* 15 8000.0*/34, },
{/* 11 101.000 *//* 0 500.0*/19, /* 1 900.0*/20, /* 2 1200.0*/23, /* 3 1500.0*/25, /* 4 1800.0*/28, /* 5 2300.0*/29, /* 6 2900.0*/29, /* 7 3400.0*/29, /* 8 3900.0*/29, /* 9 4300.0*/29, /* 10 4800.0*/29, /* 11 5300.0*/30, /* 12 5900.0*/30, /* 13 6500.0*/31, /* 14 7200.0*/32, /* 15 8000.0*/33, },
{/* 12 113.000 *//* 0 500.0*/19, /* 1 900.0*/21, /* 2 1200.0*/23, /* 3 1500.0*/25, /* 4 1800.0*/27, /* 5 2300.0*/28, /* 6 2900.0*/28, /* 7 3400.0*/28, /* 8 3900.0*/28, /* 9 4300.0*/28, /* 10 4800.0*/28, /* 11 5300.0*/29, /* 12 5900.0*/29, /* 13 6500.0*/30, /* 14 7200.0*/31, /* 15 8000.0*/32, },
{/* 13 125.000 *//* 0 500.0*/19, /* 1 900.0*/21, /* 2 1200.0*/23, /* 3 1500.0*/25, /* 4 1800.0*/27, /* 5 2300.0*/27, /* 6 2900.0*/27, /* 7 3400.0*/27, /* 8 3900.0*/26, /* 9 4300.0*/27, /* 10 4800.0*/27, /* 11 5300.0*/27, /* 12 5900.0*/28, /* 13 6500.0*/29, /* 14 7200.0*/30, /* 15 8000.0*/30, },
{/* 14 137.000 *//* 0 500.0*/18, /* 1 900.0*/20, /* 2 1200.0*/23, /* 3 1500.0*/24, /* 4 1800.0*/26, /* 5 2300.0*/26, /* 6 2900.0*/26, /* 7 3400.0*/26, /* 8 3900.0*/25, /* 9 4300.0*/26, /* 10 4800.0*/26, /* 11 5300.0*/26, /* 12 5900.0*/27, /* 13 6500.0*/28, /* 14 7200.0*/29, /* 15 8000.0*/29, },
{/* 15 149.000 *//* 0 500.0*/16, /* 1 900.0*/20, /* 2 1200.0*/22, /* 3 1500.0*/24, /* 4 1800.0*/26, /* 5 2300.0*/26, /* 6 2900.0*/26, /* 7 3400.0*/25, /* 8 3900.0*/24, /* 9 4300.0*/25, /* 10 4800.0*/25, /* 11 5300.0*/25, /* 12 5900.0*/26, /* 13 6500.0*/27, /* 14 7200.0*/28, /* 15 8000.0*/28, },
};
/* Generated by TS2C on Tue Aug 11 21:13:28 EDT 2020*/
static void setVafIgnitionTable(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
MEMCPY(config->ignitionLoadBins, hardCodedVafignitionLoadBins);
MEMCPY(config->ignitionRpmBins, hardCodedVafignitionRpmBins);
MEMCPY(config->ignitionTable, hardCodedVafignitionTable);
copyArray(config->ignitionLoadBins, hardCodedVafignitionLoadBins);
copyArray(config->ignitionRpmBins, hardCodedVafignitionRpmBins);
copyTable(config->ignitionTable, hardCodedVafignitionTable);
}
#if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT
static const ignition_table_t mapBased16IgnitionTable = {
static const uint8_t mapBased16IgnitionTable[16][16] = {
/* Generated by TS2C on Wed Jun 15 21:22:11 EDT 2016*/
{/* 0 18.000 *//* 0 650.0*/10.000, /* 1 1100.0*/11.432, /* 2 1550.0*/12.863, /* 3 2000.0*/14.295, /* 4 2450.0*/15.726, /* 5 2900.0*/17.157, /* 6 3350.0*/18.589, /* 7 3800.0*/20.021, /* 8 4250.0*/21.452, /* 9 4700.0*/22.884, /* 10 5150.0*/24.315, /* 11 5650.0*/25.906, /* 12 6100.0*/27.337, /* 13 6550.0*/28.769, /* 14 7000.0*/30.200, /* 15 7450.0*/30.200, },
{/* 1 24.000 *//* 0 650.0*/10.222, /* 1 1100.0*/11.575, /* 2 1550.0*/12.927, /* 3 2000.0*/14.279, /* 4 2450.0*/15.632, /* 5 2900.0*/16.984, /* 6 3350.0*/18.337, /* 7 3800.0*/19.689, /* 8 4250.0*/21.055, /* 9 4700.0*/22.437, /* 10 5150.0*/23.819, /* 11 5650.0*/25.354, /* 12 6100.0*/26.736, /* 13 6550.0*/28.118, /* 14 7000.0*/29.500, /* 15 7450.0*/29.500, },
{/* 2 33.000 *//* 0 650.0*/10.556, /* 1 1100.0*/11.789, /* 2 1550.0*/13.023, /* 3 2000.0*/14.257, /* 4 2450.0*/15.490, /* 5 2900.0*/16.724, /* 6 3350.0*/17.958, /* 7 3800.0*/19.192, /* 8 4250.0*/20.426, /* 9 4700.0*/21.659, /* 10 5150.0*/22.893, /* 11 5650.0*/24.264, /* 12 6100.0*/25.497, /* 13 6550.0*/26.731, /* 14 7000.0*/27.965, /* 15 7450.0*/27.965, },
{/* 3 39.000 *//* 0 650.0*/10.778, /* 1 1100.0*/11.932, /* 2 1550.0*/13.087, /* 3 2000.0*/14.242, /* 4 2450.0*/15.396, /* 5 2900.0*/16.551, /* 6 3350.0*/17.706, /* 7 3800.0*/18.860, /* 8 4250.0*/20.015, /* 9 4700.0*/21.169, /* 10 5150.0*/22.324, /* 11 5650.0*/23.607, /* 12 6100.0*/24.761, /* 13 6550.0*/25.916, /* 14 7000.0*/27.071, /* 15 7450.0*/27.071, },
{/* 4 45.000 *//* 0 650.0*/11.000, /* 1 1100.0*/12.076, /* 2 1550.0*/13.151, /* 3 2000.0*/14.227, /* 4 2450.0*/15.302, /* 5 2900.0*/16.378, /* 6 3350.0*/17.453, /* 7 3800.0*/18.529, /* 8 4250.0*/19.604, /* 9 4700.0*/20.680, /* 10 5150.0*/21.755, /* 11 5650.0*/22.950, /* 12 6100.0*/24.026, /* 13 6550.0*/25.101, /* 14 7000.0*/26.177, /* 15 7450.0*/26.177, },
{/* 5 51.000 *//* 0 650.0*/11.000, /* 1 1100.0*/11.572, /* 2 1550.0*/12.624, /* 3 2000.0*/13.676, /* 4 2450.0*/14.727, /* 5 2900.0*/15.779, /* 6 3350.0*/16.831, /* 7 3800.0*/17.883, /* 8 4250.0*/18.929, /* 9 4700.0*/19.969, /* 10 5150.0*/21.009, /* 11 5650.0*/22.164, /* 12 6100.0*/23.203, /* 13 6550.0*/24.243, /* 14 7000.0*/25.283, /* 15 7450.0*/25.283, },
{/* 6 60.000 *//* 0 650.0*/9.800, /* 1 1100.0*/10.816, /* 2 1550.0*/11.833, /* 3 2000.0*/12.849, /* 4 2450.0*/13.865, /* 5 2900.0*/14.882, /* 6 3350.0*/15.898, /* 7 3800.0*/16.914, /* 8 4250.0*/17.917, /* 9 4700.0*/18.903, /* 10 5150.0*/19.889, /* 11 5650.0*/20.984, /* 12 6100.0*/21.970, /* 13 6550.0*/22.956, /* 14 7000.0*/23.941, /* 15 7450.0*/23.941, },
{/* 7 66.000 *//* 0 650.0*/9.320, /* 1 1100.0*/10.313, /* 2 1550.0*/11.305, /* 3 2000.0*/12.298, /* 4 2450.0*/13.291, /* 5 2900.0*/14.283, /* 6 3350.0*/15.276, /* 7 3800.0*/16.269, /* 8 4250.0*/17.242, /* 9 4700.0*/18.192, /* 10 5150.0*/19.142, /* 11 5650.0*/20.198, /* 12 6100.0*/21.147, /* 13 6550.0*/22.097, /* 14 7000.0*/23.047, /* 15 7450.0*/23.047, },
{/* 8 72.000 *//* 0 650.0*/8.840, /* 1 1100.0*/9.809, /* 2 1550.0*/10.778, /* 3 2000.0*/11.747, /* 4 2450.0*/12.716, /* 5 2900.0*/13.685, /* 6 3350.0*/14.654, /* 7 3800.0*/15.623, /* 8 4250.0*/16.567, /* 9 4700.0*/17.481, /* 10 5150.0*/18.395, /* 11 5650.0*/19.411, /* 12 6100.0*/20.325, /* 13 6550.0*/21.239, /* 14 7000.0*/22.153, /* 15 7450.0*/22.153, },
{/* 9 78.000 *//* 0 650.0*/8.360, /* 1 1100.0*/9.305, /* 2 1550.0*/10.251, /* 3 2000.0*/11.196, /* 4 2450.0*/12.141, /* 5 2900.0*/13.086, /* 6 3350.0*/14.032, /* 7 3800.0*/14.977, /* 8 4250.0*/15.892, /* 9 4700.0*/16.771, /* 10 5150.0*/17.649, /* 11 5650.0*/18.624, /* 12 6100.0*/19.502, /* 13 6550.0*/20.381, /* 14 7000.0*/21.259, /* 15 7450.0*/21.259, },
{/* 10 84.000 *//* 0 650.0*/7.880, /* 1 1100.0*/8.802, /* 2 1550.0*/9.723, /* 3 2000.0*/10.645, /* 4 2450.0*/11.566, /* 5 2900.0*/12.488, /* 6 3350.0*/13.410, /* 7 3800.0*/14.331, /* 8 4250.0*/15.253, /* 9 4700.0*/16.175, /* 10 5150.0*/17.096, /* 11 5650.0*/18.120, /* 12 6100.0*/19.042, /* 13 6550.0*/19.963, /* 14 7000.0*/20.885, /* 15 7450.0*/20.885, },
{/* 11 93.000 *//* 0 650.0*/7.160, /* 1 1100.0*/8.046, /* 2 1550.0*/8.932, /* 3 2000.0*/9.818, /* 4 2450.0*/10.704, /* 5 2900.0*/11.590, /* 6 3350.0*/12.477, /* 7 3800.0*/13.363, /* 8 4250.0*/14.249, /* 9 4700.0*/15.135, /* 10 5150.0*/16.021, /* 11 5650.0*/17.005, /* 12 6100.0*/17.891, /* 13 6550.0*/18.778, /* 14 7000.0*/19.664, /* 15 7450.0*/19.664, },
{/* 12 99.000 *//* 0 650.0*/6.680, /* 1 1100.0*/6.967, /* 2 1550.0*/8.405, /* 3 2000.0*/9.000, /* 4 2450.0*/9.937, /* 5 2900.0*/10.992, /* 6 3350.0*/11.854, /* 7 3800.0*/12.717, /* 8 4250.0*/13.579, /* 9 4700.0*/14.442, /* 10 5150.0*/15.304, /* 11 5650.0*/16.262, /* 12 6100.0*/17.125, /* 13 6550.0*/17.987, /* 14 7000.0*/18.850, /* 15 7450.0*/18.850, },
{/* 13 105.000 *//* 0 650.0*/6.200, /* 1 1100.0*/7.039, /* 2 1550.0*/7.877, /* 3 2000.0*/8.716, /* 4 2450.0*/9.555, /* 5 2900.0*/10.394, /* 6 3350.0*/11.232, /* 7 3800.0*/12.071, /* 8 4250.0*/12.910, /* 9 4700.0*/13.749, /* 10 5150.0*/14.587, /* 11 5650.0*/15.519, /* 12 6100.0*/16.358, /* 13 6550.0*/17.197, /* 14 7000.0*/18.035, /* 15 7450.0*/18.035, },
{/* 14 111.000 *//* 0 650.0*/5.720, /* 1 1100.0*/6.535, /* 2 1550.0*/7.350, /* 3 2000.0*/8.165, /* 4 2450.0*/8.980, /* 5 2900.0*/9.795, /* 6 3350.0*/10.610, /* 7 3800.0*/11.425, /* 8 4250.0*/12.240, /* 9 4700.0*/13.055, /* 10 5150.0*/13.870, /* 11 5650.0*/14.776, /* 12 6100.0*/15.591, /* 13 6550.0*/16.406, /* 14 7000.0*/17.221, /* 15 7450.0*/17.221, },
{/* 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, },
{/* 0 18.000 *//* 0 650.0*/10, /* 1 1100.0*/11, /* 2 1550.0*/12, /* 3 2000.0*/14, /* 4 2450.0*/15, /* 5 2900.0*/17, /* 6 3350.0*/18, /* 7 3800.0*/20, /* 8 4250.0*/21, /* 9 4700.0*/22, /* 10 5150.0*/24, /* 11 5650.0*/25, /* 12 6100.0*/27, /* 13 6550.0*/28, /* 14 7000.0*/30, /* 15 7450.0*/30, },
{/* 1 24.000 *//* 0 650.0*/10, /* 1 1100.0*/11, /* 2 1550.0*/12, /* 3 2000.0*/14, /* 4 2450.0*/15, /* 5 2900.0*/16, /* 6 3350.0*/18, /* 7 3800.0*/19, /* 8 4250.0*/21, /* 9 4700.0*/22, /* 10 5150.0*/23, /* 11 5650.0*/25, /* 12 6100.0*/26, /* 13 6550.0*/28, /* 14 7000.0*/29, /* 15 7450.0*/29, },
{/* 2 33.000 *//* 0 650.0*/10, /* 1 1100.0*/11, /* 2 1550.0*/13, /* 3 2000.0*/14, /* 4 2450.0*/15, /* 5 2900.0*/16, /* 6 3350.0*/17, /* 7 3800.0*/19, /* 8 4250.0*/20, /* 9 4700.0*/21, /* 10 5150.0*/22, /* 11 5650.0*/24, /* 12 6100.0*/25, /* 13 6550.0*/26, /* 14 7000.0*/27, /* 15 7450.0*/27, },
{/* 3 39.000 *//* 0 650.0*/10, /* 1 1100.0*/11, /* 2 1550.0*/13, /* 3 2000.0*/14, /* 4 2450.0*/15, /* 5 2900.0*/16, /* 6 3350.0*/17, /* 7 3800.0*/18, /* 8 4250.0*/20, /* 9 4700.0*/21, /* 10 5150.0*/22, /* 11 5650.0*/23, /* 12 6100.0*/24, /* 13 6550.0*/25, /* 14 7000.0*/27, /* 15 7450.0*/27, },
{/* 4 45.000 *//* 0 650.0*/11, /* 1 1100.0*/12, /* 2 1550.0*/13, /* 3 2000.0*/14, /* 4 2450.0*/15, /* 5 2900.0*/16, /* 6 3350.0*/17, /* 7 3800.0*/18, /* 8 4250.0*/19, /* 9 4700.0*/20, /* 10 5150.0*/21, /* 11 5650.0*/22, /* 12 6100.0*/24, /* 13 6550.0*/25, /* 14 7000.0*/26, /* 15 7450.0*/26, },
{/* 5 51.000 *//* 0 650.0*/11, /* 1 1100.0*/11, /* 2 1550.0*/12, /* 3 2000.0*/13, /* 4 2450.0*/14, /* 5 2900.0*/15, /* 6 3350.0*/16, /* 7 3800.0*/17, /* 8 4250.0*/18, /* 9 4700.0*/19, /* 10 5150.0*/21, /* 11 5650.0*/22, /* 12 6100.0*/23, /* 13 6550.0*/24, /* 14 7000.0*/25, /* 15 7450.0*/25, },
{/* 6 60.000 *//* 0 650.0*/9, /* 1 1100.0*/10, /* 2 1550.0*/11, /* 3 2000.0*/12, /* 4 2450.0*/13, /* 5 2900.0*/14, /* 6 3350.0*/15, /* 7 3800.0*/16, /* 8 4250.0*/17, /* 9 4700.0*/18, /* 10 5150.0*/19, /* 11 5650.0*/20, /* 12 6100.0*/21, /* 13 6550.0*/22, /* 14 7000.0*/23, /* 15 7450.0*/23, },
{/* 7 66.000 *//* 0 650.0*/9, /* 1 1100.0*/10, /* 2 1550.0*/11, /* 3 2000.0*/12, /* 4 2450.0*/13, /* 5 2900.0*/14, /* 6 3350.0*/15, /* 7 3800.0*/16, /* 8 4250.0*/17, /* 9 4700.0*/18, /* 10 5150.0*/19, /* 11 5650.0*/20, /* 12 6100.0*/21, /* 13 6550.0*/22, /* 14 7000.0*/23, /* 15 7450.0*/23, },
{/* 8 72.000 *//* 0 650.0*/8, /* 1 1100.0*/9, /* 2 1550.0*/10, /* 3 2000.0*/11, /* 4 2450.0*/12, /* 5 2900.0*/13, /* 6 3350.0*/14, /* 7 3800.0*/15, /* 8 4250.0*/16, /* 9 4700.0*/17, /* 10 5150.0*/18, /* 11 5650.0*/19, /* 12 6100.0*/20, /* 13 6550.0*/21, /* 14 7000.0*/22, /* 15 7450.0*/22, },
{/* 9 78.000 *//* 0 650.0*/8, /* 1 1100.0*/9, /* 2 1550.0*/10, /* 3 2000.0*/11, /* 4 2450.0*/12, /* 5 2900.0*/13, /* 6 3350.0*/14, /* 7 3800.0*/14, /* 8 4250.0*/15, /* 9 4700.0*/16, /* 10 5150.0*/17, /* 11 5650.0*/18, /* 12 6100.0*/19, /* 13 6550.0*/20, /* 14 7000.0*/21, /* 15 7450.0*/21, },
{/* 10 84.000 *//* 0 650.0*/7, /* 1 1100.0*/8, /* 2 1550.0*/9, /* 3 2000.0*/10, /* 4 2450.0*/11, /* 5 2900.0*/12, /* 6 3350.0*/13, /* 7 3800.0*/14, /* 8 4250.0*/15, /* 9 4700.0*/16, /* 10 5150.0*/17, /* 11 5650.0*/18, /* 12 6100.0*/19, /* 13 6550.0*/19, /* 14 7000.0*/20, /* 15 7450.0*/20, },
{/* 11 93.000 *//* 0 650.0*/7, /* 1 1100.0*/8, /* 2 1550.0*/8, /* 3 2000.0*/9, /* 4 2450.0*/10, /* 5 2900.0*/11, /* 6 3350.0*/12, /* 7 3800.0*/13, /* 8 4250.0*/14, /* 9 4700.0*/15, /* 10 5150.0*/16, /* 11 5650.0*/17, /* 12 6100.0*/17, /* 13 6550.0*/18, /* 14 7000.0*/19, /* 15 7450.0*/19, },
{/* 12 99.000 *//* 0 650.0*/6, /* 1 1100.0*/6, /* 2 1550.0*/8, /* 3 2000.0*/9, /* 4 2450.0*/9, /* 5 2900.0*/10, /* 6 3350.0*/11, /* 7 3800.0*/12, /* 8 4250.0*/13, /* 9 4700.0*/14, /* 10 5150.0*/15, /* 11 5650.0*/16, /* 12 6100.0*/17, /* 13 6550.0*/17, /* 14 7000.0*/18, /* 15 7450.0*/18, },
{/* 13 105.000 *//* 0 650.0*/6, /* 1 1100.0*/7, /* 2 1550.0*/7, /* 3 2000.0*/8, /* 4 2450.0*/9, /* 5 2900.0*/10, /* 6 3350.0*/11, /* 7 3800.0*/12, /* 8 4250.0*/12, /* 9 4700.0*/13, /* 10 5150.0*/14, /* 11 5650.0*/15, /* 12 6100.0*/16, /* 13 6550.0*/17, /* 14 7000.0*/18, /* 15 7450.0*/18, },
{/* 14 111.000 *//* 0 650.0*/5, /* 1 1100.0*/6, /* 2 1550.0*/7, /* 3 2000.0*/8, /* 4 2450.0*/8, /* 5 2900.0*/9, /* 6 3350.0*/10, /* 7 3800.0*/11, /* 8 4250.0*/12, /* 9 4700.0*/13, /* 10 5150.0*/13, /* 11 5650.0*/14, /* 12 6100.0*/15, /* 13 6550.0*/16, /* 14 7000.0*/17, /* 15 7450.0*/17, },
{/* 15 120.000 *//* 0 650.0*/5, /* 1 1100.0*/5, /* 2 1550.0*/6, /* 3 2000.0*/7, /* 4 2450.0*/8, /* 5 2900.0*/8, /* 6 3350.0*/9, /* 7 3800.0*/10, /* 8 4250.0*/11, /* 9 4700.0*/12, /* 10 5150.0*/12, /* 11 5650.0*/13, /* 12 6100.0*/14, /* 13 6550.0*/15, /* 14 7000.0*/16, /* 15 7450.0*/16, },
};
#endif
@ -160,7 +159,7 @@ static void miataNAcommonEngineSettings(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setCommonNTCSensor(&engineConfiguration->iat, 2700);
#if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT
MEMCPY(config->ignitionTable, mapBased16IgnitionTable);
copyTable(config->ignitionTable, mapBased16IgnitionTable);
#endif
engineConfiguration->silentTriggerError = false;

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

@ -6,6 +6,7 @@
*/
#include "engine_configuration.h"
#include "table_helper.h"
EXTERN_CONFIG;
@ -15,8 +16,8 @@ static const float hardCodedcrankingCycleCoef[8] = {1.9800034, 1.800003, 1.59999
/* Generated by TS2C on Thu Jul 30 00:03:20 EDT 2020*/
void miataNA_setCrankingCycleBins(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
MEMCPY(config->crankingCycleBins, hardCodedcrankingCycleBins);
MEMCPY(config->crankingCycleCoef, hardCodedcrankingCycleCoef);
copyArray(config->crankingCycleBins, hardCodedcrankingCycleBins);
copyArray(config->crankingCycleCoef, hardCodedcrankingCycleCoef);
}
// todo: use these defaults wider? make them global defaults maybe?
@ -25,8 +26,8 @@ static const float hardCodedcrankingFuelCoef[8] = {2.7999878, 2.2000122, 1.69000
/* Generated by TS2C on Thu Jul 30 00:03:20 EDT 2020*/
void miataNA_setCrankingFuelBins(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
MEMCPY(config->crankingFuelBins, hardCodedcrankingFuelBins);
MEMCPY(config->crankingFuelCoef, hardCodedcrankingFuelCoef);
copyArray(config->crankingFuelBins, hardCodedcrankingFuelBins);
copyArray(config->crankingFuelCoef, hardCodedcrankingFuelCoef);
}
static const float hardCodediacCoastingBins[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, 100.0, 110.0};
@ -35,8 +36,8 @@ static const float hardCodediacCoasting[16] = {40.0, 40.0, 40.0, 40.0, 40.0, 40.
/* Generated by TS2C on Fri Jul 31 14:02:18 EDT 2020*/
void miataNA_setIacCoastingBins(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
MEMCPY(engineConfiguration->iacCoastingBins, hardCodediacCoastingBins);
MEMCPY(engineConfiguration->iacCoasting, hardCodediacCoasting);
copyArray(engineConfiguration->iacCoastingBins, hardCodediacCoastingBins);
copyArray(engineConfiguration->iacCoasting, hardCodediacCoasting);
}
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};
@ -45,8 +46,8 @@ static const float hardCodedcltIdleCorr[16] = {1.4000015, 1.3199997, 1.2600021,
/* Generated by TS2C on Fri Jul 31 14:02:18 EDT 2020*/
void miataNA_setCltIdleCorrBins(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
MEMCPY(config->cltIdleCorrBins, hardCodedcltIdleCorrBins);
MEMCPY(config->cltIdleCorr, hardCodedcltIdleCorr);
copyArray(config->cltIdleCorrBins, hardCodedcltIdleCorrBins);
copyArray(config->cltIdleCorr, hardCodedcltIdleCorr);
}
static const float hardCodedcltIdleRpmBins[16] = {-40.0, -30.0, -20.0, 0.0, 10.0, 20.0, 30.0, 40.0, 60.0, 70.0, 80.0, 90.0, 100.0, 120.0, 130.0, 140.0};
@ -55,37 +56,37 @@ static const float hardCodedcltIdleRpm[16] = {1180.0, 1150.0, 1130.0, 1110.0, 10
/* Generated by TS2C on Fri Jul 31 14:02:18 EDT 2020*/
void miataNA_setCltIdleRpmBins(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
MEMCPY(engineConfiguration->cltIdleRpmBins, hardCodedcltIdleRpmBins);
MEMCPY(engineConfiguration->cltIdleRpm, hardCodedcltIdleRpm);
copyArray(engineConfiguration->cltIdleRpmBins, hardCodedcltIdleRpmBins);
copyArray(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] = {
static const uint8_t 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, }
{/* 0 10.000 *//* 0 500.0*/15, /* 1 800.0*/15, /* 2 1000.0*/20, /* 3 1500.0*/21, /* 4 1800.0*/32, /* 5 2300.0*/33, /* 6 2900.0*/34, /* 7 3400.0*/35, /* 8 3900.0*/37, /* 9 4300.0*/37, /* 10 4800.0*/38, /* 11 5300.0*/38, /* 12 5900.0*/38, /* 13 6500.0*/39, /* 14 7200.0*/40, /* 15 8000.0*/41, },
{/* 1 24.000 *//* 0 500.0*/15, /* 1 800.0*/15, /* 2 1000.0*/18, /* 3 1500.0*/23, /* 4 1800.0*/30, /* 5 2300.0*/34, /* 6 2900.0*/35, /* 7 3400.0*/36, /* 8 3900.0*/37, /* 9 4300.0*/37, /* 10 4800.0*/38, /* 11 5300.0*/38, /* 12 5900.0*/38, /* 13 6500.0*/39, /* 14 7200.0*/40, /* 15 8000.0*/41, },
{/* 2 35.000 *//* 0 500.0*/15, /* 1 800.0*/15, /* 2 1000.0*/18, /* 3 1500.0*/23, /* 4 1800.0*/30, /* 5 2300.0*/33, /* 6 2900.0*/34, /* 7 3400.0*/35, /* 8 3900.0*/35, /* 9 4300.0*/35, /* 10 4800.0*/36, /* 11 5300.0*/36, /* 12 5900.0*/37, /* 13 6500.0*/37, /* 14 7200.0*/38, /* 15 8000.0*/39, },
{/* 3 55.000 *//* 0 500.0*/15, /* 1 800.0*/15, /* 2 1000.0*/22, /* 3 1500.0*/24, /* 4 1800.0*/28, /* 5 2300.0*/31, /* 6 2900.0*/32, /* 7 3400.0*/33, /* 8 3900.0*/33, /* 9 4300.0*/34, /* 10 4800.0*/34, /* 11 5300.0*/34, /* 12 5900.0*/35, /* 13 6500.0*/36, /* 14 7200.0*/36, /* 15 8000.0*/37, },
{/* 4 65.000 *//* 0 500.0*/17, /* 1 800.0*/17, /* 2 1000.0*/22, /* 3 1500.0*/24, /* 4 1800.0*/28, /* 5 2300.0*/30, /* 6 2900.0*/32, /* 7 3400.0*/32, /* 8 3900.0*/32, /* 9 4300.0*/32, /* 10 4800.0*/33, /* 11 5300.0*/33, /* 12 5900.0*/33, /* 13 6500.0*/34, /* 14 7200.0*/35, /* 15 8000.0*/36, },
{/* 5 75.000 *//* 0 500.0*/18, /* 1 800.0*/18, /* 2 1000.0*/24, /* 3 1500.0*/26, /* 4 1800.0*/27, /* 5 2300.0*/28, /* 6 2900.0*/29, /* 7 3400.0*/29, /* 8 3900.0*/28, /* 9 4300.0*/29, /* 10 4800.0*/30, /* 11 5300.0*/31, /* 12 5900.0*/31, /* 13 6500.0*/32, /* 14 7200.0*/33, /* 15 8000.0*/34, },
{/* 6 84.000 *//* 0 500.0*/19, /* 1 800.0*/19, /* 2 1000.0*/24, /* 3 1500.0*/27, /* 4 1800.0*/27, /* 5 2300.0*/27, /* 6 2900.0*/28, /* 7 3400.0*/28, /* 8 3900.0*/27, /* 9 4300.0*/28, /* 10 4800.0*/29, /* 11 5300.0*/30, /* 12 5900.0*/31, /* 13 6500.0*/32, /* 14 7200.0*/32, /* 15 8000.0*/33, },
{/* 7 99.000 *//* 0 500.0*/19, /* 1 800.0*/19, /* 2 1000.0*/23, /* 3 1500.0*/26, /* 4 1800.0*/26, /* 5 2300.0*/26, /* 6 2900.0*/26, /* 7 3400.0*/26, /* 8 3900.0*/26, /* 9 4300.0*/27, /* 10 4800.0*/29, /* 11 5300.0*/29, /* 12 5900.0*/30, /* 13 6500.0*/31, /* 14 7200.0*/32, /* 15 8000.0*/32, },
{/* 8 110.000 *//* 0 500.0*/19, /* 1 800.0*/19, /* 2 1000.0*/23, /* 3 1500.0*/26, /* 4 1800.0*/26, /* 5 2300.0*/25, /* 6 2900.0*/26, /* 7 3400.0*/26, /* 8 3900.0*/25, /* 9 4300.0*/26, /* 10 4800.0*/27, /* 11 5300.0*/28, /* 12 5900.0*/29, /* 13 6500.0*/29, /* 14 7200.0*/30, /* 15 8000.0*/31, },
{/* 9 125.000 *//* 0 500.0*/17, /* 1 800.0*/18, /* 2 1000.0*/21, /* 3 1500.0*/25, /* 4 1800.0*/26, /* 5 2300.0*/27, /* 6 2900.0*/26, /* 7 3400.0*/25, /* 8 3900.0*/24, /* 9 4300.0*/25, /* 10 4800.0*/25, /* 11 5300.0*/26, /* 12 5900.0*/26, /* 13 6500.0*/27, /* 14 7200.0*/28, /* 15 8000.0*/29, },
{/* 10 140.000 *//* 0 500.0*/15, /* 1 800.0*/17, /* 2 1000.0*/20, /* 3 1500.0*/24, /* 4 1800.0*/26, /* 5 2300.0*/26, /* 6 2900.0*/25, /* 7 3400.0*/24, /* 8 3900.0*/24, /* 9 4300.0*/24, /* 10 4800.0*/24, /* 11 5300.0*/24, /* 12 5900.0*/24, /* 13 6500.0*/24, /* 14 7200.0*/25, /* 15 8000.0*/24, },
{/* 11 160.000 *//* 0 500.0*/13, /* 1 800.0*/15, /* 2 1000.0*/18, /* 3 1500.0*/22, /* 4 1800.0*/22, /* 5 2300.0*/22, /* 6 2900.0*/21, /* 7 3400.0*/19, /* 8 3900.0*/18, /* 9 4300.0*/18, /* 10 4800.0*/18, /* 11 5300.0*/18, /* 12 5900.0*/19, /* 13 6500.0*/20, /* 14 7200.0*/20, /* 15 8000.0*/21, },
{/* 12 180.000 *//* 0 500.0*/13, /* 1 800.0*/15, /* 2 1000.0*/17, /* 3 1500.0*/19, /* 4 1800.0*/21, /* 5 2300.0*/21, /* 6 2900.0*/20, /* 7 3400.0*/18, /* 8 3900.0*/16, /* 9 4300.0*/16, /* 10 4800.0*/16, /* 11 5300.0*/17, /* 12 5900.0*/17, /* 13 6500.0*/17, /* 14 7200.0*/17, /* 15 8000.0*/17, },
{/* 13 200.000 *//* 0 500.0*/14, /* 1 800.0*/15, /* 2 1000.0*/16, /* 3 1500.0*/18, /* 4 1800.0*/19, /* 5 2300.0*/20, /* 6 2900.0*/19, /* 7 3400.0*/17, /* 8 3900.0*/14, /* 9 4300.0*/15, /* 10 4800.0*/15, /* 11 5300.0*/16, /* 12 5900.0*/16, /* 13 6500.0*/16, /* 14 7200.0*/16, /* 15 8000.0*/16, },
{/* 14 220.000 *//* 0 500.0*/15, /* 1 800.0*/15, /* 2 1000.0*/15, /* 3 1500.0*/16, /* 4 1800.0*/18, /* 5 2300.0*/19, /* 6 2900.0*/18, /* 7 3400.0*/16, /* 8 3900.0*/14, /* 9 4300.0*/14, /* 10 4800.0*/15, /* 11 5300.0*/15, /* 12 5900.0*/15, /* 13 6500.0*/15, /* 14 7200.0*/15, /* 15 8000.0*/15, },
{/* 15 250.000 *//* 0 500.0*/15, /* 1 800.0*/15, /* 2 1000.0*/15, /* 3 1500.0*/15, /* 4 1800.0*/17, /* 5 2300.0*/18, /* 6 2900.0*/16, /* 7 3400.0*/14, /* 8 3900.0*/13, /* 9 4300.0*/13, /* 10 4800.0*/14, /* 11 5300.0*/13, /* 12 5900.0*/13, /* 13 6500.0*/13, /* 14 7200.0*/13, /* 15 8000.0*/13, }
};
/* 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);
copyArray(config->ignitionLoadBins, hardCodedignitionLoadBins);
copyArray(config->ignitionRpmBins, hardCodedignitionRpmBins);
copyTable(config->ignitionTable, hardCodedignitionTable);
}

70
firmware/config/engines/mazda_miata_custom_hunchback.cpp
View File

@ -38,37 +38,37 @@ const float mazda_miata_nb2_LoadBins[FUEL_LOAD_COUNT] = {20.0, 25.0, 30.0, 35.0,
135.0, 158.0, 185.0, 220.0}
;
static float const fsio_table_dyno[FSIO_TABLE_8][FSIO_TABLE_8] = {
static uint8_t const fsio_table_dyno[FSIO_TABLE_8][FSIO_TABLE_8] = {
/* Generated by TS2C on Sun May 07 09:35:13 EDT 2017*/
{/* 0 30.000 *//* 0 700.0*/1.000, /* 1 1000.0*/3.000, /* 2 2000.0*/10.000, /* 3 3000.0*/20.000, /* 4 3500.0*/20.000, /* 5 4500.0*/16.000, /* 6 5500.0*/11.000, /* 7 6500.0*/10.000, },
{/* 1 40.000 *//* 0 700.0*/3.000, /* 1 1000.0*/10.000, /* 2 2000.0*/19.000, /* 3 3000.0*/26.000, /* 4 3500.0*/20.000, /* 5 4500.0*/16.000, /* 6 5500.0*/11.000, /* 7 6500.0*/10.000, },
{/* 2 50.000 *//* 0 700.0*/7.000, /* 1 1000.0*/16.000, /* 2 2000.0*/24.000, /* 3 3000.0*/28.000, /* 4 3500.0*/20.000, /* 5 4500.0*/16.000, /* 6 5500.0*/11.000, /* 7 6500.0*/10.000, },
{/* 3 60.000 *//* 0 700.0*/11.000, /* 1 1000.0*/20.000, /* 2 2000.0*/27.000, /* 3 3000.0*/28.000, /* 4 3500.0*/20.000, /* 5 4500.0*/16.000, /* 6 5500.0*/11.000, /* 7 6500.0*/10.000, },
{/* 4 70.000 *//* 0 700.0*/13.000, /* 1 1000.0*/24.000, /* 2 2000.0*/31.000, /* 3 3000.0*/28.000, /* 4 3500.0*/20.000, /* 5 4500.0*/16.000, /* 6 5500.0*/11.000, /* 7 6500.0*/10.000, },
{/* 5 75.000 *//* 0 700.0*/15.000, /* 1 1000.0*/27.000, /* 2 2000.0*/33.000, /* 3 3000.0*/28.000, /* 4 3500.0*/20.000, /* 5 4500.0*/16.000, /* 6 5500.0*/11.000, /* 7 6500.0*/10.000, },
{/* 6 82.000 *//* 0 700.0*/17.000, /* 1 1000.0*/28.000, /* 2 2000.0*/33.000, /* 3 3000.0*/28.000, /* 4 3500.0*/20.000, /* 5 4500.0*/16.000, /* 6 5500.0*/11.000, /* 7 6500.0*/10.000, },
{/* 7 85.000 *//* 0 700.0*/17.000, /* 1 1000.0*/28.000, /* 2 2000.0*/33.000, /* 3 3000.0*/28.000, /* 4 3500.0*/20.000, /* 5 4500.0*/16.000, /* 6 5500.0*/11.000, /* 7 6500.0*/10.000, },
{/* 0 30.000 *//* 0 700.0*/1, /* 1 1000.0*/3, /* 2 2000.0*/10, /* 3 3000.0*/20, /* 4 3500.0*/20, /* 5 4500.0*/16, /* 6 5500.0*/11, /* 7 6500.0*/10, },
{/* 1 40.000 *//* 0 700.0*/3, /* 1 1000.0*/10, /* 2 2000.0*/19, /* 3 3000.0*/26, /* 4 3500.0*/20, /* 5 4500.0*/16, /* 6 5500.0*/11, /* 7 6500.0*/10, },
{/* 2 50.000 *//* 0 700.0*/7, /* 1 1000.0*/16, /* 2 2000.0*/24, /* 3 3000.0*/28, /* 4 3500.0*/20, /* 5 4500.0*/16, /* 6 5500.0*/11, /* 7 6500.0*/10, },
{/* 3 60.000 *//* 0 700.0*/11, /* 1 1000.0*/20, /* 2 2000.0*/27, /* 3 3000.0*/28, /* 4 3500.0*/20, /* 5 4500.0*/16, /* 6 5500.0*/11, /* 7 6500.0*/10, },
{/* 4 70.000 *//* 0 700.0*/13, /* 1 1000.0*/24, /* 2 2000.0*/31, /* 3 3000.0*/28, /* 4 3500.0*/20, /* 5 4500.0*/16, /* 6 5500.0*/11, /* 7 6500.0*/10, },
{/* 5 75.000 *//* 0 700.0*/15, /* 1 1000.0*/27, /* 2 2000.0*/33, /* 3 3000.0*/28, /* 4 3500.0*/20, /* 5 4500.0*/16, /* 6 5500.0*/11, /* 7 6500.0*/10, },
{/* 6 82.000 *//* 0 700.0*/17, /* 1 1000.0*/28, /* 2 2000.0*/33, /* 3 3000.0*/28, /* 4 3500.0*/20, /* 5 4500.0*/16, /* 6 5500.0*/11, /* 7 6500.0*/10, },
{/* 7 85.000 *//* 0 700.0*/17, /* 1 1000.0*/28, /* 2 2000.0*/33, /* 3 3000.0*/28, /* 4 3500.0*/20, /* 5 4500.0*/16, /* 6 5500.0*/11, /* 7 6500.0*/10, },
};
#if DEFAULT_FUEL_LOAD_COUNT == FUEL_LOAD_COUNT
static const fuel_table_t mapBased18vvtVeTable_NA_fuel_rail = {
static const uint8_t mapBased18vvtVeTable_NA_fuel_rail[16][16] = {
/* Generated by TS2C on Sun May 07 09:37:15 EDT 2017*/
{/* 0 20.000 *//* 0 700.0*/35.685, /* 1 820.0*/36.982, /* 2 950.0*/37.200, /* 3 1100.0*/35.796, /* 4 1300.0*/36.149, /* 5 1550.0*/42.781, /* 6 1800.0*/45.281, /* 7 2150.0*/34.447, /* 8 2500.0*/26.662, /* 9 3000.0*/27.834, /* 10 3500.0*/29.178, /* 11 4150.0*/32.136, /* 12 4900.0*/36.009, /* 13 5800.0*/32.815, /* 14 6800.0*/34.415, /* 15 8000.0*/36.896, },
{/* 1 25.000 *//* 0 700.0*/35.593, /* 1 820.0*/38.290, /* 2 950.0*/38.543, /* 3 1100.0*/44.567, /* 4 1300.0*/42.543, /* 5 1550.0*/51.690, /* 6 1800.0*/50.893, /* 7 2150.0*/45.882, /* 8 2500.0*/42.473, /* 9 3000.0*/41.591, /* 10 3500.0*/39.830, /* 11 4150.0*/43.369, /* 12 4900.0*/38.590, /* 13 5800.0*/36.461, /* 14 6800.0*/38.698, /* 15 8000.0*/40.621, },
{/* 2 30.000 *//* 0 700.0*/37.539, /* 1 820.0*/41.105, /* 2 950.0*/51.838, /* 3 1100.0*/48.730, /* 4 1300.0*/47.475, /* 5 1550.0*/51.808, /* 6 1800.0*/49.862, /* 7 2150.0*/47.648, /* 8 2500.0*/56.394, /* 9 3000.0*/51.537, /* 10 3500.0*/52.022, /* 11 4150.0*/60.170, /* 12 4900.0*/59.945, /* 13 5800.0*/80.000, /* 14 6800.0*/80.000, /* 15 8000.0*/80.000, },
{/* 3 35.000 *//* 0 700.0*/39.606, /* 1 820.0*/44.472, /* 2 950.0*/53.027, /* 3 1100.0*/50.709, /* 4 1300.0*/52.243, /* 5 1550.0*/55.301, /* 6 1800.0*/55.630, /* 7 2150.0*/64.738, /* 8 2500.0*/68.993, /* 9 3000.0*/57.959, /* 10 3500.0*/59.814, /* 11 4150.0*/68.593, /* 12 4900.0*/66.688, /* 13 5800.0*/80.000, /* 14 6800.0*/80.000, /* 15 8000.0*/80.000, },
{/* 4 40.000 *//* 0 700.0*/45.470, /* 1 820.0*/57.758, /* 2 950.0*/53.028, /* 3 1100.0*/47.634, /* 4 1300.0*/62.921, /* 5 1550.0*/62.927, /* 6 1800.0*/63.611, /* 7 2150.0*/68.833, /* 8 2500.0*/72.751, /* 9 3000.0*/63.612, /* 10 3500.0*/74.939, /* 11 4150.0*/84.469, /* 12 4900.0*/75.026, /* 13 5800.0*/80.000, /* 14 6800.0*/80.000, /* 15 8000.0*/80.000, },
{/* 5 46.000 *//* 0 700.0*/55.036, /* 1 820.0*/63.090, /* 2 950.0*/58.650, /* 3 1100.0*/53.830, /* 4 1300.0*/59.599, /* 5 1550.0*/64.794, /* 6 1800.0*/67.608, /* 7 2150.0*/73.556, /* 8 2500.0*/75.610, /* 9 3000.0*/82.211, /* 10 3500.0*/80.998, /* 11 4150.0*/86.837, /* 12 4900.0*/91.399, /* 13 5800.0*/80.000, /* 14 6800.0*/80.000, /* 15 8000.0*/80.000, },
{/* 6 54.000 *//* 0 700.0*/62.275, /* 1 820.0*/69.333, /* 2 950.0*/67.104, /* 3 1100.0*/63.689, /* 4 1300.0*/67.871, /* 5 1550.0*/68.809, /* 6 1800.0*/77.741, /* 7 2150.0*/82.000, /* 8 2500.0*/90.645, /* 9 3000.0*/96.308, /* 10 3500.0*/94.651, /* 11 4150.0*/96.667, /* 12 4900.0*/92.464, /* 13 5800.0*/80.000, /* 14 6800.0*/80.000, /* 15 8000.0*/80.000, },
{/* 7 63.000 *//* 0 700.0*/67.369, /* 1 820.0*/73.738, /* 2 950.0*/72.983, /* 3 1100.0*/73.412, /* 4 1300.0*/78.288, /* 5 1550.0*/73.531, /* 6 1800.0*/79.228, /* 7 2150.0*/92.174, /* 8 2500.0*/105.553, /* 9 3000.0*/105.886, /* 10 3500.0*/100.172, /* 11 4150.0*/106.089, /* 12 4900.0*/103.000, /* 13 5800.0*/103.000, /* 14 6800.0*/108.000, /* 15 8000.0*/108.000, },
{/* 8 73.000 *//* 0 700.0*/70.760, /* 1 820.0*/74.892, /* 2 950.0*/75.153, /* 3 1100.0*/79.664, /* 4 1300.0*/89.987, /* 5 1550.0*/90.422, /* 6 1800.0*/95.789, /* 7 2150.0*/98.367, /* 8 2500.0*/96.231, /* 9 3000.0*/100.179, /* 10 3500.0*/92.473, /* 11 4150.0*/101.756, /* 12 4900.0*/103.000, /* 13 5800.0*/103.000, /* 14 6800.0*/108.000, /* 15 8000.0*/108.000, },
{/* 9 85.000 *//* 0 700.0*/72.255, /* 1 820.0*/76.109, /* 2 950.0*/79.744, /* 3 1100.0*/80.844, /* 4 1300.0*/83.493, /* 5 1550.0*/82.232, /* 6 1800.0*/85.762, /* 7 2150.0*/97.047, /* 8 2500.0*/98.763, /* 9 3000.0*/104.394, /* 10 3500.0*/102.008, /* 11 4150.0*/115.132, /* 12 4900.0*/103.000, /* 13 5800.0*/103.000, /* 14 6800.0*/108.000, /* 15 8000.0*/108.000, },
{/* 10 99.000 *//* 0 700.0*/78.899, /* 1 820.0*/77.096, /* 2 950.0*/79.895, /* 3 1100.0*/76.554, /* 4 1300.0*/78.057, /* 5 1550.0*/78.602, /* 6 1800.0*/83.254, /* 7 2150.0*/91.812, /* 8 2500.0*/101.884, /* 9 3000.0*/108.911, /* 10 3500.0*/103.629, /* 11 4150.0*/116.945, /* 12 4900.0*/108.542, /* 13 5800.0*/103.625, /* 14 6800.0*/108.000, /* 15 8000.0*/108.000, },
{/* 11 116.000 *//* 0 700.0*/80.000, /* 1 820.0*/80.000, /* 2 950.0*/80.000, /* 3 1100.0*/80.000, /* 4 1300.0*/80.000, /* 5 1550.0*/80.000, /* 6 1800.0*/80.000, /* 7 2150.0*/100.000, /* 8 2500.0*/100.000, /* 9 3000.0*/100.000, /* 10 3500.0*/106.000, /* 11 4150.0*/116.600, /* 12 4900.0*/108.000, /* 13 5800.0*/108.000, /* 14 6800.0*/108.000, /* 15 8000.0*/108.000, },
{/* 12 135.000 *//* 0 700.0*/80.000, /* 1 820.0*/80.000, /* 2 950.0*/80.000, /* 3 1100.0*/80.000, /* 4 1300.0*/80.000, /* 5 1550.0*/80.000, /* 6 1800.0*/80.000, /* 7 2150.0*/100.000, /* 8 2500.0*/100.000, /* 9 3000.0*/100.000, /* 10 3500.0*/106.000, /* 11 4150.0*/116.600, /* 12 4900.0*/108.000, /* 13 5800.0*/108.000, /* 14 6800.0*/108.000, /* 15 8000.0*/108.000, },
{/* 13 158.000 *//* 0 700.0*/80.000, /* 1 820.0*/80.000, /* 2 950.0*/80.000, /* 3 1100.0*/80.000, /* 4 1300.0*/80.000, /* 5 1550.0*/80.000, /* 6 1800.0*/80.000, /* 7 2150.0*/80.000, /* 8 2500.0*/80.000, /* 9 3000.0*/80.000, /* 10 3500.0*/80.000, /* 11 4150.0*/80.000, /* 12 4900.0*/80.000, /* 13 5800.0*/80.000, /* 14 6800.0*/80.000, /* 15 8000.0*/80.000, },
{/* 14 185.000 *//* 0 700.0*/80.000, /* 1 820.0*/80.000, /* 2 950.0*/80.000, /* 3 1100.0*/80.000, /* 4 1300.0*/80.000, /* 5 1550.0*/80.000, /* 6 1800.0*/80.000, /* 7 2150.0*/80.000, /* 8 2500.0*/80.000, /* 9 3000.0*/80.000, /* 10 3500.0*/80.000, /* 11 4150.0*/80.000, /* 12 4900.0*/80.000, /* 13 5800.0*/80.000, /* 14 6800.0*/80.000, /* 15 8000.0*/80.000, },
{/* 15 220.000 *//* 0 700.0*/80.000, /* 1 820.0*/80.000, /* 2 950.0*/80.000, /* 3 1100.0*/80.000, /* 4 1300.0*/80.000, /* 5 1550.0*/80.000, /* 6 1800.0*/80.000, /* 7 2150.0*/80.000, /* 8 2500.0*/80.000, /* 9 3000.0*/80.000, /* 10 3500.0*/80.000, /* 11 4150.0*/80.000, /* 12 4900.0*/80.000, /* 13 5800.0*/80.000, /* 14 6800.0*/80.000, /* 15 8000.0*/80.000, },
{/* 0 20.000 *//* 0 700.0*/35, /* 1 820.0*/36, /* 2 950.0*/37, /* 3 1100.0*/35, /* 4 1300.0*/36, /* 5 1550.0*/42, /* 6 1800.0*/45, /* 7 2150.0*/34, /* 8 2500.0*/26, /* 9 3000.0*/27, /* 10 3500.0*/29, /* 11 4150.0*/32, /* 12 4900.0*/36, /* 13 5800.0*/32, /* 14 6800.0*/34, /* 15 8000.0*/36, },
{/* 1 25.000 *//* 0 700.0*/35, /* 1 820.0*/38, /* 2 950.0*/38, /* 3 1100.0*/44, /* 4 1300.0*/42, /* 5 1550.0*/51, /* 6 1800.0*/50, /* 7 2150.0*/45, /* 8 2500.0*/42, /* 9 3000.0*/41, /* 10 3500.0*/39, /* 11 4150.0*/43, /* 12 4900.0*/38, /* 13 5800.0*/36, /* 14 6800.0*/38, /* 15 8000.0*/40, },
{/* 2 30.000 *//* 0 700.0*/37, /* 1 820.0*/41, /* 2 950.0*/51, /* 3 1100.0*/48, /* 4 1300.0*/47, /* 5 1550.0*/51, /* 6 1800.0*/49, /* 7 2150.0*/47, /* 8 2500.0*/56, /* 9 3000.0*/51, /* 10 3500.0*/52, /* 11 4150.0*/60, /* 12 4900.0*/59, /* 13 5800.0*/80, /* 14 6800.0*/80, /* 15 8000.0*/80, },
{/* 3 35.000 *//* 0 700.0*/39, /* 1 820.0*/44, /* 2 950.0*/53, /* 3 1100.0*/50, /* 4 1300.0*/52, /* 5 1550.0*/55, /* 6 1800.0*/55, /* 7 2150.0*/64, /* 8 2500.0*/68, /* 9 3000.0*/57, /* 10 3500.0*/59, /* 11 4150.0*/68, /* 12 4900.0*/66, /* 13 5800.0*/80, /* 14 6800.0*/80, /* 15 8000.0*/80, },
{/* 4 40.000 *//* 0 700.0*/45, /* 1 820.0*/57, /* 2 950.0*/53, /* 3 1100.0*/47, /* 4 1300.0*/62, /* 5 1550.0*/62, /* 6 1800.0*/63, /* 7 2150.0*/68, /* 8 2500.0*/72, /* 9 3000.0*/63, /* 10 3500.0*/74, /* 11 4150.0*/84, /* 12 4900.0*/75, /* 13 5800.0*/80, /* 14 6800.0*/80, /* 15 8000.0*/80, },
{/* 5 46.000 *//* 0 700.0*/55, /* 1 820.0*/63, /* 2 950.0*/58, /* 3 1100.0*/53, /* 4 1300.0*/59, /* 5 1550.0*/64, /* 6 1800.0*/67, /* 7 2150.0*/73, /* 8 2500.0*/75, /* 9 3000.0*/82, /* 10 3500.0*/80, /* 11 4150.0*/86, /* 12 4900.0*/91, /* 13 5800.0*/80, /* 14 6800.0*/80, /* 15 8000.0*/80, },
{/* 6 54.000 *//* 0 700.0*/62, /* 1 820.0*/69, /* 2 950.0*/67, /* 3 1100.0*/63, /* 4 1300.0*/67, /* 5 1550.0*/68, /* 6 1800.0*/77, /* 7 2150.0*/82, /* 8 2500.0*/90, /* 9 3000.0*/96, /* 10 3500.0*/94, /* 11 4150.0*/96, /* 12 4900.0*/92, /* 13 5800.0*/80, /* 14 6800.0*/80, /* 15 8000.0*/80, },
{/* 7 63.000 *//* 0 700.0*/67, /* 1 820.0*/73, /* 2 950.0*/72, /* 3 1100.0*/73, /* 4 1300.0*/78, /* 5 1550.0*/73, /* 6 1800.0*/79, /* 7 2150.0*/92, /* 8 2500.0*/105, /* 9 3000.0*/105, /* 10 3500.0*/100, /* 11 4150.0*/106, /* 12 4900.0*/103, /* 13 5800.0*/103, /* 14 6800.0*/108, /* 15 8000.0*/108, },
{/* 8 73.000 *//* 0 700.0*/70, /* 1 820.0*/74, /* 2 950.0*/75, /* 3 1100.0*/79, /* 4 1300.0*/89, /* 5 1550.0*/90, /* 6 1800.0*/95, /* 7 2150.0*/98, /* 8 2500.0*/96, /* 9 3000.0*/100, /* 10 3500.0*/92, /* 11 4150.0*/101, /* 12 4900.0*/103, /* 13 5800.0*/103, /* 14 6800.0*/108, /* 15 8000.0*/108, },
{/* 9 85.000 *//* 0 700.0*/72, /* 1 820.0*/76, /* 2 950.0*/79, /* 3 1100.0*/80, /* 4 1300.0*/83, /* 5 1550.0*/82, /* 6 1800.0*/85, /* 7 2150.0*/97, /* 8 2500.0*/98, /* 9 3000.0*/104, /* 10 3500.0*/102, /* 11 4150.0*/115, /* 12 4900.0*/103, /* 13 5800.0*/103, /* 14 6800.0*/108, /* 15 8000.0*/108, },
{/* 10 99.000 *//* 0 700.0*/78, /* 1 820.0*/77, /* 2 950.0*/79, /* 3 1100.0*/76, /* 4 1300.0*/78, /* 5 1550.0*/78, /* 6 1800.0*/83, /* 7 2150.0*/91, /* 8 2500.0*/101, /* 9 3000.0*/108, /* 10 3500.0*/103, /* 11 4150.0*/116, /* 12 4900.0*/108, /* 13 5800.0*/103, /* 14 6800.0*/108, /* 15 8000.0*/108, },
{/* 11 116.000 *//* 0 700.0*/80, /* 1 820.0*/80, /* 2 950.0*/80, /* 3 1100.0*/80, /* 4 1300.0*/80, /* 5 1550.0*/80, /* 6 1800.0*/80, /* 7 2150.0*/100, /* 8 2500.0*/100, /* 9 3000.0*/100, /* 10 3500.0*/106, /* 11 4150.0*/116, /* 12 4900.0*/108, /* 13 5800.0*/108, /* 14 6800.0*/108, /* 15 8000.0*/108, },
{/* 12 135.000 *//* 0 700.0*/80, /* 1 820.0*/80, /* 2 950.0*/80, /* 3 1100.0*/80, /* 4 1300.0*/80, /* 5 1550.0*/80, /* 6 1800.0*/80, /* 7 2150.0*/100, /* 8 2500.0*/100, /* 9 3000.0*/100, /* 10 3500.0*/106, /* 11 4150.0*/116, /* 12 4900.0*/108, /* 13 5800.0*/108, /* 14 6800.0*/108, /* 15 8000.0*/108, },
{/* 13 158.000 *//* 0 700.0*/80, /* 1 820.0*/80, /* 2 950.0*/80, /* 3 1100.0*/80, /* 4 1300.0*/80, /* 5 1550.0*/80, /* 6 1800.0*/80, /* 7 2150.0*/80, /* 8 2500.0*/80, /* 9 3000.0*/80, /* 10 3500.0*/80, /* 11 4150.0*/80, /* 12 4900.0*/80, /* 13 5800.0*/80, /* 14 6800.0*/80, /* 15 8000.0*/80, },
{/* 14 185.000 *//* 0 700.0*/80, /* 1 820.0*/80, /* 2 950.0*/80, /* 3 1100.0*/80, /* 4 1300.0*/80, /* 5 1550.0*/80, /* 6 1800.0*/80, /* 7 2150.0*/80, /* 8 2500.0*/80, /* 9 3000.0*/80, /* 10 3500.0*/80, /* 11 4150.0*/80, /* 12 4900.0*/80, /* 13 5800.0*/80, /* 14 6800.0*/80, /* 15 8000.0*/80, },
{/* 15 220.000 *//* 0 700.0*/80, /* 1 820.0*/80, /* 2 950.0*/80, /* 3 1100.0*/80, /* 4 1300.0*/80, /* 5 1550.0*/80, /* 6 1800.0*/80, /* 7 2150.0*/80, /* 8 2500.0*/80, /* 9 3000.0*/80, /* 10 3500.0*/80, /* 11 4150.0*/80, /* 12 4900.0*/80, /* 13 5800.0*/80, /* 14 6800.0*/80, /* 15 8000.0*/80, },
};
#endif
@ -86,20 +86,16 @@ static const float mazda_miata_nb2_targetLambdaLoadBins[FUEL_LOAD_COUNT] = {10.0
void setMazdaMiata2003EngineConfigurationNaFuelRail(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setMazdaMiata2003EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
// todo: there should be a better way?
for (int loadIndex = 0; loadIndex < FSIO_TABLE_8; loadIndex++) {
for (int rpmIndex = 0; rpmIndex < FSIO_TABLE_8; rpmIndex++) {
config->fsioTable1[loadIndex][rpmIndex] = fsio_table_dyno[loadIndex][rpmIndex];
}
}
MEMCPY(config->veRpmBins, mazda_miata_nb2_RpmBins);
MEMCPY(config->veLoadBins, mazda_miata_nb2_LoadBins);
MEMCPY(config->veTable, mapBased18vvtVeTable_NA_fuel_rail);
copyTable(config->fsioTable1, fsio_table_dyno);
copyArray(config->veRpmBins, mazda_miata_nb2_RpmBins);
copyArray(config->veLoadBins, mazda_miata_nb2_LoadBins);
copyTable(config->veTable, mapBased18vvtVeTable_NA_fuel_rail);
engineConfiguration->vvtOffset = 83; // 2002 green car value
MEMCPY(config->lambdaRpmBins, mazda_miata_nb2_targetLambdaRpmBins);
MEMCPY(config->lambdaLoadBins, mazda_miata_nb2_targetLambdaLoadBins);
copyArray(config->lambdaRpmBins, mazda_miata_nb2_targetLambdaRpmBins);
copyArray(config->lambdaLoadBins, mazda_miata_nb2_targetLambdaLoadBins);
engineConfiguration->ignitionPins[2] = GPIOC_7;

149
firmware/config/engines/mazda_miata_vvt.cpp
View File

@ -74,32 +74,31 @@ static const float vvt18fsioLoadBins[FSIO_TABLE_8] =
{30.0, 40.0, 50.0, 60.0, 70.0, 75.0, 82.0, 85.0}
;
// todo: convert to uint8 since destination table is now uint8
float const fsio_table_vvt_target[FSIO_TABLE_8][FSIO_TABLE_8] = {
static const uint8_t fsio_table_vvt_target[FSIO_TABLE_8][FSIO_TABLE_8] = {
/* Generated by TS2C on Mon Feb 13 19:11:32 EST 2017*/
{/* 0 30.000 *//* 0 700.0*/1.000, /* 1 1000.0*/3.000, /* 2 2000.0*/10.000, /* 3 3000.0*/20.000, /* 4 3500.0*/27.000, /* 5 4500.0*/28.000, /* 6 5500.0*/11.000, /* 7 6500.0*/5.000, },
{/* 1 40.000 *//* 0 700.0*/3.000, /* 1 1000.0*/10.000, /* 2 2000.0*/19.000, /* 3 3000.0*/26.000, /* 4 3500.0*/30.000, /* 5 4500.0*/28.000, /* 6 5500.0*/11.000, /* 7 6500.0*/5.000, },
{/* 2 50.000 *//* 0 700.0*/7.000, /* 1 1000.0*/16.000, /* 2 2000.0*/24.000, /* 3 3000.0*/28.000, /* 4 3500.0*/30.000, /* 5 4500.0*/28.000, /* 6 5500.0*/11.000, /* 7 6500.0*/5.000, },
{/* 3 60.000 *//* 0 700.0*/11.000, /* 1 1000.0*/20.000, /* 2 2000.0*/27.000, /* 3 3000.0*/28.000, /* 4 3500.0*/30.000, /* 5 4500.0*/28.000, /* 6 5500.0*/11.000, /* 7 6500.0*/5.000, },
{/* 4 70.000 *//* 0 700.0*/13.000, /* 1 1000.0*/24.000, /* 2 2000.0*/31.000, /* 3 3000.0*/28.000, /* 4 3500.0*/30.000, /* 5 4500.0*/28.000, /* 6 5500.0*/11.000, /* 7 6500.0*/5.000, },
{/* 5 75.000 *//* 0 700.0*/15.000, /* 1 1000.0*/27.000, /* 2 2000.0*/33.000, /* 3 3000.0*/28.000, /* 4 3500.0*/30.000, /* 5 4500.0*/28.000, /* 6 5500.0*/11.000, /* 7 6500.0*/5.000, },
{/* 6 82.000 *//* 0 700.0*/17.000, /* 1 1000.0*/28.000, /* 2 2000.0*/33.000, /* 3 3000.0*/28.000, /* 4 3500.0*/30.000, /* 5 4500.0*/28.000, /* 6 5500.0*/11.000, /* 7 6500.0*/5.000, },
{/* 7 85.000 *//* 0 700.0*/17.000, /* 1 1000.0*/28.000, /* 2 2000.0*/33.000, /* 3 3000.0*/28.000, /* 4 3500.0*/30.000, /* 5 4500.0*/28.000, /* 6 5500.0*/11.000, /* 7 6500.0*/5.000, },
{/* 0 30 *//* 0 700.0*/1, /* 1 1000.0*/3, /* 2 2000.0*/10, /* 3 3000.0*/20, /* 4 3500.0*/27, /* 5 4500.0*/28, /* 6 5500.0*/11, /* 7 6500.0*/5, },
{/* 1 40 *//* 0 700.0*/3, /* 1 1000.0*/10, /* 2 2000.0*/19, /* 3 3000.0*/26, /* 4 3500.0*/30, /* 5 4500.0*/28, /* 6 5500.0*/11, /* 7 6500.0*/5, },
{/* 2 50 *//* 0 700.0*/7, /* 1 1000.0*/16, /* 2 2000.0*/24, /* 3 3000.0*/28, /* 4 3500.0*/30, /* 5 4500.0*/28, /* 6 5500.0*/11, /* 7 6500.0*/5, },
{/* 3 60 *//* 0 700.0*/11, /* 1 1000.0*/20, /* 2 2000.0*/27, /* 3 3000.0*/28, /* 4 3500.0*/30, /* 5 4500.0*/28, /* 6 5500.0*/11, /* 7 6500.0*/5, },
{/* 4 70 *//* 0 700.0*/13, /* 1 1000.0*/24, /* 2 2000.0*/31, /* 3 3000.0*/28, /* 4 3500.0*/30, /* 5 4500.0*/28, /* 6 5500.0*/11, /* 7 6500.0*/5, },
{/* 5 75 *//* 0 700.0*/15, /* 1 1000.0*/27, /* 2 2000.0*/33, /* 3 3000.0*/28, /* 4 3500.0*/30, /* 5 4500.0*/28, /* 6 5500.0*/11, /* 7 6500.0*/5, },
{/* 6 82 *//* 0 700.0*/17, /* 1 1000.0*/28, /* 2 2000.0*/33, /* 3 3000.0*/28, /* 4 3500.0*/30, /* 5 4500.0*/28, /* 6 5500.0*/11, /* 7 6500.0*/5, },
{/* 7 85 *//* 0 700.0*/17, /* 1 1000.0*/28, /* 2 2000.0*/33, /* 3 3000.0*/28, /* 4 3500.0*/30, /* 5 4500.0*/28, /* 6 5500.0*/11, /* 7 6500.0*/5, },
};
static const float tpsTspSame[TPS_TPS_ACCEL_TABLE] =
{0.0, 10.0, 20.0, 35.0, 50.0, 65.0, 80.0, 100.0};
float const tpsTpsTable[TPS_TPS_ACCEL_TABLE][TPS_TPS_ACCEL_TABLE] = {
static const uint8_t tpsTpsTable[TPS_TPS_ACCEL_TABLE][TPS_TPS_ACCEL_TABLE] = {
/* Generated by TS2C on Tue Apr 18 21:29:16 EDT 2017*/
{/* 0 0.000 *//* 0 0.0*/0.000, /* 1 10.0*/0.000, /* 2 20.0*/0.000, /* 3 35.0*/0.000, /* 4 50.0*/0.000, /* 5 65.0*/0.000, /* 6 80.0*/0.000, /* 7 100.0*/0.000, },
{/* 1 10.000 *//* 0 0.0*/10.000, /* 1 10.0*/0.000, /* 2 20.0*/0.000, /* 3 35.0*/0.000, /* 4 50.0*/0.000, /* 5 65.0*/0.000, /* 6 80.0*/0.000, /* 7 100.0*/0.000, },
{/* 2 20.000 *//* 0 0.0*/17.000, /* 1 10.0*/10.000, /* 2 20.0*/0.000, /* 3 35.0*/0.000, /* 4 50.0*/0.000, /* 5 65.0*/0.000, /* 6 80.0*/0.000, /* 7 100.0*/0.000, },
{/* 3 35.000 *//* 0 0.0*/23.000, /* 1 10.0*/17.000, /* 2 20.0*/10.000, /* 3 35.0*/0.000, /* 4 50.0*/0.000, /* 5 65.0*/0.000, /* 6 80.0*/0.000, /* 7 100.0*/0.000, },
{/* 4 50.000 *//* 0 0.0*/28.000, /* 1 10.0*/23.000, /* 2 20.0*/17.000, /* 3 35.0*/10.000, /* 4 50.0*/0.000, /* 5 65.0*/0.000, /* 6 80.0*/0.000, /* 7 100.0*/0.000, },
{/* 5 65.000 *//* 0 0.0*/32.000, /* 1 10.0*/28.000, /* 2 20.0*/23.000, /* 3 35.0*/17.000, /* 4 50.0*/10.000, /* 5 65.0*/0.000, /* 6 80.0*/0.000, /* 7 100.0*/0.000, },
{/* 6 80.000 *//* 0 0.0*/35.000, /* 1 10.0*/32.000, /* 2 20.0*/28.000, /* 3 35.0*/23.000, /* 4 50.0*/17.000, /* 5 65.0*/10.000, /* 6 80.0*/0.000, /* 7 100.0*/0.000, },
{/* 7 100.000 *//* 0 0.0*/37.000, /* 1 10.0*/35.000, /* 2 20.0*/32.000, /* 3 35.0*/28.000, /* 4 50.0*/23.000, /* 5 65.0*/17.000, /* 6 80.0*/10.000, /* 7 100.0*/0.000, },
{/* 0 0 *//* 0 0.0*/0, /* 1 10.0*/0, /* 2 20.0*/0, /* 3 35.0*/0, /* 4 50.0*/0, /* 5 65.0*/0, /* 6 80.0*/0, /* 7 100.0*/0, },
{/* 1 10 *//* 0 0.0*/10, /* 1 10.0*/0, /* 2 20.0*/0, /* 3 35.0*/0, /* 4 50.0*/0, /* 5 65.0*/0, /* 6 80.0*/0, /* 7 100.0*/0, },
{/* 2 20 *//* 0 0.0*/17, /* 1 10.0*/10, /* 2 20.0*/0, /* 3 35.0*/0, /* 4 50.0*/0, /* 5 65.0*/0, /* 6 80.0*/0, /* 7 100.0*/0, },
{/* 3 35 *//* 0 0.0*/23, /* 1 10.0*/17, /* 2 20.0*/10, /* 3 35.0*/0, /* 4 50.0*/0, /* 5 65.0*/0, /* 6 80.0*/0, /* 7 100.0*/0, },
{/* 4 50 *//* 0 0.0*/28, /* 1 10.0*/23, /* 2 20.0*/17, /* 3 35.0*/10, /* 4 50.0*/0, /* 5 65.0*/0, /* 6 80.0*/0, /* 7 100.0*/0, },
{/* 5 65 *//* 0 0.0*/32, /* 1 10.0*/28, /* 2 20.0*/23, /* 3 35.0*/17, /* 4 50.0*/10, /* 5 65.0*/0, /* 6 80.0*/0, /* 7 100.0*/0, },
{/* 6 80 *//* 0 0.0*/35, /* 1 10.0*/32, /* 2 20.0*/28, /* 3 35.0*/23, /* 4 50.0*/17, /* 5 65.0*/10, /* 6 80.0*/0, /* 7 100.0*/0, },
{/* 7 100 *//* 0 0.0*/37, /* 1 10.0*/35, /* 2 20.0*/32, /* 3 35.0*/28, /* 4 50.0*/23, /* 5 65.0*/17, /* 6 80.0*/10, /* 7 100.0*/0, },
};
@ -129,45 +128,45 @@ static const float ignition18vvtLoadBins[FUEL_LOAD_COUNT] = {
135.30078125 , 157.69921875 , 183.900390625 , 214.400390625 ,
250.0};
static const fuel_table_t mapBased18vvtVeTable_NB_fuel_rail = {
static const int8_t mapBased18vvtVeTable_NB_fuel_rail[16][16] = {
/* Generated by TS2C on Tue Apr 18 21:46:03 EDT 2017*/
{/* 0 20.000 *//* 0 700.0*/35.685, /* 1 820.0*/36.982, /* 2 950.0*/37.200, /* 3 1100.0*/35.790, /* 4 1300.0*/36.438, /* 5 1550.0*/37.272, /* 6 1800.0*/33.458, /* 7 2150.0*/31.345, /* 8 2500.0*/25.367, /* 9 3000.0*/24.573, /* 10 3500.0*/24.560, /* 11 4150.0*/25.705, /* 12 4900.0*/26.587, /* 13 5800.0*/29.273, /* 14 6800.0*/33.646, /* 15 8000.0*/36.896, },
{/* 1 25.000 *//* 0 700.0*/35.535, /* 1 820.0*/37.952, /* 2 950.0*/38.225, /* 3 1100.0*/37.100, /* 4 1300.0*/36.868, /* 5 1550.0*/37.290, /* 6 1800.0*/41.785, /* 7 2150.0*/39.520, /* 8 2500.0*/40.022, /* 9 3000.0*/37.265, /* 10 3500.0*/35.565, /* 11 4150.0*/36.272, /* 12 4900.0*/37.039, /* 13 5800.0*/35.710, /* 14 6800.0*/38.212, /* 15 8000.0*/40.621, },
{/* 2 30.000 *//* 0 700.0*/37.748, /* 1 820.0*/40.882, /* 2 950.0*/39.945, /* 3 1100.0*/37.788, /* 4 1300.0*/38.893, /* 5 1550.0*/41.615, /* 6 1800.0*/45.105, /* 7 2150.0*/47.712, /* 8 2500.0*/54.600, /* 9 3000.0*/48.670, /* 10 3500.0*/47.853, /* 11 4150.0*/55.655, /* 12 4900.0*/55.498, /* 13 5800.0*/49.273, /* 14 6800.0*/50.331, /* 15 8000.0*/51.444, },
{/* 3 35.000 *//* 0 700.0*/39.675, /* 1 820.0*/44.125, /* 2 950.0*/42.123, /* 3 1100.0*/40.857, /* 4 1300.0*/45.520, /* 5 1550.0*/48.538, /* 6 1800.0*/48.993, /* 7 2150.0*/52.555, /* 8 2500.0*/56.085, /* 9 3000.0*/53.197, /* 10 3500.0*/52.382, /* 11 4150.0*/58.470, /* 12 4900.0*/62.063, /* 13 5800.0*/57.389, /* 14 6800.0*/58.854, /* 15 8000.0*/58.917, },
{/* 4 40.000 *//* 0 700.0*/45.470, /* 1 820.0*/56.098, /* 2 950.0*/49.000, /* 3 1100.0*/45.075, /* 4 1300.0*/54.000, /* 5 1550.0*/53.248, /* 6 1800.0*/55.022, /* 7 2150.0*/54.513, /* 8 2500.0*/57.425, /* 9 3000.0*/55.402, /* 10 3500.0*/57.045, /* 11 4150.0*/59.667, /* 12 4900.0*/62.945, /* 13 5800.0*/59.550, /* 14 6800.0*/63.474, /* 15 8000.0*/62.896, },
{/* 5 46.000 *//* 0 700.0*/54.595, /* 1 820.0*/61.655, /* 2 950.0*/56.473, /* 3 1100.0*/52.265, /* 4 1300.0*/53.317, /* 5 1550.0*/58.608, /* 6 1800.0*/57.620, /* 7 2150.0*/59.022, /* 8 2500.0*/58.695, /* 9 3000.0*/58.413, /* 10 3500.0*/60.002, /* 11 4150.0*/64.660, /* 12 4900.0*/66.688, /* 13 5800.0*/64.357, /* 14 6800.0*/65.124, /* 15 8000.0*/63.864, },
{/* 6 54.000 *//* 0 700.0*/60.197, /* 1 820.0*/67.792, /* 2 950.0*/66.027, /* 3 1100.0*/60.100, /* 4 1300.0*/59.155, /* 5 1550.0*/59.607, /* 6 1800.0*/61.960, /* 7 2150.0*/63.623, /* 8 2500.0*/63.118, /* 9 3000.0*/60.965, /* 10 3500.0*/62.195, /* 11 4150.0*/69.045, /* 12 4900.0*/71.032, /* 13 5800.0*/67.183, /* 14 6800.0*/65.605, /* 15 8000.0*/63.877, },
{/* 7 63.000 *//* 0 700.0*/65.607, /* 1 820.0*/70.670, /* 2 950.0*/71.193, /* 3 1100.0*/67.927, /* 4 1300.0*/62.265, /* 5 1550.0*/61.768, /* 6 1800.0*/65.190, /* 7 2150.0*/63.987, /* 8 2500.0*/63.945, /* 9 3000.0*/64.695, /* 10 3500.0*/66.277, /* 11 4150.0*/69.593, /* 12 4900.0*/73.335, /* 13 5800.0*/71.135, /* 14 6800.0*/67.308, /* 15 8000.0*/65.571, },
{/* 8 73.000 *//* 0 700.0*/70.760, /* 1 820.0*/74.892, /* 2 950.0*/73.700, /* 3 1100.0*/75.399, /* 4 1300.0*/71.755, /* 5 1550.0*/66.492, /* 6 1800.0*/66.218, /* 7 2150.0*/65.995, /* 8 2500.0*/67.402, /* 9 3000.0*/69.588, /* 10 3500.0*/68.407, /* 11 4150.0*/72.383, /* 12 4900.0*/76.445, /* 13 5800.0*/75.327, /* 14 6800.0*/66.716, /* 15 8000.0*/65.095, },
{/* 9 85.000 *//* 0 700.0*/71.825, /* 1 820.0*/75.935, /* 2 950.0*/76.701, /* 3 1100.0*/74.133, /* 4 1300.0*/73.258, /* 5 1550.0*/72.668, /* 6 1800.0*/71.280, /* 7 2150.0*/70.157, /* 8 2500.0*/72.560, /* 9 3000.0*/72.457, /* 10 3500.0*/74.947, /* 11 4150.0*/76.565, /* 12 4900.0*/78.225, /* 13 5800.0*/76.108, /* 14 6800.0*/68.455, /* 15 8000.0*/64.913, },
{/* 10 99.000 *//* 0 700.0*/75.315, /* 1 820.0*/76.670, /* 2 950.0*/78.845, /* 3 1100.0*/76.120, /* 4 1300.0*/73.420, /* 5 1550.0*/74.563, /* 6 1800.0*/74.585, /* 7 2150.0*/74.285, /* 8 2500.0*/77.522, /* 9 3000.0*/76.202, /* 10 3500.0*/77.563, /* 11 4150.0*/76.135, /* 12 4900.0*/77.720, /* 13 5800.0*/76.672, /* 14 6800.0*/69.815, /* 15 8000.0*/65.180, },
{/* 11 116.000 *//* 0 700.0*/80.000, /* 1 820.0*/80.000, /* 2 950.0*/80.000, /* 3 1100.0*/80.000, /* 4 1300.0*/80.000, /* 5 1550.0*/80.000, /* 6 1800.0*/80.000, /* 7 2150.0*/80.000, /* 8 2500.0*/80.000, /* 9 3000.0*/80.000, /* 10 3500.0*/80.000, /* 11 4150.0*/80.000, /* 12 4900.0*/80.000, /* 13 5800.0*/80.000, /* 14 6800.0*/80.000, /* 15 8000.0*/80.000, },
{/* 12 135.000 *//* 0 700.0*/80.000, /* 1 820.0*/80.000, /* 2 950.0*/80.000, /* 3 1100.0*/80.000, /* 4 1300.0*/80.000, /* 5 1550.0*/80.000, /* 6 1800.0*/80.000, /* 7 2150.0*/80.000, /* 8 2500.0*/80.000, /* 9 3000.0*/80.000, /* 10 3500.0*/80.000, /* 11 4150.0*/80.000, /* 12 4900.0*/80.000, /* 13 5800.0*/80.000, /* 14 6800.0*/80.000, /* 15 8000.0*/80.000, },
{/* 13 158.000 *//* 0 700.0*/80.000, /* 1 820.0*/80.000, /* 2 950.0*/80.000, /* 3 1100.0*/80.000, /* 4 1300.0*/80.000, /* 5 1550.0*/80.000, /* 6 1800.0*/80.000, /* 7 2150.0*/80.000, /* 8 2500.0*/80.000, /* 9 3000.0*/80.000, /* 10 3500.0*/80.000, /* 11 4150.0*/80.000, /* 12 4900.0*/80.000, /* 13 5800.0*/80.000, /* 14 6800.0*/80.000, /* 15 8000.0*/80.000, },
{/* 14 185.000 *//* 0 700.0*/80.000, /* 1 820.0*/80.000, /* 2 950.0*/80.000, /* 3 1100.0*/80.000, /* 4 1300.0*/80.000, /* 5 1550.0*/80.000, /* 6 1800.0*/80.000, /* 7 2150.0*/80.000, /* 8 2500.0*/80.000, /* 9 3000.0*/80.000, /* 10 3500.0*/80.000, /* 11 4150.0*/80.000, /* 12 4900.0*/80.000, /* 13 5800.0*/80.000, /* 14 6800.0*/80.000, /* 15 8000.0*/80.000, },
{/* 15 220.000 *//* 0 700.0*/80.000, /* 1 820.0*/80.000, /* 2 950.0*/80.000, /* 3 1100.0*/80.000, /* 4 1300.0*/80.000, /* 5 1550.0*/80.000, /* 6 1800.0*/80.000, /* 7 2150.0*/80.000, /* 8 2500.0*/80.000, /* 9 3000.0*/80.000, /* 10 3500.0*/80.000, /* 11 4150.0*/80.000, /* 12 4900.0*/80.000, /* 13 5800.0*/80.000, /* 14 6800.0*/80.000, /* 15 8000.0*/80.000, },
{/* 0 20 *//* 0 700.0*/35, /* 1 820.0*/36, /* 2 950.0*/37, /* 3 1100.0*/35, /* 4 1300.0*/36, /* 5 1550.0*/37, /* 6 1800.0*/33, /* 7 2150.0*/31, /* 8 2500.0*/25, /* 9 3000.0*/24, /* 10 3500.0*/24, /* 11 4150.0*/25, /* 12 4900.0*/26, /* 13 5800.0*/29, /* 14 6800.0*/33, /* 15 8000.0*/36, },
{/* 1 25 *//* 0 700.0*/35, /* 1 820.0*/37, /* 2 950.0*/38, /* 3 1100.0*/37, /* 4 1300.0*/36, /* 5 1550.0*/37, /* 6 1800.0*/41, /* 7 2150.0*/39, /* 8 2500.0*/40, /* 9 3000.0*/37, /* 10 3500.0*/35, /* 11 4150.0*/36, /* 12 4900.0*/37, /* 13 5800.0*/35, /* 14 6800.0*/38, /* 15 8000.0*/40, },
{/* 2 30 *//* 0 700.0*/37, /* 1 820.0*/40, /* 2 950.0*/39, /* 3 1100.0*/37, /* 4 1300.0*/38, /* 5 1550.0*/41, /* 6 1800.0*/45, /* 7 2150.0*/47, /* 8 2500.0*/54, /* 9 3000.0*/48, /* 10 3500.0*/47, /* 11 4150.0*/55, /* 12 4900.0*/55, /* 13 5800.0*/49, /* 14 6800.0*/50, /* 15 8000.0*/51, },
{/* 3 35 *//* 0 700.0*/39, /* 1 820.0*/44, /* 2 950.0*/42, /* 3 1100.0*/40, /* 4 1300.0*/45, /* 5 1550.0*/48, /* 6 1800.0*/48, /* 7 2150.0*/52, /* 8 2500.0*/56, /* 9 3000.0*/53, /* 10 3500.0*/52, /* 11 4150.0*/58, /* 12 4900.0*/62, /* 13 5800.0*/57, /* 14 6800.0*/58, /* 15 8000.0*/58, },
{/* 4 40 *//* 0 700.0*/45, /* 1 820.0*/56, /* 2 950.0*/49, /* 3 1100.0*/45, /* 4 1300.0*/54, /* 5 1550.0*/53, /* 6 1800.0*/55, /* 7 2150.0*/54, /* 8 2500.0*/57, /* 9 3000.0*/55, /* 10 3500.0*/57, /* 11 4150.0*/59, /* 12 4900.0*/62, /* 13 5800.0*/59, /* 14 6800.0*/63, /* 15 8000.0*/62, },
{/* 5 46 *//* 0 700.0*/54, /* 1 820.0*/61, /* 2 950.0*/56, /* 3 1100.0*/52, /* 4 1300.0*/53, /* 5 1550.0*/58, /* 6 1800.0*/57, /* 7 2150.0*/59, /* 8 2500.0*/58, /* 9 3000.0*/58, /* 10 3500.0*/60, /* 11 4150.0*/64, /* 12 4900.0*/66, /* 13 5800.0*/64, /* 14 6800.0*/65, /* 15 8000.0*/63, },
{/* 6 54 *//* 0 700.0*/60, /* 1 820.0*/67, /* 2 950.0*/66, /* 3 1100.0*/60, /* 4 1300.0*/59, /* 5 1550.0*/59, /* 6 1800.0*/61, /* 7 2150.0*/63, /* 8 2500.0*/63, /* 9 3000.0*/60, /* 10 3500.0*/62, /* 11 4150.0*/69, /* 12 4900.0*/71, /* 13 5800.0*/67, /* 14 6800.0*/65, /* 15 8000.0*/63, },
{/* 7 63 *//* 0 700.0*/65, /* 1 820.0*/70, /* 2 950.0*/71, /* 3 1100.0*/67, /* 4 1300.0*/62, /* 5 1550.0*/61, /* 6 1800.0*/65, /* 7 2150.0*/63, /* 8 2500.0*/63, /* 9 3000.0*/64, /* 10 3500.0*/66, /* 11 4150.0*/69, /* 12 4900.0*/73, /* 13 5800.0*/71, /* 14 6800.0*/67, /* 15 8000.0*/65, },
{/* 8 73 *//* 0 700.0*/70, /* 1 820.0*/74, /* 2 950.0*/73, /* 3 1100.0*/75, /* 4 1300.0*/71, /* 5 1550.0*/66, /* 6 1800.0*/66, /* 7 2150.0*/65, /* 8 2500.0*/67, /* 9 3000.0*/69, /* 10 3500.0*/68, /* 11 4150.0*/72, /* 12 4900.0*/76, /* 13 5800.0*/75, /* 14 6800.0*/66, /* 15 8000.0*/65, },
{/* 9 85 *//* 0 700.0*/71, /* 1 820.0*/75, /* 2 950.0*/76, /* 3 1100.0*/74, /* 4 1300.0*/73, /* 5 1550.0*/72, /* 6 1800.0*/71, /* 7 2150.0*/70, /* 8 2500.0*/72, /* 9 3000.0*/72, /* 10 3500.0*/74, /* 11 4150.0*/76, /* 12 4900.0*/78, /* 13 5800.0*/76, /* 14 6800.0*/68, /* 15 8000.0*/64, },
{/* 10 99 *//* 0 700.0*/75, /* 1 820.0*/76, /* 2 950.0*/78, /* 3 1100.0*/76, /* 4 1300.0*/73, /* 5 1550.0*/74, /* 6 1800.0*/74, /* 7 2150.0*/74, /* 8 2500.0*/77, /* 9 3000.0*/76, /* 10 3500.0*/77, /* 11 4150.0*/76, /* 12 4900.0*/77, /* 13 5800.0*/76, /* 14 6800.0*/69, /* 15 8000.0*/65, },
{/* 11 116 *//* 0 700.0*/80, /* 1 820.0*/80, /* 2 950.0*/80, /* 3 1100.0*/80, /* 4 1300.0*/80, /* 5 1550.0*/80, /* 6 1800.0*/80, /* 7 2150.0*/80, /* 8 2500.0*/80, /* 9 3000.0*/80, /* 10 3500.0*/80, /* 11 4150.0*/80, /* 12 4900.0*/80, /* 13 5800.0*/80, /* 14 6800.0*/80, /* 15 8000.0*/80, },
{/* 12 135 *//* 0 700.0*/80, /* 1 820.0*/80, /* 2 950.0*/80, /* 3 1100.0*/80, /* 4 1300.0*/80, /* 5 1550.0*/80, /* 6 1800.0*/80, /* 7 2150.0*/80, /* 8 2500.0*/80, /* 9 3000.0*/80, /* 10 3500.0*/80, /* 11 4150.0*/80, /* 12 4900.0*/80, /* 13 5800.0*/80, /* 14 6800.0*/80, /* 15 8000.0*/80, },
{/* 13 158 *//* 0 700.0*/80, /* 1 820.0*/80, /* 2 950.0*/80, /* 3 1100.0*/80, /* 4 1300.0*/80, /* 5 1550.0*/80, /* 6 1800.0*/80, /* 7 2150.0*/80, /* 8 2500.0*/80, /* 9 3000.0*/80, /* 10 3500.0*/80, /* 11 4150.0*/80, /* 12 4900.0*/80, /* 13 5800.0*/80, /* 14 6800.0*/80, /* 15 8000.0*/80, },
{/* 14 185 *//* 0 700.0*/80, /* 1 820.0*/80, /* 2 950.0*/80, /* 3 1100.0*/80, /* 4 1300.0*/80, /* 5 1550.0*/80, /* 6 1800.0*/80, /* 7 2150.0*/80, /* 8 2500.0*/80, /* 9 3000.0*/80, /* 10 3500.0*/80, /* 11 4150.0*/80, /* 12 4900.0*/80, /* 13 5800.0*/80, /* 14 6800.0*/80, /* 15 8000.0*/80, },
{/* 15 220 *//* 0 700.0*/80, /* 1 820.0*/80, /* 2 950.0*/80, /* 3 1100.0*/80, /* 4 1300.0*/80, /* 5 1550.0*/80, /* 6 1800.0*/80, /* 7 2150.0*/80, /* 8 2500.0*/80, /* 9 3000.0*/80, /* 10 3500.0*/80, /* 11 4150.0*/80, /* 12 4900.0*/80, /* 13 5800.0*/80, /* 14 6800.0*/80, /* 15 8000.0*/80, },
};
#if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT
static const ignition_table_t mapBased18vvtTimingTable = {
static const uint8_t mapBased18vvtTimingTable[16][16] = {
/* Generated by TS2C on Tue Apr 18 21:43:57 EDT 2017*/
{/* 0 25.000 *//* 0 700.0*/14.800, /* 1 850.0*/13.000, /* 2 943.0*/13.000, /* 3 1112.0*/16.000, /* 4 1310.0*/21.500, /* 5 1545.0*/25.100, /* 6 1821.0*/28.300, /* 7 2146.0*/31.460, /* 8 2530.0*/34.370, /* 9 2982.0*/36.598, /* 10 3515.0*/38.698, /* 11 4144.0*/39.728, /* 12 4884.0*/40.346, /* 13 5757.0*/40.758, /* 14 6787.0*/40.964, /* 15 8000.0*/41.170, },
{/* 1 29.100 *//* 0 700.0*/14.800, /* 1 850.0*/13.000, /* 2 943.0*/13.000, /* 3 1112.0*/16.100, /* 4 1310.0*/21.500, /* 5 1545.0*/25.000, /* 6 1821.0*/28.200, /* 7 2146.0*/31.270, /* 8 2530.0*/34.190, /* 9 2982.0*/36.210, /* 10 3515.0*/38.286, /* 11 4144.0*/39.316, /* 12 4884.0*/40.037, /* 13 5757.0*/40.552, /* 14 6787.0*/40.758, /* 15 8000.0*/40.964, },
{/* 2 34.000 *//* 0 700.0*/14.800, /* 1 850.0*/13.000, /* 2 943.0*/13.000, /* 3 1112.0*/16.830, /* 4 1310.0*/21.600, /* 5 1545.0*/24.800, /* 6 1821.0*/27.800, /* 7 2146.0*/30.790, /* 8 2530.0*/33.540, /* 9 2982.0*/35.888, /* 10 3515.0*/37.771, /* 11 4144.0*/38.801, /* 12 4884.0*/39.522, /* 13 5757.0*/40.140, /* 14 6787.0*/40.346, /* 15 8000.0*/40.552, },
{/* 3 39.600 *//* 0 700.0*/15.200, /* 1 850.0*/13.436, /* 2 943.0*/13.368, /* 3 1112.0*/17.520, /* 4 1310.0*/21.700, /* 5 1545.0*/24.600, /* 6 1821.0*/27.400, /* 7 2146.0*/30.140, /* 8 2530.0*/33.010, /* 9 2982.0*/35.072, /* 10 3515.0*/36.947, /* 11 4144.0*/38.183, /* 12 4884.0*/38.904, /* 13 5757.0*/39.522, /* 14 6787.0*/39.728, /* 15 8000.0*/39.934, },
{/* 4 46.200 *//* 0 700.0*/15.500, /* 1 850.0*/13.949, /* 2 943.0*/13.801, /* 3 1112.0*/18.450, /* 4 1310.0*/21.800, /* 5 1545.0*/24.400, /* 6 1821.0*/26.900, /* 7 2146.0*/29.490, /* 8 2530.0*/32.270, /* 9 2982.0*/33.944, /* 10 3515.0*/36.123, /* 11 4144.0*/37.359, /* 12 4884.0*/38.183, /* 13 5757.0*/38.698, /* 14 6787.0*/38.904, /* 15 8000.0*/39.213, },
{/* 5 53.900 *//* 0 700.0*/15.700, /* 1 850.0*/14.549, /* 2 943.0*/14.306, /* 3 1112.0*/18.970, /* 4 1310.0*/21.900, /* 5 1545.0*/24.000, /* 6 1821.0*/26.200, /* 7 2146.0*/28.770, /* 8 2530.0*/30.950, /* 9 2982.0*/32.926, /* 10 3515.0*/34.990, /* 11 4144.0*/36.226, /* 12 4884.0*/37.050, /* 13 5757.0*/37.771, /* 14 6787.0*/38.080, /* 15 8000.0*/38.492, },
{/* 6 62.800 *//* 0 700.0*/15.900, /* 1 850.0*/15.241, /* 2 943.0*/14.891, /* 3 1112.0*/19.520, /* 4 1310.0*/21.700, /* 5 1545.0*/23.600, /* 6 1821.0*/25.600, /* 7 2146.0*/27.700, /* 8 2530.0*/29.650, /* 9 2982.0*/31.702, /* 10 3515.0*/33.436, /* 11 4144.0*/34.558, /* 12 4884.0*/35.476, /* 13 5757.0*/36.190, /* 14 6787.0*/36.598, /* 15 8000.0*/37.210, },
{/* 7 73.200 *//* 0 700.0*/16.200, /* 1 850.0*/16.051, /* 2 943.0*/15.573, /* 3 1112.0*/19.700, /* 4 1310.0*/21.400, /* 5 1545.0*/23.000, /* 6 1821.0*/24.800, /* 7 2146.0*/26.440, /* 8 2530.0*/28.270, /* 9 2982.0*/30.020, /* 10 3515.0*/31.400, /* 11 4144.0*/32.600, /* 12 4884.0*/33.300, /* 13 5757.0*/34.100, /* 14 6787.0*/34.700, /* 15 8000.0*/35.300, },
{/* 8 85.400 *//* 0 700.0*/16.830, /* 1 850.0*/17.000, /* 2 943.0*/16.375, /* 3 1112.0*/19.600, /* 4 1310.0*/20.800, /* 5 1545.0*/22.300, /* 6 1821.0*/23.700, /* 7 2146.0*/24.950, /* 8 2530.0*/26.710, /* 9 2982.0*/28.000, /* 10 3515.0*/29.600, /* 11 4144.0*/31.000, /* 12 4884.0*/31.900, /* 13 5757.0*/32.600, /* 14 6787.0*/33.200, /* 15 8000.0*/33.900, },
{/* 9 99.500 *//* 0 700.0*/16.200, /* 1 850.0*/16.800, /* 2 943.0*/17.300, /* 3 1112.0*/18.000, /* 4 1310.0*/19.000, /* 5 1545.0*/20.200, /* 6 1821.0*/21.300, /* 7 2146.0*/22.100, /* 8 2530.0*/23.400, /* 9 2982.0*/25.200, /* 10 3515.0*/26.700, /* 11 4144.0*/28.000, /* 12 4884.0*/28.900, /* 13 5757.0*/29.800, /* 14 6787.0*/30.700, /* 15 8000.0*/31.400, },
{/* 10 116.000 *//* 0 700.0*/15.300, /* 1 850.0*/15.900, /* 2 943.0*/16.300, /* 3 1112.0*/16.800, /* 4 1310.0*/17.400, /* 5 1545.0*/18.300, /* 6 1821.0*/19.300, /* 7 2146.0*/20.000, /* 8 2530.0*/21.500, /* 9 2982.0*/23.000, /* 10 3515.0*/24.500, /* 11 4144.0*/25.900, /* 12 4884.0*/26.900, /* 13 5757.0*/27.700, /* 14 6787.0*/28.700, /* 15 8000.0*/29.500, },
{/* 11 135.301 *//* 0 700.0*/13.600, /* 1 850.0*/13.900, /* 2 943.0*/14.100, /* 3 1112.0*/14.600, /* 4 1310.0*/15.100, /* 5 1545.0*/15.900, /* 6 1821.0*/17.000, /* 7 2146.0*/17.700, /* 8 2530.0*/19.100, /* 9 2982.0*/20.600, /* 10 3515.0*/22.100, /* 11 4144.0*/23.300, /* 12 4884.0*/24.500, /* 13 5757.0*/25.500, /* 14 6787.0*/26.500, /* 15 8000.0*/27.300, },
{/* 12 157.699 *//* 0 700.0*/11.200, /* 1 850.0*/11.600, /* 2 943.0*/11.800, /* 3 1112.0*/12.200, /* 4 1310.0*/12.500, /* 5 1545.0*/13.200, /* 6 1821.0*/14.200, /* 7 2146.0*/15.100, /* 8 2530.0*/16.500, /* 9 2982.0*/17.700, /* 10 3515.0*/19.200, /* 11 4144.0*/20.600, /* 12 4884.0*/21.700, /* 13 5757.0*/22.800, /* 14 6787.0*/24.000, /* 15 8000.0*/25.000, },
{/* 13 183.900 *//* 0 700.0*/8.300, /* 1 850.0*/8.700, /* 2 943.0*/9.000, /* 3 1112.0*/9.300, /* 4 1310.0*/9.800, /* 5 1545.0*/10.400, /* 6 1821.0*/11.300, /* 7 2146.0*/12.100, /* 8 2530.0*/13.100, /* 9 2982.0*/14.500, /* 10 3515.0*/16.000, /* 11 4144.0*/17.200, /* 12 4884.0*/18.500, /* 13 5757.0*/19.700, /* 14 6787.0*/21.000, /* 15 8000.0*/22.100, },
{/* 14 214.400 *//* 0 700.0*/5.000, /* 1 850.0*/5.300, /* 2 943.0*/5.600, /* 3 1112.0*/5.900, /* 4 1310.0*/6.400, /* 5 1545.0*/7.000, /* 6 1821.0*/7.600, /* 7 2146.0*/8.400, /* 8 2530.0*/9.600, /* 9 2982.0*/10.800, /* 10 3515.0*/12.100, /* 11 4144.0*/13.400, /* 12 4884.0*/14.800, /* 13 5757.0*/16.200, /* 14 6787.0*/17.400, /* 15 8000.0*/18.700, },
{/* 15 250.000 *//* 0 700.0*/1.100, /* 1 850.0*/1.400, /* 2 943.0*/1.600, /* 3 1112.0*/2.000, /* 4 1310.0*/2.500, /* 5 1545.0*/3.000, /* 6 1821.0*/3.700, /* 7 2146.0*/4.400, /* 8 2530.0*/5.400, /* 9 2982.0*/6.600, /* 10 3515.0*/7.600, /* 11 4144.0*/9.000, /* 12 4884.0*/10.500, /* 13 5757.0*/12.000, /* 14 6787.0*/13.400, /* 15 8000.0*/14.900, },
{/* 0 25 *//* 0 700.0*/14, /* 1 850.0*/13, /* 2 943.0*/13, /* 3 1112.0*/16, /* 4 1310.0*/21, /* 5 1545.0*/25, /* 6 1821.0*/28, /* 7 2146.0*/31, /* 8 2530.0*/34, /* 9 2982.0*/36, /* 10 3515.0*/38, /* 11 4144.0*/39, /* 12 4884.0*/40, /* 13 5757.0*/40, /* 14 6787.0*/40, /* 15 8000.0*/41, },
{/* 1 29.100 *//* 0 700.0*/14, /* 1 850.0*/13, /* 2 943.0*/13, /* 3 1112.0*/16, /* 4 1310.0*/21, /* 5 1545.0*/25, /* 6 1821.0*/28, /* 7 2146.0*/31, /* 8 2530.0*/34, /* 9 2982.0*/36, /* 10 3515.0*/38, /* 11 4144.0*/39, /* 12 4884.0*/40, /* 13 5757.0*/40, /* 14 6787.0*/40, /* 15 8000.0*/40, },
{/* 2 34 *//* 0 700.0*/14, /* 1 850.0*/13, /* 2 943.0*/13, /* 3 1112.0*/16, /* 4 1310.0*/21, /* 5 1545.0*/24, /* 6 1821.0*/27, /* 7 2146.0*/30, /* 8 2530.0*/33, /* 9 2982.0*/35, /* 10 3515.0*/37, /* 11 4144.0*/38, /* 12 4884.0*/39, /* 13 5757.0*/40, /* 14 6787.0*/40, /* 15 8000.0*/40, },
{/* 3 39.600 *//* 0 700.0*/15, /* 1 850.0*/13, /* 2 943.0*/13, /* 3 1112.0*/17, /* 4 1310.0*/21, /* 5 1545.0*/24, /* 6 1821.0*/27, /* 7 2146.0*/30, /* 8 2530.0*/33, /* 9 2982.0*/35, /* 10 3515.0*/36, /* 11 4144.0*/38, /* 12 4884.0*/38, /* 13 5757.0*/39, /* 14 6787.0*/39, /* 15 8000.0*/39, },
{/* 4 46.200 *//* 0 700.0*/15, /* 1 850.0*/13, /* 2 943.0*/13, /* 3 1112.0*/18, /* 4 1310.0*/21, /* 5 1545.0*/24, /* 6 1821.0*/26, /* 7 2146.0*/29, /* 8 2530.0*/32, /* 9 2982.0*/33, /* 10 3515.0*/36, /* 11 4144.0*/37, /* 12 4884.0*/38, /* 13 5757.0*/38, /* 14 6787.0*/38, /* 15 8000.0*/39, },
{/* 5 53.900 *//* 0 700.0*/15, /* 1 850.0*/14, /* 2 943.0*/14, /* 3 1112.0*/18, /* 4 1310.0*/21, /* 5 1545.0*/24, /* 6 1821.0*/26, /* 7 2146.0*/28, /* 8 2530.0*/30, /* 9 2982.0*/32, /* 10 3515.0*/34, /* 11 4144.0*/36, /* 12 4884.0*/37, /* 13 5757.0*/37, /* 14 6787.0*/38, /* 15 8000.0*/38, },
{/* 6 62.800 *//* 0 700.0*/15, /* 1 850.0*/15, /* 2 943.0*/14, /* 3 1112.0*/19, /* 4 1310.0*/21, /* 5 1545.0*/23, /* 6 1821.0*/25, /* 7 2146.0*/27, /* 8 2530.0*/29, /* 9 2982.0*/31, /* 10 3515.0*/33, /* 11 4144.0*/34, /* 12 4884.0*/35, /* 13 5757.0*/36, /* 14 6787.0*/36, /* 15 8000.0*/37, },
{/* 7 73.200 *//* 0 700.0*/16, /* 1 850.0*/16, /* 2 943.0*/15, /* 3 1112.0*/19, /* 4 1310.0*/21, /* 5 1545.0*/23, /* 6 1821.0*/24, /* 7 2146.0*/26, /* 8 2530.0*/28, /* 9 2982.0*/30, /* 10 3515.0*/31, /* 11 4144.0*/32, /* 12 4884.0*/33, /* 13 5757.0*/34, /* 14 6787.0*/34, /* 15 8000.0*/35, },
{/* 8 85.400 *//* 0 700.0*/16, /* 1 850.0*/17, /* 2 943.0*/16, /* 3 1112.0*/19, /* 4 1310.0*/20, /* 5 1545.0*/22, /* 6 1821.0*/23, /* 7 2146.0*/24, /* 8 2530.0*/26, /* 9 2982.0*/28, /* 10 3515.0*/29, /* 11 4144.0*/31, /* 12 4884.0*/31, /* 13 5757.0*/32, /* 14 6787.0*/33, /* 15 8000.0*/33, },
{/* 9 99.500 *//* 0 700.0*/16, /* 1 850.0*/16, /* 2 943.0*/17, /* 3 1112.0*/18, /* 4 1310.0*/19, /* 5 1545.0*/20, /* 6 1821.0*/21, /* 7 2146.0*/22, /* 8 2530.0*/23, /* 9 2982.0*/25, /* 10 3515.0*/26, /* 11 4144.0*/28, /* 12 4884.0*/28, /* 13 5757.0*/29, /* 14 6787.0*/30, /* 15 8000.0*/31, },
{/* 10 116 *//* 0 700.0*/15, /* 1 850.0*/15, /* 2 943.0*/16, /* 3 1112.0*/16, /* 4 1310.0*/17, /* 5 1545.0*/18, /* 6 1821.0*/19, /* 7 2146.0*/20, /* 8 2530.0*/21, /* 9 2982.0*/23, /* 10 3515.0*/24, /* 11 4144.0*/25, /* 12 4884.0*/26, /* 13 5757.0*/27, /* 14 6787.0*/28, /* 15 8000.0*/29, },
{/* 11 135.301 *//* 0 700.0*/13, /* 1 850.0*/13, /* 2 943.0*/14, /* 3 1112.0*/14, /* 4 1310.0*/15, /* 5 1545.0*/15, /* 6 1821.0*/17, /* 7 2146.0*/17, /* 8 2530.0*/19, /* 9 2982.0*/20, /* 10 3515.0*/22, /* 11 4144.0*/23, /* 12 4884.0*/24, /* 13 5757.0*/25, /* 14 6787.0*/26, /* 15 8000.0*/27, },
{/* 12 157.699 *//* 0 700.0*/11, /* 1 850.0*/11, /* 2 943.0*/11, /* 3 1112.0*/12, /* 4 1310.0*/12, /* 5 1545.0*/13, /* 6 1821.0*/14, /* 7 2146.0*/15, /* 8 2530.0*/16, /* 9 2982.0*/17, /* 10 3515.0*/19, /* 11 4144.0*/20, /* 12 4884.0*/21, /* 13 5757.0*/22, /* 14 6787.0*/24, /* 15 8000.0*/25, },
{/* 13 183.900 *//* 0 700.0*/8, /* 1 850.0*/8, /* 2 943.0*/9, /* 3 1112.0*/9, /* 4 1310.0*/9, /* 5 1545.0*/10, /* 6 1821.0*/11, /* 7 2146.0*/12, /* 8 2530.0*/13, /* 9 2982.0*/14, /* 10 3515.0*/16, /* 11 4144.0*/17, /* 12 4884.0*/18, /* 13 5757.0*/19, /* 14 6787.0*/21, /* 15 8000.0*/22, },
{/* 14 214.400 *//* 0 700.0*/5, /* 1 850.0*/5, /* 2 943.0*/5, /* 3 1112.0*/5, /* 4 1310.0*/6, /* 5 1545.0*/7, /* 6 1821.0*/7, /* 7 2146.0*/8, /* 8 2530.0*/9, /* 9 2982.0*/10, /* 10 3515.0*/12, /* 11 4144.0*/13, /* 12 4884.0*/14, /* 13 5757.0*/16, /* 14 6787.0*/17, /* 15 8000.0*/18, },
{/* 15 250 *//* 0 700.0*/1, /* 1 850.0*/1, /* 2 943.0*/1, /* 3 1112.0*/2, /* 4 1310.0*/2, /* 5 1545.0*/3, /* 6 1821.0*/3, /* 7 2146.0*/4, /* 8 2530.0*/5, /* 9 2982.0*/6, /* 10 3515.0*/7, /* 11 4144.0*/9, /* 12 4884.0*/10, /* 13 5757.0*/12, /* 14 6787.0*/13, /* 15 8000.0*/14, },
};
#endif
@ -242,30 +241,20 @@ static void setMAFTransferFunction(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
}
void setMazdaMiataNbTpsTps(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
memcpy(config->tpsTpsAccelFromRpmBins, tpsTspSame, sizeof(tpsTspSame));
memcpy(config->tpsTpsAccelFromRpmBins, tpsTspSame, sizeof(tpsTspSame));
// todo: there should be a better way?
for (int loadIndex = 0; loadIndex < TPS_TPS_ACCEL_TABLE; loadIndex++) {
for (int rpmIndex = 0; rpmIndex < TPS_TPS_ACCEL_TABLE; rpmIndex++) {
config->tpsTpsAccelTable[loadIndex][rpmIndex] = tpsTpsTable[loadIndex][rpmIndex];
}
}
copyArray(config->tpsTpsAccelFromRpmBins, tpsTspSame);
copyArray(config->tpsTpsAccelFromRpmBins, tpsTspSame);
copyTable(config->tpsTpsAccelTable, tpsTpsTable);
}
void setMazdaMiataNbInjectorLag(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
memcpy(engineConfiguration->injector.battLagCorr, injectorLagCorrection, sizeof(injectorLagCorrection));
memcpy(engineConfiguration->injector.battLagCorrBins, injectorLagBins, sizeof(injectorLagBins));
copyArray(engineConfiguration->injector.battLagCorr, injectorLagCorrection);
copyArray(engineConfiguration->injector.battLagCorrBins, injectorLagBins);
}
void setMazdaNB2VVTSettings(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
memcpy(config->vvtTable1RpmBins, vvt18fsioRpmBins, sizeof(vvt18fsioRpmBins));
memcpy(config->vvtTable1LoadBins, vvt18fsioLoadBins, sizeof(vvt18fsioLoadBins));
// todo: there should be a better way?
for (int loadIndex = 0; loadIndex < FSIO_TABLE_8; loadIndex++) {
for (int rpmIndex = 0; rpmIndex < FSIO_TABLE_8; rpmIndex++) {
config->vvtTable1[loadIndex][rpmIndex] = fsio_table_vvt_target[loadIndex][rpmIndex];
}
}
copyArray(config->vvtTable1RpmBins, vvt18fsioRpmBins);
copyArray(config->vvtTable1LoadBins, vvt18fsioLoadBins);
copyTable(config->vvtTable1, fsio_table_vvt_target);
engineConfiguration->auxPidFrequency[0] = 300; // VVT solenoid control
@ -348,14 +337,14 @@ static void setMazdaMiataEngineNB2Defaults(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->vvtMode[0] = VVT_MIATA_NB2;
engineConfiguration->vvtOffset = 98; // 2003 red car value
MEMCPY(config->veRpmBins, mazda_miata_nb2_RpmBins);
MEMCPY(config->veLoadBins, mazda_miata_nb2_LoadBins);
MEMCPY(config->veTable, mapBased18vvtVeTable_NB_fuel_rail);
copyArray(config->veRpmBins, mazda_miata_nb2_RpmBins);
copyArray(config->veLoadBins, mazda_miata_nb2_LoadBins);
copyTable(config->veTable, mapBased18vvtVeTable_NB_fuel_rail);
MEMCPY(config->ignitionRpmBins, ignition18vvtRpmBins);
MEMCPY(config->ignitionLoadBins, ignition18vvtLoadBins);
copyArray(config->ignitionRpmBins, ignition18vvtRpmBins);
copyArray(config->ignitionLoadBins, ignition18vvtLoadBins);
#if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT
MEMCPY(config->ignitionTable, mapBased18vvtTimingTable);
copyTable(config->ignitionTable, mapBased18vvtTimingTable);
#endif
setMazdaNB2VVTSettings(PASS_CONFIG_PARAMETER_SIGNATURE);
@ -376,7 +365,7 @@ static void setMazdaMiataEngineNB2Defaults(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
//set idle_offset 30
engineConfiguration->idleRpmPid.offset = 30;
engineConfiguration->idleRpmPid.pFactor = 0.07;
engineConfiguration->idleRpmPid.iFactor = 0.0001;
engineConfiguration->idleRpmPid.iFactor = 01;
engineConfiguration->idleRpmPid.dFactor = 5;
engineConfiguration->idleRpmPid.periodMs = 10;
@ -524,7 +513,7 @@ void setMazdaMiata2003EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->idleRpmPid.offset = 0;
engineConfiguration->idleRpmPid.pFactor = 0.2;
engineConfiguration->idleRpmPid.iFactor = 0.0001;
engineConfiguration->idleRpmPid.iFactor = 01;
engineConfiguration->idleRpmPid.dFactor = 5;
engineConfiguration->idleRpmPid.periodMs = 10;
@ -664,7 +653,7 @@ void setMiataNB2_MRE_ETB(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
//set idle_offset 0
engineConfiguration->idleRpmPid.offset = 0;
engineConfiguration->idleRpmPid.pFactor = 0.2;
engineConfiguration->idleRpmPid.iFactor = 0.0001;
engineConfiguration->idleRpmPid.iFactor = 01;
engineConfiguration->idleRpmPid.dFactor = 5;
engineConfiguration->idleRpmPid.periodMs = 10;

4
firmware/controllers/actuators/electronic_throttle.cpp
View File

@ -109,8 +109,8 @@ static const float hardCodedetbHitachiBiasValues[8] = {-18.0, -17.0, -15.0, 0.0,
/* Generated by TS2C on Thu Aug 20 21:10:02 EDT 2020*/
void setHitachiEtbBiasBins(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
MEMCPY(engineConfiguration->etbBiasBins, hardCodedetbHitachiBiasBins);
MEMCPY(engineConfiguration->etbBiasValues, hardCodedetbHitachiBiasValues);
copyArray(engineConfiguration->etbBiasBins, hardCodedetbHitachiBiasBins);
copyArray(engineConfiguration->etbBiasValues, hardCodedetbHitachiBiasValues);
}

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

@ -43,23 +43,24 @@ static int minCrankingRpm = 0;
static const float iatTimingRpmBins[IGN_LOAD_COUNT] = {880, 1260, 1640, 2020, 2400, 2780, 3000, 3380, 3760, 4140, 4520, 5000, 5700, 6500, 7200, 8000};
//880 1260 1640 2020 2400 2780 3000 3380 3760 4140 4520 5000 5700 6500 7200 8000
static const ignition_table_t defaultIatTiming = {
{ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2},
{ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2},
{ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2},
{ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2},
{3.5, 3.5, 3.5, 3.5, 3.5, 3.5, 3.5, 3.5, 3.5, 3.5, 3.5, 2, 2, 2, 2, 2},
{ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2},
{ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0},
static const int8_t defaultIatTiming[16][16] = {
// NOTE: this table is stored in tenths of a degree (so we can use int8_t instead of float), converted upon copy (see copyTable call below)
{ 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 20, 20, 20, 20, 20 },
{ 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 20, 20, 20, 20, 20 },
{ 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 20, 20, 20, 20, 20 },
{ 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 20, 20, 20, 20, 20 },
{ 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 20, 20, 20, 20, 20 },
{ 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 20, 20, 20, 20, 2},
{ 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 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, 0, 0, 0, 0, 0},
{ 0, 0, -0.9, -0.9, -0.9, -0.9, -0.9, -0.9, -0.9, -0.9, -0.9, -0.9, -0.9, -0.9, -0.9, -0.9},
{ -3.3, -3.4, -4.9, -4.9, -4.9, -4.9, -4.4, -4.4, -4.4, -4.4, -4.4, -0.9, -0.9, -0.9, -0.9, -0.9},
{ -4.4, -4.9, -5.9, -5.9, -5.9, -5.9, -4.9, -4.9, -4.9, -4.9, -4.9, -2.4, -2.4, -2.4, -2.4, -2.4},
{ -4.4, -4.9, -5.9, -5.9, -5.9, -5.9, -4.9, -4.9, -4.9, -4.9, -4.9, -2.9, -2.9, -2.9, -2.9, -2.9},
{-4.4, -4.9, -5.9, -5.9, -5.9, -5.9, -4.9, -4.9, -4.9, -4.9, -4.9, -3.9, -3.9, -3.9, -3.9, -3.9},
{-4.4, -4.9, -5.9, -5.9, -5.9, -5.9, -4.9, -4.9, -4.9, -4.9, -4.9, -3.9, -3.9, -3.9, -3.9, -3.9},
{-4.4, -4.9, -5.9, -5.9, -5.9, -5.9, -4.9, -4.9, -4.9, -4.9, -4.9, -3.9, -3.9, -3.9, -3.9, -3.9},
{ 0, 0, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9},
{ -33, -34, -49, -49, -49, -49, -44, -44, -44, -44, -44, -9, -9, -9, -9, -9},
{ -44, -49, -59, -59, -59, -59, -49, -49, -49, -49, -49, -24, -24, -24, -24, -24},
{ -44, -49, -59, -59, -59, -59, -49, -49, -49, -49, -49, -29, -29, -29, -29, -29},
{ -44, -49, -59, -59, -59, -59, -49, -49, -49, -49, -49, -39, -39, -39, -39, -39},
{ -44, -49, -59, -59, -59, -59, -49, -49, -49, -49, -49, -39, -39, -39, -39, -39},
{ -44, -49, -59, -59, -59, -59, -49, -49, -49, -49, -49, -39, -39, -39, -39, -39},
};
#endif /* IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT */
@ -241,8 +242,9 @@ size_t getMultiSparkCount(int rpm DECLARE_ENGINE_PARAMETER_SUFFIX) {
void setDefaultIatTimingCorrection(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
setLinearCurve(config->ignitionIatCorrLoadBins, /*from*/CLT_CURVE_RANGE_FROM, 110, 1);
#if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT
MEMCPY(config->ignitionIatCorrRpmBins, iatTimingRpmBins);
MEMCPY(config->ignitionIatCorrTable, defaultIatTiming);
copyArray(config->ignitionIatCorrRpmBins, iatTimingRpmBins);
// defaultIatTiming stored in tenths of a degree, see table above
copyTable(config->ignitionIatCorrTable, defaultIatTiming, 0.1f);
#else
setLinearCurve(config->ignitionIatCorrLoadBins, /*from*/0, 6000, 1);
#endif /* IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT */

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

@ -109,29 +109,6 @@ EXTERN_ENGINE;
//#define TS_DEFAULT_SPEED 115200
#define TS_DEFAULT_SPEED 38400
#define xxxxx 0
#if 0
static fuel_table_t alphaNfuel = {
{/*0 engineLoad=0.00*/ /*0 800.0*/xxxxx, /*1 1213.0*/xxxxx, /*2 1626.0*/xxxxx, /*3 2040.0*/xxxxx, /*4 2453.0*/xxxxx, /*5 2866.0*/xxxxx, /*6 3280.0*/xxxxx, /*7 3693.0*/xxxxx, /*8 4106.0*/xxxxx, /*9 4520.0*/xxxxx, /*10 4933.0*/xxxxx, /*11 5346.0*/xxxxx, /*12 5760.0*/xxxxx, /*13 6173.0*/xxxxx, /*14 6586.0*/xxxxx, /*15 7000.0*/xxxxx},
{/*1 engineLoad=6.66*/ /*0 800.0*/xxxxx, /*1 1213.0*/xxxxx, /*2 1626.0*/xxxxx, /*3 2040.0*/xxxxx, /*4 2453.0*/xxxxx, /*5 2866.0*/xxxxx, /*6 3280.0*/xxxxx, /*7 3693.0*/xxxxx, /*8 4106.0*/xxxxx, /*9 4520.0*/xxxxx, /*10 4933.0*/xxxxx, /*11 5346.0*/xxxxx, /*12 5760.0*/xxxxx, /*13 6173.0*/xxxxx, /*14 6586.0*/xxxxx, /*15 7000.0*/xxxxx},
{/*2 engineLoad=13.33*/ /*0 800.0*/xxxxx, /*1 1213.0*/xxxxx, /*2 1626.0*/xxxxx, /*3 2040.0*/xxxxx, /*4 2453.0*/xxxxx, /*5 2866.0*/xxxxx, /*6 3280.0*/xxxxx, /*7 3693.0*/xxxxx, /*8 4106.0*/xxxxx, /*9 4520.0*/xxxxx, /*10 4933.0*/xxxxx, /*11 5346.0*/xxxxx, /*12 5760.0*/xxxxx, /*13 6173.0*/xxxxx, /*14 6586.0*/xxxxx, /*15 7000.0*/xxxxx},
{/*3 engineLoad=20.00*/ /*0 800.0*/xxxxx, /*1 1213.0*/xxxxx, /*2 1626.0*/xxxxx, /*3 2040.0*/xxxxx, /*4 2453.0*/xxxxx, /*5 2866.0*/xxxxx, /*6 3280.0*/xxxxx, /*7 3693.0*/xxxxx, /*8 4106.0*/xxxxx, /*9 4520.0*/xxxxx, /*10 4933.0*/xxxxx, /*11 5346.0*/xxxxx, /*12 5760.0*/xxxxx, /*13 6173.0*/xxxxx, /*14 6586.0*/xxxxx, /*15 7000.0*/xxxxx},
{/*4 engineLoad=26.66*/ /*0 800.0*/xxxxx, /*1 1213.0*/xxxxx, /*2 1626.0*/xxxxx, /*3 2040.0*/xxxxx, /*4 2453.0*/xxxxx, /*5 2866.0*/xxxxx, /*6 3280.0*/xxxxx, /*7 3693.0*/xxxxx, /*8 4106.0*/xxxxx, /*9 4520.0*/xxxxx, /*10 4933.0*/xxxxx, /*11 5346.0*/xxxxx, /*12 5760.0*/xxxxx, /*13 6173.0*/xxxxx, /*14 6586.0*/xxxxx, /*15 7000.0*/xxxxx},
{/*5 engineLoad=33.33*/ /*0 800.0*/xxxxx, /*1 1213.0*/xxxxx, /*2 1626.0*/xxxxx, /*3 2040.0*/xxxxx, /*4 2453.0*/xxxxx, /*5 2866.0*/xxxxx, /*6 3280.0*/xxxxx, /*7 3693.0*/xxxxx, /*8 4106.0*/xxxxx, /*9 4520.0*/xxxxx, /*10 4933.0*/xxxxx, /*11 5346.0*/xxxxx, /*12 5760.0*/xxxxx, /*13 6173.0*/xxxxx, /*14 6586.0*/xxxxx, /*15 7000.0*/xxxxx},
{/*6 engineLoad=40.00*/ /*0 800.0*/xxxxx, /*1 1213.0*/xxxxx, /*2 1626.0*/xxxxx, /*3 2040.0*/xxxxx, /*4 2453.0*/xxxxx, /*5 2866.0*/xxxxx, /*6 3280.0*/xxxxx, /*7 3693.0*/xxxxx, /*8 4106.0*/xxxxx, /*9 4520.0*/xxxxx, /*10 4933.0*/xxxxx, /*11 5346.0*/xxxxx, /*12 5760.0*/xxxxx, /*13 6173.0*/xxxxx, /*14 6586.0*/xxxxx, /*15 7000.0*/xxxxx},
{/*7 engineLoad=46.66*/ /*0 800.0*/xxxxx, /*1 1213.0*/xxxxx, /*2 1626.0*/xxxxx, /*3 2040.0*/xxxxx, /*4 2453.0*/xxxxx, /*5 2866.0*/xxxxx, /*6 3280.0*/xxxxx, /*7 3693.0*/xxxxx, /*8 4106.0*/xxxxx, /*9 4520.0*/xxxxx, /*10 4933.0*/xxxxx, /*11 5346.0*/xxxxx, /*12 5760.0*/xxxxx, /*13 6173.0*/xxxxx, /*14 6586.0*/xxxxx, /*15 7000.0*/xxxxx},
{/*8 engineLoad=53.33*/ /*0 800.0*/xxxxx, /*1 1213.0*/xxxxx, /*2 1626.0*/xxxxx, /*3 2040.0*/xxxxx, /*4 2453.0*/xxxxx, /*5 2866.0*/xxxxx, /*6 3280.0*/xxxxx, /*7 3693.0*/xxxxx, /*8 4106.0*/xxxxx, /*9 4520.0*/xxxxx, /*10 4933.0*/xxxxx, /*11 5346.0*/xxxxx, /*12 5760.0*/xxxxx, /*13 6173.0*/xxxxx, /*14 6586.0*/xxxxx, /*15 7000.0*/xxxxx},
{/*9 engineLoad=60.00*/ /*0 800.0*/xxxxx, /*1 1213.0*/xxxxx, /*2 1626.0*/xxxxx, /*3 2040.0*/xxxxx, /*4 2453.0*/xxxxx, /*5 2866.0*/xxxxx, /*6 3280.0*/xxxxx, /*7 3693.0*/xxxxx, /*8 4106.0*/xxxxx, /*9 4520.0*/xxxxx, /*10 4933.0*/xxxxx, /*11 5346.0*/xxxxx, /*12 5760.0*/xxxxx, /*13 6173.0*/xxxxx, /*14 6586.0*/xxxxx, /*15 7000.0*/xxxxx},
{/*10 engineLoad=66.66*/ /*0 800.0*/xxxxx, /*1 1213.0*/xxxxx, /*2 1626.0*/xxxxx, /*3 2040.0*/xxxxx, /*4 2453.0*/xxxxx, /*5 2866.0*/xxxxx, /*6 3280.0*/xxxxx, /*7 3693.0*/xxxxx, /*8 4106.0*/xxxxx, /*9 4520.0*/xxxxx, /*10 4933.0*/xxxxx, /*11 5346.0*/xxxxx, /*12 5760.0*/xxxxx, /*13 6173.0*/xxxxx, /*14 6586.0*/xxxxx, /*15 7000.0*/xxxxx},
{/*11 engineLoad=73.33*/ /*0 800.0*/xxxxx, /*1 1213.0*/xxxxx, /*2 1626.0*/xxxxx, /*3 2040.0*/xxxxx, /*4 2453.0*/xxxxx, /*5 2866.0*/xxxxx, /*6 3280.0*/xxxxx, /*7 3693.0*/xxxxx, /*8 4106.0*/xxxxx, /*9 4520.0*/xxxxx, /*10 4933.0*/xxxxx, /*11 5346.0*/xxxxx, /*12 5760.0*/xxxxx, /*13 6173.0*/xxxxx, /*14 6586.0*/xxxxx, /*15 7000.0*/xxxxx},
{/*12 engineLoad=80.00*/ /*0 800.0*/xxxxx, /*1 1213.0*/xxxxx, /*2 1626.0*/xxxxx, /*3 2040.0*/xxxxx, /*4 2453.0*/xxxxx, /*5 2866.0*/xxxxx, /*6 3280.0*/xxxxx, /*7 3693.0*/xxxxx, /*8 4106.0*/xxxxx, /*9 4520.0*/xxxxx, /*10 4933.0*/xxxxx, /*11 5346.0*/xxxxx, /*12 5760.0*/xxxxx, /*13 6173.0*/xxxxx, /*14 6586.0*/xxxxx, /*15 7000.0*/xxxxx},
{/*13 engineLoad=86.66*/ /*0 800.0*/xxxxx, /*1 1213.0*/xxxxx, /*2 1626.0*/xxxxx, /*3 2040.0*/xxxxx, /*4 2453.0*/xxxxx, /*5 2866.0*/xxxxx, /*6 3280.0*/xxxxx, /*7 3693.0*/xxxxx, /*8 4106.0*/xxxxx, /*9 4520.0*/xxxxx, /*10 4933.0*/xxxxx, /*11 5346.0*/xxxxx, /*12 5760.0*/xxxxx, /*13 6173.0*/xxxxx, /*14 6586.0*/xxxxx, /*15 7000.0*/xxxxx},
{/*14 engineLoad=93.33*/ /*0 800.0*/xxxxx, /*1 1213.0*/xxxxx, /*2 1626.0*/xxxxx, /*3 2040.0*/xxxxx, /*4 2453.0*/xxxxx, /*5 2866.0*/xxxxx, /*6 3280.0*/xxxxx, /*7 3693.0*/xxxxx, /*8 4106.0*/xxxxx, /*9 4520.0*/xxxxx, /*10 4933.0*/xxxxx, /*11 5346.0*/xxxxx, /*12 5760.0*/xxxxx, /*13 6173.0*/xxxxx, /*14 6586.0*/xxxxx, /*15 7000.0*/xxxxx},
{/*15 engineLoad=100.00*/ /*0 800.0*/xxxxx, /*1 1213.0*/xxxxx, /*2 1626.0*/xxxxx, /*3 2040.0*/xxxxx, /*4 2453.0*/xxxxx, /*5 2866.0*/xxxxx, /*6 3280.0*/xxxxx, /*7 3693.0*/xxxxx, /*8 4106.0*/xxxxx, /*9 4520.0*/xxxxx, /*10 4933.0*/xxxxx, /*11 5346.0*/xxxxx, /*12 5760.0*/xxxxx, /*13 6173.0*/xxxxx, /*14 6586.0*/xxxxx, /*15 7000.0*/xxxxx}
};
#endif
/**
* Current engine configuration. On firmware start we assign empty configuration, then
* we copy actual configuration after reading settings.
@ -260,23 +237,15 @@ void setFuelTablesLoadBin(float minValue, float maxValue DECLARE_CONFIG_PARAMETE
setLinearCurve(config->lambdaLoadBins, minValue, maxValue, 1);
}
void setTimingMap(ignition_table_t map, float value) {
for (int l = 0; l < IGN_LOAD_COUNT; l++) {
for (int r = 0; r < IGN_RPM_COUNT; r++) {
map[l][r] = value;
}
}
}
void setWholeIatCorrTimingTable(float value DECLARE_CONFIG_PARAMETER_SUFFIX) {
setTimingMap(config->ignitionIatCorrTable, value);
setTable(config->ignitionIatCorrTable, value);
}
/**
* See also crankingTimingAngle
*/
void setWholeTimingTable_d(angle_t value DECLARE_CONFIG_PARAMETER_SUFFIX) {
setTimingMap(config->ignitionTable, value);
setTable(config->ignitionTable, value);
}
static void initTemperatureCurve(float *bins, float *values, int size, float defaultValue) {

2
firmware/controllers/algo/engine_configuration.h
View File

@ -45,8 +45,6 @@ void incrementGlobalConfigurationVersion(DECLARE_ENGINE_PARAMETER_SIGNATURE);
void commonFrankensoAnalogInputs(engine_configuration_s *engineConfiguration);
void setFrankenso0_1_joystick(engine_configuration_s *engineConfiguration);
#define MEMCPY(dest, src) {memcpy(dest, src, sizeof(src));}
void emptyCallbackWithConfiguration(engine_configuration_s * engine);
void setDefaultFrankensoConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE);

18
firmware/util/containers/table_helper.h
View File

@ -76,15 +76,6 @@ private:
const char *name;
};
template<int RPM_BIN_SIZE, int LOAD_BIN_SIZE, typename vType, typename kType, typename TValueMultiplier = efi::ratio<1>>
void copy2DTable(const vType source[LOAD_BIN_SIZE][RPM_BIN_SIZE], vType destination[LOAD_BIN_SIZE][RPM_BIN_SIZE]) {
for (int k = 0; k < LOAD_BIN_SIZE; k++) {
for (int rpmIndex = 0; rpmIndex < RPM_BIN_SIZE; rpmIndex++) {
destination[k][rpmIndex] = source[k][rpmIndex];
}
}
}
typedef Map3D<FUEL_RPM_COUNT, FUEL_LOAD_COUNT, uint8_t, float, efi::ratio<1, PACK_MULT_LAMBDA_CFG>> lambda_Map3D_t;
typedef Map3D<IGN_RPM_COUNT, IGN_LOAD_COUNT, float, float> ign_Map3D_t;
typedef Map3D<FUEL_RPM_COUNT, FUEL_LOAD_COUNT, float, float> fuel_Map3D_t;
@ -129,4 +120,13 @@ constexpr void setTable(TElement (&dest)[N][M], const TElement value) {
}
}
template <typename TDest, typename TSource, size_t N, size_t M>
constexpr void copyTable(TDest (&dest)[N][M], const TSource (&source)[N][M], float multiply = 1.0f) {
for (size_t n = 0; n < N; n++) {
for (size_t m = 0; m < M; m++) {
dest[n][m] = source[n][m] * multiply;
}
}
}
void setRpmTableBin(float array[], int size);