From 3072d54717976bce7cb2b4d93fcc3e0b4875cb36 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Mon, 15 Mar 2021 07:23:19 -0700 Subject: [PATCH] dead code, warnings (#2461) --- firmware/controllers/actuators/vvt.cpp | 1 + firmware/controllers/algo/engine.cpp | 2 +- firmware/controllers/algo/engine.h | 2 +- firmware/controllers/engine_cycle/rpm_calculator.cpp | 1 + firmware/controllers/sensors/sensor_info_printing.cpp | 2 +- firmware/controllers/trigger/trigger_central.cpp | 2 +- firmware/controllers/trigger/trigger_emulator_algo.cpp | 4 ---- firmware/hw_layer/adc/adc_inputs.cpp | 2 +- firmware/hw_layer/adc/adc_inputs.h | 2 +- firmware/hw_layer/mass_storage/compressed_block_device.cpp | 4 ++-- firmware/hw_layer/ports/stm32/stm32_adc_v2.cpp | 2 +- firmware/hw_layer/sensors/cj125.cpp | 2 +- 12 files changed, 12 insertions(+), 14 deletions(-) diff --git a/firmware/controllers/actuators/vvt.cpp b/firmware/controllers/actuators/vvt.cpp index b18c188273..860564785e 100644 --- a/firmware/controllers/actuators/vvt.cpp +++ b/firmware/controllers/actuators/vvt.cpp @@ -58,6 +58,7 @@ expected VvtController::getSetpoint() const { expected VvtController::getOpenLoop(angle_t target) const { // TODO: could we do VVT open loop? + UNUSED(target); return 0; } diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp index 4640958745..e1471e96a2 100644 --- a/firmware/controllers/algo/engine.cpp +++ b/firmware/controllers/algo/engine.cpp @@ -326,7 +326,7 @@ void Engine::updateSwitchInputs(DECLARE_ENGINE_PARAMETER_SIGNATURE) { #endif // EFI_GPIO_HARDWARE } -void Engine::onTriggerSignalEvent(efitick_t nowNt) { +void Engine::onTriggerSignalEvent() { isSpinning = true; } diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h index 908d242a8f..105a951658 100644 --- a/firmware/controllers/algo/engine.h +++ b/firmware/controllers/algo/engine.h @@ -316,7 +316,7 @@ public: /** * this is invoked each time we register a trigger tooth signal */ - void onTriggerSignalEvent(efitick_t nowNt); + void onTriggerSignalEvent(); EngineState engineState; SensorsState sensors; efitick_t mainRelayBenchStartNt = 0; diff --git a/firmware/controllers/engine_cycle/rpm_calculator.cpp b/firmware/controllers/engine_cycle/rpm_calculator.cpp index f7a581eb34..36741b8be4 100644 --- a/firmware/controllers/engine_cycle/rpm_calculator.cpp +++ b/firmware/controllers/engine_cycle/rpm_calculator.cpp @@ -322,6 +322,7 @@ static char rpmBuffer[_MAX_FILLER]; * digital sniffer. */ static void onTdcCallback(Engine *engine) { + UNUSED(engine); #if EFI_UNIT_TEST if (!engine->needTdcCallback) { return; diff --git a/firmware/controllers/sensors/sensor_info_printing.cpp b/firmware/controllers/sensors/sensor_info_printing.cpp index be3b69ef58..033c28d0ba 100644 --- a/firmware/controllers/sensors/sensor_info_printing.cpp +++ b/firmware/controllers/sensors/sensor_info_printing.cpp @@ -48,7 +48,7 @@ void RpmCalculator::showInfo(Logging* logger, const char* /*sensorName*/) const } void Lps25Sensor::showInfo(Logging* logger, const char* sensorName) const { - // TODO + scheduleMsg(logger, "%s: LPS25 baro %.2f kPa", sensorName, get().Value); } void LinearFunc::showInfo(Logging* logger, float testRawValue) const { diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp index 41004d31bb..f0829347f0 100644 --- a/firmware/controllers/trigger/trigger_central.cpp +++ b/firmware/controllers/trigger/trigger_central.cpp @@ -468,7 +468,7 @@ void TriggerCentral::handleShaftSignal(trigger_event_e signal, efitick_t timesta } } - engine->onTriggerSignalEvent(timestamp); + engine->onTriggerSignalEvent(); m_lastEventTimer.reset(timestamp); diff --git a/firmware/controllers/trigger/trigger_emulator_algo.cpp b/firmware/controllers/trigger/trigger_emulator_algo.cpp index 58b74034e6..3f5065d859 100644 --- a/firmware/controllers/trigger/trigger_emulator_algo.cpp +++ b/firmware/controllers/trigger/trigger_emulator_algo.cpp @@ -83,10 +83,6 @@ static float pwmSwitchTimesBuffer[PWM_PHASE_MAX_COUNT]; PwmConfig triggerSignal(pwmSwitchTimesBuffer, sr); -#define DO_NOT_STOP 999999999 - -static int stopEmulationAtIndex = DO_NOT_STOP; - static Logging *logger; static int atTriggerVersion = 0; diff --git a/firmware/hw_layer/adc/adc_inputs.cpp b/firmware/hw_layer/adc/adc_inputs.cpp index 75ded2ab24..df0d6ca036 100644 --- a/firmware/hw_layer/adc/adc_inputs.cpp +++ b/firmware/hw_layer/adc/adc_inputs.cpp @@ -375,7 +375,7 @@ static void setAdcDebugReporting(int value) { scheduleMsg(&logger, "adcDebug=%d", adcDebugReporting); } -void waitForSlowAdc(int lastAdcCounter) { +void waitForSlowAdc(uint32_t lastAdcCounter) { // we use slowAdcCounter instead of slowAdc.conversionCount because we need ADC_COMPLETE state // todo: use sync.objects? while (slowAdcCounter <= lastAdcCounter) { diff --git a/firmware/hw_layer/adc/adc_inputs.h b/firmware/hw_layer/adc/adc_inputs.h index 860dd7f197..83baa28956 100644 --- a/firmware/hw_layer/adc/adc_inputs.h +++ b/firmware/hw_layer/adc/adc_inputs.h @@ -43,7 +43,7 @@ adc_channel_e getAdcChannel(brain_pin_e pin); brain_pin_e getAdcChannelBrainPin(const char *msg, adc_channel_e hwChannel); // wait until at least 1 slowADC sampling is complete -void waitForSlowAdc(int lastAdcCounter = 0); +void waitForSlowAdc(uint32_t lastAdcCounter = 0); // get a number of completed slowADC samples int getSlowAdcCounter(); diff --git a/firmware/hw_layer/mass_storage/compressed_block_device.cpp b/firmware/hw_layer/mass_storage/compressed_block_device.cpp index 193b9d723a..f8bc382e87 100644 --- a/firmware/hw_layer/mass_storage/compressed_block_device.cpp +++ b/firmware/hw_layer/mass_storage/compressed_block_device.cpp @@ -51,11 +51,11 @@ static bool disconnect(void* instance) { return HAL_SUCCESS; } -static bool read(void* instance, uint32_t startblk, uint8_t* buffer, uint32_t n) { +static bool read(void* instance, uint32_t startblk, uint8_t* buffer, uint32_t /*n*/) { CompressedBlockDevice* cbd = reinterpret_cast(instance); // If we just initialized, or trying to seek backwards, (re)initialize the decompressor - if (cbd->lastBlock == -1 || startblk <= cbd->lastBlock) { + if (cbd->lastBlock == -1 || (int32_t)startblk <= cbd->lastBlock) { uzlib_uncompress_init(&cbd->d, cbd->dictionary, sizeof(cbd->dictionary)); cbd->d.source = cbd->source; diff --git a/firmware/hw_layer/ports/stm32/stm32_adc_v2.cpp b/firmware/hw_layer/ports/stm32/stm32_adc_v2.cpp index 4c8d39fba9..e77f773783 100644 --- a/firmware/hw_layer/ports/stm32/stm32_adc_v2.cpp +++ b/firmware/hw_layer/ports/stm32/stm32_adc_v2.cpp @@ -159,7 +159,7 @@ bool readSlowAnalogInputs(adcsample_t* convertedSamples) { } // Average samples to get some noise filtering and oversampling - for (int i = 0; i < slowChannelCount; i++) { + for (size_t i = 0; i < slowChannelCount; i++) { uint32_t sum = 0; size_t index = i; for (size_t j = 0; j < SLOW_ADC_OVERSAMPLE; j++) { diff --git a/firmware/hw_layer/sensors/cj125.cpp b/firmware/hw_layer/sensors/cj125.cpp index 9c0efdb2bd..0beef080fe 100644 --- a/firmware/hw_layer/sensors/cj125.cpp +++ b/firmware/hw_layer/sensors/cj125.cpp @@ -63,7 +63,7 @@ static SPIConfig cj125spicfg = { #endif /* HAL_USE_SPI */ -static volatile int lastSlowAdcCounter = 0; +static uint32_t lastSlowAdcCounter = 0; // LSU conversion tables. See cj125_sensor_type_e // For LSU4.2, See http://www.bosch-motorsport.com/media/catalog_resources/Lambda_Sensor_LSU_42_Datasheet_51_en_2779111435pdf.pdf