auto-sync
This commit is contained in:
parent
a6afe1b6d4
commit
e9a334af67
|
@ -36,6 +36,8 @@ rem Generate human-readable version of the .map memory usage report
|
||||||
java -jar ../../java_tools/gcc_map_reader.jar > ../rusefi_ram_report.txt
|
java -jar ../../java_tools/gcc_map_reader.jar > ../rusefi_ram_report.txt
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
|
arm-none-eabi-size --format=berkeley "build\rusefi.elf"
|
||||||
|
|
||||||
rem file, let's program the board right away
|
rem file, let's program the board right away
|
||||||
flash.bat
|
flash.bat
|
||||||
exit
|
exit
|
||||||
|
|
|
@ -10,6 +10,10 @@
|
||||||
#ifndef EFIFEATURES_H_
|
#ifndef EFIFEATURES_H_
|
||||||
#define EFIFEATURES_H_
|
#define EFIFEATURES_H_
|
||||||
|
|
||||||
|
#define EFI_GPIO TRUE
|
||||||
|
|
||||||
|
#define EFI_FSIO TRUE
|
||||||
|
|
||||||
#define EFI_USE_CCM TRUE
|
#define EFI_USE_CCM TRUE
|
||||||
|
|
||||||
#ifndef EFI_ENABLE_ASSERTS
|
#ifndef EFI_ENABLE_ASSERTS
|
||||||
|
|
|
@ -159,7 +159,11 @@ extern "C"
|
||||||
io_pin_e getPinByName(const char *name);
|
io_pin_e getPinByName(const char *name);
|
||||||
|
|
||||||
void setDefaultPinState(io_pin_e pin, pin_output_mode_e *defaultState);
|
void setDefaultPinState(io_pin_e pin, pin_output_mode_e *defaultState);
|
||||||
void turnAllPinsOff(void);
|
#if EFI_GPIO
|
||||||
|
void turnAllPinsOff(void);
|
||||||
|
#else
|
||||||
|
#define turnAllPinsOff() {}
|
||||||
|
#endif
|
||||||
void outputPinRegisterExt2(const char *msg, io_pin_e ioPin, brain_pin_e brainPin, pin_output_mode_e *outputMode);
|
void outputPinRegisterExt2(const char *msg, io_pin_e ioPin, brain_pin_e brainPin, pin_output_mode_e *outputMode);
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
|
|
@ -509,9 +509,14 @@ void initEngineContoller(Engine *engine) {
|
||||||
|
|
||||||
chThdCreateStatic(csThreadStack, sizeof(csThreadStack), LOWPRIO, (tfunc_t) csThread, NULL);
|
chThdCreateStatic(csThreadStack, sizeof(csThreadStack), LOWPRIO, (tfunc_t) csThread, NULL);
|
||||||
|
|
||||||
|
#if EFI_ENGINE_CONTROL || defined(__DOXYGEN__)
|
||||||
initInjectorCentral(engine);
|
initInjectorCentral(engine);
|
||||||
initPwmTester();
|
|
||||||
initIgnitionCentral();
|
initIgnitionCentral();
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if EFI_PWM_TESTER
|
||||||
|
initPwmTester();
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This has to go after 'initInjectorCentral' and 'initInjectorCentral' in order to
|
* This has to go after 'initInjectorCentral' and 'initInjectorCentral' in order to
|
||||||
|
@ -525,19 +530,19 @@ void initEngineContoller(Engine *engine) {
|
||||||
initElectronicThrottle();
|
initElectronicThrottle();
|
||||||
#endif /* EFI_ELECTRONIC_THROTTLE_BODY */
|
#endif /* EFI_ELECTRONIC_THROTTLE_BODY */
|
||||||
|
|
||||||
#if EFI_MALFUNCTION_INDICATOR
|
#if EFI_MALFUNCTION_INDICATOR || defined(__DOXYGEN__)
|
||||||
if (engineConfiguration->isMilEnabled) {
|
if (engineConfiguration->isMilEnabled) {
|
||||||
initMalfunctionIndicator(engine);
|
initMalfunctionIndicator(engine);
|
||||||
}
|
}
|
||||||
#endif /* EFI_MALFUNCTION_INDICATOR */
|
#endif /* EFI_MALFUNCTION_INDICATOR */
|
||||||
|
|
||||||
#if EFI_MAP_AVERAGING
|
#if EFI_MAP_AVERAGING || defined(__DOXYGEN__)
|
||||||
if (engineConfiguration->isMapAveragingEnabled) {
|
if (engineConfiguration->isMapAveragingEnabled) {
|
||||||
initMapAveraging(engine);
|
initMapAveraging(engine);
|
||||||
}
|
}
|
||||||
#endif /* EFI_MAP_AVERAGING */
|
#endif /* EFI_MAP_AVERAGING */
|
||||||
|
|
||||||
#if EFI_ENGINE_CONTROL
|
#if EFI_ENGINE_CONTROL || defined(__DOXYGEN__)
|
||||||
if (boardConfiguration->isEngineControlEnabled) {
|
if (boardConfiguration->isEngineControlEnabled) {
|
||||||
/**
|
/**
|
||||||
* This method initialized the main listener which actually runs injectors & ignition
|
* This method initialized the main listener which actually runs injectors & ignition
|
||||||
|
@ -546,12 +551,10 @@ void initEngineContoller(Engine *engine) {
|
||||||
}
|
}
|
||||||
#endif /* EFI_ENGINE_CONTROL */
|
#endif /* EFI_ENGINE_CONTROL */
|
||||||
|
|
||||||
#if EFI_IDLE_CONTROL
|
#if EFI_IDLE_CONTROL || defined(__DOXYGEN__)
|
||||||
if (engineConfiguration->isIdleThreadEnabled) {
|
if (engineConfiguration->isIdleThreadEnabled) {
|
||||||
startIdleThread(engine);
|
startIdleThread(engine);
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
scheduleMsg(&logger, "no idle control");
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if EFI_FUEL_PUMP
|
#if EFI_FUEL_PUMP
|
||||||
|
|
|
@ -20,8 +20,11 @@
|
||||||
* If not, see <http://www.gnu.org/licenses/>.
|
* If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "injector_central.h"
|
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
|
|
||||||
|
#if EFI_ENGINE_CONTROL || defined(__DOXYGEN__)
|
||||||
|
|
||||||
|
#include "injector_central.h"
|
||||||
#include "io_pins.h"
|
#include "io_pins.h"
|
||||||
#include "signal_executor.h"
|
#include "signal_executor.h"
|
||||||
#include "main_trigger_callback.h"
|
#include "main_trigger_callback.h"
|
||||||
|
@ -231,3 +234,5 @@ void initInjectorCentral(Engine *engine) {
|
||||||
addConsoleActionSSSSS("fuelbench2", fuelbench2);
|
addConsoleActionSSSSS("fuelbench2", fuelbench2);
|
||||||
addConsoleActionSSSSS("sparkbench2", sparkbench2);
|
addConsoleActionSSSSS("sparkbench2", sparkbench2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
|
@ -6,9 +6,11 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
|
#if EFI_GPIO
|
||||||
#include "efiGpio.h"
|
#include "efiGpio.h"
|
||||||
#include "io_pins.h"
|
#include "io_pins.h"
|
||||||
|
|
||||||
|
|
||||||
// todo: clean this mess, this should become 'static'/private
|
// todo: clean this mess, this should become 'static'/private
|
||||||
OutputPin outputs[IO_PIN_COUNT];
|
OutputPin outputs[IO_PIN_COUNT];
|
||||||
pin_output_mode_e *pinDefaultState[IO_PIN_COUNT];
|
pin_output_mode_e *pinDefaultState[IO_PIN_COUNT];
|
||||||
|
@ -99,3 +101,4 @@ void setOutputPinValue(io_pin_e pin, int logicValue) {
|
||||||
doSetOutputPinValue(pin, logicValue);
|
doSetOutputPinValue(pin, logicValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif /* EFI_GPIO */
|
||||||
|
|
|
@ -5,6 +5,9 @@
|
||||||
* @author Andrey Belomutskiy, (c) 2012-2014
|
* @author Andrey Belomutskiy, (c) 2012-2014
|
||||||
*/
|
*/
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
|
|
||||||
|
#if EFI_EMULATE_POSITION_SENSORS || defined(__DOXYGEN__)
|
||||||
|
|
||||||
#include "trigger_emulator_algo.h"
|
#include "trigger_emulator_algo.h"
|
||||||
#include "engine_configuration.h"
|
#include "engine_configuration.h"
|
||||||
#include "LocalVersionHolder.h"
|
#include "LocalVersionHolder.h"
|
||||||
|
@ -104,8 +107,6 @@ static void updateTriggerShapeIfNeeded(PwmConfig *state) {
|
||||||
|
|
||||||
static TriggerEmulatorHelper helper;
|
static TriggerEmulatorHelper helper;
|
||||||
|
|
||||||
#if EFI_EMULATE_POSITION_SENSORS || defined(__DOXYGEN__)
|
|
||||||
|
|
||||||
static void emulatorApplyPinState(PwmConfig *state, int stateIndex) {
|
static void emulatorApplyPinState(PwmConfig *state, int stateIndex) {
|
||||||
if (stopEmulationAtIndex == stateIndex) {
|
if (stopEmulationAtIndex == stateIndex) {
|
||||||
isEmulating = false;
|
isEmulating = false;
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
arm-none-eabi-objdump -S debug_EGT2CAN/rusefi.elf > debug.dump
|
|
@ -17,7 +17,7 @@
|
||||||
#include "engine_configuration.h"
|
#include "engine_configuration.h"
|
||||||
#include "console_io.h"
|
#include "console_io.h"
|
||||||
|
|
||||||
#if EFI_ENGINE_CONTROL
|
#if EFI_ENGINE_CONTROL || defined(__DOXYGEN__)
|
||||||
#include "main_trigger_callback.h"
|
#include "main_trigger_callback.h"
|
||||||
#endif /* EFI_ENGINE_CONTROL */
|
#endif /* EFI_ENGINE_CONTROL */
|
||||||
|
|
||||||
|
@ -183,6 +183,8 @@ void initOutputPins(void) {
|
||||||
addConsoleActionS("get_pin_value", getPinValue);
|
addConsoleActionS("get_pin_value", getPinValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if EFI_GPIO
|
||||||
|
|
||||||
static io_pin_e TO_BE_TURNED_OFF_ON_ERROR[] = { SPARKOUT_1_OUTPUT, SPARKOUT_2_OUTPUT, SPARKOUT_3_OUTPUT,
|
static io_pin_e TO_BE_TURNED_OFF_ON_ERROR[] = { SPARKOUT_1_OUTPUT, SPARKOUT_2_OUTPUT, SPARKOUT_3_OUTPUT,
|
||||||
SPARKOUT_4_OUTPUT, SPARKOUT_5_OUTPUT, SPARKOUT_6_OUTPUT, SPARKOUT_7_OUTPUT, SPARKOUT_8_OUTPUT,
|
SPARKOUT_4_OUTPUT, SPARKOUT_5_OUTPUT, SPARKOUT_6_OUTPUT, SPARKOUT_7_OUTPUT, SPARKOUT_8_OUTPUT,
|
||||||
SPARKOUT_9_OUTPUT, SPARKOUT_10_OUTPUT, SPARKOUT_11_OUTPUT, SPARKOUT_12_OUTPUT,
|
SPARKOUT_9_OUTPUT, SPARKOUT_10_OUTPUT, SPARKOUT_11_OUTPUT, SPARKOUT_12_OUTPUT,
|
||||||
|
@ -202,4 +204,4 @@ void turnAllPinsOff(void) {
|
||||||
turnOutputPinOff(l);
|
turnOutputPinOff(l);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
|
@ -13,9 +13,9 @@
|
||||||
#include "chrtclib.h"
|
#include "chrtclib.h"
|
||||||
#include "rtc_helper.h"
|
#include "rtc_helper.h"
|
||||||
|
|
||||||
|
#if EFI_RTC
|
||||||
static Logging logger;
|
static Logging logger;
|
||||||
|
|
||||||
#if EFI_RTC
|
|
||||||
static void date_help(void) {
|
static void date_help(void) {
|
||||||
scheduleMsg(&logger, "Usage: date_help");
|
scheduleMsg(&logger, "Usage: date_help");
|
||||||
scheduleMsg(&logger, " date_get");
|
scheduleMsg(&logger, " date_get");
|
||||||
|
@ -130,8 +130,8 @@ static void date_set(char *strDate) {
|
||||||
#endif /* EFI_RTC */
|
#endif /* EFI_RTC */
|
||||||
|
|
||||||
void initRtc(void) {
|
void initRtc(void) {
|
||||||
initLogging(&logger, "rtc");
|
|
||||||
#if EFI_RTC
|
#if EFI_RTC
|
||||||
|
initLogging(&logger, "rtc");
|
||||||
printMsg(&logger, "initRtc()");
|
printMsg(&logger, "initRtc()");
|
||||||
|
|
||||||
// yes, it's my begin time and we always start from this one 1391894433 - 2014-02-08 21:20:03
|
// yes, it's my begin time and we always start from this one 1391894433 - 2014-02-08 21:20:03
|
||||||
|
|
|
@ -10,6 +10,10 @@
|
||||||
|
|
||||||
#define EFI_ENABLE_ASSERTS TRUE
|
#define EFI_ENABLE_ASSERTS TRUE
|
||||||
|
|
||||||
|
#define EFI_GPIO TRUE
|
||||||
|
|
||||||
|
#define EFI_FSIO TRUE
|
||||||
|
|
||||||
#define EFI_HISTOGRAMS TRUE
|
#define EFI_HISTOGRAMS TRUE
|
||||||
|
|
||||||
#define EFI_CLI_SUPPORT FALSE
|
#define EFI_CLI_SUPPORT FALSE
|
||||||
|
|
|
@ -10,6 +10,10 @@
|
||||||
|
|
||||||
#define EFI_ENABLE_ASSERTS TRUE
|
#define EFI_ENABLE_ASSERTS TRUE
|
||||||
|
|
||||||
|
#define EFI_GPIO TRUE
|
||||||
|
|
||||||
|
#define EFI_FSIO TRUE
|
||||||
|
|
||||||
#define EFI_SIMULATOR TRUE
|
#define EFI_SIMULATOR TRUE
|
||||||
|
|
||||||
#define EFI_SUPPORT_DODGE_NEON TRUE
|
#define EFI_SUPPORT_DODGE_NEON TRUE
|
||||||
|
|
Loading…
Reference in New Issue