diff --git a/firmware/hw_layer/adc_inputs.cpp b/firmware/hw_layer/adc_inputs.cpp index 7cb58bae81..46226e2935 100644 --- a/firmware/hw_layer/adc_inputs.cpp +++ b/firmware/hw_layer/adc_inputs.cpp @@ -13,6 +13,7 @@ #include "pin_repository.h" #include "engine_math.h" +#include "board_test.h" #if EFI_SPEED_DENSITY #include "map_averaging.h" @@ -475,7 +476,7 @@ static void adc_callback_fast(ADCDriver *adcp, adcsample_t *buffer, size_t n) { } } -void initAdcInputs(void) { +void initAdcInputs(bool boardTestMode) { initLoggingExt(&logger, "ADC", LOGGING_BUFFER, sizeof(LOGGING_BUFFER)); printMsg(&logger, "initAdcInputs()"); @@ -503,7 +504,7 @@ void initAdcInputs(void) { slowAdc.init(); pwmStart(EFI_INTERNAL_SLOW_ADC_PWM, &pwmcfg_slow); - if (boardConfiguration->isFastAdcEnabled) { + if (boardConfiguration->isFastAdcEnabled || boardTestMode) { fastAdc.init(); /* * Initializes the PWM driver. diff --git a/firmware/hw_layer/adc_inputs.h b/firmware/hw_layer/adc_inputs.h index 2c92591a78..be52af29b0 100644 --- a/firmware/hw_layer/adc_inputs.h +++ b/firmware/hw_layer/adc_inputs.h @@ -14,7 +14,7 @@ const char * getAdcMode(adc_channel_e hwChannel); int getAdcChannelPin(adc_channel_e hwChannel); -void initAdcInputs(void); +void initAdcInputs(bool boardTestMode); GPIO_TypeDef* getAdcChannelPort(adc_channel_e hwChannel); adc_channel_e getAdcChannel(brain_pin_e pin); diff --git a/firmware/hw_layer/board_test.h b/firmware/hw_layer/board_test.h index a129fbca03..0b502e7b2c 100644 --- a/firmware/hw_layer/board_test.h +++ b/firmware/hw_layer/board_test.h @@ -22,12 +22,13 @@ #ifndef BOARD_TEST_H_ #define BOARD_TEST_H_ +void initBoardTest(void); + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -void initBoardTest(void); bool isBoardTestMode(void); void printBoardTestState(void); diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp index d41e5ac211..615c517df4 100644 --- a/firmware/hw_layer/hardware.cpp +++ b/firmware/hw_layer/hardware.cpp @@ -197,7 +197,7 @@ void initHardware(Logging *logger, Engine *engine) { mySetPadMode2("board test", boardConfiguration->boardTestModeJumperPin, PAL_MODE_INPUT_PULLUP); bool isBoardTestMode_b = GET_BOARD_TEST_MODE_VALUE(); - initAdcInputs(); + initAdcInputs(isBoardTestMode_b); if (isBoardTestMode_b) { initBoardTest(); diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 6efd1115bc..1230cfad09 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -249,5 +249,5 @@ void firmwareError(const char *fmt, ...) { } int getRusEfiVersion(void) { - return 20141021; + return 20141022; }