From 38564e48ebc28b85b382e832dfb1d676ff3b9152 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Wed, 9 Mar 2016 16:01:51 -0500 Subject: [PATCH] auto-sync --- ...ngine_configuration_generated_structures.h | 12 +++---- firmware/integration/rusefi_config.txt | 34 +++++++++---------- firmware/tunerstudio/rusefi.ini | 19 ++++++++++- 3 files changed, 41 insertions(+), 24 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 9a364204cc..5b2aa93870 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 Mar 08 23:31:32 EST 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Mar 09 14:59:13 EST 2016 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -775,7 +775,7 @@ typedef struct { */ injector_s injector; /** - * Should the trigger emulator push data right into trigger input, eliminating the need for physical jumper wires? + * Should trigger emulator push data right into trigger handling logic, eliminating the need for physical jumper wires? * PS: Funny name, right? :) offset 80 bit 0 */ bool directSelfStimulation : 1; @@ -896,7 +896,7 @@ typedef struct { */ angle_t injectionOffset; /** - * Timing advance while cranking engine + * Timing advance while engine cranking * offset 440 */ angle_t crankingTimingAngle; @@ -920,13 +920,13 @@ typedef struct { */ angle_t fixedModeTiming; /** - * This field is the angle between Top Dead Center (TDC) and the first trigger event. + * Angle between Top Dead Center (TDC) and the first trigger event. * Knowing this angle allows us to control timing and other angles in reference to TDC. * offset 460 */ angle_t globalTriggerAngleOffset; /** - * This parameter holds the coefficient of input voltage dividers + * Coefficient of input voltage dividers on your PCB * offset 464 */ float analogInputDividerCoefficient; @@ -1694,4 +1694,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Mar 08 23:31:32 EST 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Mar 09 14:59:13 EST 2016 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index dab824b7ce..97a5912028 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -164,7 +164,7 @@ end_struct injector_s injector -bit directSelfStimulation;Should the trigger emulator push data right into trigger input, eliminating the need for physical jumper wires?\nPS: Funny name, right? :) +bit directSelfStimulation;+Should trigger emulator push data right into trigger handling logic, eliminating the need for physical jumper wires?\nPS: Funny name, right? :) int16_t tpsMin;todo: extract these two fields into a structure\ntodo: we need two sets of TPS parameters - modern ETBs have two sensors;"ADC", 1, 0, 0, 1023, 0 int16_t tpsMax;tpsMax value as 10 bit ADC value. Not Voltage!;"ADC", 1, 0, 0, 1023, 0 @@ -175,7 +175,7 @@ int16_t tpsErrorDetectionTooHigh;;"%", 1, 0, -40, 200, 0 cranking_parameters_s cranking float primingSquirtDurationMs;;"*C", 1, 0, -40, 200, 1 float ignitionDwellForCrankingMs;;"ms", 1, 0, 0, 200, 1 -float 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.;"deg", 1, 0, 0, 3000.0, 0 +float 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.;"deg", 1, 0, 0, 3000.0, 0 MAP_sensor_config_s map;@see hasMapSensor\n@see isMapAveragingEnabled @@ -187,7 +187,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;;"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;+kHz knock band override;"kHz", 1, 0.0, 0.0, 10.0, 2 float[DWELL_CURVE_SIZE] sparkDwellBins;;"RPM", 1, 0.0, 0.0, 18000, 2 @@ -204,8 +204,8 @@ firing_order_e firingOrder; end_struct specs_s specs - float cylinderBore;Cylinder diameter, in mm. -int sensorSnifferRpmThreshold;Disable sensor sniffer above this rpm;"RPM", 1, 0, 0,30000, 0 + float cylinderBore;+Cylinder diameter, in mm. +int sensorSnifferRpmThreshold;+Disable sensor sniffer above this rpm;"RPM", 1, 0, 0,30000, 0 int rpmHardLimit;;"rpm", 1, 0, 0, 20000.0, 2 @@ -213,39 +213,39 @@ int sensorSnifferRpmThreshold;Disable sensor sniffer above this rpm;"RPM", custom engine_load_mode_e 4 bits, U32, @OFFSET@, [0:1], @@engine_load_mode_e_enum@@ -engine_load_mode_e algorithm;This setting controls which algorithm is used for ENGINE LOAD +engine_load_mode_e algorithm;+This setting controls which algorithm is used for ENGINE LOAD custom injection_mode_e 4 bits, U32, @OFFSET@, [0:1], "Simultaneous", "Sequential", "Batch", "INVALID" injection_mode_e crankingInjectionMode; injection_mode_e injectionMode; -angle_t injectionOffset;this is about deciding when the injector starts it's squirt\nSee also injectionPhase map;"deg", 1, 0.0, -720, 720, 2 -angle_t crankingTimingAngle;Timing advance while cranking engine; "deg", 1, 0.0, -360, 360, 2 +angle_t injectionOffset;+this is about deciding when the injector starts it's squirt\nSee also injectionPhase map;"deg", 1, 0.0, -720, 720, 2 +angle_t crankingTimingAngle;+Timing advance while engine cranking; "deg", 1, 0.0, -360, 360, 2 custom ignition_mode_e 4 bits, U32, @OFFSET@, [0:1], "One coil", "Individual Coils", "Wasted", "INVALID" ignition_mode_e ignitionMode; -angle_t ignitionOffset;this value could be used to offset the whole ignition timing table by a constant;"RPM", 1, 0, 0, 3000.0, 0 +angle_t ignitionOffset;+this value could be used to offset the whole ignition timing table by a constant;"RPM", 1, 0, 0, 3000.0, 0 custom timing_mode_e 4 bits, U32, @OFFSET@ [0:0], "dynamic", "fixed" timing_mode_e timingMode; -angle_t fixedModeTiming;This value is used in 'fixed timing' mode, i.e. constant timing\nThis mode is useful for instance while adjusting distributor location;"RPM", 1, 0, 0, 3000.0, 0 +angle_t fixedModeTiming;+This value is used in 'fixed timing' mode, i.e. constant timing\nThis mode is useful for instance while adjusting distributor location;"RPM", 1, 0, 0, 3000.0, 0 -angle_t globalTriggerAngleOffset;This field is the angle between Top Dead Center (TDC) and the first trigger event.\nKnowing this angle allows us to control timing and other angles in reference to TDC.;"deg", 1, 0, 0, 720, 0 +angle_t globalTriggerAngleOffset;+Angle between Top Dead Center (TDC) and the first trigger event.\nKnowing this angle allows us to control timing and other angles in reference to TDC.;"deg", 1, 0, 0, 720, 0 -float analogInputDividerCoefficient;This parameter holds the coefficient of input voltage dividers;"coef", 1, 0, 0.01, 10.0, 2 -float vbattDividerCoeff;Battery Voltage input resistor divider coefficient;"coef", 1, 0, 0.01, 20.0, 2 +float analogInputDividerCoefficient;+Coefficient of input voltage dividers on your PCB;"coef", 1, 0, 0.01, 10.0, 2 +float vbattDividerCoeff;+Battery Voltage input resistor divider coefficient;"coef", 1, 0, 0.01, 20.0, 2 adc_channel_e vbattAdcChannel; -float fanOnTemperature;Cooling fan turn-on temperature threshold, in Celsuis;"*C", 1, 0, 0, 1000.0, 2 -float fanOffTemperature;Cooling fan turn-off temperature threshold, in Celsuis;"*C", 1, 0, 0, 1000.0, 2 +float fanOnTemperature;+Cooling fan turn-on temperature threshold, in Celsuis;"*C", 1, 0, 0, 1000.0, 2 +float fanOffTemperature;+Cooling fan turn-off temperature threshold, in Celsuis;"*C", 1, 0, 0, 1000.0, 2 adc_channel_e fuelLevelSensor; -float vehicleSpeedCoef;This coefficient translates vehicle speed input frequency (in Hz) into vehicle speed, km/h;"coef", 1, 0, 0.01, 2000.0, 2 +float vehicleSpeedCoef;+This coefficient translates vehicle speed input frequency (in Hz) into vehicle speed, km/h;"coef", 1, 0, 0.01, 2000.0, 2 custom can_nbc_e 4 bits, U32, @OFFSET@, [0:1], "BMW", "FIAT", "VAG" , "MAZDA RX8" can_nbc_e canNbcType; @@ -281,7 +281,7 @@ custom trigger_type_e 4 bits, U32, @OFFSET@, [0:4], @@trigger_type_e_enum@@ bit customIsSynchronizationNeeded; bit customNeedSecondTriggerInput; - bit useOnlyFirstChannel;This option could be used if your second trigger channel is broken + bit useOnlyFirstChannel;+This option could be used if your second trigger channel is broken int customTotalToothCount;;"number", 1, 0.0, 0, 1000.0, 2 int customSkippedToothCount;;"number", 1, 0.0, 0, 1000.0, 2 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 0d7e25e24e..5ac64aeed6 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -41,7 +41,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 Mar 08 23:34:32 EST 2016 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Mar 09 14:59:13 EST 2016 pageSize = 17080 page = 1 @@ -595,8 +595,25 @@ page = 1 [SettingContextHelp] injector_flow = "cc/min, cubic centimeter per minute\nBy the way, g/s = 0.125997881 * (lb/hr)\ng/s = 0.125997881 * (cc/min)/10.5\ng/s = 0.0119997981 * cc/min" injector_lag = "Base injector lag\nSee also vBatt correction curve" + directSelfStimulation = "Should trigger emulator push data right into trigger handling logic, eliminating the need for physical jumper wires?\nPS: Funny name, right? :)" 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" + 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." + knockBandCustom = "kHz knock band override" + cylinderBore = "Cylinder diameter, in mm." + sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm" + algorithm = "This setting controls which algorithm is used for ENGINE LOAD" + injectionOffset = "this is about deciding when the injector starts it's squirt\nSee also injectionPhase map" + crankingTimingAngle = "Timing advance while engine cranking" + ignitionOffset = "this value could be used to offset the whole ignition timing table by a constant" + fixedModeTiming = "This value is used in 'fixed timing' mode, i.e. constant timing\nThis mode is useful for instance while adjusting distributor location" + globalTriggerAngleOffset = "Angle between Top Dead Center (TDC) and the first trigger event.\nKnowing this angle allows us to control timing and other angles in reference to TDC." + analogInputDividerCoefficient = "Coefficient of input voltage dividers on your PCB" + vbattDividerCoeff = "Battery Voltage input resistor divider coefficient" + fanOnTemperature = "Cooling fan turn-on temperature threshold, in Celsuis" + fanOffTemperature = "Cooling fan turn-off temperature threshold, in Celsuis" + vehicleSpeedCoef = "This coefficient translates vehicle speed input frequency (in Hz) into vehicle speed, km/h" + trigger_useOnlyFirstChannel = "This option could be used if your second trigger channel is broken" ; CONFIG_DEFINITION_END