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 2015-02-10 22:04:38 -06:00
parent 3a74eb1c13
commit e105e7d2c0
5 changed files with 48 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
firmware/controllers/engine_controller.cpp
View File

@ -44,16 +44,18 @@
#include "malfunction_indicator.h"
#include "map_averaging.h"
#include "malfunction_central.h"
#include "pin_repository.h"
#include "engine.h"
#include "algo.h"
#if EFI_PROD_CODE
#include "pwm_generator.h"
#include "adc_inputs.h"
#include "algo.h"
#include "efilib2.h"
#include "PwmTester.h"
#include "engine.h"
#include "pin_repository.h"
#include "pwm_generator.h"
#include "lcd_controller.h"
#include "pin_repository.h"
#endif
extern bool hasFirmwareErrorFlag;
@ -152,6 +154,7 @@ static void updateErrorCodes(void) {
// }
//}
#if EFI_PROD_CODE || defined(__DOXYGEN__)
Overflow64Counter halTime;
//todo: macro to save method invocation
@ -173,6 +176,8 @@ int getTimeNowSeconds(void) {
return chTimeNow() / CH_FREQUENCY;
}
#endif /* EFI_PROD_CODE */
static void cylinderCleanupControl(Engine *engine) {
#if EFI_ENGINE_CONTROL || defined(__DOXYGEN__)
bool newValue;
@ -189,6 +194,7 @@ static void cylinderCleanupControl(Engine *engine) {
}
static void onEvenyGeneralMilliseconds(Engine *engine) {
#if EFI_PROD_CODE
/**
* We need to push current value into the 64 bit counter often enough so that we do not miss an overflow
*/
@ -197,8 +203,9 @@ static void onEvenyGeneralMilliseconds(Engine *engine) {
if (!alreadyLocked) {
unlockAnyContext();
}
#endif
#if EFI_ENGINE_CONTROL || defined(__DOXYGEN__)
#if (EFI_PROD_CODE && EFI_ENGINE_CONTROL )|| defined(__DOXYGEN__)
if (!engine->rpmCalculator.isRunning())
writeToFlashIfPending();
#endif
@ -206,7 +213,7 @@ static void onEvenyGeneralMilliseconds(Engine *engine) {
engine->watchdog();
engine->updateSlowSensors();
#if EFI_FSIO || defined(__DOXYGEN__)
#if (EFI_PROD_CODE && EFI_FSIO) || defined(__DOXYGEN__)
runFsio();
#endif
@ -219,7 +226,7 @@ static void onEvenyGeneralMilliseconds(Engine *engine) {
(vtfunc_t) &onEvenyGeneralMilliseconds, engine);
}
static void initPeriodicEvents(Engine *engine) {
void initPeriodicEvents(Engine *engine) {
// schedule first invocation
chVTSetAny(&everyMsTimer, boardConfiguration->generalPeriodicThreadPeriod * TICKS_IN_MS,
(vtfunc_t) &onEvenyGeneralMilliseconds, engine);
@ -340,7 +347,9 @@ void initEngineContoller(Logging *sharedLogger, Engine *engine) {
initSensors(PASS_ENGINE_PARAMETER_F);
#if EFI_PROD_CODE
initPwmGenerator();
#endif
#if EFI_ANALOG_CHART
initAnalogChart();
@ -373,7 +382,7 @@ void initEngineContoller(Logging *sharedLogger, Engine *engine) {
chThdCreateStatic(csThreadStack, sizeof(csThreadStack), LOWPRIO, (tfunc_t) csThread, NULL);
#if EFI_ENGINE_CONTROL || defined(__DOXYGEN__)
#if (EFI_PROD_CODE && EFI_ENGINE_CONTROL) || defined(__DOXYGEN__)
initInjectorCentral(engine);
initIgnitionCentral();
/**
@ -429,7 +438,7 @@ void initEngineContoller(Logging *sharedLogger, Engine *engine) {
addConsoleActionI("get_int", getInt);
addConsoleActionI("get_short", getShort);
#if EFI_FSIO || defined(__DOXYGEN__)
#if (EFI_PROD_CODE && EFI_FSIO) || defined(__DOXYGEN__)
initFsioImpl(sharedLogger, engine);
#endif

1
firmware/controllers/engine_controller.h
View File

@ -15,6 +15,7 @@
#include "engine.h"
char * getPinNameByAdcChannel(adc_channel_e hwChannel, char *buffer);
void initPeriodicEvents(Engine *engine);
void initEngineContoller(Logging *sharedLogger, Engine *engine);
#endif /* ENGINE_STATUS_H_ */

1
win32_functional_tests/Makefile
View File

@ -120,6 +120,7 @@ CSRC = ${PORTSRC} \
CPPSRC = $(UTILSRC_CPP) \
$(CONTROLLERS_ALGO_SRC_CPP) \
$(PROJECT_DIR)/controllers/settings.cpp \
$(PROJECT_DIR)/controllers/engine_controller.cpp \
$(PROJECT_DIR)/development/analog_chart.cpp \
$(TRIGGER_SRC_CPP) \
$(TRIGGER_DECODERS_SRC_CPP) \

2
win32_functional_tests/simulator/framework.cpp
View File

@ -16,10 +16,12 @@ uint64_t getTimeNowUs(void) {
return chTimeNow() * (1000000 / CH_FREQUENCY);
}
// todo; reduce code duplication with prod code?
efitimems_t currentTimeMillis(void) {
return getTimeNowUs() / 1000;
}
// todo; reduce code duplication with prod code?
int getTimeNowSeconds(void) {
return chTimeNow() / CH_FREQUENCY;
}

35
win32_functional_tests/simulator/rusEfiFunctionalTest.cpp
View File

@ -27,9 +27,15 @@
#include "engine.h"
#include "tunerstudio.h"
#include "trigger_emulator.h"
#include "engine_controller.h"
static Engine _engine;
Engine *engine = &_engine;
// todo: reuse the instance from engine_controller?
//static Engine _engine;
//Engine *engine = &_engine;
EXTERN_ENGINE;
extern engine_configuration2_s * engineConfiguration2;
extern WaveChart waveChart;
@ -38,14 +44,14 @@ uint32_t maxLockTime = 0;
// todo: move this field to trigger_central
bool isInsideTriggerHandler;
persistent_config_container_s persistentState;
static engine_configuration2_s ec2;
//persistent_config_container_s persistentState;
//static engine_configuration2_s ec2;
static LoggingWithStorage sharedLogger("simulator");
engine_configuration_s * engineConfiguration = &persistentState.persistentConfiguration.engineConfiguration;
board_configuration_s *boardConfiguration = &persistentState.persistentConfiguration.engineConfiguration.bc;
engine_configuration2_s *engineConfiguration2 = &ec2;
//engine_configuration_s * engineConfiguration = &persistentState.persistentConfiguration.engineConfiguration;
//board_configuration_s *boardConfiguration = &persistentState.persistentConfiguration.engineConfiguration.bc;
//engine_configuration2_s *engineConfiguration2 = &ec2;
void outputPinRegisterExt2(const char *msg, OutputPin *output, brain_pin_e brainPin, pin_output_mode_e *outputMode) {
}
@ -76,15 +82,19 @@ void rusEfiFunctionalTest(void) {
engine->engineConfiguration = engineConfiguration;
engine->engineConfiguration2 = engineConfiguration2;
// todo: reduce code duplication with initEngineContoller
resetConfigurationExt(NULL, FORD_ASPIRE_1996, engine);
prepareShapes(engine);
initThermistors(PASS_ENGINE_PARAMETER_F);
initSensors(PASS_ENGINE_PARAMETER_F);
initAlgo(engineConfiguration);
initRpmCalculator(engine);
#if EFI_ANALOG_CHART
initAnalogChart();
#endif /* EFI_ANALOG_CHART */
initTriggerEmulator(&sharedLogger, engine);
@ -93,7 +103,14 @@ void rusEfiFunctionalTest(void) {
initTriggerCentral(&sharedLogger, engine);
startStatusThreads(engine);
startTunerStudioConnectivity(&sharedLogger);
#if EFI_TUNER_STUDIO
if (engineConfiguration->isTunerStudioEnabled) {
startTunerStudioConnectivity(&sharedLogger);
}
#endif
initPeriodicEvents(engine);
}
void printPendingMessages(void) {