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

auto-sync

This commit is contained in:
rusEfi 2014-11-15 11:03:07 -06:00
parent 9b8af9e9f1
commit 9d3de521c3
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/engines/test_engine.cpp
View File

@ -11,7 +11,7 @@
#include "test_engine.h" #include "test_engine.h"
void setTestEngineConfiguration(engine_configuration_s *engineConfiguration) { void setTestEngineConfiguration(engine_configuration_s *engineConfiguration) {
// engineConfiguration->triggerConfig.triggerType = TT_TOOTHED_WHEEL; engineConfiguration->triggerConfig.triggerType = TT_TOOTHED_WHEEL;
trigger_config_s *triggerConfig = &engineConfiguration->triggerConfig; trigger_config_s *triggerConfig = &engineConfiguration->triggerConfig;
triggerConfig->customIsSynchronizationNeeded = false; triggerConfig->customIsSynchronizationNeeded = false;

2
firmware/controllers/flash_main.h
View File

@ -12,7 +12,7 @@
#include "engine_configuration.h" #include "engine_configuration.h"
#include "engine.h" #include "engine.h"
#define FLASH_DATA_VERSION 5343 #define FLASH_DATA_VERSION 5376
void readFromFlash(void); void readFromFlash(void);
void initFlash(Engine *engine); void initFlash(Engine *engine);

2
firmware/controllers/trigger/trigger_emulator_algo.cpp
View File

@ -113,7 +113,7 @@ static void emulatorApplyPinState(PwmConfig *state, int stateIndex) {
if (!isEmulating) { if (!isEmulating) {
return; return;
} }
#if EFI_PROD_CODE #if EFI_PROD_CODE || defined(__DOXYGEN__)
applyPinState(state, stateIndex); applyPinState(state, stateIndex);
#endif /* EFI_PROD_CODE */ #endif /* EFI_PROD_CODE */
if (engineConfiguration->directSelfStimulation) { if (engineConfiguration->directSelfStimulation) {

13
firmware/rusefi.cpp
View File

@ -106,8 +106,8 @@ extern "C" {
#include "rfi_perftest.h" #include "rfi_perftest.h"
#include "rusefi.h" #include "rusefi.h"
#include "memstreams.h"
} }
#include "memstreams.h"
#include "eficonsole.h" #include "eficonsole.h"
#include "status_loop.h" #include "status_loop.h"
@ -117,7 +117,7 @@ extern "C" {
#include "lcd_HD44780.h" #include "lcd_HD44780.h"
#endif /* EFI_HD44780_LCD */ #endif /* EFI_HD44780_LCD */
#if EFI_ENGINE_EMULATOR #if EFI_ENGINE_EMULATOR || defined(__DOXYGEN__)
#include "engine_emulator.h" #include "engine_emulator.h"
#endif /* EFI_ENGINE_EMULATOR */ #endif /* EFI_ENGINE_EMULATOR */
@ -175,11 +175,11 @@ void runRusEfi(void) {
*/ */
initEngineContoller(engine); initEngineContoller(engine);
#if EFI_PERF_METRICS #if EFI_PERF_METRICS || defined(__DOXYGEN__)
initTimePerfActions(); initTimePerfActions();
#endif #endif
#if EFI_ENGINE_EMULATOR #if EFI_ENGINE_EMULATOR || defined(__DOXYGEN__)
initEngineEmulator(engine); initEngineEmulator(engine);
#endif #endif
startStatusThreads(engine); startStatusThreads(engine);
@ -193,7 +193,7 @@ void runRusEfi(void) {
while (TRUE) { while (TRUE) {
efiAssertVoid(getRemainingStack(chThdSelf()) > 128, "stack#1"); efiAssertVoid(getRemainingStack(chThdSelf()) > 128, "stack#1");
#if EFI_CLI_SUPPORT && !EFI_UART_ECHO_TEST_MODE #if (EFI_CLI_SUPPORT && !EFI_UART_ECHO_TEST_MODE) || defined(__DOXYGEN__)
// sensor state + all pending messages for our own dev console // sensor state + all pending messages for our own dev console
updateDevConsoleState(engine); updateDevConsoleState(engine);
#endif /* EFI_CLI_SUPPORT */ #endif /* EFI_CLI_SUPPORT */
@ -204,6 +204,7 @@ void runRusEfi(void) {
static virtual_timer_t resetTimer; static virtual_timer_t resetTimer;
// todo: move this into a hw-specific file
static void rebootNow(void) { static void rebootNow(void) {
NVIC_SystemReset(); NVIC_SystemReset();
} }
@ -252,5 +253,5 @@ void firmwareError(const char *fmt, ...) {
} }
int getRusEfiVersion(void) { int getRusEfiVersion(void) {
return 20141114; return 20141115;
} }