From c3380c4ef3e7b87a8971481c2c050085a1d38432 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Fri, 4 Jan 2019 17:18:43 -0500 Subject: [PATCH] #35 --- firmware/config/engines/dodge_neon.cpp | 2 +- .../controllers/algo/engine_configuration.cpp | 2 +- .../engine_configuration_generated_structures.h | 12 ++++++++---- firmware/controllers/algo/rusefi_generated.h | 10 ++++++---- firmware/hw_layer/HIP9011.cpp | 8 ++++---- firmware/integration/rusefi_config.txt | 5 +++-- .../models/src/com/rusefi/config/Fields.java | 17 +++++++++++------ 7 files changed, 34 insertions(+), 22 deletions(-) diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index 9b6620bb51..4d83c2c7d4 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -431,7 +431,7 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { boardConfiguration->isFastAdcEnabled = true; engineConfiguration->map.sensor.type = MT_DODGE_NEON_2003; - boardConfiguration->hip9011Gain = 0.3; + engineConfiguration->hip9011Gain = 0.3; float t = 0.5; diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 49a5fefd99..c33cda8f19 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -1052,7 +1052,7 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { boardConfiguration->spi3misoPin = GPIOB_4; boardConfiguration->spi3sckPin = GPIOB_3; - boardConfiguration->hip9011Gain = 1; + engineConfiguration->hip9011Gain = 1; #if EFI_HIP_9011 || defined(__DOXYGEN__) setHip9011FrankensoPinout(); #endif diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index ee081fae94..1d8ef87068 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 Wed Dec 19 21:31:59 EST 2018 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Jan 04 17:02:17 EST 2019 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -824,7 +824,7 @@ typedef struct { /** * offset 752 */ - float hip9011Gain; + float unusedBc; /** * offset 756 */ @@ -2208,7 +2208,11 @@ typedef struct { /** * offset 4156 */ - int unusedEnd[581]; + float hip9011Gain; + /** + * offset 4160 + */ + int unusedEnd[580]; /** total size 6480*/ } engine_configuration_s; @@ -2455,4 +2459,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Dec 19 21:31:59 EST 2018 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Jan 04 17:02:17 EST 2019 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 0856b7d45b..09eb934de1 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -813,8 +813,8 @@ #define spi3misoPin_offset_hex 548 #define spi3sckPin_offset 1356 #define spi3sckPin_offset_hex 54c -#define hip9011Gain_offset 1360 -#define hip9011Gain_offset_hex 550 +#define unusedBc_offset 1360 +#define unusedBc_offset_hex 550 #define joystickCenterPin_offset 1364 #define joystickCenterPin_offset_hex 554 #define joystickAPin_offset 1368 @@ -1591,8 +1591,10 @@ #define etbBiasBins_offset_hex 1014 #define etbBiasValues_offset 4124 #define etbBiasValues_offset_hex 101c -#define unusedEnd_offset 4156 -#define unusedEnd_offset_hex 103c +#define hip9011Gain_offset 4156 +#define hip9011Gain_offset_hex 103c +#define unusedEnd_offset 4160 +#define unusedEnd_offset_hex 1040 #define cltCrankingCorrBins_offset 6480 #define cltCrankingCorrBins_offset_hex 1950 #define cltCrankingCorr_offset 6512 diff --git a/firmware/hw_layer/HIP9011.cpp b/firmware/hw_layer/HIP9011.cpp index 274cf9258b..e0a62406d6 100644 --- a/firmware/hw_layer/HIP9011.cpp +++ b/firmware/hw_layer/HIP9011.cpp @@ -135,7 +135,7 @@ static void showHipInfo(void) { char *outputName = getPinNameByAdcChannel("hip", engineConfiguration->hipOutputChannel, hipPinNameBuffer); - scheduleMsg(logger, "band_index=%d gain %.2f/index=%d output=%s", currentBandIndex, boardConfiguration->hip9011Gain, currentGainIndex, + scheduleMsg(logger, "band_index=%d gain %.2f/index=%d output=%s", currentBandIndex, engineConfiguration->hip9011Gain, currentGainIndex, outputName); scheduleMsg(logger, "integrator index=%d knockVThreshold=%.2f knockCount=%d maxKnockSubDeg=%.2f", currentIntergratorIndex, engineConfiguration->knockVThreshold, @@ -191,7 +191,7 @@ void setHip9011FrankensoPinout(void) { engineConfiguration->spi2MisoMode = PAL_STM32_PUPDR_PULLUP; // 32 #endif /* EFI_PROD_CODE */ - boardConfiguration->hip9011Gain = 1; + engineConfiguration->hip9011Gain = 1; engineConfiguration->knockVThreshold = 4; engineConfiguration->maxKnockSubDeg = 20; @@ -269,7 +269,7 @@ void setHipBand(float value) { } void setHipGain(float value) { - boardConfiguration->hip9011Gain = value; + engineConfiguration->hip9011Gain = value; showHipInfo(); } @@ -307,7 +307,7 @@ void hipAdcCallback(adcsample_t adcValue) { } int integratorIndex = getIntegrationIndexByRpm(GET_RPM()); - int gainIndex = getHip9011GainIndex(boardConfiguration->hip9011Gain); + int gainIndex = getHip9011GainIndex(engineConfiguration->hip9011Gain); int bandIndex = getBandIndex(); int prescalerIndex = engineConfiguration->hip9011PrescalerAndSDO; diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index fad89ed35d..45380fd476 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -612,7 +612,7 @@ custom fsio_setting_t 4 scalar, F32, @OFFSET@, "Val", 1, 0, 0, brain_pin_e spi3misoPin; brain_pin_e spi3sckPin; - float hip9011Gain; + float unusedBc; brain_pin_e joystickCenterPin; brain_pin_e joystickAPin; brain_pin_e joystickBPin; @@ -930,7 +930,8 @@ tChargeMode_e tChargeMode; uint8_t[ETB_BIAS_CURVE_LENGTH] etbBiasBins;target TPS value, 0 to 100%;"target TPS position", 1, 0.0, 0, 100.0, 0 float[ETB_BIAS_CURVE_LENGTH] etbBiasValues;PWM bias, 0 to 100%;"ETB duty cycle bias", 1, 0.0, -100, 100.0, 2 - int[581] unusedEnd; + float hip9011Gain; + int[580] unusedEnd; end_struct diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 596f1966c9..62cae473be 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 Sun Dec 09 10:18:27 EST 2018 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Jan 04 17:02:17 EST 2019 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int BLOCKING_FACTOR = 400; @@ -562,8 +562,8 @@ public class Fields { public static final int spi3misoPin_offset = 1352; public static final int spi3misoPin_offset_hex = 548; public static final int spi3sckPin_offset = 1356; - public static final int hip9011Gain_offset = 1360; - public static final int hip9011Gain_offset_hex = 550; + public static final int unusedBc_offset = 1360; + public static final int unusedBc_offset_hex = 550; public static final int joystickCenterPin_offset = 1364; public static final int joystickCenterPin_offset_hex = 554; public static final int joystickAPin_offset = 1368; @@ -1053,7 +1053,9 @@ public class Fields { public static final int etbBiasBins_offset = 4116; public static final int etbBiasBins_offset_hex = 1014; public static final int etbBiasValues_offset = 4124; - public static final int unusedEnd_offset = 4156; + public static final int hip9011Gain_offset = 4156; + public static final int unusedEnd_offset = 4160; + public static final int unusedEnd_offset_hex = 1040; public static final int cltCrankingCorrBins_offset = 6480; public static final int cltCrankingCorrBins_offset_hex = 1950; public static final int cltCrankingCorr_offset = 6512; @@ -1188,6 +1190,8 @@ public class Fields { public static final String GAUGE_NAME_DEBUG_I1 = "debug i1: pParam"; public static final String GAUGE_NAME_DEBUG_I2 = "debug i2: offset"; public static final String GAUGE_NAME_DEBUG_I3 = "debug i3"; + public static final String GAUGE_NAME_DEBUG_I4 = "debug i4"; + public static final String GAUGE_NAME_DEBUG_I5 = "debug i5"; public static final String GAUGE_NAME_DWELL_DUTY = "dwell: coil duty cycle"; public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; public static final Field ENGINETYPE = Field.create("ENGINETYPE", 0, FieldType.INT); @@ -1543,7 +1547,7 @@ public class Fields { public static final Field SPI3MOSIPIN = Field.create("SPI3MOSIPIN", 1348, FieldType.INT, brain_pin_e); public static final Field SPI3MISOPIN = Field.create("SPI3MISOPIN", 1352, FieldType.INT, brain_pin_e); public static final Field SPI3SCKPIN = Field.create("SPI3SCKPIN", 1356, FieldType.INT, brain_pin_e); - public static final Field HIP9011GAIN = Field.create("HIP9011GAIN", 1360, FieldType.FLOAT); + public static final Field UNUSEDBC = Field.create("UNUSEDBC", 1360, FieldType.FLOAT); public static final Field JOYSTICKCENTERPIN = Field.create("JOYSTICKCENTERPIN", 1364, FieldType.INT, brain_pin_e); public static final Field JOYSTICKAPIN = Field.create("JOYSTICKAPIN", 1368, FieldType.INT, brain_pin_e); public static final Field JOYSTICKBPIN = Field.create("JOYSTICKBPIN", 1372, FieldType.INT, brain_pin_e); @@ -1731,7 +1735,7 @@ public class Fields { public static final Field TPSDECELENLEANMENTTHRESHOLD = Field.create("TPSDECELENLEANMENTTHRESHOLD", 2208, FieldType.FLOAT); public static final Field TPSDECELENLEANMENTMULTIPLIER = Field.create("TPSDECELENLEANMENTMULTIPLIER", 2212, FieldType.FLOAT); public static final Field SLOWADCALPHA = Field.create("SLOWADCALPHA", 2216, FieldType.FLOAT); - public static final String[] debug_mode_e = {"Alternator_PID", "TPS accel enrich", "Warmup PID", "IDLE", "EL accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test", "Aux Valves", "ADC", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "mode28", "mode29"}; + public static final String[] debug_mode_e = {"Alternator_PID", "TPS accel enrich", "Warmup PID", "IDLE", "EL accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test", "Aux Valves", "ADC", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "mode28", "mode29", "Ion Sense"}; public static final Field DEBUGMODE = Field.create("DEBUGMODE", 2220, FieldType.INT, debug_mode_e); public static final Field AUXVALVES1 = Field.create("AUXVALVES1", 2224, FieldType.INT, brain_pin_e); public static final Field AUXVALVES2 = Field.create("AUXVALVES2", 2228, FieldType.INT, brain_pin_e); @@ -1891,6 +1895,7 @@ public class Fields { public static final Field TCHARGEAIRDECRLIMIT = Field.create("TCHARGEAIRDECRLIMIT", 4108, FieldType.FLOAT); public static final String[] tChargeMode_e = {"RPM+TPS (Default)", "Air Mass Interpolation"}; public static final Field TCHARGEMODE = Field.create("TCHARGEMODE", 4112, FieldType.INT, tChargeMode_e); + public static final Field HIP9011GAIN = Field.create("HIP9011GAIN", 4156, FieldType.FLOAT); public static final Field FSIOFORMULAS1 = Field.create("FSIOFORMULAS1", 6672, FieldType.INT); public static final Field FSIOFORMULAS2 = Field.create("FSIOFORMULAS2", 6872, FieldType.INT); public static final Field FSIOFORMULAS3 = Field.create("FSIOFORMULAS3", 7072, FieldType.INT);