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

auto-sync

This commit is contained in:
rusEfi 2014-09-11 21:02:53 -05:00
parent 9d096ab649
commit a79d32aeac
4 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -257,6 +257,14 @@ void setDefaultConfiguration(engine_configuration_s *engineConfiguration, board_
engineConfiguration->isCylinderCleanupEnabled = true;
engineConfiguration->secondTriggerChannelEnabled = true;
engineConfiguration->isMapAveragingEnabled = true;
engineConfiguration->isMilEnabled = true;
engineConfiguration->isFuelPumpEnabled = true;
engineConfiguration->isTunerStudioEnabled = true;
engineConfiguration->isWaveAnalyzerEnabled = true;
engineConfiguration->isIdleThreadEnabled = true;
boardConfiguration->idleValvePin = GPIOE_2;
boardConfiguration->idleValvePinMode = OM_DEFAULT;
boardConfiguration->fuelPumpPin = GPIOC_13;

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

@ -404,6 +404,12 @@ typedef struct {
bool isCylinderCleanupEnabled : 1; // bit 2
bool secondTriggerChannelEnabled : 1; // bit 3
bool needSecondTriggerInput : 1; // bit 4
bool isMapAveragingEnabled : 1; // bit 5
bool isMilEnabled : 1; // bit 6
bool isFuelPumpEnabled : 1; // bit 7
bool isTunerStudioEnabled : 1; // bit 8
bool isWaveAnalyzerEnabled : 1; // bit 9
bool isIdleThreadEnabled : 1; // bit 10
int digitalChartSize;
/**

7
firmware/controllers/settings.cpp
View File

@ -102,6 +102,13 @@ void printConfiguration(engine_configuration_s *engineConfiguration, engine_conf
scheduleMsg(&logger, "injectionOffset=%f/enabled=%s", (double) engineConfiguration->injectionOffset,
boolToString(engineConfiguration->isInjectionEnabled));
scheduleMsg(&logger, "map_avg=%s/mil=%s/fp=%s/ts=%s/wa=%s/it=%s", boolToString(engineConfiguration->isMapAveragingEnabled),
boolToString(engineConfiguration->isMilEnabled),
boolToString(engineConfiguration->isFuelPumpEnabled),
boolToString(engineConfiguration->isTunerStudioEnabled),
boolToString(engineConfiguration->isWaveAnalyzerEnabled),
boolToString(engineConfiguration->isIdleThreadEnabled));
scheduleMsg(&logger, "crankingChargeAngle=%f", engineConfiguration->crankingChargeAngle);
scheduleMsg(&logger, "crankingTimingAngle=%f", engineConfiguration->crankingTimingAngle);
scheduleMsg(&logger, "globalTriggerAngleOffset=%f", engineConfiguration->globalTriggerAngleOffset);

12
firmware/emulation/analog_chart.c
View File

@ -22,11 +22,11 @@ static int initialized = FALSE;
extern engine_configuration_s *engineConfiguration;
void acAddData(float angle, float value) {
if (!initialized) {
if (!initialized) {
return; // this is possible because of initialization sequence
}
}
if( engineConfiguration->analogChartFrequency < 1) {
if (engineConfiguration->analogChartFrequency < 1) {
//todofirmwareError()
return;
}
@ -38,7 +38,7 @@ void acAddData(float angle, float value) {
// output pending data
if (getFullLog()) {
scheduleLogging(&logging);
}
}
pendingData = FALSE;
}
return;
@ -50,9 +50,9 @@ void acAddData(float angle, float value) {
appendPrintf(&logging, "analog_chart%s", DELIMETER);
}
if (remainingSize(&logging) > 100) {
if (remainingSize(&logging) > 100) {
appendPrintf(&logging, "%f|%f|", angle, value);
}
}
}
void initAnalogChart(void) {