diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index c9783f43ed..9862a55ced 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Mar 25 17:51:52 PDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Mar 27 12:12:49 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -2947,8 +2947,8 @@ struct engine_configuration_s { /** * offset 4140 */ - int mainUnusedEnd[527]; - /** total size 6248*/ + int mainUnusedEnd[495]; + /** total size 6120*/ }; typedef struct engine_configuration_s engine_configuration_s; @@ -2959,6 +2959,22 @@ struct persistent_config_s { * offset 0 */ engine_configuration_s engineConfiguration; + /** + * offset 6120 + */ + float afterstartCoolantBins[AFTERSTART_HOLD_CURVE_SIZE]; + /** + * offset 6152 + */ + float afterstartHoldTime[AFTERSTART_HOLD_CURVE_SIZE]; + /** + * offset 6184 + */ + float afterstartEnrich[AFTERSTART_ENRICH_CURVE_SIZE]; + /** + * offset 6216 + */ + float afterstartDecayTime[AFTERSTART_DECAY_CURVE_SIZE]; /** * offset 6248 */ @@ -3230,4 +3246,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Mar 25 17:51:52 PDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Mar 27 12:12:49 EDT 2020 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 6ed03179b5..18307b429c 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -53,6 +53,17 @@ #define afrTable_offset_hex 48a0 #define afterCrankingIACtaperDuration_offset 2036 #define afterCrankingIACtaperDuration_offset_hex 7f4 +#define AFTERSTART_DECAY_CURVE_SIZE 8 +#define AFTERSTART_ENRICH_CURVE_SIZE 8 +#define AFTERSTART_HOLD_CURVE_SIZE 8 +#define afterstartCoolantBins_offset 6120 +#define afterstartCoolantBins_offset_hex 17e8 +#define afterstartDecayTime_offset 6216 +#define afterstartDecayTime_offset_hex 1848 +#define afterstartEnrich_offset 6184 +#define afterstartEnrich_offset_hex 1828 +#define afterstartHoldTime_offset 6152 +#define afterstartHoldTime_offset_hex 1808 #define alFIn_offset 4024 #define alFIn_offset_hex fb8 #define alignEngineSnifferAtTDC_offset 744 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 90ca9a1376..a494353788 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -155,6 +155,9 @@ struct_no_prefix engine_configuration_s #define BARO_CORR_SIZE 4 #define MAF_DECODING_COUNT 256 +#define AFTERSTART_HOLD_CURVE_SIZE 8 +#define AFTERSTART_DECAY_CURVE_SIZE 8 +#define AFTERSTART_ENRICH_CURVE_SIZE 8 custom fuel_table_t 4*@@FUEL_RPM_COUNT@@x@@FUEL_LOAD_COUNT@@ array, F32, @OFFSET@, [@@FUEL_RPM_COUNT@@x@@FUEL_LOAD_COUNT@@],"ms", 1, 0, 0.0, 500.0, 2 custom ve_table_t 4*@@FUEL_RPM_COUNT@@x@@FUEL_LOAD_COUNT@@ array, F32, @OFFSET@, [@@FUEL_RPM_COUNT@@x@@FUEL_LOAD_COUNT@@],"%", 1, 0, 0, 999.0, 2 @@ -1191,13 +1194,20 @@ uint8_t[4] unusuedsw; uint8_t[IAC_PID_MULT_SIZE] iacPidMultLoadBins;;"Load", 1, 0.0, 0, 500.0, 2 uint8_t[IAC_PID_MULT_SIZE] iacPidMultRpmBins;;"RPM", @@RPM_1_BYTE_PACKING_MULT@@, 0, 0.0, 12000.0, 0 - int[527] mainUnusedEnd; + int[495] mainUnusedEnd; ! end of engine_configuration_s end_struct engine_configuration_s engineConfiguration; + +float[AFTERSTART_HOLD_CURVE_SIZE] afterstartCoolantBins;;"C", 1, 0, -100.0, 250.0, 0 +float[AFTERSTART_HOLD_CURVE_SIZE] afterstartHoldTime;;"Seconds", 1, 0, 0, 100, 1 +float[AFTERSTART_ENRICH_CURVE_SIZE] afterstartEnrich;;"%", 1, 0, 0, 600, 1 +float[AFTERSTART_DECAY_CURVE_SIZE] afterstartDecayTime;;"Seconds", 1, 0, 0, 100, 1 + + boost_table_t boostTableOpenLoop; uint8_t[BOOST_LOAD_COUNT] boostMapBins;;"", @@LOAD_1_BYTE_PACKING_MULT@@, 0, 0, 600.0, 1 uint8_t[BOOST_RPM_COUNT] boostRpmBins;;"RPM", @@RPM_1_BYTE_PACKING_MULT@@, 0, 0.0, 12000.0, 0 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 8b4c02967b..f6f92bbcc2 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Thu Mar 26 19:23:49 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Mar 27 12:12:49 EDT 2020 pageSize = 20000 page = 1 @@ -1011,6 +1011,10 @@ page = 1 iacPidMultLoadBins = array, U08, 4124, [8], "Load", 1, 0.0, 0, 500.0, 2 iacPidMultRpmBins = array, U08, 4132, [8], "RPM", 50, 0, 0.0, 12000.0, 0 ;no TS info - skipping mainUnusedEnd offset 4140 + afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100.0, 250.0, 0 + afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 + afterstartEnrich = array, F32, 6184, [8], "%", 1, 0, 0, 600, 1 + afterstartDecayTime = array, F32, 6216, [8], "Seconds", 1, 0, 0, 100, 1 boostTableOpenLoop = array, U08, 6248, [8x8],"", 2, 0 , 0, 3000, 0 boostMapBins = array, U08, 6312, [8], "", 2, 0, 0, 600.0, 1 boostRpmBins = array, U08, 6320, [8], "RPM", 50, 0, 0.0, 12000.0, 0 diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index ad1574399f..90e6cd0117 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Thu Mar 26 19:23:54 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Mar 27 12:12:55 EDT 2020 pageSize = 20000 page = 1 @@ -1011,6 +1011,10 @@ page = 1 iacPidMultLoadBins = array, U08, 4124, [8], "Load", 1, 0.0, 0, 500.0, 2 iacPidMultRpmBins = array, U08, 4132, [8], "RPM", 50, 0, 0.0, 12000.0, 0 ;no TS info - skipping mainUnusedEnd offset 4140 + afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100.0, 250.0, 0 + afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 + afterstartEnrich = array, F32, 6184, [8], "%", 1, 0, 0, 600, 1 + afterstartDecayTime = array, F32, 6216, [8], "Seconds", 1, 0, 0, 100, 1 boostTableOpenLoop = array, U08, 6248, [8x8],"", 2, 0 , 0, 3000, 0 boostMapBins = array, U08, 6312, [8], "", 2, 0, 0, 600.0, 1 boostRpmBins = array, U08, 6320, [8], "RPM", 50, 0, 0.0, 12000.0, 0 diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 2dd46b56b7..cb5d6e1d4d 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Thu Mar 26 19:23:51 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Mar 27 12:12:52 EDT 2020 pageSize = 20000 page = 1 @@ -1011,6 +1011,10 @@ page = 1 iacPidMultLoadBins = array, U08, 4124, [8], "Load", 1, 0.0, 0, 500.0, 2 iacPidMultRpmBins = array, U08, 4132, [8], "RPM", 50, 0, 0.0, 12000.0, 0 ;no TS info - skipping mainUnusedEnd offset 4140 + afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100.0, 250.0, 0 + afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 + afterstartEnrich = array, F32, 6184, [8], "%", 1, 0, 0, 600, 1 + afterstartDecayTime = array, F32, 6216, [8], "Seconds", 1, 0, 0, 100, 1 boostTableOpenLoop = array, U08, 6248, [8x8],"", 2, 0 , 0, 3000, 0 boostMapBins = array, U08, 6312, [8], "", 2, 0, 0, 600.0, 1 boostRpmBins = array, U08, 6320, [8], "RPM", 50, 0, 0.0, 12000.0, 0 diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 5dd3327a2b..fc6e6ac9e8 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Thu Mar 26 19:23:56 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Mar 27 12:12:57 EDT 2020 pageSize = 20000 page = 1 @@ -1011,6 +1011,10 @@ page = 1 iacPidMultLoadBins = array, U08, 4124, [8], "Load", 1, 0.0, 0, 500.0, 2 iacPidMultRpmBins = array, U08, 4132, [8], "RPM", 50, 0, 0.0, 12000.0, 0 ;no TS info - skipping mainUnusedEnd offset 4140 + afterstartCoolantBins = array, F32, 6120, [8], "C", 1, 0, -100.0, 250.0, 0 + afterstartHoldTime = array, F32, 6152, [8], "Seconds", 1, 0, 0, 100, 1 + afterstartEnrich = array, F32, 6184, [8], "%", 1, 0, 0, 600, 1 + afterstartDecayTime = array, F32, 6216, [8], "Seconds", 1, 0, 0, 100, 1 boostTableOpenLoop = array, U08, 6248, [8x8],"", 2, 0 , 0, 3000, 0 boostMapBins = array, U08, 6312, [8], "", 2, 0, 0, 600.0, 1 boostRpmBins = array, U08, 6320, [8], "RPM", 50, 0, 0.0, 12000.0, 0 diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index 19c02a0990..0cf66dbd94 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Thu Mar 26 11:42:18 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Mar 27 12:12:49 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -38,6 +38,16 @@ public class Fields { public static final int afrRpmBins_offset = 18912; public static final int afrTable_offset = 18592; public static final int afterCrankingIACtaperDuration_offset = 2036; + public static final int AFTERSTART_DECAY_CURVE_SIZE = 8; + public static final int AFTERSTART_ENRICH_CURVE_SIZE = 8; + public static final int AFTERSTART_HOLD_CURVE_SIZE = 8; + public static final int afterstartCoolantBins_offset = 6120; + public static final int afterstartDecayTime_offset = 6216; + public static final int afterstartDecayTime_offset_hex = 1848; + public static final int afterstartEnrich_offset = 6184; + public static final int afterstartEnrich_offset_hex = 1828; + public static final int afterstartHoldTime_offset = 6152; + public static final int afterstartHoldTime_offset_hex = 1808; public static final int alFIn_offset = 4024; public static final int alignEngineSnifferAtTDC_offset = 744; public static final int alternator_antiwindupFreq_offset = 1764;