rusefi
/
rusefi
mirror of https://github.com/rusefi/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2015-01-22 13:04:19 -06:00
parent 8135739c73
commit 277be2f43a
8 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/engines/GY6_139QMB.cpp
View File

@ -16,7 +16,7 @@ void setGy6139qmbDefaultEngineConfiguration(engine_configuration_s *engineConfig
engineConfiguration->analogInputDividerCoefficient = 1.52; engineConfiguration->analogInputDividerCoefficient = 1.52;
engineConfiguration->algorithm = LM_MAP; engineConfiguration->algorithm = LM_MAP;
engineConfiguration->globalTriggerAngleOffset = 15; engineConfiguration->globalTriggerAngleOffset = 15;
engineConfiguration->analogChartMode = AC_MAP; engineConfiguration->bc.analogChartMode = AC_MAP;
engineConfiguration->cylindersCount = 1; engineConfiguration->cylindersCount = 1;
setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR); setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR);

2
firmware/config/engines/dodge_neon.cpp
View File

@ -341,7 +341,7 @@ void setDodgeNeonNGCEngineConfiguration(engine_configuration_s *engineConfigurat
engineConfiguration->cltAdcChannel = EFI_ADC_12; engineConfiguration->cltAdcChannel = EFI_ADC_12;
engineConfiguration->analogChartMode = AC_MAP; boardConfiguration->analogChartMode = AC_MAP;
boardConfiguration->isFastAdcEnabled = true; boardConfiguration->isFastAdcEnabled = true;
engineConfiguration->map.sensor.sensorType = MT_DODGE_NEON_2003; engineConfiguration->map.sensor.sensorType = MT_DODGE_NEON_2003;

2
firmware/controllers/algo/engine_configuration.cpp
View File

@ -243,7 +243,7 @@ void setDefaultConfiguration(engine_configuration_s *engineConfiguration, board_
engineConfiguration->fixedModeTiming = 50; engineConfiguration->fixedModeTiming = 50;
// performance optimization // performance optimization
engineConfiguration->analogChartMode = AC_OFF; boardConfiguration->analogChartMode = AC_OFF;
engineConfiguration->map.sensor.hwChannel = EFI_ADC_4; engineConfiguration->map.sensor.hwChannel = EFI_ADC_4;
engineConfiguration->baroSensor.hwChannel = EFI_ADC_4; engineConfiguration->baroSensor.hwChannel = EFI_ADC_4;

6
firmware/controllers/algo/engine_configuration.h
View File

@ -272,7 +272,9 @@ typedef struct {
brain_pin_e joystickCPin; brain_pin_e joystickCPin;
// offset 6248 // offset 6248
brain_pin_e joystickDPin; brain_pin_e joystickDPin;
int unusedbs[7]; // offset 6252
uint32_t analogChartMode;
int unusedbs[6];
le_formula_t le_formulas[LE_COMMAND_COUNT]; le_formula_t le_formulas[LE_COMMAND_COUNT];
@ -349,7 +351,7 @@ typedef struct {
/** /**
* offset 334 * offset 334
*/ */
uint16_t analogChartMode; uint16_t unused334;
/** /**
* todo: finish implementation. These values are used for TPS disconnect detection * todo: finish implementation. These values are used for TPS disconnect detection

2
firmware/controllers/map_averaging.cpp
View File

@ -96,7 +96,7 @@ void mapAveragingCallback(adcsample_t value) {
float currentPressure = getMapByVoltage(voltage); float currentPressure = getMapByVoltage(voltage);
#if EFI_ANALOG_CHART #if EFI_ANALOG_CHART
if (engineConfiguration->analogChartMode == AC_MAP) if (boardConfiguration->analogChartMode == AC_MAP)
if (perRevolutionCounter % FAST_MAP_CHART_SKIP_FACTOR == 0) if (perRevolutionCounter % FAST_MAP_CHART_SKIP_FACTOR == 0)
acAddData(getCrankshaftAngleNt(getTimeNowNt() PASS_ENGINE_PARAMETER), currentPressure); acAddData(getCrankshaftAngleNt(getTimeNowNt() PASS_ENGINE_PARAMETER), currentPressure);
#endif /* EFI_ANALOG_CHART */ #endif /* EFI_ANALOG_CHART */

2
firmware/controllers/settings.cpp
View File

@ -325,7 +325,7 @@ static void setMalfunctionIndicatorPinMode(int value) {
} }
static void setAnalogChartMode(int value) { static void setAnalogChartMode(int value) {
engineConfiguration->analogChartMode = (analog_chart_e)value; boardConfiguration->analogChartMode = (analog_chart_e)value;
doPrintConfiguration(engine); doPrintConfiguration(engine);
} }

4
firmware/controllers/trigger/rpm_calculator.cpp
View File

@ -143,7 +143,7 @@ void rpmShaftPositionCallback(trigger_event_e ckpSignalType, uint32_t index DECL
if (index != 0) { if (index != 0) {
#if EFI_ANALOG_CHART || defined(__DOXYGEN__) #if EFI_ANALOG_CHART || defined(__DOXYGEN__)
if (engineConfiguration->analogChartMode == AC_TRIGGER) if (boardConfiguration->analogChartMode == AC_TRIGGER)
acAddData(getCrankshaftAngleNt(nowNt PASS_ENGINE_PARAMETER), 1000 * ckpSignalType + index); acAddData(getCrankshaftAngleNt(nowNt PASS_ENGINE_PARAMETER), 1000 * ckpSignalType + index);
#endif #endif
return; return;
@ -171,7 +171,7 @@ void rpmShaftPositionCallback(trigger_event_e ckpSignalType, uint32_t index DECL
rpmState->onNewEngineCycle(); rpmState->onNewEngineCycle();
rpmState->lastRpmEventTimeNt = nowNt; rpmState->lastRpmEventTimeNt = nowNt;
#if EFI_ANALOG_CHART || defined(__DOXYGEN__) #if EFI_ANALOG_CHART || defined(__DOXYGEN__)
if (engineConfiguration->analogChartMode == AC_TRIGGER) if (boardConfiguration->analogChartMode == AC_TRIGGER)
acAddData(getCrankshaftAngleNt(nowNt PASS_ENGINE_PARAMETER), index); acAddData(getCrankshaftAngleNt(nowNt PASS_ENGINE_PARAMETER), index);
#endif #endif
} }

6
firmware/tunerstudio/rusefi.ini
View File

@ -52,7 +52,6 @@ enable2ndByteCanID = false
tpsMin = scalar, S16, 330, "ADC", 1, 0, 0, 1023, 0 ; * ( 2 bytes) tpsMin = scalar, S16, 330, "ADC", 1, 0, 0, 1023, 0 ; * ( 2 bytes)
tpsMax = scalar, S16, 332, "ADC", 1, 0, 0, 1023, 0 ; * ( 2 bytes) tpsMax = scalar, S16, 332, "ADC", 1, 0, 0, 1023, 0 ; * ( 2 bytes)
analogChartMode = bits, S16, 334, [0:1], "none", "trigger", "MAP", "INVALID"
tpsErrorLowValue = scalar, U16, 336, "°C", 1, 0, -40, 200, 1; size 4 tpsErrorLowValue = scalar, U16, 336, "°C", 1, 0, -40, 200, 1; size 4
tpsErrorHighValue = scalar, U16, 338, "°C", 1, 0, -40, 200, 1; size 4 tpsErrorHighValue = scalar, U16, 338, "°C", 1, 0, -40, 200, 1; size 4
@ -352,6 +351,11 @@ enable2ndByteCanID = false
fsio_setting14 = scalar, F32, 6184, "Val", 1, 0, 0, 18000, 0 ; size 4 fsio_setting14 = scalar, F32, 6184, "Val", 1, 0, 0, 18000, 0 ; size 4
fsio_setting15 = scalar, F32, 6188, "Val", 1, 0, 0, 18000, 0 ; size 4 fsio_setting15 = scalar, F32, 6188, "Val", 1, 0, 0, 18000, 0 ; size 4
; hip9011Gain 6228
; joystickDPin 6248
analogChartMode = bits, S32, 6252, [0:1], "none", "trigger", "MAP", "INVALID"
useConstantDwellDuringCranking= bits, U32, 6280, [3:3], "false", "true" useConstantDwellDuringCranking= bits, U32, 6280, [3:3], "false", "true"
isCanEnabled = bits, U32, 6280, [5:5], "false", "true" isCanEnabled = bits, U32, 6280, [5:5], "false", "true"
hasCltSensor = bits, U32, 6280, [6:6], "false", "true" hasCltSensor = bits, U32, 6280, [6:6], "false", "true"