diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index 642415935a..e165a2a28c 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -67,22 +67,19 @@ // this 'true' value is needed for simulator static volatile bool fullLog = true; -int warningEnabled = TRUE; +int warningEnabled = true; //int warningEnabled = FALSE; extern board_configuration_s *boardConfiguration; extern bool hasFirmwareErrorFlag; #define FULL_LOGGING_KEY "fl" -#if (EFI_PROD_CODE || EFI_SIMULATOR) || defined(__DOXYGEN__) static Logging logger; static void setWarningEnabled(int value) { warningEnabled = value; } -#endif /* EFI_PROD_CODE || EFI_SIMULATOR */ - #if EFI_FILE_LOGGING || defined(__DOXYGEN__) static Logging fileLogger; #endif /* EFI_FILE_LOGGING */ diff --git a/firmware/console_util/console_util.mk b/firmware/console_util/console_util.mk index 7a75ff1361..18660005bd 100644 --- a/firmware/console_util/console_util.mk +++ b/firmware/console_util/console_util.mk @@ -1,3 +1,2 @@ -CONSOLEUTILSRC = $(PROJECT_DIR)/console_util/datalogging.c \ - $(PROJECT_DIR)/console_util/rfiutil.c \ No newline at end of file +CONSOLEUTILSRC = $(PROJECT_DIR)/console_util/rfiutil.c \ No newline at end of file diff --git a/firmware/console_util/rfiutil.c b/firmware/console_util/rfiutil.c index de81f3a7d9..42e035c923 100644 --- a/firmware/console_util/rfiutil.c +++ b/firmware/console_util/rfiutil.c @@ -46,14 +46,14 @@ int mylog10(int param) { return mylog10(param / 10) + 1; } */ - +/* char hexChar(int v) { v = v & 0xF; if (v < 10) return (char)('0' + v); return 'A' - 10 + v; } - +*/ // todo: make this a macro? int isIsrContext(void) { /** diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp index 8ec7222292..9f752e4ebd 100644 --- a/firmware/controllers/algo/engine.cpp +++ b/firmware/controllers/algo/engine.cpp @@ -21,9 +21,7 @@ #define isRunningBenchTest() true #endif -#if EFI_PROD_CODE || EFI_SIMULATOR static Logging logger; -#endif EXTERN_ENGINE ; @@ -54,17 +52,13 @@ void Engine::precalc(engine_configuration_s *engineConfiguration) { } void Engine::init() { -#if EFI_PROD_CODE || EFI_SIMULATOR initLogging(&logger, "engine"); -#endif } static bool stopPin(io_pin_e pin) { if (getOutputPinValue(pin)) { setOutputPinValue(pin, 0); -#if EFI_PROD_CODE || EFI_SIMULATOR scheduleMsg(&logger, "turning off %s", getPinName(pin)); -#endif return true; } return false; @@ -120,15 +114,10 @@ void StartupFuelPumping::setPumpsCounter(engine_configuration_s *engineConfigura pumpsCounter = newValue; if (pumpsCounter == PUMPS_TO_PRIME) { -#if EFI_PROD_CODE || EFI_SIMULATOR scheduleMsg(&logger, "let's squirt prime pulse %f", pumpsCounter); -#endif pumpsCounter = 0; } else { -#if EFI_PROD_CODE || EFI_SIMULATOR scheduleMsg(&logger, "setPumpsCounter %d", pumpsCounter); -#endif - } } } diff --git a/firmware/controllers/algo/signal_executor.cpp b/firmware/controllers/algo/signal_executor.cpp index 1f332f621f..f7c55308c6 100644 --- a/firmware/controllers/algo/signal_executor.cpp +++ b/firmware/controllers/algo/signal_executor.cpp @@ -39,17 +39,13 @@ EXTERN_ENGINE; extern WaveChart waveChart; #endif -#if EFI_PROD_CODE || EFI_SIMULATOR static Logging logger; -#endif extern OutputPin outputs[IO_PIN_COUNT]; extern pin_output_mode_e *pinDefaultState[IO_PIN_COUNT]; void initSignalExecutor(void) { -#if EFI_PROD_CODE || EFI_SIMULATOR initLogging(&logger, "s exec"); -#endif initSignalExecutorImpl(); } diff --git a/firmware/controllers/trigger/rpm_calculator.cpp b/firmware/controllers/trigger/rpm_calculator.cpp index cf9bb3d357..dce964e9db 100644 --- a/firmware/controllers/trigger/rpm_calculator.cpp +++ b/firmware/controllers/trigger/rpm_calculator.cpp @@ -38,14 +38,9 @@ extern WaveChart waveChart; #define TOP_DEAD_CENTER_MESSAGE "r" -EXTERN_ENGINE -; +EXTERN_ENGINE; -#if EFI_PROD_CODE || EFI_SIMULATOR static Logging logger; -EXTERN_ENGINE -; -#endif RpmCalculator::RpmCalculator() { #if !EFI_PROD_CODE diff --git a/firmware/console_util/datalogging.c b/firmware/util/datalogging.c similarity index 100% rename from firmware/console_util/datalogging.c rename to firmware/util/datalogging.c index 7b4b97c10f..c242480769 100644 --- a/firmware/console_util/datalogging.c +++ b/firmware/util/datalogging.c @@ -32,11 +32,11 @@ #include #include "main.h" -#include "rfiutil.h" #include "chprintf.h" #include "chmtx.h" #include "memstreams.h" #include "console_io.h" +#include "rfiutil.h" // we use this magic constant to make sure it's not just a random non-zero int in memory #define MAGIC_LOGGING_FLAG 45234441 diff --git a/firmware/console_util/datalogging.h b/firmware/util/datalogging.h similarity index 100% rename from firmware/console_util/datalogging.h rename to firmware/util/datalogging.h diff --git a/firmware/util/util.mk b/firmware/util/util.mk index 7dd65ee922..996e11125f 100644 --- a/firmware/util/util.mk +++ b/firmware/util/util.mk @@ -1,8 +1,11 @@ -UTILSRC = $(PROJECT_DIR)/util/data_buffer.c \ - $(PROJECT_DIR)/util/crc.c \ +UTIL_TEST_SRC = $(PROJECT_DIR)/util/crc.c \ + $(PROJECT_DIR)/util/data_buffer.c \ $(PROJECT_DIR)/util/histogram.c \ $(PROJECT_DIR)/util/cli_registry.c + +UTILSRC = $(UTIL_TEST_SRC) \ + $(PROJECT_DIR)/console_util/datalogging.c UTILSRC_CPP = $(PROJECT_DIR)/util/cyclic_buffer.cpp \ $(PROJECT_DIR)/util/listener_array.cpp \ diff --git a/unit_tests/.cproject b/unit_tests/.cproject index 379751c48a..9dc616b547 100644 --- a/unit_tests/.cproject +++ b/unit_tests/.cproject @@ -75,7 +75,7 @@ - + @@ -123,7 +123,7 @@ - + diff --git a/unit_tests/Makefile b/unit_tests/Makefile index 2cbb06e040..d2fece4e25 100644 --- a/unit_tests/Makefile +++ b/unit_tests/Makefile @@ -84,7 +84,7 @@ include test.mk # C sources that can be compiled in ARM or THUMB mode depending on the global # setting. -CSRC = $(UTILSRC) \ +CSRC = $(UTIL_TEST_SRC) \ $(CONTROLLERS_ALGO_SRC) \ $(CONTROLLERS_CORE_SRC) \ $(CONTROLLERS_MATH_SRC) \ diff --git a/unit_tests/global.h b/unit_tests/global.h index 8a4caeddfa..2d05846d53 100644 --- a/unit_tests/global.h +++ b/unit_tests/global.h @@ -26,8 +26,6 @@ typedef int bool_t; -typedef void * Logging; - #define EFI_ERROR_CODE 0xffffffff #define TRUE 1 #define FALSE 0 diff --git a/unit_tests/main.cpp b/unit_tests/main.cpp index 3d880f6076..e549d7cd73 100644 --- a/unit_tests/main.cpp +++ b/unit_tests/main.cpp @@ -176,3 +176,9 @@ int warning(const char *fmt, ...) { bool isCranking(void) { return 0; } + +void initLogging(Logging *logging, const char *name) { +} + +void scheduleMsg(Logging *logging, const char *fmt, ...) { +} diff --git a/unit_tests/main.h b/unit_tests/main.h index b7a9a76a51..6df9d2e1f9 100644 --- a/unit_tests/main.h +++ b/unit_tests/main.h @@ -15,6 +15,7 @@ #include "global.h" #include "error_handling.h" #include "efifeatures.h" +#include "datalogging.h" #include "efilib.h" #include "efitime.h"