FOME-Tech
/
fome-fw
mirror of https://github.com/FOME-Tech/fome-fw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2015-01-12 18:05:46 -06:00
parent a174734294
commit 3106182831
47 changed files with 98 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/console/status_loop.cpp
View File

@ -26,7 +26,6 @@
#include "main.h"
#include "status_loop.h"
#include "ec2.h"
#include "adc_inputs.h"
#if EFI_WAVE_ANALYZER || defined(__DOXYGEN__)

42
firmware/controllers/algo/ec2.h
View File

@ -12,48 +12,6 @@
#ifndef EC2_H_
#define EC2_H_
#include "global.h"
#include "engine_configuration.h"
#include "event_registry.h"
#include "trigger_structure.h"
#include "table_helper.h"
class FuelSchedule {
public:
FuelSchedule();
void clear();
ActuatorEventList events;
void addFuelEvents(injection_mode_e mode DECLARE_ENGINE_PARAMETER_S);
void registerInjectionEvent(
io_pin_e pin, float angle, bool_t isSimultanious DECLARE_ENGINE_PARAMETER_S);
uint8_t hasEvents[PWM_PHASE_MAX_COUNT];
};
/**
* this part of the structure is separate just because so far
* these fields are not integrated with Tuner Studio. Step by step :)
*/
class engine_configuration2_s {
// todo: move these fields into Engine class, eliminate this class
public:
engine_configuration2_s();
#if EFI_ENGINE_CONTROL || defined(__DOXYGEN__)
FuelSchedule crankingInjectionEvents;
FuelSchedule injectionEvents;
#endif
float fsioLastValue[LE_COMMAND_COUNT];
/**
* We are alternating two event lists in order to avoid a potential issue around revolution boundary
* when an event is scheduled within the next revolution.
*/
IgnitionEventList ignitionEvents[2];
};
#endif /* EC2_H_ */

45
firmware/controllers/algo/engine.h
View File

