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

more detail state check for #623

This commit is contained in:
rusefi 2018-11-20 22:43:09 -05:00
parent 3fb0ee1094
commit f0dd3d3a6a
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
firmware/controllers/algo/obd_error_codes.h
View File

@ -2062,6 +2062,17 @@ typedef enum {
CUSTOM_ERR_6688 = 6688, CUSTOM_ERR_6688 = 6688,
CUSTOM_ERR_6689 = 6689, CUSTOM_ERR_6689 = 6689,
CUSTOM_ERR_6690 = 6660,
CUSTOM_ERR_6691 = 6661,
CUSTOM_ERR_6692 = 6662,
CUSTOM_ERR_6693 = 6663,
CUSTOM_ERR_6694 = 6664,
CUSTOM_ERR_6695 = 6665,
CUSTOM_ERR_6696 = 6666,
CUSTOM_ERR_6697 = 6667,
CUSTOM_ERR_6698 = 6668,
CUSTOM_ERR_6700 = 6669,
// this is needed for proper enum size, this matters for malfunction_central // this is needed for proper enum size, this matters for malfunction_central
Internal_ForceMyEnumIntSize_cranking_obd_code = ENUM_32_BITS, Internal_ForceMyEnumIntSize_cranking_obd_code = ENUM_32_BITS,
} obd_code_e; } obd_code_e;

2
firmware/controllers/engine_controller.cpp
View File

@ -736,5 +736,5 @@ int getRusEfiVersion(void) {
if (initBootloader() != 0) if (initBootloader() != 0)
return 123; return 123;
#endif /* EFI_BOOTLOADER_INCLUDE_CODE */ #endif /* EFI_BOOTLOADER_INCLUDE_CODE */
return 20181030; return 20181120;
} }

3
firmware/controllers/map_averaging.cpp
View File

@ -228,11 +228,14 @@ void refreshMapAveragingPreCalc(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
if (isValidRpm(rpm)) { if (isValidRpm(rpm)) {
MAP_sensor_config_s * c = &engineConfiguration->map; MAP_sensor_config_s * c = &engineConfiguration->map;
angle_t start = interpolate2d("mapa", rpm, c->samplingAngleBins, c->samplingAngle, MAP_ANGLE_SIZE); angle_t start = interpolate2d("mapa", rpm, c->samplingAngleBins, c->samplingAngle, MAP_ANGLE_SIZE);
efiAssertVoid(CUSTOM_ERR_6690, !cisnan(start), "start");
angle_t offsetAngle = TRIGGER_SHAPE(eventAngles[CONFIG(mapAveragingSchedulingAtIndex)]); angle_t offsetAngle = TRIGGER_SHAPE(eventAngles[CONFIG(mapAveragingSchedulingAtIndex)]);
efiAssertVoid(CUSTOM_ERR_6691, !cisnan(offsetAngle), "offsetAngle");
for (int i = 0; i < engineConfiguration->specs.cylindersCount; i++) { for (int i = 0; i < engineConfiguration->specs.cylindersCount; i++) {
angle_t cylinderOffset = getEngineCycle(engineConfiguration->operationMode) * i / engineConfiguration->specs.cylindersCount; angle_t cylinderOffset = getEngineCycle(engineConfiguration->operationMode) * i / engineConfiguration->specs.cylindersCount;
efiAssertVoid(CUSTOM_ERR_6692, !cisnan(cylinderOffset), "cylinderOffset");
float cylinderStart = start + cylinderOffset - offsetAngle + tdcPosition(); float cylinderStart = start + cylinderOffset - offsetAngle + tdcPosition();
fixAngle(cylinderStart, "cylinderStart", CUSTOM_ERR_6562); fixAngle(cylinderStart, "cylinderStart", CUSTOM_ERR_6562);
engine->engineState.mapAveragingStart[i] = cylinderStart; engine->engineState.mapAveragingStart[i] = cylinderStart;