From 93d4e5c5c62f4f3f94b9945af9a40ea052096682 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Wed, 14 Jan 2015 20:03:44 -0600 Subject: [PATCH] auto-sync --- firmware/controllers/engine_controller.cpp | 2 +- firmware/controllers/map_averaging.cpp | 8 ++++---- firmware/controllers/map_averaging.h | 2 +- firmware/controllers/trigger/rpm_calculator.cpp | 3 +-- firmware/controllers/trigger/trigger_decoder.cpp | 14 +++++--------- firmware/controllers/trigger/trigger_decoder.h | 2 +- firmware/hw_layer/hardware.cpp | 2 +- firmware/rusefi.cpp | 2 +- .../simulator/rusEfiFunctionalTest.cpp | 16 ++++++++++------ 9 files changed, 25 insertions(+), 26 deletions(-) diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index e20b381591..be207f5319 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -378,7 +378,7 @@ void initEngineContoller(Logging *sharedLogger, Engine *engine) { #if EFI_MAP_AVERAGING || defined(__DOXYGEN__) if (engineConfiguration->isMapAveragingEnabled) { - initMapAveraging(engine); + initMapAveraging(sharedLogger, engine); } #endif /* EFI_MAP_AVERAGING */ diff --git a/firmware/controllers/map_averaging.cpp b/firmware/controllers/map_averaging.cpp index 84262c7f9a..1c52187b44 100644 --- a/firmware/controllers/map_averaging.cpp +++ b/firmware/controllers/map_averaging.cpp @@ -39,7 +39,7 @@ #define FAST_MAP_CHART_SKIP_FACTOR 16 -static LoggingWithStorage logger; +static Logging *logger; /** * Running counter of measurements per revolution @@ -153,7 +153,7 @@ static void mapAveragingCallback(trigger_event_e ckpEventType, uint32_t index DE } static void showMapStats(void) { - scheduleMsg(&logger, "per revolution %d", perRevolution); + scheduleMsg(logger, "per revolution %d", perRevolution); } float getMapVoltage(void) { @@ -170,8 +170,8 @@ float getMap(void) { return getMapByVoltage(v_averagedMapValue); } -void initMapAveraging(Engine *engine) { - initLogging(&logger, "Map Averaging"); +void initMapAveraging(Logging *sharedLogger, Engine *engine) { + logger = sharedLogger; startTimer[0].name = "map start0"; startTimer[1].name = "map start1"; diff --git a/firmware/controllers/map_averaging.h b/firmware/controllers/map_averaging.h index 5a2bd6be8d..c8c7d1141e 100644 --- a/firmware/controllers/map_averaging.h +++ b/firmware/controllers/map_averaging.h @@ -13,7 +13,7 @@ #if HAL_USE_ADC || defined(__DOXYGEN__) void mapAveragingCallback(adcsample_t newValue); -void initMapAveraging(Engine *engine); +void initMapAveraging(Logging *sharedLogger, Engine *engine); #endif diff --git a/firmware/controllers/trigger/rpm_calculator.cpp b/firmware/controllers/trigger/rpm_calculator.cpp index 583d3930c8..5410211add 100644 --- a/firmware/controllers/trigger/rpm_calculator.cpp +++ b/firmware/controllers/trigger/rpm_calculator.cpp @@ -37,7 +37,7 @@ extern WaveChart waveChart; EXTERN_ENGINE; -static LoggingWithStorage logger; +static Logging * logger; RpmCalculator::RpmCalculator() { #if !EFI_PROD_CODE @@ -223,7 +223,6 @@ float getCrankshaftAngleNt(uint64_t timeNt DECLARE_ENGINE_PARAMETER_S) { void initRpmCalculator(Engine *engine) { #if (EFI_PROD_CODE || EFI_SIMULATOR) || defined(__DOXYGEN__) - initLogging(&logger, "rpm calc"); tdcScheduler[0].name = "tdc0"; tdcScheduler[1].name = "tdc1"; diff --git a/firmware/controllers/trigger/trigger_decoder.cpp b/firmware/controllers/trigger/trigger_decoder.cpp index b56663664f..974783d749 100644 --- a/firmware/controllers/trigger/trigger_decoder.cpp +++ b/firmware/controllers/trigger/trigger_decoder.cpp @@ -50,9 +50,7 @@ bool printGapRatio = false; float actualSynchGap; #endif /* ! EFI_PROD_CODE */ -#if (EFI_PROD_CODE || EFI_SIMULATOR) -static LoggingWithStorage logger; -#endif +static Logging * logger; /** * @return TRUE is something is wrong with trigger decoding @@ -170,7 +168,7 @@ void TriggerState::decodeTriggerEvent(trigger_event_e const signal, uint64_t now #endif /* EFI_PROD_CODE */ float gap = 1.0 * currentDuration / toothed_previous_duration; #if EFI_PROD_CODE - scheduleMsg(&logger, "gap=%f @ %d", gap, current_index); + scheduleMsg(logger, "gap=%f @ %d", gap, current_index); #else actualSynchGap = gap; print("current gap %f\r\n", gap); @@ -198,7 +196,7 @@ void TriggerState::decodeTriggerEvent(trigger_event_e const signal, uint64_t now totalTriggerErrorCounter++; if (engineConfiguration->isPrintTriggerSynchDetails) { #if EFI_PROD_CODE - scheduleMsg(&logger, "error: synchronizationPoint @ index %d expected %d/%d/%d got %d/%d/%d", current_index, + scheduleMsg(logger, "error: synchronizationPoint @ index %d expected %d/%d/%d got %d/%d/%d", current_index, TRIGGER_SHAPE(expectedEventCount[0]), TRIGGER_SHAPE(expectedEventCount[1]), TRIGGER_SHAPE(expectedEventCount[2]), eventCount[0], eventCount[1], eventCount[2]); #endif /* EFI_PROD_CODE */ @@ -444,10 +442,8 @@ uint32_t findTriggerZeroEventIndex(TriggerShape * shape, trigger_config_s const* //static Logging logger; #endif -void initTriggerDecoderLogger(void) { -#if (EFI_PROD_CODE || EFI_SIMULATOR) - initLogging(&logger, "trigger decoder"); -#endif +void initTriggerDecoderLogger(Logging *sharedLogger) { + logger = sharedLogger; } void initTriggerDecoder(void) { diff --git a/firmware/controllers/trigger/trigger_decoder.h b/firmware/controllers/trigger/trigger_decoder.h index 0817a164db..87d57adbac 100644 --- a/firmware/controllers/trigger/trigger_decoder.h +++ b/firmware/controllers/trigger/trigger_decoder.h @@ -90,7 +90,7 @@ class Engine; void initializeTriggerShape(Logging *logger, engine_configuration_s const *engineConfiguration, Engine *engine); void initTriggerDecoder(void); -void initTriggerDecoderLogger(void); +void initTriggerDecoderLogger(Logging *sharedLogger); bool_t isTriggerDecoderError(void); diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp index 457daa20ed..4c4535c89a 100644 --- a/firmware/hw_layer/hardware.cpp +++ b/firmware/hw_layer/hardware.cpp @@ -184,7 +184,7 @@ void initHardware(Logging *l, Engine *engine) { * which would be used while finding trigger synch index * while config read */ - initTriggerDecoderLogger(); + initTriggerDecoderLogger(sharedLogger); /** * We need the LED_ERROR pin even before we read configuration diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 658f780380..19ffbe10c1 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -253,7 +253,7 @@ void firmwareError(const char *fmt, ...) { } } -static char UNUSED_RAM_SIZE[5500]; +static char UNUSED_RAM_SIZE[6000]; static char UNUSED_CCM_SIZE[8000] CCM_OPTIONAL; diff --git a/win32_functional_tests/simulator/rusEfiFunctionalTest.cpp b/win32_functional_tests/simulator/rusEfiFunctionalTest.cpp index ffc3650e59..0394470a94 100644 --- a/win32_functional_tests/simulator/rusEfiFunctionalTest.cpp +++ b/win32_functional_tests/simulator/rusEfiFunctionalTest.cpp @@ -41,6 +41,8 @@ bool isInsideTriggerHandler; persistent_config_container_s persistentState; static engine_configuration2_s ec2; +static LoggingWithStorage sharedLogger; + engine_configuration_s * engineConfiguration = &persistentState.persistentConfiguration.engineConfiguration; board_configuration_s *boardConfiguration = &persistentState.persistentConfiguration.engineConfiguration.bc; engine_configuration2_s *engineConfiguration2 = &ec2; @@ -48,9 +50,9 @@ engine_configuration2_s *engineConfiguration2 = &ec2; void outputPinRegisterExt2(const char *msg, OutputPin *output, brain_pin_e brainPin, pin_output_mode_e *outputMode) { } -int isInjectionEnabled(void) { - return TRUE; -} +//int isInjectionEnabled(void) { +// return true; +//} int getRemainingStack(Thread *otp) { return 99999; @@ -68,6 +70,8 @@ void rusEfiFunctionalTest(void) { initFakeBoard(); + initLogging(&sharedLogger, "simulator"); + initStatusLoop(engine); initDataStructures(PASS_ENGINE_PARAMETER_F); @@ -84,14 +88,14 @@ void rusEfiFunctionalTest(void) { initAnalogChart(); - initTriggerEmulator(engine); + initTriggerEmulator(&sharedLogger, engine); - initMainEventListener(engine); + initMainEventListener(&sharedLogger, engine); initTriggerCentral(engine); startStatusThreads(engine); - startTunerStudioConnectivity(); + startTunerStudioConnectivity(&sharedLogger); } void printPendingMessages(void) {