mirror of https://github.com/rusefi/rusefi.git
vvt defaults
This commit is contained in:
rusefi
parent
f0e63bab91
commit
27f94a8f76
|
|
@ -36,6 +36,16 @@
|
|||
|
||||
EXTERN_ENGINE;
|
||||
|
||||
static const float injectorLagBins[VBAT_INJECTOR_CURVE_SIZE] = {
|
||||
6.0, 8.0, 10.0, 11.0,
|
||||
12.0, 13.0, 14.0, 15.0
|
||||
};
|
||||
|
||||
static const float injectorLagCorrection[VBAT_INJECTOR_CURVE_SIZE] = {
|
||||
4.0 , 3.0 , 2.0 , 1.7,
|
||||
1.5 , 1.35, 1.25 , 1.20
|
||||
};
|
||||
|
||||
static const float ve18fsioRpmBins[FSIO_TABLE_8] =
|
||||
{700.0, 1000.0, 2000.0, 3000.0, 3500.0, 4500.0, 5500.0, 6500.0}
|
||||
;
|
||||
|
|
@ -56,15 +66,42 @@ float fsio_table[FSIO_TABLE_8][FSIO_TABLE_8] = {
|
|||
{/* 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, },
|
||||
};
|
||||
|
||||
static const float tpsTspSame[TPS_TPS_ACCEL_TABLE] =
|
||||
{0.0, 10.0, 20.0, 35.0, 50.0, 65.0, 80.0, 100.0};
|
||||
|
||||
static const float ve18vvtRpmBins[FUEL_RPM_COUNT] = {
|
||||
float 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, },
|
||||
};
|
||||
|
||||
|
||||
static const float ve18vvtRpmBins[FUEL_RPM_COUNT] = {700.0, 820.0, 950.0, 1100.0,
|
||||
1300.0, 1550.0, 1800.0, 2150.0,
|
||||
2500.0, 3000.0, 3500.0, 4150.0,
|
||||
4900.0, 5800.0, 6800.0, 8000.0}
|
||||
;
|
||||
|
||||
static const float ve18vvtLoadBins[FUEL_LOAD_COUNT] = {20.0, 25.0, 30.0, 35.0,
|
||||
40.0, 46.0, 54.0, 63.0,
|
||||
73.0, 85.0, 99.0, 116.0,
|
||||
135.0, 158.0, 185.0, 220.0}
|
||||
;
|
||||
|
||||
static const float ignition18vvtRpmBins[FUEL_RPM_COUNT] = {
|
||||
700.0, 850.0 , 943.0 ,
|
||||
1112.0 , 1310.0 , 1545.0 ,
|
||||
1821.0, 2146.0, 2530.0,
|
||||
2982.0, 3515.0 , 4144.0 ,
|
||||
4884.0 , 5757.0 , 6787.0, 8000.0};
|
||||
|
||||
static const float ve18vvtLoadBins[FUEL_LOAD_COUNT] = {
|
||||
static const float ignition18vvtLoadBins[FUEL_LOAD_COUNT] = {
|
||||
25.0 , 29.10009765625 , 34.0 , 39.60009765625 ,
|
||||
46.2001953125 , 53.89990234375 , 62.7998046875 ,
|
||||
73.2001953125 , 85.400390625 , 99.5 , 116.0 ,
|
||||
|
|
@ -72,36 +109,36 @@ static const float ve18vvtLoadBins[FUEL_LOAD_COUNT] = {
|
|||
250.0};
|
||||
|
||||
static const fuel_table_t mapBased18vvtVeTable = {
|
||||
/* Generated by TS2C on Mon Feb 13 19:12:12 EST 2017*/
|
||||
{/* 0 25.000 *//* 0 700.0*/45.000, /* 1 850.0*/45.000, /* 2 943.0*/33.400, /* 3 1112.0*/30.300, /* 4 1310.0*/25.300, /* 5 1545.0*/23.500, /* 6 1821.0*/22.200, /* 7 2146.0*/21.200, /* 8 2530.0*/21.300, /* 9 2982.0*/22.900, /* 10 3515.0*/32.100, /* 11 4144.0*/29.400, /* 12 4884.0*/26.600, /* 13 5757.0*/25.200, /* 14 6787.0*/24.400, /* 15 8000.0*/23.500, },
|
||||
{/* 1 29.100 *//* 0 700.0*/45.000, /* 1 850.0*/45.000, /* 2 943.0*/33.700, /* 3 1112.0*/33.400, /* 4 1310.0*/36.300, /* 5 1545.0*/35.300, /* 6 1821.0*/35.000, /* 7 2146.0*/32.200, /* 8 2530.0*/30.800, /* 9 2982.0*/32.700, /* 10 3515.0*/44.400, /* 11 4144.0*/43.600, /* 12 4884.0*/38.200, /* 13 5757.0*/36.100, /* 14 6787.0*/34.700, /* 15 8000.0*/34.000, },
|
||||
{/* 2 34.000 *//* 0 700.0*/45.000, /* 1 850.0*/47.000, /* 2 943.0*/37.300, /* 3 1112.0*/40.300, /* 4 1310.0*/41.000, /* 5 1545.0*/40.000, /* 6 1821.0*/39.700, /* 7 2146.0*/37.700, /* 8 2530.0*/37.400, /* 9 2982.0*/40.100, /* 10 3515.0*/48.200, /* 11 4144.0*/47.900, /* 12 4884.0*/44.000, /* 13 5757.0*/40.400, /* 14 6787.0*/39.600, /* 15 8000.0*/39.500, },
|
||||
{/* 3 39.600 *//* 0 700.0*/45.000, /* 1 850.0*/45.000, /* 2 943.0*/44.000, /* 3 1112.0*/44.000, /* 4 1310.0*/44.000, /* 5 1545.0*/43.500, /* 6 1821.0*/43.700, /* 7 2146.0*/42.300, /* 8 2530.0*/42.000, /* 9 2982.0*/44.100, /* 10 3515.0*/51.700, /* 11 4144.0*/52.200, /* 12 4884.0*/48.800, /* 13 5757.0*/45.900, /* 14 6787.0*/44.300, /* 15 8000.0*/44.000, },
|
||||
{/* 4 46.200 *//* 0 700.0*/49.900, /* 1 850.0*/48.400, /* 2 943.0*/47.600, /* 3 1112.0*/47.000, /* 4 1310.0*/47.500, /* 5 1545.0*/47.000, /* 6 1821.0*/47.300, /* 7 2146.0*/46.100, /* 8 2530.0*/45.800, /* 9 2982.0*/47.700, /* 10 3515.0*/53.900, /* 11 4144.0*/54.300, /* 12 4884.0*/53.200, /* 13 5757.0*/50.300, /* 14 6787.0*/49.100, /* 15 8000.0*/49.400, },
|
||||
{/* 5 53.900 *//* 0 700.0*/55.400, /* 1 850.0*/53.700, /* 2 943.0*/50.400, /* 3 1112.0*/49.500, /* 4 1310.0*/50.000, /* 5 1545.0*/49.900, /* 6 1821.0*/50.200, /* 7 2146.0*/49.300, /* 8 2530.0*/48.800, /* 9 2982.0*/51.000, /* 10 3515.0*/55.300, /* 11 4144.0*/57.100, /* 12 4884.0*/57.900, /* 13 5757.0*/55.100, /* 14 6787.0*/54.200, /* 15 8000.0*/55.300, },
|
||||
{/* 6 62.800 *//* 0 700.0*/59.100, /* 1 850.0*/57.800, /* 2 943.0*/54.200, /* 3 1112.0*/52.200, /* 4 1310.0*/52.600, /* 5 1545.0*/52.800, /* 6 1821.0*/53.200, /* 7 2146.0*/52.300, /* 8 2530.0*/52.000, /* 9 2982.0*/53.700, /* 10 3515.0*/57.900, /* 11 4144.0*/60.800, /* 12 4884.0*/61.900, /* 13 5757.0*/60.300, /* 14 6787.0*/59.300, /* 15 8000.0*/60.300, },
|
||||
{/* 7 73.200 *//* 0 700.0*/62.000, /* 1 850.0*/61.700, /* 2 943.0*/59.800, /* 3 1112.0*/57.700, /* 4 1310.0*/56.900, /* 5 1545.0*/56.500, /* 6 1821.0*/56.600, /* 7 2146.0*/55.700, /* 8 2530.0*/54.600, /* 9 2982.0*/56.300, /* 10 3515.0*/61.600, /* 11 4144.0*/64.800, /* 12 4884.0*/64.900, /* 13 5757.0*/63.800, /* 14 6787.0*/63.300, /* 15 8000.0*/64.400, },
|
||||
{/* 8 85.400 *//* 0 700.0*/65.600, /* 1 850.0*/65.500, /* 2 943.0*/64.200, /* 3 1112.0*/60.800, /* 4 1310.0*/59.600, /* 5 1545.0*/60.100, /* 6 1821.0*/60.700, /* 7 2146.0*/59.500, /* 8 2530.0*/57.500, /* 9 2982.0*/59.500, /* 10 3515.0*/65.500, /* 11 4144.0*/70.400, /* 12 4884.0*/69.800, /* 13 5757.0*/67.400, /* 14 6787.0*/67.000, /* 15 8000.0*/68.300, },
|
||||
{/* 9 99.500 *//* 0 700.0*/70.200, /* 1 850.0*/69.800, /* 2 943.0*/69.100, /* 3 1112.0*/66.900, /* 4 1310.0*/64.200, /* 5 1545.0*/64.300, /* 6 1821.0*/64.300, /* 7 2146.0*/63.400, /* 8 2530.0*/61.700, /* 9 2982.0*/64.200, /* 10 3515.0*/69.400, /* 11 4144.0*/75.800, /* 12 4884.0*/75.100, /* 13 5757.0*/72.300, /* 14 6787.0*/70.000, /* 15 8000.0*/70.600, },
|
||||
{/* 10 116.000 *//* 0 700.0*/75.500, /* 1 850.0*/75.200, /* 2 943.0*/74.700, /* 3 1112.0*/73.400, /* 4 1310.0*/70.800, /* 5 1545.0*/69.500, /* 6 1821.0*/68.600, /* 7 2146.0*/66.200, /* 8 2530.0*/65.100, /* 9 2982.0*/69.300, /* 10 3515.0*/74.500, /* 11 4144.0*/80.900, /* 12 4884.0*/82.000, /* 13 5757.0*/77.500, /* 14 6787.0*/74.100, /* 15 8000.0*/74.000, },
|
||||
{/* 11 135.301 *//* 0 700.0*/82.600, /* 1 850.0*/82.300, /* 2 943.0*/82.000, /* 3 1112.0*/81.000, /* 4 1310.0*/78.800, /* 5 1545.0*/76.500, /* 6 1821.0*/74.700, /* 7 2146.0*/71.500, /* 8 2530.0*/71.200, /* 9 2982.0*/75.200, /* 10 3515.0*/81.000, /* 11 4144.0*/90.800, /* 12 4884.0*/91.100, /* 13 5757.0*/85.700, /* 14 6787.0*/81.000, /* 15 8000.0*/79.700, },
|
||||
{/* 12 157.699 *//* 0 700.0*/91.700, /* 1 850.0*/91.600, /* 2 943.0*/90.900, /* 3 1112.0*/89.900, /* 4 1310.0*/88.900, /* 5 1545.0*/87.300, /* 6 1821.0*/86.000, /* 7 2146.0*/81.400, /* 8 2530.0*/79.400, /* 9 2982.0*/80.000, /* 10 3515.0*/90.800, /* 11 4144.0*/102.100, /* 12 4884.0*/102.700, /* 13 5757.0*/99.600, /* 14 6787.0*/92.900, /* 15 8000.0*/88.500, },
|
||||
{/* 13 183.900 *//* 0 700.0*/100.000, /* 1 850.0*/100.000, /* 2 943.0*/100.000, /* 3 1112.0*/99.800, /* 4 1310.0*/98.900, /* 5 1545.0*/97.500, /* 6 1821.0*/96.400, /* 7 2146.0*/94.700, /* 8 2530.0*/93.600, /* 9 2982.0*/93.700, /* 10 3515.0*/99.400, /* 11 4144.0*/109.000, /* 12 4884.0*/110.000, /* 13 5757.0*/107.500, /* 14 6787.0*/102.000, /* 15 8000.0*/97.000, },
|
||||
{/* 14 214.400 *//* 0 700.0*/100.000, /* 1 850.0*/100.000, /* 2 943.0*/100.000, /* 3 1112.0*/100.000, /* 4 1310.0*/100.000, /* 5 1545.0*/100.000, /* 6 1821.0*/100.000, /* 7 2146.0*/100.000, /* 8 2530.0*/100.000, /* 9 2982.0*/100.000, /* 10 3515.0*/104.000, /* 11 4144.0*/116.000, /* 12 4884.0*/117.400, /* 13 5757.0*/114.800, /* 14 6787.0*/108.200, /* 15 8000.0*/104.300, },
|
||||
{/* 15 250.000 *//* 0 700.0*/100.000, /* 1 850.0*/100.000, /* 2 943.0*/100.000, /* 3 1112.0*/100.000, /* 4 1310.0*/100.000, /* 5 1545.0*/100.000, /* 6 1821.0*/100.000, /* 7 2146.0*/100.000, /* 8 2530.0*/100.000, /* 9 2982.0*/100.000, /* 10 3515.0*/107.400, /* 11 4144.0*/121.500, /* 12 4884.0*/122.400, /* 13 5757.0*/120.200, /* 14 6787.0*/112.700, /* 15 8000.0*/109.500, },
|
||||
/* 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, },
|
||||
};
|
||||
|
||||
static const ignition_table_t mapBased18vvtTimingTable = {
|
||||
/* Generated by TS2C on Tue Feb 14 22:31:15 EST 2017*/
|
||||
{/* 0 25.000 *//* 0 700.0*/14.800, /* 1 850.0*/14.800, /* 2 943.0*/14.800, /* 3 1112.0*/10.000, /* 4 1310.0*/15.500, /* 5 1545.0*/19.100, /* 6 1821.0*/22.300, /* 7 2146.0*/25.000, /* 8 2530.0*/27.600, /* 9 2982.0*/30.598, /* 10 3515.0*/32.698, /* 11 4144.0*/33.728, /* 12 4884.0*/34.346, /* 13 5757.0*/34.758, /* 14 6787.0*/34.964, /* 15 8000.0*/35.170, },
|
||||
{/* 1 29.100 *//* 0 700.0*/14.800, /* 1 850.0*/14.800, /* 2 943.0*/14.800, /* 3 1112.0*/10.100, /* 4 1310.0*/15.500, /* 5 1545.0*/19.000, /* 6 1821.0*/22.200, /* 7 2146.0*/24.600, /* 8 2530.0*/27.000, /* 9 2982.0*/30.190, /* 10 3515.0*/32.286, /* 11 4144.0*/33.316, /* 12 4884.0*/34.037, /* 13 5757.0*/34.552, /* 14 6787.0*/34.758, /* 15 8000.0*/34.964, },
|
||||
{/* 2 34.000 *//* 0 700.0*/14.800, /* 1 850.0*/14.800, /* 2 943.0*/14.900, /* 3 1112.0*/10.400, /* 4 1310.0*/15.600, /* 5 1545.0*/18.800, /* 6 1821.0*/21.800, /* 7 2146.0*/24.000, /* 8 2530.0*/26.400, /* 9 2982.0*/29.578, /* 10 3515.0*/31.771, /* 11 4144.0*/32.801, /* 12 4884.0*/33.522, /* 13 5757.0*/34.140, /* 14 6787.0*/34.346, /* 15 8000.0*/34.552, },
|
||||
{/* 3 39.600 *//* 0 700.0*/15.200, /* 1 850.0*/15.200, /* 2 943.0*/15.400, /* 3 1112.0*/11.900, /* 4 1310.0*/15.700, /* 5 1545.0*/18.600, /* 6 1821.0*/21.400, /* 7 2146.0*/23.400, /* 8 2530.0*/25.800, /* 9 2982.0*/28.762, /* 10 3515.0*/30.947, /* 11 4144.0*/32.183, /* 12 4884.0*/32.904, /* 13 5757.0*/33.522, /* 14 6787.0*/33.728, /* 15 8000.0*/33.934, },
|
||||
{/* 4 46.200 *//* 0 700.0*/15.500, /* 1 850.0*/15.500, /* 2 943.0*/15.800, /* 3 1112.0*/13.000, /* 4 1310.0*/15.800, /* 5 1545.0*/18.400, /* 6 1821.0*/20.900, /* 7 2146.0*/22.700, /* 8 2530.0*/25.000, /* 9 2982.0*/27.844, /* 10 3515.0*/30.123, /* 11 4144.0*/31.359, /* 12 4884.0*/32.183, /* 13 5757.0*/32.698, /* 14 6787.0*/32.904, /* 15 8000.0*/33.213, },
|
||||
{/* 5 53.900 *//* 0 700.0*/15.700, /* 1 850.0*/15.800, /* 2 943.0*/16.400, /* 3 1112.0*/13.400, /* 4 1310.0*/15.900, /* 5 1545.0*/18.000, /* 6 1821.0*/20.200, /* 7 2146.0*/22.000, /* 8 2530.0*/24.100, /* 9 2982.0*/26.926, /* 10 3515.0*/28.990, /* 11 4144.0*/30.226, /* 12 4884.0*/31.050, /* 13 5757.0*/31.771, /* 14 6787.0*/32.080, /* 15 8000.0*/32.492, },
|
||||
{/* 6 62.800 *//* 0 700.0*/15.900, /* 1 850.0*/16.100, /* 2 943.0*/16.900, /* 3 1112.0*/13.600, /* 4 1310.0*/15.700, /* 5 1545.0*/17.600, /* 6 1821.0*/19.600, /* 7 2146.0*/21.100, /* 8 2530.0*/23.000, /* 9 2982.0*/25.702, /* 10 3515.0*/27.436, /* 11 4144.0*/28.558, /* 12 4884.0*/29.476, /* 13 5757.0*/30.190, /* 14 6787.0*/30.598, /* 15 8000.0*/31.210, },
|
||||
{/* 7 73.200 *//* 0 700.0*/16.200, /* 1 850.0*/16.500, /* 2 943.0*/17.200, /* 3 1112.0*/13.700, /* 4 1310.0*/15.400, /* 5 1545.0*/17.000, /* 6 1821.0*/18.800, /* 7 2146.0*/20.000, /* 8 2530.0*/21.700, /* 9 2982.0*/23.600, /* 10 3515.0*/25.400, /* 11 4144.0*/26.600, /* 12 4884.0*/27.300, /* 13 5757.0*/28.100, /* 14 6787.0*/28.700, /* 15 8000.0*/29.300, },
|
||||
{/* 8 85.400 *//* 0 700.0*/16.300, /* 1 850.0*/17.000, /* 2 943.0*/17.500, /* 3 1112.0*/13.600, /* 4 1310.0*/14.800, /* 5 1545.0*/16.300, /* 6 1821.0*/17.700, /* 7 2146.0*/18.600, /* 8 2530.0*/20.300, /* 9 2982.0*/22.000, /* 10 3515.0*/23.600, /* 11 4144.0*/25.000, /* 12 4884.0*/25.900, /* 13 5757.0*/26.600, /* 14 6787.0*/27.200, /* 15 8000.0*/27.900, },
|
||||
/* 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, },
|
||||
|
|
@ -111,6 +148,22 @@ static const ignition_table_t mapBased18vvtTimingTable = {
|
|||
{/* 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, },
|
||||
};
|
||||
|
||||
void setMazdaMiataNbTpsTps(DECLARE_ENGINE_PARAMETER_F) {
|
||||
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];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void setMazdaMiataNbInjectorLag(DECLARE_ENGINE_PARAMETER_F) {
|
||||
memcpy(engineConfiguration->injector.battLagCorr, injectorLagCorrection, sizeof(injectorLagCorrection));
|
||||
memcpy(engineConfiguration->injector.battLagCorrBins, injectorLagBins, sizeof(injectorLagBins));
|
||||
}
|
||||
|
||||
void setMazdaMiata2003EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
|
||||
setCustomEngineConfiguration(PASS_ENGINE_PARAMETER_F);
|
||||
|
||||
|
|
@ -135,8 +188,10 @@ void setMazdaMiata2003EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
|
|||
|
||||
engineConfiguration->auxPid[0].pFactor = 2;
|
||||
engineConfiguration->auxPid[0].iFactor = 0.005;
|
||||
engineConfiguration->auxPid[0].dFactor = 1;
|
||||
engineConfiguration->auxPid[0].offset = 20;
|
||||
engineConfiguration->auxPid[0].dFactor = 0;
|
||||
engineConfiguration->auxPid[0].offset = 33;
|
||||
engineConfiguration->aux1PidMin = 24;
|
||||
engineConfiguration->aux1PidMax = 44;
|
||||
|
||||
// set idle_position 35
|
||||
boardConfiguration->manIdlePosition = 35;
|
||||
|
|
@ -184,19 +239,24 @@ void setMazdaMiata2003EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
|
|||
memcpy(config->veLoadBins, ve18vvtLoadBins, sizeof(ve18vvtLoadBins));
|
||||
copyFuelTable(mapBased18vvtVeTable, config->veTable);
|
||||
|
||||
memcpy(config->ignitionRpmBins, ve18vvtRpmBins, sizeof(ve18vvtRpmBins));
|
||||
memcpy(config->ignitionLoadBins, ve18vvtLoadBins, sizeof(ve18vvtLoadBins));
|
||||
memcpy(config->ignitionRpmBins, ignition18vvtRpmBins, sizeof(ignition18vvtRpmBins));
|
||||
memcpy(config->ignitionLoadBins, ignition18vvtLoadBins, sizeof(ignition18vvtLoadBins));
|
||||
copyTimingTable(mapBased18vvtTimingTable, config->ignitionTable);
|
||||
|
||||
|
||||
memcpy(config->fsioTable1RpmBins, ve18fsioRpmBins, sizeof(ve18fsioRpmBins));
|
||||
memcpy(config->fsioTable1LoadBins, ve18fsioLoadBins, sizeof(ve18fsioLoadBins));
|
||||
// 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[loadIndex][rpmIndex];
|
||||
}
|
||||
}
|
||||
|
||||
setMazdaMiataNbTpsTps(PASS_ENGINE_PARAMETER_F);
|
||||
|
||||
|
||||
setMazdaMiataNbInjectorLag(PASS_ENGINE_PARAMETER_F);
|
||||
|
||||
engineConfiguration->tpsMin = 100; // convert 12to10 bit (ADC/4)
|
||||
engineConfiguration->tpsMax = 650; // convert 12to10 bit (ADC/4)
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
#include "engine.h"
|
||||
|
||||
void setMazdaMiataNbInjectorLag(DECLARE_ENGINE_PARAMETER_F);
|
||||
void setMazdaMiataNbTpsTps(DECLARE_ENGINE_PARAMETER_F);
|
||||
|
||||
void setMazdaMiata2003EngineConfiguration(DECLARE_ENGINE_PARAMETER_F);
|
||||
void setMazdaMiata2003EngineConfigurationNewBoard(DECLARE_ENGINE_PARAMETER_F);
|
||||
|
|
|
|||
Loading…
Reference in New Issue