diff --git a/firmware/config/stm32f4ems/efifeatures.h b/firmware/config/stm32f4ems/efifeatures.h index 0222e988c8..a58bc6cd4d 100644 --- a/firmware/config/stm32f4ems/efifeatures.h +++ b/firmware/config/stm32f4ems/efifeatures.h @@ -143,7 +143,7 @@ #define EFI_ENGINE_SNIFFER TRUE #define EFI_HISTOGRAMS FALSE -#define EFI_ANALOG_CHART TRUE +#define EFI_SENSOR_CHART TRUE #if defined __GNUC__ #define EFI_PERF_METRICS FALSE diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index db9aa67c39..dd4a21908f 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -506,9 +506,9 @@ void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S) { initPwmGenerator(); #endif -#if EFI_ANALOG_CHART || defined(__DOXYGEN__) +#if EFI_SENSOR_CHART || defined(__DOXYGEN__) initSensorChart(); -#endif /* EFI_ANALOG_CHART */ +#endif /* EFI_SENSOR_CHART */ initAlgo(sharedLogger, engineConfiguration); diff --git a/firmware/controllers/map_averaging.cpp b/firmware/controllers/map_averaging.cpp index 71c313ed7d..a75942b01e 100644 --- a/firmware/controllers/map_averaging.cpp +++ b/firmware/controllers/map_averaging.cpp @@ -34,9 +34,9 @@ #include "engine.h" #include "engine_math.h" -#if EFI_ANALOG_CHART || defined(__DOXYGEN__) +#if EFI_SENSOR_CHART || defined(__DOXYGEN__) #include "sensor_chart.h" -#endif /* EFI_ANALOG_CHART */ +#endif /* EFI_SENSOR_CHART */ #define FAST_MAP_CHART_SKIP_FACTOR 16 @@ -116,7 +116,7 @@ void mapAveragingCallback(adcsample_t adcValue) { measurementsPerRevolutionCounter++; efiAssertVoid(getRemainingStack(chThdSelf()) > 128, "lowstck#9a"); -#if (EFI_ANALOG_CHART && EFI_ANALOG_SENSORS) || defined(__DOXYGEN__) +#if (EFI_SENSOR_CHART && EFI_ANALOG_SENSORS) || defined(__DOXYGEN__) if (boardConfiguration->sensorChartMode == SC_MAP) { if (measurementsPerRevolutionCounter % FAST_MAP_CHART_SKIP_FACTOR == 0) { @@ -127,7 +127,7 @@ void mapAveragingCallback(adcsample_t adcValue) { currentPressure); } } -#endif /* EFI_ANALOG_CHART */ +#endif /* EFI_SENSOR_CHART */ /** * Local copy is now safe, but it's an overkill: we only diff --git a/firmware/controllers/trigger/rpm_calculator.cpp b/firmware/controllers/trigger/rpm_calculator.cpp index 8daf4c8b65..df7383fca3 100644 --- a/firmware/controllers/trigger/rpm_calculator.cpp +++ b/firmware/controllers/trigger/rpm_calculator.cpp @@ -24,7 +24,7 @@ #include "engine.h" #endif -#if EFI_ANALOG_CHART || defined(__DOXYGEN__) +#if EFI_SENSOR_CHART || defined(__DOXYGEN__) #include "sensor_chart.h" #endif @@ -164,7 +164,7 @@ void rpmShaftPositionCallback(trigger_event_e ckpSignalType, efiAssertVoid(getRemainingStack(chThdSelf()) > 256, "lowstck#2z"); #endif -#if EFI_ANALOG_CHART || defined(__DOXYGEN__) +#if EFI_SENSOR_CHART || defined(__DOXYGEN__) angle_t crankAngle = NAN; int signal = -1; if (boardConfiguration->sensorChartMode == SC_TRIGGER) { @@ -174,7 +174,7 @@ void rpmShaftPositionCallback(trigger_event_e ckpSignalType, #endif if (index != 0) { -#if EFI_ANALOG_CHART || defined(__DOXYGEN__) +#if EFI_SENSOR_CHART || defined(__DOXYGEN__) if (boardConfiguration->sensorChartMode == SC_TRIGGER) { scAddData(crankAngle, signal); } @@ -203,7 +203,7 @@ void rpmShaftPositionCallback(trigger_event_e ckpSignalType, } rpmState->onNewEngineCycle(); rpmState->lastRpmEventTimeNt = nowNt; -#if EFI_ANALOG_CHART || defined(__DOXYGEN__) +#if EFI_SENSOR_CHART || defined(__DOXYGEN__) if (boardConfiguration->sensorChartMode == SC_TRIGGER) { scAddData(crankAngle, signal); } diff --git a/firmware/controllers/trigger/trigger_decoder.cpp b/firmware/controllers/trigger/trigger_decoder.cpp index 2c512cc4aa..54bd74062f 100644 --- a/firmware/controllers/trigger/trigger_decoder.cpp +++ b/firmware/controllers/trigger/trigger_decoder.cpp @@ -37,7 +37,7 @@ #include "engine.h" #include "engine_math.h" -#if EFI_ANALOG_CHART || defined(__DOXYGEN__) +#if EFI_SENSOR_CHART || defined(__DOXYGEN__) #include "sensor_chart.h" #endif @@ -126,7 +126,7 @@ void TriggerState::decodeTriggerEvent(trigger_event_e const signal, efitime_t no prevSignal = curSignal; curSignal = signal; -#if EFI_ANALOG_CHART || defined(__DOXYGEN__) +#if EFI_SENSOR_CHART || defined(__DOXYGEN__) if (boardConfiguration->sensorChartMode == SC_RPM_ACCEL) { angle_t currentAngle = TRIGGER_SHAPE(eventAngles[currentCycle.current_index]); // todo: make this '90' depend on cylinder count? diff --git a/firmware/development/rfi_perftest.cpp b/firmware/development/rfi_perftest.cpp index 7e9b7e0d4d..f9f8094f4b 100644 --- a/firmware/development/rfi_perftest.cpp +++ b/firmware/development/rfi_perftest.cpp @@ -286,7 +286,7 @@ static void runChibioTest(void) { print("EFI_MAP_AVERAGING=%d\r\n", EFI_MAP_AVERAGING); print("EFI_WAVE_ANALYZER=%d\r\n", EFI_WAVE_ANALYZER); print("EFI_ENGINE_SNIFFER=%d\r\n", EFI_ENGINE_SNIFFER); - print("EFI_ANALOG_CHART=%d\r\n", EFI_ANALOG_CHART); + print("EFI_SENSOR_CHART=%d\r\n", EFI_SENSOR_CHART); print("EFI_SHAFT_POSITION_INPUT=%d\r\n", EFI_SHAFT_POSITION_INPUT); print("EFI_ENGINE_CONTROL=%d\r\n", EFI_ENGINE_CONTROL); print("CH_DBG_SYSTEM_STATE_CHECK=%d\r\n", CH_DBG_SYSTEM_STATE_CHECK); diff --git a/firmware/development/sensor_chart.cpp b/firmware/development/sensor_chart.cpp index e1f9c7aadf..01bc4bd48e 100644 --- a/firmware/development/sensor_chart.cpp +++ b/firmware/development/sensor_chart.cpp @@ -11,7 +11,7 @@ #include "rpm_calculator.h" #include "status_loop.h" -#if EFI_ANALOG_CHART || defined(__DOXYGEN__) +#if EFI_SENSOR_CHART || defined(__DOXYGEN__) static char LOGGING_BUFFER[5000]; static Logging logging("analog chart", LOGGING_BUFFER, sizeof(LOGGING_BUFFER)); @@ -76,4 +76,4 @@ void initSensorChart(void) { initialized = true; } -#endif /* EFI_ANALOG_CHART */ +#endif /* EFI_SENSOR_CHART */ diff --git a/firmware/util/datalogging.cpp b/firmware/util/datalogging.cpp index 23ce18dbea..b76ab525d5 100644 --- a/firmware/util/datalogging.cpp +++ b/firmware/util/datalogging.cpp @@ -41,9 +41,6 @@ #include "rfiutil.h" #include "loggingcentral.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 - static MemoryStream intermediateLoggingBuffer; static uint8_t intermediateLoggingBufferData[INTERMEDIATE_LOGGING_BUFFER_SIZE] CCM_OPTIONAL; //todo define max-printf-buffer @@ -142,11 +139,11 @@ void initLoggingExt(Logging *logging, const char *name, char *buffer, int buffer logging->buffer = buffer; logging->bufferSize = bufferSize; resetLogging(logging); - logging->isInitialized = MAGIC_LOGGING_FLAG; + logging->isInitialized = true; } int isInitialized(Logging *logging) { - return logging->isInitialized == MAGIC_LOGGING_FLAG; + return logging->isInitialized; } void debugInt(Logging *logging, const char *caption, int value) { diff --git a/firmware/util/datalogging.h b/firmware/util/datalogging.h index b486e9234e..e5374f9c58 100644 --- a/firmware/util/datalogging.h +++ b/firmware/util/datalogging.h @@ -35,7 +35,7 @@ public: */ char *linePointer; int bufferSize; - volatile int isInitialized; + volatile bool_t isInitialized; }; class LoggingWithStorage : public Logging {