mirror of https://github.com/FOME-Tech/fome-fw.git
auto-sync
This commit is contained in:
parent
c02c25f5a1
commit
40488a0dcf
|
@ -13,6 +13,7 @@
|
||||||
|
|
||||||
#include "pin_repository.h"
|
#include "pin_repository.h"
|
||||||
#include "engine_math.h"
|
#include "engine_math.h"
|
||||||
|
#include "board_test.h"
|
||||||
|
|
||||||
#if EFI_SPEED_DENSITY
|
#if EFI_SPEED_DENSITY
|
||||||
#include "map_averaging.h"
|
#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));
|
initLoggingExt(&logger, "ADC", LOGGING_BUFFER, sizeof(LOGGING_BUFFER));
|
||||||
printMsg(&logger, "initAdcInputs()");
|
printMsg(&logger, "initAdcInputs()");
|
||||||
|
@ -503,7 +504,7 @@ void initAdcInputs(void) {
|
||||||
|
|
||||||
slowAdc.init();
|
slowAdc.init();
|
||||||
pwmStart(EFI_INTERNAL_SLOW_ADC_PWM, &pwmcfg_slow);
|
pwmStart(EFI_INTERNAL_SLOW_ADC_PWM, &pwmcfg_slow);
|
||||||
if (boardConfiguration->isFastAdcEnabled) {
|
if (boardConfiguration->isFastAdcEnabled || boardTestMode) {
|
||||||
fastAdc.init();
|
fastAdc.init();
|
||||||
/*
|
/*
|
||||||
* Initializes the PWM driver.
|
* Initializes the PWM driver.
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
const char * getAdcMode(adc_channel_e hwChannel);
|
const char * getAdcMode(adc_channel_e hwChannel);
|
||||||
int getAdcChannelPin(adc_channel_e hwChannel);
|
int getAdcChannelPin(adc_channel_e hwChannel);
|
||||||
void initAdcInputs(void);
|
void initAdcInputs(bool boardTestMode);
|
||||||
GPIO_TypeDef* getAdcChannelPort(adc_channel_e hwChannel);
|
GPIO_TypeDef* getAdcChannelPort(adc_channel_e hwChannel);
|
||||||
adc_channel_e getAdcChannel(brain_pin_e pin);
|
adc_channel_e getAdcChannel(brain_pin_e pin);
|
||||||
|
|
||||||
|
|
|
@ -22,12 +22,13 @@
|
||||||
#ifndef BOARD_TEST_H_
|
#ifndef BOARD_TEST_H_
|
||||||
#define BOARD_TEST_H_
|
#define BOARD_TEST_H_
|
||||||
|
|
||||||
|
void initBoardTest(void);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C"
|
extern "C"
|
||||||
{
|
{
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
void initBoardTest(void);
|
|
||||||
bool isBoardTestMode(void);
|
bool isBoardTestMode(void);
|
||||||
void printBoardTestState(void);
|
void printBoardTestState(void);
|
||||||
|
|
||||||
|
|
|
@ -197,7 +197,7 @@ void initHardware(Logging *logger, Engine *engine) {
|
||||||
mySetPadMode2("board test", boardConfiguration->boardTestModeJumperPin, PAL_MODE_INPUT_PULLUP);
|
mySetPadMode2("board test", boardConfiguration->boardTestModeJumperPin, PAL_MODE_INPUT_PULLUP);
|
||||||
bool isBoardTestMode_b = GET_BOARD_TEST_MODE_VALUE();
|
bool isBoardTestMode_b = GET_BOARD_TEST_MODE_VALUE();
|
||||||
|
|
||||||
initAdcInputs();
|
initAdcInputs(isBoardTestMode_b);
|
||||||
|
|
||||||
if (isBoardTestMode_b) {
|
if (isBoardTestMode_b) {
|
||||||
initBoardTest();
|
initBoardTest();
|
||||||
|
|
|
@ -249,5 +249,5 @@ void firmwareError(const char *fmt, ...) {
|
||||||
}
|
}
|
||||||
|
|
||||||
int getRusEfiVersion(void) {
|
int getRusEfiVersion(void) {
|
||||||
return 20141021;
|
return 20141022;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue