From efcf0532da8ecc5529565afd22f1ea8b3adf9095 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 2 Aug 2020 11:09:18 -0400 Subject: [PATCH] NA6 progress --- firmware/config/engines/mazda_miata_base_maps.cpp | 6 +++--- firmware/os_access.h | 2 +- .../src/main/java/com/rusefi/tools/tune/CurveData.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/firmware/config/engines/mazda_miata_base_maps.cpp b/firmware/config/engines/mazda_miata_base_maps.cpp index 186a235fec..425fedd6a6 100644 --- a/firmware/config/engines/mazda_miata_base_maps.cpp +++ b/firmware/config/engines/mazda_miata_base_maps.cpp @@ -31,7 +31,7 @@ void miataNA_setCrankingFuelBins(DECLARE_CONFIG_PARAMETER_SIGNATURE) { 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}; -static const float hardCodediacCoasting[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}; +static const float hardCodediacCoasting[16] = {40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0, 40.0}; /* Generated by TS2C on Fri Jul 31 14:02:18 EDT 2020*/ void miataNA_setIacCoastingBins(DECLARE_CONFIG_PARAMETER_SIGNATURE) { @@ -41,7 +41,7 @@ void miataNA_setIacCoastingBins(DECLARE_CONFIG_PARAMETER_SIGNATURE) { 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}; -static const float hardCodedcltIdleCorr[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}; +static const float hardCodedcltIdleCorr[16] = {1.4000015, 1.3199997, 1.2600021, 1.2099991, 1.1699982, 1.050003, 1.0299988, 1.0199966, 1.0299988, 1.0199966, 1.0100021, 1.0, 0.9900017, 0.9900017, 0.9900017, 0.9900017}; /* Generated by TS2C on Fri Jul 31 14:02:18 EDT 2020*/ void miataNA_setCltIdleCorrBins(DECLARE_CONFIG_PARAMETER_SIGNATURE) { @@ -51,7 +51,7 @@ void miataNA_setCltIdleCorrBins(DECLARE_CONFIG_PARAMETER_SIGNATURE) { 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}; -static const float hardCodedcltIdleRpm[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}; +static const float hardCodedcltIdleRpm[16] = {1180.0, 1150.0, 1130.0, 1110.0, 1090.0, 1070.0, 1050.0, 1020.0, 990.0, 970.0, 950.0, 950.0, 950.0, 950.0, 950.0, 950.0}; /* Generated by TS2C on Fri Jul 31 14:02:18 EDT 2020*/ void miataNA_setCltIdleRpmBins(DECLARE_CONFIG_PARAMETER_SIGNATURE) { diff --git a/firmware/os_access.h b/firmware/os_access.h index 8ab1bc3ed6..302c28d79b 100644 --- a/firmware/os_access.h +++ b/firmware/os_access.h @@ -1,5 +1,5 @@ /* - * os_access.h + * @file os_access.h * * OS access is not part of global.h in order to help separate synchronous code from asynchronous * diff --git a/java_console/models/src/main/java/com/rusefi/tools/tune/CurveData.java b/java_console/models/src/main/java/com/rusefi/tools/tune/CurveData.java index 78160cbfee..0302e6e3e7 100644 --- a/java_console/models/src/main/java/com/rusefi/tools/tune/CurveData.java +++ b/java_console/models/src/main/java/com/rusefi/tools/tune/CurveData.java @@ -27,7 +27,7 @@ public class CurveData { static CurveData processCurve(String msqFileName, String loadSectionName, IniFileModel model, BufferedWriter w) throws IOException { ArrayIniField field = (ArrayIniField) model.allIniFields.get(loadSectionName); int curveSize = field.getRows(); - BufferedReader r = TS2C.readAndScroll(msqFileName, loadSectionName); + BufferedReader r = TS2C.readAndScroll(msqFileName, loadSectionName + "\""); float[] curve = new float[curveSize]; readAxle(curve, r);