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

auto-sync

This commit is contained in:
rusEfi 2015-02-25 07:08:28 -06:00
parent c35dc0b4a9
commit 690139f638
6 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/config/stm32f4ems/efifeatures.h
View File

@ -112,10 +112,6 @@
*/
#define EFI_PROD_CODE TRUE
/**
* Do we need Malfunction Indicator blinking logic?
*/
#define EFI_MALFUNCTIONAL_INDICATOR TRUE
/**
* Do we need file logging (like SD card) logic?
*/
@ -155,6 +151,9 @@
//#define EFI_ELECTRONIC_THROTTLE_BODY TRUE
#define EFI_ELECTRONIC_THROTTLE_BODY FALSE
/**
* Do we need Malfunction Indicator blinking logic?
*/
#define EFI_MALFUNCTION_INDICATOR TRUE
//#define EFI_MALFUNCTION_INDICATOR FALSE

16
firmware/controllers/engine_controller.cpp
View File

@ -41,9 +41,9 @@
#include "allsensors.h"
#include "analog_chart.h"
#include "electronic_throttle.h"
#include "malfunction_indicator.h"
#include "map_averaging.h"
#include "malfunction_central.h"
#include "malfunction_indicator.h"
#include "engine.h"
#include "algo.h"
#include "LocalVersionHolder.h"
@ -386,7 +386,7 @@ static void setFloat(const char *offsetStr, const char *valueStr) {
getFloat(offset);
}
#if EFI_PROD_CODE
#if EFI_PROD_CODE || defined(__DOXYGEN__)
static void resetAccel(void) {
engine->accelEnrichment.reset();
}
@ -399,17 +399,17 @@ void initEngineContoller(Logging *sharedLogger, Engine *engine) {
initSensors(sharedLogger PASS_ENGINE_PARAMETER_F);
#if EFI_PROD_CODE
#if EFI_PROD_CODE || defined(__DOXYGEN__)
initPwmGenerator();
#endif
#if EFI_ANALOG_CHART
#if EFI_ANALOG_CHART || defined(__DOXYGEN__)
initAnalogChart();
#endif /* EFI_ANALOG_CHART */
initAlgo(sharedLogger, engineConfiguration);
#if EFI_WAVE_ANALYZER
#if EFI_WAVE_ANALYZER || defined(__DOXYGEN__)
if (engineConfiguration->isWaveAnalyzerEnabled) {
initWaveAnalyzer(sharedLogger);
}
@ -423,7 +423,7 @@ void initEngineContoller(Logging *sharedLogger, Engine *engine) {
initRpmCalculator(engine);
#endif /* EFI_SHAFT_POSITION_INPUT */
#if EFI_TUNER_STUDIO
#if EFI_TUNER_STUDIO || defined(__DOXYGEN__)
if (engineConfiguration->isTunerStudioEnabled) {
startTunerStudioConnectivity(sharedLogger);
}
@ -444,13 +444,13 @@ void initEngineContoller(Logging *sharedLogger, Engine *engine) {
prepareShapes(engine);
#endif
#if EFI_PWM_TESTER
#if EFI_PWM_TESTER || defined(__DOXYGEN__)
initPwmTester();
#endif
initMalfunctionCentral();
#if EFI_ELECTRONIC_THROTTLE_BODY
#if EFI_ELECTRONIC_THROTTLE_BODY || defined(__DOXYGEN__)
initElectronicThrottle();
#endif /* EFI_ELECTRONIC_THROTTLE_BODY */

3
firmware/controllers/malfunction_indicator.cpp
View File

@ -31,7 +31,7 @@
#include "malfunction_indicator.h"
#include "efiGpio.h"
#if EFI_MALFUNCTION_INDICATOR
#if EFI_MALFUNCTION_INDICATOR || defined(__DOXYGEN__)
#define MFI_LONG_BLINK 1500
#define MFI_SHORT_BLINK 400
@ -110,7 +110,6 @@ void initMalfunctionIndicator(Engine *engine) {
chThdCreateStatic(mfiThreadStack, sizeof(mfiThreadStack), LOWPRIO, (tfunc_t) mfiThread, NULL);
addConsoleAction("testmil", testMil);
}
#endif /* EFI_MALFUNCTION_INDICATOR */

4
firmware/controllers/malfunction_indicator.h
View File

@ -14,10 +14,10 @@
#include "main.h"
#include "engine.h"
#if EFI_MALFUNCTIONAL_INDICATOR
#if EFI_MALFUNCTION_INDICATOR || defined(__DOXYGEN__)
void initMalfunctionIndicator(Engine *engine);
#endif /* EFI_MALFUNCTIONAL_INDICATOR */
#endif /* EFI_MALFUNCTION_INDICATOR */
#endif /* MALFUNCTION_INDICATOR_H_ */

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

@ -403,14 +403,14 @@ void mainTriggerCallback(trigger_event_e ckpSignalType, uint32_t eventIndex DECL
#endif /* EFI_HISTOGRAMS */
}
#if EFI_PROD_CODE
#if EFI_WAVE_CHART || defined(__DOXYGEN__)
#include "wave_chart.h"
#endif
static void showTriggerHistogram(void) {
printAllCallbacksHistogram();
showMainHistogram();
#if EFI_PROD_CODE
#if EFI_WAVE_CHART || defined(__DOXYGEN__)
showWaveChartHistogram();
#endif
}

2
firmware/development/wave_chart.cpp
View File

@ -27,7 +27,7 @@
#include "main.h"
#include "wave_chart.h"
#if EFI_WAVE_CHART
#if EFI_WAVE_CHART || defined(__DOXYGEN__)
#include "engine_configuration.h"
#include "eficonsole.h"