From 04180ebde04d682958b095eaf8d3d44bc15ccdc2 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Mon, 13 Feb 2017 20:02:46 -0500 Subject: [PATCH] auto-sync --- firmware/config/engines/mazda_miata_vvt.cpp | 64 ++++++++++---------- java_console/models/src/com/rusefi/TS2C.java | 23 ++++++- 2 files changed, 55 insertions(+), 32 deletions(-) diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index 010aaf2929..4276a7a01c 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -15,23 +15,24 @@ EXTERN_ENGINE; +static const float ve18fsioRpmBins[FSIO_TABLE_8] = +{700.0, 1000.0, 2000.0, 3000.0, 3500.0, 4500.0, 5500.0, 6500.0} +; -static const float ve18fsioRpmBins[FSIO_TABLE_8] = { - 650, 800,1650,2500,3350,4200,5050,7000 -}; - +static const float ve18fsioLoadBins[FSIO_TABLE_8] = +{30.0, 40.0, 50.0, 60.0, 70.0, 75.0, 82.0, 85.0} +; float fsio_table[FSIO_TABLE_8][FSIO_TABLE_8] = { - /* Generated by TS2C on Fri Jan 20 20:35:41 EST 2017*/ - {/* 0 20.000 *//* 0 650.0*/0.000, /* 1 800.0*/5.000, /* 2 1650.0*/20.000, /* 3 2500.0*/20.000, /* 4 3350.0*/32.000, /* 5 4200.0*/32.000, /* 6 5050.0*/32.000, /* 7 7000.0*/32.000, }, - {/* 1 30.000 *//* 0 650.0*/0.000, /* 1 800.0*/5.000, /* 2 1650.0*/20.000, /* 3 2500.0*/20.000, /* 4 3350.0*/32.000, /* 5 4200.0*/32.000, /* 6 5050.0*/32.000, /* 7 7000.0*/32.000, }, - {/* 2 40.000 *//* 0 650.0*/0.000, /* 1 800.0*/5.000, /* 2 1650.0*/20.000, /* 3 2500.0*/20.000, /* 4 3350.0*/32.000, /* 5 4200.0*/32.000, /* 6 5050.0*/32.000, /* 7 7000.0*/32.000, }, - {/* 3 60.000 *//* 0 650.0*/0.000, /* 1 800.0*/5.000, /* 2 1650.0*/20.000, /* 3 2500.0*/20.000, /* 4 3350.0*/32.000, /* 5 4200.0*/32.000, /* 6 5050.0*/32.000, /* 7 7000.0*/32.000, }, - {/* 4 70.000 *//* 0 650.0*/0.000, /* 1 800.0*/5.000, /* 2 1650.0*/20.000, /* 3 2500.0*/20.000, /* 4 3350.0*/32.000, /* 5 4200.0*/32.000, /* 6 5050.0*/32.000, /* 7 7000.0*/32.000, }, - {/* 5 90.000 *//* 0 650.0*/0.000, /* 1 800.0*/5.000, /* 2 1650.0*/20.000, /* 3 2500.0*/20.000, /* 4 3350.0*/32.000, /* 5 4200.0*/32.000, /* 6 5050.0*/32.000, /* 7 7000.0*/32.000, }, - {/* 6 100.000 *//* 0 650.0*/0.000, /* 1 800.0*/5.000, /* 2 1650.0*/20.000, /* 3 2500.0*/20.000, /* 4 3350.0*/32.000, /* 5 4200.0*/32.000, /* 6 5050.0*/32.000, /* 7 7000.0*/32.000, }, - {/* 7 120.000 *//* 0 650.0*/0.000, /* 1 800.0*/5.000, /* 2 1650.0*/20.000, /* 3 2500.0*/20.000, /* 4 3350.0*/32.000, /* 5 4200.0*/32.000, /* 6 5050.0*/32.000, /* 7 7000.0*/32.000, }, - + /* 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, }, }; @@ -50,23 +51,23 @@ static const float ve18vvtLoadBins[FUEL_LOAD_COUNT] = { 250.0}; static const fuel_table_t mapBased18vvtVeTable = { -/* Generated by TS2C on Thu Dec 15 22:39:00 EST 2016*/ -{/* 0 15.000 *//* 0 700.0*/45.000, /* 1 1000.0*/45.000, /* 2 1300.0*/33.400, /* 3 1700.0*/30.300, /* 4 2100.0*/25.300, /* 5 2500.0*/23.500, /* 6 2900.0*/22.200, /* 7 3300.0*/21.200, /* 8 3800.0*/21.300, /* 9 4300.0*/22.900, /* 10 4800.0*/32.100, /* 11 5300.0*/29.400, /* 12 5800.0*/26.600, /* 13 6400.0*/25.200, /* 14 7000.0*/24.400, /* 15 7600.0*/23.500, }, -{/* 1 30.500 *//* 0 700.0*/45.000, /* 1 1000.0*/45.000, /* 2 1300.0*/33.700, /* 3 1700.0*/33.400, /* 4 2100.0*/36.300, /* 5 2500.0*/35.300, /* 6 2900.0*/35.000, /* 7 3300.0*/32.200, /* 8 3800.0*/30.800, /* 9 4300.0*/32.700, /* 10 4800.0*/44.400, /* 11 5300.0*/43.600, /* 12 5800.0*/38.200, /* 13 6400.0*/36.100, /* 14 7000.0*/34.700, /* 15 7600.0*/34.000, }, -{/* 2 41.500 *//* 0 700.0*/45.000, /* 1 1000.0*/47.000, /* 2 1300.0*/37.300, /* 3 1700.0*/40.300, /* 4 2100.0*/41.000, /* 5 2500.0*/40.000, /* 6 2900.0*/39.700, /* 7 3300.0*/37.700, /* 8 3800.0*/37.400, /* 9 4300.0*/40.100, /* 10 4800.0*/48.200, /* 11 5300.0*/47.900, /* 12 5800.0*/44.000, /* 13 6400.0*/40.400, /* 14 7000.0*/39.600, /* 15 7600.0*/39.500, }, -{/* 3 53.200 *//* 0 700.0*/45.000, /* 1 1000.0*/45.000, /* 2 1300.0*/44.000, /* 3 1700.0*/44.000, /* 4 2100.0*/44.000, /* 5 2500.0*/43.500, /* 6 2900.0*/43.700, /* 7 3300.0*/42.300, /* 8 3800.0*/42.000, /* 9 4300.0*/44.100, /* 10 4800.0*/51.700, /* 11 5300.0*/52.200, /* 12 5800.0*/48.800, /* 13 6400.0*/45.900, /* 14 7000.0*/44.300, /* 15 7600.0*/44.000, }, -{/* 4 65.400 *//* 0 700.0*/49.900, /* 1 1000.0*/48.400, /* 2 1300.0*/47.600, /* 3 1700.0*/47.000, /* 4 2100.0*/47.500, /* 5 2500.0*/47.000, /* 6 2900.0*/47.300, /* 7 3300.0*/46.100, /* 8 3800.0*/45.800, /* 9 4300.0*/47.700, /* 10 4800.0*/53.900, /* 11 5300.0*/54.300, /* 12 5800.0*/53.200, /* 13 6400.0*/50.300, /* 14 7000.0*/49.100, /* 15 7600.0*/49.400, }, -{/* 5 78.300 *//* 0 700.0*/55.400, /* 1 1000.0*/53.700, /* 2 1300.0*/50.400, /* 3 1700.0*/49.500, /* 4 2100.0*/50.000, /* 5 2500.0*/49.900, /* 6 2900.0*/50.200, /* 7 3300.0*/49.300, /* 8 3800.0*/48.800, /* 9 4300.0*/51.000, /* 10 4800.0*/55.300, /* 11 5300.0*/57.100, /* 12 5800.0*/57.900, /* 13 6400.0*/55.100, /* 14 7000.0*/54.200, /* 15 7600.0*/55.300, }, -{/* 6 91.800 *//* 0 700.0*/59.100, /* 1 1000.0*/57.800, /* 2 1300.0*/54.200, /* 3 1700.0*/52.200, /* 4 2100.0*/52.600, /* 5 2500.0*/52.800, /* 6 2900.0*/53.200, /* 7 3300.0*/52.300, /* 8 3800.0*/52.000, /* 9 4300.0*/53.700, /* 10 4800.0*/57.900, /* 11 5300.0*/60.800, /* 12 5800.0*/61.900, /* 13 6400.0*/60.300, /* 14 7000.0*/59.300, /* 15 7600.0*/60.300, }, -{/* 7 106.000 *//* 0 700.0*/62.000, /* 1 1000.0*/61.700, /* 2 1300.0*/59.800, /* 3 1700.0*/57.700, /* 4 2100.0*/56.900, /* 5 2500.0*/56.500, /* 6 2900.0*/56.600, /* 7 3300.0*/55.700, /* 8 3800.0*/54.600, /* 9 4300.0*/56.300, /* 10 4800.0*/61.600, /* 11 5300.0*/64.800, /* 12 5800.0*/64.900, /* 13 6400.0*/63.800, /* 14 7000.0*/63.300, /* 15 7600.0*/64.400, }, -{/* 8 121.000 *//* 0 700.0*/65.600, /* 1 1000.0*/65.500, /* 2 1300.0*/64.200, /* 3 1700.0*/60.800, /* 4 2100.0*/59.600, /* 5 2500.0*/60.100, /* 6 2900.0*/60.700, /* 7 3300.0*/59.500, /* 8 3800.0*/57.500, /* 9 4300.0*/59.500, /* 10 4800.0*/65.500, /* 11 5300.0*/70.400, /* 12 5800.0*/69.800, /* 13 6400.0*/67.400, /* 14 7000.0*/67.000, /* 15 7600.0*/68.300, }, -{/* 9 136.699 *//* 0 700.0*/70.200, /* 1 1000.0*/69.800, /* 2 1300.0*/69.100, /* 3 1700.0*/66.900, /* 4 2100.0*/64.200, /* 5 2500.0*/64.300, /* 6 2900.0*/64.300, /* 7 3300.0*/63.400, /* 8 3800.0*/61.700, /* 9 4300.0*/64.200, /* 10 4800.0*/69.400, /* 11 5300.0*/75.800, /* 12 5800.0*/75.100, /* 13 6400.0*/72.300, /* 14 7000.0*/70.000, /* 15 7600.0*/70.600, }, -{/* 10 153.301 *//* 0 700.0*/75.500, /* 1 1000.0*/75.200, /* 2 1300.0*/74.700, /* 3 1700.0*/73.400, /* 4 2100.0*/70.800, /* 5 2500.0*/69.500, /* 6 2900.0*/68.600, /* 7 3300.0*/66.200, /* 8 3800.0*/65.100, /* 9 4300.0*/69.300, /* 10 4800.0*/74.500, /* 11 5300.0*/80.900, /* 12 5800.0*/82.000, /* 13 6400.0*/77.500, /* 14 7000.0*/74.100, /* 15 7600.0*/74.000, }, -{/* 11 170.699 *//* 0 700.0*/82.600, /* 1 1000.0*/82.300, /* 2 1300.0*/82.000, /* 3 1700.0*/81.000, /* 4 2100.0*/78.800, /* 5 2500.0*/76.500, /* 6 2900.0*/74.700, /* 7 3300.0*/71.500, /* 8 3800.0*/71.200, /* 9 4300.0*/75.200, /* 10 4800.0*/81.000, /* 11 5300.0*/90.800, /* 12 5800.0*/91.100, /* 13 6400.0*/85.700, /* 14 7000.0*/81.000, /* 15 7600.0*/79.700, }, -{/* 12 189.100 *//* 0 700.0*/91.700, /* 1 1000.0*/91.600, /* 2 1300.0*/90.900, /* 3 1700.0*/89.900, /* 4 2100.0*/88.900, /* 5 2500.0*/87.300, /* 6 2900.0*/86.000, /* 7 3300.0*/81.400, /* 8 3800.0*/79.400, /* 9 4300.0*/80.000, /* 10 4800.0*/90.800, /* 11 5300.0*/102.100, /* 12 5800.0*/102.700, /* 13 6400.0*/99.600, /* 14 7000.0*/92.900, /* 15 7600.0*/88.500, }, -{/* 13 208.400 *//* 0 700.0*/100.000, /* 1 1000.0*/100.000, /* 2 1300.0*/100.000, /* 3 1700.0*/99.800, /* 4 2100.0*/98.900, /* 5 2500.0*/97.500, /* 6 2900.0*/96.400, /* 7 3300.0*/94.700, /* 8 3800.0*/93.600, /* 9 4300.0*/93.700, /* 10 4800.0*/99.400, /* 11 5300.0*/109.000, /* 12 5800.0*/110.000, /* 13 6400.0*/107.500, /* 14 7000.0*/102.000, /* 15 7600.0*/97.000, }, -{/* 14 228.699 *//* 0 700.0*/100.000, /* 1 1000.0*/100.000, /* 2 1300.0*/100.000, /* 3 1700.0*/100.000, /* 4 2100.0*/100.000, /* 5 2500.0*/100.000, /* 6 2900.0*/100.000, /* 7 3300.0*/100.000, /* 8 3800.0*/100.000, /* 9 4300.0*/100.000, /* 10 4800.0*/104.000, /* 11 5300.0*/116.000, /* 12 5800.0*/117.400, /* 13 6400.0*/114.800, /* 14 7000.0*/108.200, /* 15 7600.0*/104.300, }, -{/* 15 250.000 *//* 0 700.0*/100.000, /* 1 1000.0*/100.000, /* 2 1300.0*/100.000, /* 3 1700.0*/100.000, /* 4 2100.0*/100.000, /* 5 2500.0*/100.000, /* 6 2900.0*/100.000, /* 7 3300.0*/100.000, /* 8 3800.0*/100.000, /* 9 4300.0*/100.000, /* 10 4800.0*/107.400, /* 11 5300.0*/121.500, /* 12 5800.0*/122.400, /* 13 6400.0*/120.200, /* 14 7000.0*/112.700, /* 15 7600.0*/109.500, }, + /* 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, }, }; static const ignition_table_t mapBased18vvtTimingTable = { @@ -163,6 +164,7 @@ void setMazdaMiata2003EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { memcpy(config->fsioTable1RpmBins, ve18fsioRpmBins, sizeof(ve18fsioRpmBins)); + memcpy(config->fsioTable1LoadBins, ve18fsioLoadBins, sizeof(ve18fsioLoadBins)); 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]; diff --git a/java_console/models/src/com/rusefi/TS2C.java b/java_console/models/src/com/rusefi/TS2C.java index 3a90293cfd..a745166095 100644 --- a/java_console/models/src/com/rusefi/TS2C.java +++ b/java_console/models/src/com/rusefi/TS2C.java @@ -64,13 +64,34 @@ public class TS2C { return table[loadIndex][rpmIndex]; } }, "TS2C"); + + + w.write("\r\n\r\n/* rpm bins */\r\n\r\n"); + w.write(toString(rpmBins)); + + w.write("\r\n\r\n/* load bins */\r\n\r\n"); + w.write(toString(loadBins)); + + w.close(); + + } + + private String toString(float[] a) { + StringBuilder b = new StringBuilder(); + int iMax = a.length - 1; + b.append('{'); + for (int i = 0; ; i++) { + b.append(a[i]); + if (i == iMax) + return b.append('}').toString(); + b.append(", "); + } } private void writeTable(BufferedWriter w, ValueSource valueSource, String toolName) throws IOException { w.write("/* Generated by " + toolName + " on " + new Date() + "*/\r\n"); for (int loadIndex = 0; loadIndex < loadCount; loadIndex++) writeLine(valueSource, w, loadIndex); - w.close(); } private static BufferedReader readAndScroll(String fileName, String sectionName) throws IOException {