From 79e3bb307dc6ba99e6215f2ba36925a396bcf32b Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Wed, 29 Jul 2020 02:29:55 -0700 Subject: [PATCH] misc --- firmware/controllers/engine_cycle/spark_logic.cpp | 2 -- firmware/controllers/sensors/converters/thermistor_func.h | 6 +++--- firmware/controllers/sensors/proxy_sensor.h | 2 +- firmware/controllers/sensors/sensor.cpp | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/firmware/controllers/engine_cycle/spark_logic.cpp b/firmware/controllers/engine_cycle/spark_logic.cpp index 5827e45ee8..adbc811848 100644 --- a/firmware/controllers/engine_cycle/spark_logic.cpp +++ b/firmware/controllers/engine_cycle/spark_logic.cpp @@ -191,8 +191,6 @@ if (engineConfiguration->debugMode == DBG_DWELL_METRIC) { { event->sparksRemaining--; - efitick_t nowNt = getTimeNowNt(); - efitick_t nextDwellStart = nowNt + engine->engineState.multispark.delay; efitick_t nextFiring = nextDwellStart + engine->engineState.multispark.dwell; diff --git a/firmware/controllers/sensors/converters/thermistor_func.h b/firmware/controllers/sensors/converters/thermistor_func.h index 98627b4e32..416ae9c751 100644 --- a/firmware/controllers/sensors/converters/thermistor_func.h +++ b/firmware/controllers/sensors/converters/thermistor_func.h @@ -20,7 +20,7 @@ public: private: // Steinhart-Hart coefficients - float m_a; - float m_b; - float m_c; + float m_a = 0; + float m_b = 0; + float m_c = 0; }; diff --git a/firmware/controllers/sensors/proxy_sensor.h b/firmware/controllers/sensors/proxy_sensor.h index 5518d4e108..257b4068b1 100644 --- a/firmware/controllers/sensors/proxy_sensor.h +++ b/firmware/controllers/sensors/proxy_sensor.h @@ -24,7 +24,7 @@ public: void showInfo(Logging* logger, const char* sensorName) const override; private: - SensorResult get() const { + SensorResult get() const override { return Sensor::get(m_proxiedSensor); } diff --git a/firmware/controllers/sensors/sensor.cpp b/firmware/controllers/sensors/sensor.cpp index c0127c5305..b328fe7bfb 100644 --- a/firmware/controllers/sensors/sensor.cpp +++ b/firmware/controllers/sensors/sensor.cpp @@ -51,7 +51,7 @@ bool Sensor::Register() { return false; } else { // put ourselves in the registry - s_sensorRegistry[getIndex()].sensor = this; + entry.sensor = this; return true; } }