From b2e26a2e2b618d14084e94280b33f650a24269b6 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Thu, 3 Dec 2020 06:38:53 +0000 Subject: [PATCH 1/2] Auto-generated configs and docs --- .../config/controllers/algo/auto_generated_enums.cpp | 6 +++--- .../config/controllers/algo/auto_generated_enums.cpp | 6 +++--- firmware/controllers/algo/auto_generated_enums.cpp | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp b/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp index 6f14c9032e..b27084e5df 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Thu Dec 03 06:24:35 UTC 2020 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Thu Dec 03 06:38:27 UTC 2020 // see also gen_config_and_enums.bat @@ -1387,8 +1387,6 @@ case TT_MAZDA_MIATA_VVT_TEST: return "TT_MAZDA_MIATA_VVT_TEST"; case TT_MAZDA_SOHC_4: return "TT_MAZDA_SOHC_4"; -case TT_UNUSED_42: - return "TT_UNUSED_42"; case TT_MIATA_VVT: return "TT_MIATA_VVT"; case TT_MITSUBISHI: @@ -1421,6 +1419,8 @@ case TT_TOOTHED_WHEEL_60_2: return "TT_TOOTHED_WHEEL_60_2"; case TT_UNUSED: return "TT_UNUSED"; +case TT_UNUSED_42: + return "TT_UNUSED_42"; case TT_UNUSED_6: return "TT_UNUSED_6"; case TT_VVT_BOSCH_QUICK_START: diff --git a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp index 243da13de7..91d3b1431a 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp +++ b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Thu Dec 03 06:24:34 UTC 2020 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Thu Dec 03 06:38:27 UTC 2020 // see also gen_config_and_enums.bat @@ -1183,8 +1183,6 @@ case TT_MAZDA_MIATA_VVT_TEST: return "TT_MAZDA_MIATA_VVT_TEST"; case TT_MAZDA_SOHC_4: return "TT_MAZDA_SOHC_4"; -case TT_UNUSED_42: - return "TT_UNUSED_42"; case TT_MIATA_VVT: return "TT_MIATA_VVT"; case TT_MITSUBISHI: @@ -1217,6 +1215,8 @@ case TT_TOOTHED_WHEEL_60_2: return "TT_TOOTHED_WHEEL_60_2"; case TT_UNUSED: return "TT_UNUSED"; +case TT_UNUSED_42: + return "TT_UNUSED_42"; case TT_UNUSED_6: return "TT_UNUSED_6"; case TT_VVT_BOSCH_QUICK_START: diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index 8c29fc828c..2721491481 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Thu Dec 03 06:24:33 UTC 2020 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Thu Dec 03 06:38:26 UTC 2020 // see also gen_config_and_enums.bat @@ -1329,8 +1329,6 @@ case TT_MAZDA_MIATA_VVT_TEST: return "TT_MAZDA_MIATA_VVT_TEST"; case TT_MAZDA_SOHC_4: return "TT_MAZDA_SOHC_4"; -case TT_UNUSED_42: - return "TT_UNUSED_42"; case TT_MIATA_VVT: return "TT_MIATA_VVT"; case TT_MITSUBISHI: @@ -1363,6 +1361,8 @@ case TT_TOOTHED_WHEEL_60_2: return "TT_TOOTHED_WHEEL_60_2"; case TT_UNUSED: return "TT_UNUSED"; +case TT_UNUSED_42: + return "TT_UNUSED_42"; case TT_UNUSED_6: return "TT_UNUSED_6"; case TT_VVT_BOSCH_QUICK_START: From 4deb87520478af69e634f0b2cbaaca2642428045 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Thu, 3 Dec 2020 06:27:27 -0600 Subject: [PATCH 2/2] 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; }