rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master

This commit is contained in:
rusefillc 2020-12-03 09:34:37 -05:00
parent 92fe2e5fb9 4deb875204
commit eedc777609
5 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp
View File

@ -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:

6
firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp
View File

@ -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:

6
firmware/controllers/algo/auto_generated_enums.cpp
View File

@ -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:

6
firmware/hw_layer/adc/AdcConfiguration.h
View File

@ -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;
/**

5
firmware/hw_layer/adc/adc_inputs.cpp
View File

@ -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;
}