From 87111dc6876019cc69f17b20f7041448975864b9 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Wed, 2 Mar 2016 00:02:17 -0500 Subject: [PATCH] auto-sync --- .../engine_configuration_generated_structures.h | 8 ++++---- firmware/controllers/algo/rusefi_types.h | 3 +++ firmware/integration/rusefi_config.txt | 12 +++++++----- firmware/tunerstudio/rusefi.ini | 14 +++++++------- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 7bbe83367e..a7abc4ec4e 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 Sun Feb 28 00:56:56 EST 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Mar 01 22:57:52 EST 2016 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1573,7 +1573,7 @@ typedef struct { /** * offset 9176 */ - ignition_table_t ignitionIatCorrTable; + angle_table_t ignitionIatCorrTable; /** * offset 10200 */ @@ -1585,7 +1585,7 @@ typedef struct { /** * offset 10328 */ - ignition_table_t injectionPhase; + angle_table_t injectionPhase; /** * offset 11352 */ @@ -1648,4 +1648,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Feb 28 00:56:56 EST 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Mar 01 22:57:52 EST 2016 diff --git a/firmware/controllers/algo/rusefi_types.h b/firmware/controllers/algo/rusefi_types.h index 54730d4fb6..b19c9cf394 100644 --- a/firmware/controllers/algo/rusefi_types.h +++ b/firmware/controllers/algo/rusefi_types.h @@ -67,6 +67,9 @@ typedef struct { ignition_table_t map; } full_i_table_s; +// this is different type simply to have different hi/low range in rusefi.ini +typedef ignition_table_t angle_table_t; + typedef int cylinders_count_t; typedef int32_t bool32_t; diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 77173da5f2..8998ac5f84 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -68,7 +68,9 @@ custom baro_corr_table_t 64 array, F32, @OFFSET@, [@@BARO_CORR_SIZE@@x@@BARO ! please note that 1024 here is 4 * IGN_LOAD_COUNT * IGN_RPM_COUNT -custom ignition_table_t 1024 array, F32, @OFFSET@, [16x16],"deg", 1, 0, -720, 720, 2 +custom ignition_table_t 1024 array, F32, @OFFSET@, [16x16],"deg", 1, 0, -20, 90, 2 + +custom angle_table_t 1024 array, F32, @OFFSET@, [16x16],"deg", 1, 0, -720, 720, 2 struct pid_s float pFactor;;"value", 1, 0, 0, 1000, 5 @@ -100,8 +102,8 @@ custom air_pressure_sensor_type_e 4 bits, U32, @OFFSET@, [0:2] "Custom", "DENSO custom adc_channel_e 4 bits, U32, @OFFSET@, [0:4] @@adc_channel_e_enum@@ struct air_pressure_sensor_config_s -float valueAt0;kPa value at zero volts;"kpa", 1, 0, 0, 450, 2 -float valueAt5;kPa value at 5 volts;"kpa", 1, 0, 0, 450, 2 +float valueAt0;kPa value at zero volts;"kpa", 1, 0, -400, 800, 2 +float valueAt5;kPa value at 5 volts;"kpa", 1, 0, -400, 800, 2 air_pressure_sensor_type_e type; adc_channel_e hwChannel; end_struct @@ -674,11 +676,11 @@ float[CLT_CURVE_SIZE] cltIdleCorr;;"%", 1, 0, 0.0, 500.0, 2 float[MAF_DECODING_COUNT] mafDecoding;kg/hour value.\nBy the way 2.081989116 kg/h = 1 ft³/m;"kg/hour", 1, 0, -500.0, 4000.0, 2 float[MAF_DECODING_COUNT] mafDecodingBins;; "V", 1, 0, -5.0, 150.0, 2 -ignition_table_t ignitionIatCorrTable; +angle_table_t ignitionIatCorrTable; float[IGN_LOAD_COUNT] ignitionIatCorrLoadBins;;"Load", 1, 0.0, 0, 300.0, 2 float[IGN_RPM_COUNT] ignitionIatCorrRpmBins;;"RPM", 1, 0.0, 0, 18000.0, 2 -ignition_table_t injectionPhase; +angle_table_t injectionPhase; float[FUEL_LOAD_COUNT] injPhaseLoadBins;;"Load", 1, 0.0, 0, 300.0, 2 float[FUEL_RPM_COUNT] injPhaseRpmBins;;"RPM", 1, 0.0, 0, 18000.0, 2 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 79e964f2c9..d15286c36f 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 Sun Feb 28 00:56:56 EST 2016 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Mar 01 22:57:52 EST 2016 pageSize = 16088 page = 1 @@ -572,7 +572,7 @@ page = 1 fuelTable = array, F32, 11480, [16x16],"ms", 1, 0, 0.0, 300.0, 2 fuelLoadBins = array, F32, 12504, [16], "V", 1, 0, 0.0, 300.0, 2 fuelRpmBins = array, F32, 12568, [16], "RPM", 1, 0, 0.0, 25500.0, 2 - ignitionTable = array, F32, 12632, [16x16],"deg", 1, 0, -720, 720, 2 + ignitionTable = array, F32, 12632, [16x16],"deg", 1, 0, -20, 90, 2 ignitionLoadBins = array, F32, 13656, [16], "Load", 1, 0.0, 0, 300.0, 2 ignitionRpmBins = array, F32, 13720, [16], "RPM", 1, 0.0, 0, 18000.0, 2 veTable = array, F32, 13784, [16x16],"%", 1, 0, 0, 999.0, 2 @@ -1307,8 +1307,8 @@ cmdinjspk16 = "w\x00\x00\x00\x2f" dialog = mapSensorVDlg, "Voltage Sensor Settings", xAxis field = "MAP ADC input", map_sensor_hwChannel, {hasFrequencyReportingMapSensor == 0} field = "Map type", map_sensor_type, {hasFrequencyReportingMapSensor == 0} - field = "MAP at minimum voltage", map_sensor_valueAt0, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0} - field = "MAP at maximum voltage", map_sensor_valueAt5, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0} + field = "MAP value at 0.0v", map_sensor_valueAt0, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0} + field = "MAP value at 5.0v", map_sensor_valueAt5, { map_sensor_type == 0 && hasFrequencyReportingMapSensor == 0} dialog = mapSensorFDlg, "Frequency Sensor Settings", xAxis field = "pin", frequencyReportingMapInputPin, {hasFrequencyReportingMapSensor == 1} @@ -1403,9 +1403,9 @@ cmdinjspk16 = "w\x00\x00\x00\x2f" field = "Fuel Pump Pin", fuelPumpPin ; Engine->MIL Settings - dialog = malfunction, "MIL Settings" - field = "MIL Pin Mode", malfunctionIndicatorPinMode - field = "MIL Pin", malfunctionIndicatorPin + dialog = malfunction, "Check Engine Settings" + field = "Check Engine Pin Mode", malfunctionIndicatorPinMode + field = "Check Engine Pin", malfunctionIndicatorPin ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings"