From 4deb87520478af69e634f0b2cbaaca2642428045 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Thu, 3 Dec 2020 06:27:27 -0600 Subject: [PATCH] fix warnings (#2003) Co-authored-by: Matthew Kennedy --- firmware/hw_layer/adc/AdcConfiguration.h | 6 +++--- firmware/hw_layer/adc/adc_inputs.cpp | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/firmware/hw_layer/adc/AdcConfiguration.h b/firmware/hw_layer/adc/AdcConfiguration.h index 96911d28d5..96cbd94f92 100644 --- a/firmware/hw_layer/adc/AdcConfiguration.h +++ b/firmware/hw_layer/adc/AdcConfiguration.h @@ -28,8 +28,8 @@ public: bool isHwUsed(adc_channel_e hwChannel) const; int size() const; void init(void); - int conversionCount; - int errorsCount; + uint32_t conversionCount = 0; + uint32_t errorsCount = 0; int getAdcValueByIndex(int internalIndex) const; void invalidateSamplesCache(); @@ -38,7 +38,7 @@ public: int getAdcValueByHwChannel(adc_channel_e hwChannel) const; adc_state values; - int channelCount; + size_t channelCount = 0; private: ADCConversionGroup* hwConfig; /** diff --git a/firmware/hw_layer/adc/adc_inputs.cpp b/firmware/hw_layer/adc/adc_inputs.cpp index 6e4965d5c1..3845fc38af 100644 --- a/firmware/hw_layer/adc/adc_inputs.cpp +++ b/firmware/hw_layer/adc/adc_inputs.cpp @@ -64,9 +64,6 @@ float getVoltage(const char *msg, adc_channel_e hwChannel DECLARE_ENGINE_PARAMET AdcDevice::AdcDevice(ADCConversionGroup* hwConfig, adcsample_t *buf) { this->hwConfig = hwConfig; this->samples = buf; - channelCount = 0; - conversionCount = 0; - errorsCount = 0; hwConfig->sqr1 = 0; hwConfig->sqr2 = 0; @@ -342,7 +339,7 @@ void AdcDevice::init(void) { } bool AdcDevice::isHwUsed(adc_channel_e hwChannelIndex) const { - for (int i = 0; i < channelCount; i++) { + for (size_t i = 0; i < channelCount; i++) { if (hardwareIndexByIndernalAdcIndex[i] == hwChannelIndex) { return true; }