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 2014-12-06 15:03:17 -06:00
parent 76d14c02d4
commit f4ea15a227
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -572,7 +572,6 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType, Engine *e
firmwareError("Unexpected engine type: %d", engineType);
}
applyNonPersistentConfiguration(logger, engine);
parseUserFsio(PASS_ENGINE_PARAMETER_F);
#if EFI_TUNER_STUDIO
syncTunerStudioCopy();
@ -607,6 +606,7 @@ void applyNonPersistentConfiguration(Logging * logger, Engine *engine) {
return;
}
engine->engineCycleEventCount = engine->triggerShape.getLength();
parseUserFsio(PASS_ENGINE_PARAMETER_F);
}
void prepareShapes(Engine *engine) {

1
firmware/controllers/core/logic_expression.cpp
View File

@ -405,6 +405,7 @@ void initEval(Engine *engine) {
#endif
void parseUserFsio(DECLARE_ENGINE_PARAMETER_F) {
board_configuration_s * boardConfiguration = &engineConfiguration->bc;
for (int i = 0; i < LE_COMMAND_COUNT; i++) {
brain_pin_e brainPin = boardConfiguration->fsioPins[i];

10
firmware/controllers/engine_controller.cpp
View File

@ -340,6 +340,16 @@ static void showFsioInfo(void) {
showFsio("ac", acRelayLogic);
showFsio("fuel", fuelPumpLogic);
for (int i = 0; i < LE_COMMAND_COUNT; i++) {
char * exp = boardConfiguration->le_formulas[i];
if (exp[0] != 0) {
scheduleMsg(&logger, "FSIO #%d [%s] at %s@%dHz = %f", (i + 1), exp, hwPortname(boardConfiguration->fsioPins[i]),
boardConfiguration->fsioFrequency[i],
engineConfiguration2->fsioLastValue[i]);
showFsio("user-defined", fsioLogics[i]);
}
}
}
static void setFsioFrequency(int index, int frequency) {

8
firmware/controllers/settings.cpp
View File

@ -177,14 +177,6 @@ void printConfiguration(engine_configuration_s *engineConfiguration, engine_conf
printSpiState(&logger, boardConfiguration);
#endif /* EFI_PROD_CODE */
for (int i = 0; i < LE_COMMAND_COUNT; i++) {
char * exp = boardConfiguration->le_formulas[i];
if (exp[0] != 0) {
scheduleMsg(&logger, "FSIO #%d [%s] at %s@%dHz = %f", (i + 1), exp, hwPortname(boardConfiguration->fsioPins[i]),
boardConfiguration->fsioFrequency[i],
engineConfiguration2->fsioLastValue[i]);
}
}
}
extern engine_configuration_s *engineConfiguration;