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

auto-sync

This commit is contained in:
rusEfi 2016-12-13 14:01:43 -05:00
parent 615dbe81be
commit e11767cc50
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1818,8 +1818,8 @@ typedef enum {
CUSTOM_ERR_6138 = 6138, CUSTOM_ERR_6138 = 6138,
CUSTOM_ERR_6139 = 6139, CUSTOM_ERR_6139 = 6139,
CUSTOM_ERR_6140 = 6140, CUSTOM_ERR_TOO_FEW_EVENTS = 6140,
CUSTOM_ERR_6141 = 6141, CUSTOM_ERR_FLASH_CRC_FAILED = 6141,
CUSTOM_ERR_6142 = 6142, CUSTOM_ERR_6142 = 6142,
CUSTOM_ERR_6143 = 6143, CUSTOM_ERR_6143 = 6143,
CUSTOM_ERR_6144 = 6144, CUSTOM_ERR_6144 = 6144,

1
firmware/controllers/flash_main.cpp
View File

@ -110,6 +110,7 @@ persisted_configuration_state_e readConfiguration(Logging * logger) {
persisted_configuration_state_e result; persisted_configuration_state_e result;
if (!isValidCrc(&persistentState)) { if (!isValidCrc(&persistentState)) {
result = CRC_FAILED; result = CRC_FAILED;
warning(CUSTOM_ERR_FLASH_CRC_FAILED, "flash CRC failed");
resetConfigurationExt(logger, DEFAULT_ENGINE_TYPE PASS_ENGINE_PARAMETER); resetConfigurationExt(logger, DEFAULT_ENGINE_TYPE PASS_ENGINE_PARAMETER);
} else if (persistentState.version != FLASH_DATA_VERSION || persistentState.size != PERSISTENT_SIZE) { } else if (persistentState.version != FLASH_DATA_VERSION || persistentState.size != PERSISTENT_SIZE) {
result = INCOMPATIBLE_VERSION; result = INCOMPATIBLE_VERSION;

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

@ -82,11 +82,11 @@ void TriggerShape::calculateTriggerSynchPoint(TriggerState *state DECLARE_ENGINE
} }
int totalExpected = 0; int totalExpected = 0;
for (int i = 0;i<PWM_PHASE_MAX_WAVE_PER_PWM;i++) { for (int i = 0;i < PWM_PHASE_MAX_WAVE_PER_PWM;i++) {
totalExpected += expectedEventCount[i]; totalExpected += expectedEventCount[i];
} }
if (totalExpected < 2) { if (totalExpected < 2) {
firmwareError(CUSTOM_ERR_6140, "Too few trigger events"); firmwareError(CUSTOM_ERR_TOO_FEW_EVENTS, "Too few trigger events");
} }
} }

2
firmware/rusefi.cpp
View File

@ -290,5 +290,5 @@ int getRusEfiVersion(void) {
return 123; // this is here to make the compiler happy about the unused array return 123; // this is here to make the compiler happy about the unused array
if (UNUSED_CCM_SIZE[0] * 0 != 0) if (UNUSED_CCM_SIZE[0] * 0 != 0)
return 3211; // this is here to make the compiler happy about the unused array return 3211; // this is here to make the compiler happy about the unused array
return 20161201; return 20161213;
} }