mirror of https://github.com/rusefi/rusefi-1.git
fixing build
This commit is contained in:
parent
7c31baa327
commit
b1f66d43ce
|
@ -68,6 +68,7 @@ void Engine::updateSlowSensors(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
|
||||||
|
|
||||||
engineState.updateSlowSensors(PASS_ENGINE_PARAMETER_SIGNATURE);
|
engineState.updateSlowSensors(PASS_ENGINE_PARAMETER_SIGNATURE);
|
||||||
|
|
||||||
|
// todo: move this logic somewhere to sensors folder?
|
||||||
if (engineConfiguration->fuelLevelSensor != EFI_ADC_NONE) {
|
if (engineConfiguration->fuelLevelSensor != EFI_ADC_NONE) {
|
||||||
float fuelLevelVoltage = getVoltageDivided("fuel", engineConfiguration->fuelLevelSensor);
|
float fuelLevelVoltage = getVoltageDivided("fuel", engineConfiguration->fuelLevelSensor);
|
||||||
sensors.fuelTankGauge = interpolate(boardConfiguration->fuelLevelEmptyTankVoltage, 0,
|
sensors.fuelTankGauge = interpolate(boardConfiguration->fuelLevelEmptyTankVoltage, 0,
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
#include "fsio_core.h"
|
#include "fsio_core.h"
|
||||||
#include "fsio_impl.h"
|
#include "fsio_impl.h"
|
||||||
#include "adc_inputs.h"
|
#include "analog_input.h"
|
||||||
|
|
||||||
extern fsio8_Map3D_f32t fsioTable1;
|
extern fsio8_Map3D_f32t fsioTable1;
|
||||||
extern fsio8_Map3D_u8t fsioTable2;
|
extern fsio8_Map3D_u8t fsioTable2;
|
||||||
|
|
|
@ -22,9 +22,7 @@
|
||||||
#include "oil_pressure.h"
|
#include "oil_pressure.h"
|
||||||
#include "adc_inputs.h"
|
#include "adc_inputs.h"
|
||||||
|
|
||||||
#if EFI_PROD_CODE || EFI_SIMULATOR
|
#include "analog_input.h"
|
||||||
#include "adc_inputs.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void initSensors(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX);
|
void initSensors(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX);
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,20 @@
|
||||||
|
/*
|
||||||
|
* analog_input.h
|
||||||
|
*
|
||||||
|
* @date Nov 24, 2017
|
||||||
|
* @author Andrey Belomutskiy, (c) 2012-2017
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef CONTROLLERS_SENSORS_ANALOG_INPUT_H_
|
||||||
|
#define CONTROLLERS_SENSORS_ANALOG_INPUT_H_
|
||||||
|
|
||||||
|
#if EFI_PROD_CODE
|
||||||
|
#include "adc_inputs.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if EFI_SIMULATOR
|
||||||
|
#include "adc_math.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* CONTROLLERS_SENSORS_ANALOG_INPUT_H_ */
|
|
@ -10,8 +10,8 @@
|
||||||
*/
|
*/
|
||||||
#include "ego.h"
|
#include "ego.h"
|
||||||
#include "interpolation.h"
|
#include "interpolation.h"
|
||||||
#include "adc_inputs.h"
|
|
||||||
#include "engine.h"
|
#include "engine.h"
|
||||||
|
#include "analog_input.h"
|
||||||
|
|
||||||
EXTERN_ENGINE;
|
EXTERN_ENGINE;
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
#include "engine.h"
|
#include "engine.h"
|
||||||
#include "adc_inputs.h"
|
#include "analog_input.h"
|
||||||
#include "maf.h"
|
#include "maf.h"
|
||||||
|
|
||||||
EXTERN_ENGINE
|
EXTERN_ENGINE
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
#include "engine_configuration.h"
|
#include "engine_configuration.h"
|
||||||
#include "engine_math.h"
|
#include "engine_math.h"
|
||||||
#include "adc_inputs.h"
|
#include "analog_input.h"
|
||||||
#include "interpolation.h"
|
#include "interpolation.h"
|
||||||
#include "error_handling.h"
|
#include "error_handling.h"
|
||||||
#include "map.h"
|
#include "map.h"
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
/**
|
/**
|
||||||
* @author Matthew Kennedy, (c) 2017
|
* @author Matthew Kennedy, (c) 2017
|
||||||
*/
|
*/
|
||||||
|
#include "main.h"
|
||||||
#include "oil_pressure.h"
|
#include "oil_pressure.h"
|
||||||
#include "interpolation.h"
|
#include "interpolation.h"
|
||||||
#include "adc_inputs.h"
|
#include "analog_input.h"
|
||||||
#include "engine.h"
|
#include "engine.h"
|
||||||
|
|
||||||
EXTERN_ENGINE;
|
EXTERN_ENGINE;
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
#include "thermistors.h"
|
#include "thermistors.h"
|
||||||
#include "adc_inputs.h"
|
#include "analog_input.h"
|
||||||
#include "engine_configuration.h"
|
#include "engine_configuration.h"
|
||||||
#include "engine_math.h"
|
#include "engine_math.h"
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,10 @@
|
||||||
/**
|
/**
|
||||||
* @author Andrey Belomutskiy, (c) 2012-2017
|
* @author Andrey Belomutskiy, (c) 2012-2017
|
||||||
*/
|
*/
|
||||||
#include "main.h"
|
#include "engine.h"
|
||||||
#include "tps.h"
|
#include "tps.h"
|
||||||
#include "engine_configuration.h"
|
|
||||||
#include "interpolation.h"
|
#include "interpolation.h"
|
||||||
#include "adc_inputs.h"
|
#include "analog_input.h"
|
||||||
#include "allsensors.h"
|
|
||||||
|
|
||||||
EXTERN_ENGINE;
|
EXTERN_ENGINE;
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
#include "engine.h"
|
#include "engine.h"
|
||||||
#include "adc_inputs.h"
|
#include "analog_input.h"
|
||||||
#include "voltage.h"
|
#include "voltage.h"
|
||||||
|
|
||||||
EXTERN_ENGINE;
|
EXTERN_ENGINE;
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
#include "engine_math.h"
|
#include "engine_math.h"
|
||||||
#include "alternatorController.h"
|
#include "alternatorController.h"
|
||||||
#include "idle_thread.h"
|
#include "idle_thread.h"
|
||||||
|
#include "allsensors.h"
|
||||||
|
|
||||||
#if EFI_PROD_CODE || defined(__DOXYGEN__)
|
#if EFI_PROD_CODE || defined(__DOXYGEN__)
|
||||||
#include "vehicle_speed.h"
|
#include "vehicle_speed.h"
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
/**
|
/**
|
||||||
* @file adc_math.h
|
* @file adc_math.h
|
||||||
*
|
*
|
||||||
* todo: all this looks to be about internal ADC, merge this file with
|
* todo: all this looks to be about internal ADC, merge this file with adc_inputs.h?
|
||||||
|
* these macro are also used in simulator so maybe not really merging with adc_inputs.h until simulator get's it's own implementation?
|
||||||
*
|
*
|
||||||
* @date Mar 18, 2014
|
* @date Mar 18, 2014
|
||||||
* @author Andrey Belomutskiy, (c) 2012-2017
|
* @author Andrey Belomutskiy, (c) 2012-2017
|
||||||
|
|
Loading…
Reference in New Issue