From c757009065f35c2eb3b8047cc31ee160201b21a2 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 20 May 2018 13:22:32 -0400 Subject: [PATCH] knock and bore --- .../algo/engine_configuration_generated_structures.h | 7 ++++--- firmware/integration/rusefi_config.txt | 2 +- firmware/tunerstudio/rusefi.ini | 5 +++-- firmware/tunerstudio/rusefi.input | 1 + 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 89f8a1cd82..d488c211f6 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 Tue May 08 11:56:12 EDT 2018 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun May 20 13:21:41 EDT 2018 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1038,7 +1038,8 @@ typedef struct { */ int hip9011PrescalerAndSDO; /** - * kHz knock band override + * We calculate knock band based of cylinderBore + * Use this to override - kHz knock band override * offset 328 */ float knockBandCustom; @@ -2385,4 +2386,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue May 08 11:56:12 EDT 2018 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun May 20 13:21:41 EDT 2018 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 414feed761..56099f564e 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -297,7 +297,7 @@ ThermistorConf iat; int step1rpm;A secondary Rev limit engaged by the driver to help launch the vehicle faster;"rpm", 1, 0, 0, 20000.0, 2 int step1timing;;"deg", 1, 0, -180, 180, 2 int hip9011PrescalerAndSDO;6=8MHz todo solit two bit fields;"integer", 1, 0.0, 0.0, 32, 0 - float knockBandCustom;+kHz knock band override;"kHz", 1, 0.0, 0.0, 10.0, 2 + float knockBandCustom;+We calculate knock band based of cylinderBore\n Use this to override - kHz knock band override;"kHz", 1, 0.0, 0.0, 10.0, 2 float[DWELL_CURVE_SIZE] sparkDwellRpmBins;On single-coil or wasted spark setups you have to lower dwell at high RPM;"RPM", 1, 0.0, 0.0, 18000, 2 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 9908dd28b8..2cbf31835f 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -63,7 +63,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 Tue May 08 11:56:12 EDT 2018 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun May 20 13:21:41 EDT 2018 pageSize = 20000 page = 1 @@ -864,7 +864,7 @@ page = 1 cranking_baseFuel = "Fuel squirt duration while cranking\nA number of curves adjust this value according to CLT/IAT/TPS etc" cranking_rpm = "Cranking mode threshold. Special cranking logic controls fuel and spark while RPM is below this threshold\nset cranking_rpm X" crankingChargeAngle = "While cranking (which causes battery voltage to drop) we can calculate dwell time in shaft\ndegrees, not in absolute time as in running mode.\nset cranking_charge_angle X" - knockBandCustom = "kHz knock band override" + knockBandCustom = "We calculate knock band based of cylinderBore\n Use this to override - kHz knock band override" cylinderBore = "Cylinder diameter, in mm." sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" fuelAlgorithm = "This setting controls which fuel quantity control algorithm is used.\nset algorithm X" @@ -2476,6 +2476,7 @@ cmd_stop_engine = "w\x00\x99\x00\x00" field = "ChipSelect mode", hip9011CsPinMode, {isHip9011Enabled == 1} field = "hip Output/stm input", hipOutputChannel, {isHip9011Enabled == 1} field = "prescaler & SDO", hip9011PrescalerAndSDO, {isHip9011Enabled == 1} + field = "cylinder bore (mm)", cylinderBore, {isHip9011Enabled == 1} field = "Band Freq override", knockBandCustom, {isHip9011Enabled == 1} field = "SPI device", hip9011SpiDevice, {isHip9011Enabled == 1} field = "SPI1sck", spi1SckMode, {isHip9011Enabled == 1} diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index b4e7ac4139..0231072c27 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1638,6 +1638,7 @@ cmd_stop_engine = "w\x00\x99\x00\x00" field = "ChipSelect mode", hip9011CsPinMode, {isHip9011Enabled == 1} field = "hip Output/stm input", hipOutputChannel, {isHip9011Enabled == 1} field = "prescaler & SDO", hip9011PrescalerAndSDO, {isHip9011Enabled == 1} + field = "cylinder bore (mm)", cylinderBore, {isHip9011Enabled == 1} field = "Band Freq override", knockBandCustom, {isHip9011Enabled == 1} field = "SPI device", hip9011SpiDevice, {isHip9011Enabled == 1} field = "SPI1sck", spi1SckMode, {isHip9011Enabled == 1}