@ -9,9 +9,52 @@
#include "main.h"
#include "engine_configuration.h"
#include "ec2.h"
#include "rpm_calculator.h"
#include "global.h"
#include "engine_configuration.h"
#include "event_registry.h"
#include "trigger_structure.h"
#include "table_helper.h"
class FuelSchedule {
public:
FuelSchedule();
void clear();
ActuatorEventList events;
void addFuelEvents(injection_mode_e mode DECLARE_ENGINE_PARAMETER_S);
void registerInjectionEvent(
io_pin_e pin, float angle, bool_t isSimultanious DECLARE_ENGINE_PARAMETER_S);
uint8_t hasEvents[PWM_PHASE_MAX_COUNT];
};
/**
* this part of the structure is separate just because so far
* these fields are not integrated with Tuner Studio. Step by step :)
*/
class engine_configuration2_s {
// todo: move these fields into Engine class, eliminate this class
public:
engine_configuration2_s();
#if EFI_ENGINE_CONTROL || defined(__DOXYGEN__)
FuelSchedule crankingInjectionEvents;
FuelSchedule injectionEvents;
#endif
float fsioLastValue[LE_COMMAND_COUNT];
/**
* We are alternating two event lists in order to avoid a potential issue around revolution boundary
* when an event is scheduled within the next revolution.
*/
IgnitionEventList ignitionEvents[2];
};
class EngineState {
public:
/**

1
firmware/controllers/engine_controller.cpp
View File

@ -49,7 +49,6 @@
#include "adc_inputs.h"
#include "algo.h"
#include "efilib2.h"
#include "ec2.h"
#include "PwmTester.h"
#include "engine.h"
#include "pin_repository.h"

1
firmware/controllers/injector_central.cpp
View File

@ -32,7 +32,6 @@
#include "main_trigger_callback.h"
#include "engine_configuration.h"
#include "pin_repository.h"
#include "ec2.h"
#include "efiGpio.h"
static Logging logger;

1
firmware/controllers/math/engine_math.h
View File

@ -10,7 +10,6 @@
#include "engine_configuration.h"
#include "ec2.h"
#include "trigger_structure.h"
#include "table_helper.h"
#include "engine.h"

2
firmware/controllers/math/speed_density.h
View File

@ -7,8 +7,6 @@
#ifndef SPEED_DENSITY_H_
#define SPEED_DENSITY_H_
#include "engine_configuration.h"
#include "ec2.h"
#include "engine.h"
float getTCharge(int rpm, float tps, float coolantTemp, float airTemp);

1
firmware/controllers/settings.cpp
View File

@ -16,7 +16,6 @@
#include "adc_inputs.h"
#include "interpolation.h"
#include "tps.h"
#include "ec2.h"
#include "map.h"
#include "trigger_decoder.h"
#include "console_io.h"

1
firmware/controllers/trigger/main_trigger_callback.cpp
View File

@ -33,7 +33,6 @@
#if EFI_ENGINE_CONTROL || defined(__DOXYGEN__)
#include "main_trigger_callback.h"
#include "ec2.h"
#include "engine_math.h"
#include "trigger_central.h"

2
firmware/controllers/trigger/main_trigger_callback.h
View File

@ -16,8 +16,6 @@
#define MAX_IGNITER_COUNT 4
#ifdef __cplusplus
#include "engine_configuration.h"
#include "ec2.h"
#include "event_registry.h"
#include "engine.h"

21
firmware/controllers/trigger/rpm_calculator.cpp
View File

@ -12,31 +12,28 @@
#include "main.h"
#include "rpm_calculator.h"
#if EFI_WAVE_CHART
#include "wave_chart.h"
extern WaveChart waveChart;
#endif /* EFI_WAVE_CHART */
#if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__)
#include "rpm_calculator.h"
#include "trigger_central.h"
#include "engine_configuration.h"
#include "ec2.h"
#include "engine_math.h"
#if EFI_PROD_CODE
#include "rfiutil.h"
#include "engine.h"
#endif
#if EFI_ANALOG_CHART
#if ! EFI_UNIT_TEST
#include "analog_chart.h"
#endif /* EFI_PROD_CODE */
#endif
#include "efilib2.h"
#define TOP_DEAD_CENTER_MESSAGE "r"
#if EFI_WAVE_CHART
#include "wave_chart.h"
extern WaveChart waveChart;
#endif /* EFI_WAVE_CHART */
EXTERN_ENGINE;
@ -125,8 +122,6 @@ bool isCranking(void) {
}
#endif
extern uint32_t triggerHanlderEntryTime;
/**
* @brief Shaft position callback used by RPM calculation logic.
*

13
firmware/controllers/trigger/rpm_calculator.h
View File

@ -12,6 +12,8 @@
#include <global.h>
#include "engine_configuration.h"
#define TOP_DEAD_CENTER_MESSAGE "r"
#define WC_DOWN "d"
#define WC_UP "u"
#define WC_CRANK1 "c1"
@ -78,14 +80,11 @@ void initRpmCalculator(Engine *engine);
float getCrankshaftAngleNt(uint64_t timeNt DECLARE_ENGINE_PARAMETER_S);
#endif
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
bool isCranking(void);
int getRevolutionCounter(void);
bool isCranking(void);
#define isValidRpm(rpm) ((rpm) > 0 && (rpm) < UNREALISTIC_RPM)
#if EFI_WAVE_CHART
@ -95,6 +94,10 @@ int getRevolutionCounter(void);
#endif /* EFI_WAVE_CHART */
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#ifdef __cplusplus
}
#endif /* __cplusplus */

3
firmware/controllers/trigger/trigger_bmw.h
View File

@ -7,8 +7,7 @@
#ifndef TRIGGER_BMW_H_
#define TRIGGER_BMW_H_
#include "engine_configuration.h"
#include "ec2.h"
#include "engine.h"
void configureMiniCooperTriggerShape(trigger_shape_s *s);

7
firmware/controllers/trigger/trigger_central.cpp
View File

