From c2c258dcb2680bd617799c40a6d938a8c95a987c Mon Sep 17 00:00:00 2001 From: rusEfi Date: Tue, 6 Dec 2016 22:03:16 -0500 Subject: [PATCH] auto-sync --- ...ngine_configuration_generated_structures.h | 30 +++++++++++++++++-- firmware/controllers/algo/rusefi_generated.h | 8 ++++- firmware/controllers/math/engine_math.cpp | 2 ++ firmware/integration/rusefi_config.txt | 5 +++- firmware/tunerstudio/rusefi.ini | 7 +++-- .../models/src/com/rusefi/config/Fields.java | 10 +++++-- 6 files changed, 53 insertions(+), 9 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 149931de82..3a4e393da2 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Nov 17 22:30:07 EST 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Dec 06 21:51:50 EST 2016 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1782,7 +1782,31 @@ typedef struct { /** * offset 2644 */ - int unused[101]; + float autoTuneCltThreshold; + /** + * offset 2648 + */ + float autoTuneTpsRocThreshold; + /** + * offset 2652 + */ + float autoTuneTpsQuietPeriod; + /** + * offset 2656 + */ + float postCrankingTargetClt; + /** + * offset 2660 + */ + float postCrankingFactor; + /** + * offset 2664 + */ + float postCrankingDurationSec; + /** + * offset 2668 + */ + int unused[95]; /** total size 3048*/ } engine_configuration_s; @@ -1997,4 +2021,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Nov 17 22:30:07 EST 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Dec 06 21:51:50 EST 2016 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index c77c2d24d4..464c1d51d5 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -891,7 +891,13 @@ #define cltTimingBins_offset 2576 #define cltTimingExtra_offset 2608 #define nbVvtIndex_offset 2640 -#define unused_offset 2644 +#define autoTuneCltThreshold_offset 2644 +#define autoTuneTpsRocThreshold_offset 2648 +#define autoTuneTpsQuietPeriod_offset 2652 +#define postCrankingTargetClt_offset 2656 +#define postCrankingFactor_offset 2660 +#define postCrankingDurationSec_offset 2664 +#define unused_offset 2668 #define le_formulas1_offset 3048 #define le_formulas2_offset 3248 #define le_formulas3_offset 3448 diff --git a/firmware/controllers/math/engine_math.cpp b/firmware/controllers/math/engine_math.cpp index 9bc25e237f..7fe158c38a 100644 --- a/firmware/controllers/math/engine_math.cpp +++ b/firmware/controllers/math/engine_math.cpp @@ -139,6 +139,8 @@ void FuelSchedule::addFuelEventsForCylinder(int i DECLARE_ENGINE_PARAMETER_S) { bool isSimultanious = mode == IM_SIMULTANEOUS; + assertAngleRange(baseAngle, "addFbaseAngle"); + float angle = baseAngle + i * ENGINE(engineCycle) / CONFIG(specs.cylindersCount); diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 7b49c69a5a..7301ef0c5c 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -763,7 +763,10 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult", 1, 0, 0.0, 300, float autoTuneCltThreshold; float autoTuneTpsRocThreshold; float autoTuneTpsQuietPeriod; - int[98] unused; + float postCrankingTargetClt;;"degC", 1, 0, 0, 100, 0 + float postCrankingFactor;;"mult", 1, 0, 0, 100, 4 + float postCrankingDurationSec;;"seconds", 1, 0, 0, 100, 2 + int[95] unused; end_struct diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 08e94eb4ec..2a307c8bbd 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -42,7 +42,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Nov 23 15:13:21 EST 2016 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Dec 06 21:51:50 EST 2016 pageSize = 16376 page = 1 @@ -625,7 +625,10 @@ page = 1 ;skipping autoTuneCltThreshold offset 2644 ;skipping autoTuneTpsRocThreshold offset 2648 ;skipping autoTuneTpsQuietPeriod offset 2652 -;skipping unused offset 2656 + postCrankingTargetClt = scalar, F32, 2656, "degC", 1, 0, 0, 100, 0 + postCrankingFactor = scalar, F32, 2660, "mult", 1, 0, 0, 100, 4 + postCrankingDurationSec = scalar, F32, 2664, "seconds", 1, 0, 0, 100, 2 +;skipping unused offset 2668 le_formulas1 = array, U08, 3048, [200],"char", 1, 0, 0.0, 3.0, 2 le_formulas2 = array, U08, 3248, [200],"char", 1, 0, 0.0, 3.0, 2 le_formulas3 = array, U08, 3448, [200],"char", 1, 0, 0.0, 3.0, 2 diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index e89973401d..0f4cc760b5 100644 --- a/java_console/models/src/com/rusefi/config/Fields.java +++ b/java_console/models/src/com/rusefi/config/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config; -// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Nov 23 15:13:21 EST 2016 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Dec 06 21:51:50 EST 2016 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int FSIO_ADC_COUNT = 4; @@ -898,7 +898,10 @@ public class Fields { public static final int autoTuneCltThreshold_offset = 2644; public static final int autoTuneTpsRocThreshold_offset = 2648; public static final int autoTuneTpsQuietPeriod_offset = 2652; - public static final int unused_offset = 2656; + public static final int postCrankingTargetClt_offset = 2656; + public static final int postCrankingFactor_offset = 2660; + public static final int postCrankingDurationSec_offset = 2664; + public static final int unused_offset = 2668; public static final int le_formulas1_offset = 3048; public static final int le_formulas2_offset = 3248; public static final int le_formulas3_offset = 3448; @@ -1539,6 +1542,9 @@ public class Fields { public static final Field AUTOTUNECLTTHRESHOLD = Field.create("AUTOTUNECLTTHRESHOLD", 2644, FieldType.FLOAT); public static final Field AUTOTUNETPSROCTHRESHOLD = Field.create("AUTOTUNETPSROCTHRESHOLD", 2648, FieldType.FLOAT); public static final Field AUTOTUNETPSQUIETPERIOD = Field.create("AUTOTUNETPSQUIETPERIOD", 2652, FieldType.FLOAT); + public static final Field POSTCRANKINGTARGETCLT = Field.create("POSTCRANKINGTARGETCLT", 2656, FieldType.FLOAT); + public static final Field POSTCRANKINGFACTOR = Field.create("POSTCRANKINGFACTOR", 2660, FieldType.FLOAT); + public static final Field POSTCRANKINGDURATIONSEC = Field.create("POSTCRANKINGDURATIONSEC", 2664, FieldType.FLOAT); public static final Field LE_FORMULAS1 = Field.create("LE_FORMULAS1", 3048, FieldType.INT); public static final Field LE_FORMULAS2 = Field.create("LE_FORMULAS2", 3248, FieldType.INT); public static final Field LE_FORMULAS3 = Field.create("LE_FORMULAS3", 3448, FieldType.INT);