mirror of https://github.com/rusefi/rusefi-1.git
auto-sync
This commit is contained in:
parent
05f2fd89a3
commit
5663ab3491
|
@ -71,9 +71,9 @@
|
|||
<listOptionValue builtIn="false" value=""../controllers/system""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/math""/>
|
||||
<listOptionValue builtIn="false" value=""../console_util""/>
|
||||
<listOptionValue builtIn="false" value=""../emulation""/>
|
||||
<listOptionValue builtIn="false" value=""../emulation/test""/>
|
||||
<listOptionValue builtIn="false" value=""../emulation/hw_layer""/>
|
||||
<listOptionValue builtIn="false" value=""../development""/>
|
||||
<listOptionValue builtIn="false" value=""../development/test""/>
|
||||
<listOptionValue builtIn="false" value=""../development/hw_layer""/>
|
||||
<listOptionValue builtIn="false" value=""../hw_layer""/>
|
||||
<listOptionValue builtIn="false" value=""../hw_layer/flash""/>
|
||||
<listOptionValue builtIn="false" value=""../hw_layer/lcd""/>
|
||||
|
@ -132,9 +132,9 @@
|
|||
<listOptionValue builtIn="false" value=""../controllers/system""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/math""/>
|
||||
<listOptionValue builtIn="false" value=""../console_util""/>
|
||||
<listOptionValue builtIn="false" value=""../emulation""/>
|
||||
<listOptionValue builtIn="false" value=""../emulation/test""/>
|
||||
<listOptionValue builtIn="false" value=""../emulation/hw_layer""/>
|
||||
<listOptionValue builtIn="false" value=""../development""/>
|
||||
<listOptionValue builtIn="false" value=""../development/test""/>
|
||||
<listOptionValue builtIn="false" value=""../development/hw_layer""/>
|
||||
<listOptionValue builtIn="false" value=""../hw_layer""/>
|
||||
<listOptionValue builtIn="false" value=""../hw_layer/flash""/>
|
||||
<listOptionValue builtIn="false" value=""../hw_layer/lcd""/>
|
||||
|
@ -363,9 +363,9 @@
|
|||
<listOptionValue builtIn="false" value=""../controllers/system""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/math""/>
|
||||
<listOptionValue builtIn="false" value=""../console_util""/>
|
||||
<listOptionValue builtIn="false" value=""../emulation""/>
|
||||
<listOptionValue builtIn="false" value=""../emulation/test""/>
|
||||
<listOptionValue builtIn="false" value=""../emulation/hw_layer""/>
|
||||
<listOptionValue builtIn="false" value=""../development""/>
|
||||
<listOptionValue builtIn="false" value=""../development/test""/>
|
||||
<listOptionValue builtIn="false" value=""../development/hw_layer""/>
|
||||
<listOptionValue builtIn="false" value=""../hw_layer""/>
|
||||
<listOptionValue builtIn="false" value=""../hw_layer/flash""/>
|
||||
<listOptionValue builtIn="false" value=""../hw_layer/lcd""/>
|
||||
|
@ -419,9 +419,9 @@
|
|||
<listOptionValue builtIn="false" value=""../controllers/system""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/math""/>
|
||||
<listOptionValue builtIn="false" value=""../console_util""/>
|
||||
<listOptionValue builtIn="false" value=""../emulation""/>
|
||||
<listOptionValue builtIn="false" value=""../emulation/test""/>
|
||||
<listOptionValue builtIn="false" value=""../emulation/hw_layer""/>
|
||||
<listOptionValue builtIn="false" value=""../development""/>
|
||||
<listOptionValue builtIn="false" value=""../development/test""/>
|
||||
<listOptionValue builtIn="false" value=""../development/hw_layer""/>
|
||||
<listOptionValue builtIn="false" value=""../hw_layer""/>
|
||||
<listOptionValue builtIn="false" value=""../hw_layer/stm32f0""/>
|
||||
<listOptionValue builtIn="false" value=""../hw_layer/algo""/>
|
||||
|
|
|
@ -90,7 +90,7 @@ include $(CHIBIOS)/os/various/fatfs_bindings/fatfs.mk
|
|||
include console/tunerstudio/tunerstudio.mk
|
||||
include ext/ext.mk
|
||||
include hw_layer/hw_layer.mk
|
||||
include emulation/development.mk
|
||||
include development/development.mk
|
||||
include controllers/controllers.mk
|
||||
|
||||
include $(PROJECT_DIR)/util/util.mk
|
||||
|
@ -121,7 +121,7 @@ CSRC = $(PORTSRC) \
|
|||
$(CONSOLESRC) \
|
||||
$(CONSOLEUTILSRC) \
|
||||
$(HALSRC) \
|
||||
$(EMULATIONSRC) \
|
||||
$(DEV_SRC) \
|
||||
$(HW_LAYER_EMS) \
|
||||
$(CONTROLLERSSRC) \
|
||||
$(CONTROLLERS_ALGO_SRC) \
|
||||
|
@ -139,7 +139,7 @@ CSRC = $(PORTSRC) \
|
|||
CPPSRC = $(CHCPPSRC) \
|
||||
$(TRIGGER_SRC_CPP) \
|
||||
$(TRIGGER_DECODERS_SRC_CPP) \
|
||||
$(EMULATIONSRC_CPP) \
|
||||
$(DEV_SRC_CPP) \
|
||||
$(CONTROLLERS_ALGO_SRC_CPP) \
|
||||
$(SYSTEMSRC_CPP) \
|
||||
$(ENGINES_SRC_CPP) \
|
||||
|
@ -196,9 +196,9 @@ INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
|
|||
hw_layer/algo \
|
||||
hw_layer/lcd \
|
||||
hw_layer/stm32f4 \
|
||||
emulation \
|
||||
emulation/hw_layer \
|
||||
emulation/test \
|
||||
development \
|
||||
development/hw_layer \
|
||||
development/test \
|
||||
controllers \
|
||||
controllers/sensors \
|
||||
controllers/system \
|
||||
|
|
|
@ -13,7 +13,6 @@ CONTROLLERS_ALGO_SRC_CPP = $(PROJECT_DIR)/controllers/algo/OutputSignalArray.cpp
|
|||
$(PROJECT_DIR)/controllers/algo/engine.cpp \
|
||||
$(PROJECT_DIR)/controllers/algo/event_registry.cpp \
|
||||
$(PROJECT_DIR)/controllers/algo/algo.cpp \
|
||||
$(PROJECT_DIR)/controllers/algo/wave_chart.cpp \
|
||||
$(PROJECT_DIR)/controllers/algo/signal_executor.cpp \
|
||||
$(PROJECT_DIR)/controllers/algo/enum_strings.cpp
|
||||
|
||||
|
|
|
@ -66,10 +66,5 @@ public:
|
|||
uint64_t stopEngineRequestTimeNt;
|
||||
};
|
||||
|
||||
void initializeIgnitionActions(float advance, float dwellAngle,
|
||||
IgnitionEventList *list DECLARE_ENGINE_PARAMETER_S);
|
||||
|
||||
void setDefaultNonPersistentConfiguration(engine_configuration2_s *engineConfiguration2);
|
||||
void printConfiguration(engine_configuration_s *engineConfiguration, engine_configuration2_s *engineConfiguration2);
|
||||
|
||||
#endif /* EC2_H_ */
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* @file signal_executor.c
|
||||
* @file signal_executor.cpp
|
||||
*
|
||||
* todo: we should split this file into two:
|
||||
* one for pure scheduling and another one for signal output which would
|
||||
|
@ -34,8 +34,10 @@
|
|||
|
||||
EXTERN_ENGINE;
|
||||
|
||||
#if EFI_WAVE_CHART
|
||||
#include "wave_chart.h"
|
||||
extern WaveChart waveChart;
|
||||
#endif
|
||||
|
||||
#if EFI_PROD_CODE || EFI_SIMULATOR
|
||||
static Logging logger;
|
||||
|
|
|
@ -10,8 +10,6 @@
|
|||
|
||||
#include "engine_configuration.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
#include "ec2.h"
|
||||
#include "trigger_structure.h"
|
||||
#include "table_helper.h"
|
||||
|
@ -24,12 +22,8 @@ void findTriggerPosition(
|
|||
|
||||
int isInjectionEnabled(engine_configuration_s *engineConfiguration);
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif /* __cplusplus */
|
||||
void initializeIgnitionActions(float advance, float dwellAngle,
|
||||
IgnitionEventList *list DECLARE_ENGINE_PARAMETER_S);
|
||||
|
||||
/**
|
||||
* @brief Shifts angle into the [0..720) range for four stroke and [0..360) for two stroke
|
||||
|
@ -75,8 +69,4 @@ void setTimingLoadBin(engine_configuration_s *engineConfiguration, float l, floa
|
|||
|
||||
void setSingleCoilDwell(engine_configuration_s *engineConfiguration);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* ENGINE_MATH_H_ */
|
||||
|
|
|
@ -12,17 +12,7 @@
|
|||
|
||||
#include "main.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#define getMafT(ec) (getVoltageDivided(ec->mafAdcChannel))
|
||||
|
||||
float getMaf(void);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif
|
||||
|
|
|
@ -9,16 +9,17 @@
|
|||
#ifndef INJECTOR_CONTROL_H_
|
||||
#define INJECTOR_CONTROL_H_
|
||||
|
||||
#include "engine_configuration.h"
|
||||
#include "engine.h"
|
||||
|
||||
void initSettings(engine_configuration_s *engineConfiguration);
|
||||
void printSpiState(Logging *logger, board_configuration_s *boardConfiguration);
|
||||
void printConfiguration(engine_configuration_s *engineConfiguration, engine_configuration2_s *engineConfiguration2);
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif /* __cplusplus */
|
||||
|
||||
void printSpiState(Logging *logger, board_configuration_s *boardConfiguration);
|
||||
void pokeControl(void);
|
||||
void setEngineType(int value);
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
|
@ -390,7 +390,9 @@ void mainTriggerCallback(trigger_event_e ckpSignalType, uint32_t eventIndex DECL
|
|||
#endif /* EFI_HISTOGRAMS */
|
||||
}
|
||||
|
||||
#if EFI_PROD_CODE
|
||||
#include "wave_chart.h"
|
||||
#endif
|
||||
|
||||
static void showTriggerHistogram(void) {
|
||||
printAllCallbacksHistogram();
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
#include "listener_array.h"
|
||||
#include "data_buffer.h"
|
||||
#include "histogram.h"
|
||||
#include "wave_chart.h"
|
||||
#include "pwm_generator_logic.h"
|
||||
#include "efilib2.h"
|
||||
|
||||
|
@ -27,6 +26,7 @@
|
|||
#endif
|
||||
|
||||
#if EFI_WAVE_CHART
|
||||
#include "wave_chart.h"
|
||||
WaveChart waveChart;
|
||||
#endif /* EFI_WAVE_CHART */
|
||||
|
||||
|
|
|
@ -0,0 +1,13 @@
|
|||
|
||||
DEV_SRC = development/hw_layer/poten.c \
|
||||
development/test/test.c \
|
||||
development/test/testbmk.c
|
||||
|
||||
DEV_SRC_CPP = development/trigger_emulator.cpp \
|
||||
development/analog_chart.cpp \
|
||||
development/rfi_perftest.cpp \
|
||||
development/engine_emulator.cpp \
|
||||
$(PROJECT_DIR)/development/wave_chart.cpp \
|
||||
development/wave_analyzer.cpp
|
||||
|
||||
DEV_SIMULATOR_SRC_CPP = $(PROJECT_DIR)/development/wave_chart.cpp
|
|
@ -1,11 +0,0 @@
|
|||
|
||||
EMULATIONSRC = emulation/hw_layer/poten.c \
|
||||
emulation/test/test.c \
|
||||
emulation/test/testbmk.c
|
||||
|
||||
EMULATIONSRC_CPP = emulation/trigger_emulator.cpp \
|
||||
emulation/analog_chart.cpp \
|
||||
emulation/rfi_perftest.cpp \
|
||||
emulation/engine_emulator.cpp \
|
||||
emulation/wave_analyzer.cpp
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
// This file was generated by Version2Header
|
||||
// Sat Dec 27 09:45:34 EST 2014
|
||||
// Thu Jan 01 15:21:19 EST 2015
|
||||
#ifndef VCS_VERSION
|
||||
#define VCS_VERSION "5964"
|
||||
#define VCS_VERSION "6083"
|
||||
#endif
|
||||
|
|
|
@ -12,13 +12,6 @@
|
|||
#include <stdio.h>
|
||||
#include <math.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
#define CH_FREQUENCY 1000
|
||||
|
||||
#include "global.h"
|
||||
#include "error_handling.h"
|
||||
#include "efifeatures.h"
|
||||
|
@ -28,6 +21,13 @@ extern "C"
|
|||
|
||||
#include "boards.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
#define CH_FREQUENCY 1000
|
||||
|
||||
typedef int bool_t;
|
||||
|
||||
void chDbgAssert(int c, char *msg, void *arg);
|
||||
|
|
|
@ -81,6 +81,7 @@ include $(PROJECT_DIR)/controllers/system/system.mk
|
|||
include $(PROJECT_DIR)/console/console.mk
|
||||
include $(PROJECT_DIR)/console/tunerstudio/tunerstudio.mk
|
||||
include $(PROJECT_DIR)/console_util/console_util.mk
|
||||
include $(PROJECT_DIR)/development/development.mk
|
||||
|
||||
include $(CHIBIOS)/boards/simulator/board.mk
|
||||
include ${CHIBIOS}/os/hal/hal.mk
|
||||
|
@ -120,7 +121,7 @@ CSRC = ${PORTSRC} \
|
|||
CPPSRC = $(UTILSRC_CPP) \
|
||||
$(CONTROLLERS_ALGO_SRC_CPP) \
|
||||
$(PROJECT_DIR)/controllers/settings.cpp \
|
||||
$(PROJECT_DIR)/emulation/analog_chart.cpp \
|
||||
$(PROJECT_DIR)/development/analog_chart.cpp \
|
||||
$(TRIGGER_SRC_CPP) \
|
||||
$(TRIGGER_DECODERS_SRC_CPP) \
|
||||
$(SYSTEMSRC_CPP) \
|
||||
|
@ -129,10 +130,11 @@ CPPSRC = $(UTILSRC_CPP) \
|
|||
$(CONTROLLERS_SENSORS_SRC_CPP) \
|
||||
$(CONTROLLERS_CORE_SRC_CPP) \
|
||||
$(CONTROLLERS_MATH_SRC_CPP) \
|
||||
$(DEV_SIMULATOR_SRC_CPP) \
|
||||
$(ENGINES_SRC_CPP) \
|
||||
$(PROJECT_DIR)/simulator/rusEfiFunctionalTest.cpp \
|
||||
$(PROJECT_DIR)/simulator/framework.cpp \
|
||||
$(PROJECT_DIR)/emulation/trigger_emulator.cpp \
|
||||
$(PROJECT_DIR)/development/trigger_emulator.cpp \
|
||||
$(TEST_SRC_CPP)
|
||||
# C sources to be compiled in ARM mode regardless of the global setting.
|
||||
# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
|
||||
|
@ -168,7 +170,7 @@ $(PORTINC) $(KERNINC) $(TESTINC) \
|
|||
$(PROJECT_DIR)/ext_algo \
|
||||
$(PROJECT_DIR)/controllers \
|
||||
$(PROJECT_DIR)/hw_layer/algo \
|
||||
$(PROJECT_DIR)/emulation \
|
||||
$(PROJECT_DIR)/development \
|
||||
$(PROJECT_DIR)/controllers/algo \
|
||||
$(PROJECT_DIR)/controllers/core \
|
||||
$(PROJECT_DIR)/controllers/math \
|
||||
|
|
Loading…
Reference in New Issue