@ -228,8 +228,11 @@ void triggerInfo(Engine *engine) {
trigger_shape_s *ts = &engine->triggerShape;
scheduleMsg(&logger, "Template %s/%d trigger %d", getConfigurationName(engineConfiguration->engineType),
engineConfiguration->engineType, engineConfiguration->triggerConfig.triggerType);
scheduleMsg(&logger, "Template %s (%d) trigger %s (%d)",
getConfigurationName(engineConfiguration->engineType),
engineConfiguration->engineType,
getTrigger_type_e(engineConfiguration->triggerConfig.triggerType),
engineConfiguration->triggerConfig.triggerType);
scheduleMsg(&logger, "trigger event counters %d/%d/%d/%d", triggerCentral.getHwEventCounter(0),
triggerCentral.getHwEventCounter(1), triggerCentral.getHwEventCounter(2),

1
firmware/controllers/trigger/trigger_central.h
View File

@ -16,7 +16,6 @@ class Engine;
typedef void (*ShaftPositionListener)(trigger_event_e signal, uint32_t index DECLARE_ENGINE_PARAMETER_S);
#ifdef __cplusplus
#include "ec2.h"
#include "engine.h"
#define HW_EVENT_TYPES 6

1
firmware/controllers/trigger/trigger_decoder.h
View File

@ -10,7 +10,6 @@
#include "trigger_structure.h"
#include "engine_configuration.h"
#include "ec2.h"
class TriggerState;

1
firmware/controllers/trigger/trigger_emulator_algo.cpp
View File

@ -11,7 +11,6 @@
#include "trigger_emulator_algo.h"
#include "engine_configuration.h"
#include "LocalVersionHolder.h"
#include "ec2.h"
#include "trigger_central.h"
#if EFI_PROD_CODE

3
firmware/controllers/trigger/trigger_mazda.h
View File

@ -9,8 +9,7 @@
#define TRIGGER_MAZDA_H_
#include "trigger_structure.h"
#include "engine_configuration.h"
#include "ec2.h"
#include "engine.h"
#define MIATA_NA_GAP 1.4930f

9
firmware/development/analog_chart.h
View File

@ -8,16 +8,9 @@
#ifndef ANALOG_CHART_H_
#define ANALOG_CHART_H_
#ifdef __cplusplus
extern "C"
{
#endif /* __cplusplus */
#include "global.h"
void acAddData(float angle, float value);
void initAnalogChart(void);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* ANALOG_CHART_H_ */

5
firmware/development/wave_chart.h
View File

@ -13,7 +13,6 @@
#if EFI_WAVE_CHART
#include "datalogging.h"
#endif /* EFI_WAVE_CHART */
/**
* @brief Dev console sniffer data buffer
@ -28,9 +27,7 @@ public:
void publishChartIfFull();
void addWaveChartEvent3(const char *name, const char *msg);
private:
#if EFI_WAVE_CHART
Logging logging;
#endif /* EFI_WAVE_CHART */
uint32_t counter;
uint64_t startTimeNt;
volatile int isInitialized;
@ -40,4 +37,6 @@ void initWaveChart(WaveChart *chart);
void showWaveChartHistogram(void);
void setChartSize(int newSize);
#endif /* EFI_WAVE_CHART */
#endif /* WAVE_CHART_H_ */

1
firmware/hw_layer/hardware.cpp
View File

@ -37,7 +37,6 @@
#include "trigger_central.h"
#include "svnversion.h"
#include "engine_configuration.h"
#include "ec2.h"
#endif
#if EFI_INTERNAL_FLASH

1
firmware/rusefi.cpp
View File

@ -96,7 +96,6 @@
#include "main.h"
#include "trigger_structure.h"
#include "ec2.h"
#include "hardware.h"
#include "engine_controller.h"
#include "efiGpio.h"

2
unit_tests/adc_inputs.h
View File

@ -2,7 +2,7 @@
* @file adc_inputs.h
*
* @date Dec 7, 2013
* @author Andrey Belomutskiy, (c) 2012-2013
* @author Andrey Belomutskiy, (c) 2012-2015
*/
#ifndef ADC_INPUTS_H_

2
unit_tests/boards.cpp
View File

@ -2,7 +2,7 @@
* @file board.c
*
* @date Nov 15, 2013
* @author Andrey Belomutskiy, (c) 2012-2013
* @author Andrey Belomutskiy, (c) 2012-2015
*/
#include "boards.h"

2
unit_tests/boards.h
View File

@ -2,7 +2,7 @@
* boards.h
*
* Created on: Nov 15, 2013
* Author: Andrey Belomutskiy, (c) 2012-2013
* Author: Andrey Belomutskiy, (c) 2012-2015
*/
#ifndef BOARDS_H_

3
unit_tests/main.cpp
View File

@ -26,11 +26,12 @@
#include "test_idle_controller.h"
#include "test_signal_executor.h"
extern "C"
{
#include "map_resize.h"
#include "test_event_registry.h"
#include "test_signal_executor.h"
#include "test_util.h"
}

2
unit_tests/map_resize.cpp
View File

@ -2,7 +2,7 @@
* @file map_resize.c
*
* @date Jan 12, 2014
* @author Andrey Belomutskiy, (c) 2012-2013
* @author Andrey Belomutskiy, (c) 2012-2015
*/
#include <stdio.h>

2
unit_tests/map_resize.h
View File

@ -2,7 +2,7 @@
* @file map_resize.h
*
* @date Jan 12, 2014
* @author Andrey Belomutskiy, (c) 2012-2013
* @author Andrey Belomutskiy, (c) 2012-2015
*/
#ifndef MAP_RESIZE_H_

2
unit_tests/test_accel_enrichment.cpp
View File

@ -3,7 +3,7 @@
*
* Created on: apr 29, 2014
* Author: Dmitry Sidin
* Author: Andrey Belomutskiy, (c) 2012-2013
* Author: Andrey Belomutskiy, (c) 2012-2015
*/
#include "main.h"

2
unit_tests/test_accel_enrichment.h
View File

@ -3,7 +3,7 @@
*
* Created on: apr 29, 2014
* Author: Dmitry Sidin
* Author: Andrey Belomutskiy, (c) 2012-2013
* Author: Andrey Belomutskiy, (c) 2012-2015
*/
#ifndef TEST_ACCEL_ENRICHMENT_H_

2
unit_tests/test_basic_math/test_find_index.cpp
View File

@ -2,7 +2,7 @@
* test_find_index.cpp
*
* Created on: Oct 30, 2013
* Author: Andrey Belomutskiy, (c) 2012-2013
* Author: Andrey Belomutskiy, (c) 2012-2015
*/
#include "main.h"

2
unit_tests/test_basic_math/test_find_index.h
View File

@ -2,7 +2,7 @@
* test_find_index.h
*
* Created on: Oct 30, 2013
* Author: Andrey Belomutskiy, (c) 2012-2013
* Author: Andrey Belomutskiy, (c) 2012-2015
*/
#ifndef TEST_FIND_INDEX_H_

2
unit_tests/test_basic_math/test_interpolation_3d.cpp
View File

@ -1,6 +1,6 @@
/*
* Created on: Oct 17, 2013
* Author: Andrey Belomutskiy, (c) 2012-2013
* Author: Andrey Belomutskiy, (c) 2012-2015
*/
/**

2
unit_tests/test_basic_math/test_interpolation_3d.h
View File

@ -1,6 +1,6 @@
/*
* Created on: Oct 17, 2013
* Author: Andrey Belomutskiy, (c) 2012-2013
* Author: Andrey Belomutskiy, (c) 2012-2015
*/
/**

2
unit_tests/test_data_structures/test_event_registry.cpp
View File

@ -2,7 +2,7 @@
* test_event_registry.cpp
*
* Created on: Nov 27, 2013
* Author: Andrey Belomutskiy, (c) 2012-2013
* Author: Andrey Belomutskiy, (c) 2012-2015
*/
#include "event_registry.h"

2
unit_tests/test_data_structures/test_event_registry.h
View File

@ -2,7 +2,7 @@
* test_event_registry.h
*
* Created on: Nov 27, 2013
* Author: Andrey Belomutskiy, (c) 2012-2013
* Author: Andrey Belomutskiy, (c) 2012-2015
*/
#ifndef TEST_EVENT_REGISTRY_H_

2
unit_tests/test_engine_math.cpp
View File

@ -2,7 +2,7 @@
* @file test_engine_math.c
*
* Created on: Nov 14, 2013
* Author: Andrey Belomutskiy, (c) 2012-2013
* Author: Andrey Belomutskiy, (c) 2012-2015
*/
#include "test_engine_math.h"

2
unit_tests/test_engine_math.h
View File

@ -2,7 +2,7 @@
* @file test_engine_math.h
*
* Created on: Nov 14, 2013
* Author: Andrey Belomutskiy, (c) 2012-2013
* Author: Andrey Belomutskiy, (c) 2012-2015
*/
#ifndef TEST_ENGINE_MATH_H_

2
unit_tests/test_fuel_map.cpp
View File

@ -2,7 +2,7 @@
* @file test_fuel_map.cpp
*
* Created on: Nov 6, 2013
* Author: Andrey Belomutskiy, (c) 2012-2013
* Author: Andrey Belomutskiy, (c) 2012-2015
*/
#include "test_fuel_map.h"

2
unit_tests/test_sensors.cpp
View File

@ -2,7 +2,7 @@
* @file test_sensors.c
*
* @date Dec 7, 2013
* @author Andrey Belomutskiy, (c) 2012-2013
* @author Andrey Belomutskiy, (c) 2012-2015
*/
#include "main.h"

2
unit_tests/test_sensors.h
View File

@ -2,7 +2,7 @@
* @file test_sensors.h
*
* @date Dec 7, 2013
* @author Andrey Belomutskiy, (c) 2012-2013
* @author Andrey Belomutskiy, (c) 2012-2015
*/
#ifndef TEST_SENSORS_H_

2
unit_tests/test_signal_executor.cpp
View File

@ -2,7 +2,7 @@
* @file test_signal_executor.cpp
*
* @date Nov 28, 2013
* @author Andrey Belomutskiy, (c) 2012-2013
* @author Andrey Belomutskiy, (c) 2012-2015
*/
#include <time.h>

5
unit_tests/test_signal_executor.h
View File

@ -2,19 +2,20 @@
* @file test_signal_executor.h
*
* @date Nov 28, 2013
* @author Andrey Belomutskiy, (c) 2012-2013
* @author Andrey Belomutskiy, (c) 2012-2015
*/
#ifndef TEST_SIGNAL_EXECUTOR_H_
#define TEST_SIGNAL_EXECUTOR_H_
int getRevolutionCounter();
#ifdef __cplusplus
extern "C"
{
#endif /* __cplusplus */
void testSignalExecutor(void);
int getRevolutionCounter();
#ifdef __cplusplus
}

2
unit_tests/test_trigger_decoder.cpp
View File

@ -2,7 +2,7 @@
* @file test_trigger_decoder.cpp
*
* @date Dec 24, 2013
* @author Andrey Belomutskiy, (c) 2012-2013
* @author Andrey Belomutskiy, (c) 2012-2015
*/
#include "main.h"

2
unit_tests/test_trigger_decoder.h
View File

@ -2,7 +2,7 @@
* @file test_trigger_decoder.h
*
* @date Dec 24, 2013
* @author Andrey Belomutskiy, (c) 2012-2013
* @author Andrey Belomutskiy, (c) 2012-2015
*/
#ifndef TEST_TRIGGER_DECODER_H_

2
unit_tests/test_util.cpp
View File

@ -2,7 +2,7 @@
* @file test_util.c
*
* @date Dec 8, 2013
* @author Andrey Belomutskiy, (c) 2012-2013
* @author Andrey Belomutskiy, (c) 2012-2015
*/
#include <string.h>

2
unit_tests/test_util.h
View File

@ -2,7 +2,7 @@
* @file test_cyclic_buffer.h
*
* @date Dec 8, 2013
* @author Andrey Belomutskiy, (c) 2012-2013
* @author Andrey Belomutskiy, (c) 2012-2015
*/
#ifndef TEST_CYCLIC_BUFFER_H_