mirror of https://github.com/rusefi/rusefi-1.git
Finally rename injector_central to bench_test (#1229)
* bench test rename * rename consumers * good lord what are all of these externs doing * fix tests
This commit is contained in:
parent
a410e00609
commit
53679fab54
|
@ -80,7 +80,7 @@
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "engine_configuration.h"
|
#include "engine_configuration.h"
|
||||||
#include "injector_central.h"
|
#include "bench_test.h"
|
||||||
#include "svnversion.h"
|
#include "svnversion.h"
|
||||||
#include "loggingcentral.h"
|
#include "loggingcentral.h"
|
||||||
#include "status_loop.h"
|
#include "status_loop.h"
|
||||||
|
|
|
@ -21,7 +21,6 @@ static LoggingWithStorage logger;
|
||||||
static SimplePwm pwmTest[5];
|
static SimplePwm pwmTest[5];
|
||||||
|
|
||||||
extern OutputPin warningLedPin;
|
extern OutputPin warningLedPin;
|
||||||
extern EnginePins enginePins;
|
|
||||||
|
|
||||||
EXTERN_ENGINE;
|
EXTERN_ENGINE;
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
#include "perf_trace.h"
|
#include "perf_trace.h"
|
||||||
|
|
||||||
#if EFI_PROD_CODE
|
#if EFI_PROD_CODE
|
||||||
#include "injector_central.h"
|
#include "bench_test.h"
|
||||||
#else
|
#else
|
||||||
#define isRunningBenchTest() true
|
#define isRunningBenchTest() true
|
||||||
#endif /* EFI_PROD_CODE */
|
#endif /* EFI_PROD_CODE */
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/**
|
/**
|
||||||
* @file injector_central.cpp
|
* @file bench_test.cpp
|
||||||
* @brief Utility methods related to fuel injection.
|
* @brief Utility methods related to bench testing.
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* @date Sep 8, 2013
|
* @date Sep 8, 2013
|
||||||
|
@ -27,7 +27,7 @@
|
||||||
#if !EFI_UNIT_TEST
|
#if !EFI_UNIT_TEST
|
||||||
|
|
||||||
#include "flash_main.h"
|
#include "flash_main.h"
|
||||||
#include "injector_central.h"
|
#include "bench_test.h"
|
||||||
#include "io_pins.h"
|
#include "io_pins.h"
|
||||||
#include "main_trigger_callback.h"
|
#include "main_trigger_callback.h"
|
||||||
#include "engine_configuration.h"
|
#include "engine_configuration.h"
|
||||||
|
@ -57,44 +57,10 @@ EXTERN_ENGINE
|
||||||
static Logging * logger;
|
static Logging * logger;
|
||||||
static bool isRunningBench = false;
|
static bool isRunningBench = false;
|
||||||
|
|
||||||
// todo: move into Engine object?
|
|
||||||
// todo: looks like these flags are not currently used? dead functionality? unfinished functionality?
|
|
||||||
static int is_injector_enabled[INJECTION_PIN_COUNT];
|
|
||||||
|
|
||||||
bool isRunningBenchTest(void) {
|
bool isRunningBenchTest(void) {
|
||||||
return isRunningBench;
|
return isRunningBench;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void assertCylinderId(int cylinderId, const char *msg) {
|
|
||||||
int isValid = cylinderId >= 1 && cylinderId <= engineConfiguration->specs.cylindersCount;
|
|
||||||
if (!isValid) {
|
|
||||||
// we are here only in case of a fatal issue - at this point it is fine to make some blocking i-o
|
|
||||||
//scheduleSimpleMsg(&logger, "cid=", cylinderId);
|
|
||||||
print("ERROR [%s] cid=%d\r\n", msg, cylinderId);
|
|
||||||
efiAssertVoid(CUSTOM_ERR_6647, false, "Cylinder ID");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param cylinderId - from 1 to NUMBER_OF_CYLINDERS
|
|
||||||
*/
|
|
||||||
static int isInjectorEnabled(int cylinderId) {
|
|
||||||
assertCylinderId(cylinderId, "isInjectorEnabled");
|
|
||||||
return is_injector_enabled[cylinderId - 1];
|
|
||||||
}
|
|
||||||
|
|
||||||
static void printInjectorsStatus(void) {
|
|
||||||
for (int id = 1; id <= engineConfiguration->specs.cylindersCount; id++) {
|
|
||||||
scheduleMsg(logger, "injector_%d: %d", id, isInjectorEnabled(id));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void setInjectorEnabled(int id, int value) {
|
|
||||||
efiAssertVoid(CUSTOM_ERR_6648, id >= 0 && id < engineConfiguration->specs.cylindersCount, "injector id");
|
|
||||||
is_injector_enabled[id] = value;
|
|
||||||
printInjectorsStatus();
|
|
||||||
}
|
|
||||||
|
|
||||||
static void runBench(brain_pin_e brainPin, OutputPin *output, float delayMs, float onTimeMs, float offTimeMs,
|
static void runBench(brain_pin_e brainPin, OutputPin *output, float delayMs, float onTimeMs, float offTimeMs,
|
||||||
int count) {
|
int count) {
|
||||||
int delaySt = delayMs < 1 ? 1 : TIME_MS2I(delayMs);
|
int delaySt = delayMs < 1 ? 1 : TIME_MS2I(delayMs);
|
||||||
|
@ -337,20 +303,9 @@ void executeTSCommand(uint16_t subsystem, uint16_t index) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void initInjectorCentral(Logging *sharedLogger) {
|
void initBenchTest(Logging *sharedLogger) {
|
||||||
logger = sharedLogger;
|
logger = sharedLogger;
|
||||||
|
|
||||||
for (int i = 0; i < INJECTION_PIN_COUNT; i++) {
|
|
||||||
is_injector_enabled[i] = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
enginePins.startInjectionPins();
|
|
||||||
enginePins.startIgnitionPins();
|
|
||||||
enginePins.startAuxValves();
|
|
||||||
|
|
||||||
printInjectorsStatus();
|
|
||||||
addConsoleActionII("injector", setInjectorEnabled);
|
|
||||||
|
|
||||||
addConsoleAction("fuelpumpbench", fuelPumpBench);
|
addConsoleAction("fuelpumpbench", fuelPumpBench);
|
||||||
addConsoleAction("acrelaybench", acRelayBench);
|
addConsoleAction("acrelaybench", acRelayBench);
|
||||||
addConsoleActionS("fuelpumpbench2", fuelPumpBenchExt);
|
addConsoleActionS("fuelpumpbench2", fuelPumpBenchExt);
|
|
@ -1,6 +1,6 @@
|
||||||
/**
|
/**
|
||||||
* @file injector_central.h
|
* @file bench_test.h
|
||||||
* @brief Utility methods related to fuel injection.
|
* @brief Utility methods related to bench testing.
|
||||||
*
|
*
|
||||||
* todo: rename this file
|
* todo: rename this file
|
||||||
*
|
*
|
||||||
|
@ -16,7 +16,7 @@ void fanBench(void);
|
||||||
void fuelPumpBench(void);
|
void fuelPumpBench(void);
|
||||||
void acRelayBench(void);
|
void acRelayBench(void);
|
||||||
void milBench(void);
|
void milBench(void);
|
||||||
void initInjectorCentral(Logging *sharedLogger);
|
void initBenchTest(Logging *sharedLogger);
|
||||||
bool isRunningBenchTest(void);
|
bool isRunningBenchTest(void);
|
||||||
|
|
||||||
void executeTSCommand(uint16_t subsystem, uint16_t index);
|
void executeTSCommand(uint16_t subsystem, uint16_t index);
|
|
@ -33,7 +33,7 @@ CONTROLLERS_SRC_CPP = \
|
||||||
$(CONTROLLERS_DIR)/engine_cycle/main_trigger_callback.cpp \
|
$(CONTROLLERS_DIR)/engine_cycle/main_trigger_callback.cpp \
|
||||||
$(CONTROLLERS_DIR)/engine_cycle/aux_valves.cpp \
|
$(CONTROLLERS_DIR)/engine_cycle/aux_valves.cpp \
|
||||||
$(CONTROLLERS_DIR)/flash_main.cpp \
|
$(CONTROLLERS_DIR)/flash_main.cpp \
|
||||||
$(CONTROLLERS_DIR)/injector_central.cpp \
|
$(CONTROLLERS_DIR)/bench_test.cpp \
|
||||||
$(CONTROLLERS_DIR)/can/obd2.cpp \
|
$(CONTROLLERS_DIR)/can/obd2.cpp \
|
||||||
$(CONTROLLERS_DIR)/can/can_verbose.cpp \
|
$(CONTROLLERS_DIR)/can/can_verbose.cpp \
|
||||||
$(CONTROLLERS_DIR)/can/can_rx.cpp \
|
$(CONTROLLERS_DIR)/can/can_rx.cpp \
|
||||||
|
|
|
@ -72,8 +72,6 @@ static LENameOrdinalPair leInShutdown(LE_METHOD_IN_SHUTDOWN, "in_shutdown");
|
||||||
|
|
||||||
#define LE_EVAL_POOL_SIZE 32
|
#define LE_EVAL_POOL_SIZE 32
|
||||||
|
|
||||||
extern EnginePins enginePins;
|
|
||||||
|
|
||||||
static LECalculator evalCalc;
|
static LECalculator evalCalc;
|
||||||
static LEElement evalPoolElements[LE_EVAL_POOL_SIZE];
|
static LEElement evalPoolElements[LE_EVAL_POOL_SIZE];
|
||||||
static LEElementPool evalPool(evalPoolElements, LE_EVAL_POOL_SIZE);
|
static LEElementPool evalPool(evalPoolElements, LE_EVAL_POOL_SIZE);
|
||||||
|
@ -165,7 +163,7 @@ float getEngineValue(le_action_e action DECLARE_ENGINE_PARAMETER_SUFFIX) {
|
||||||
#include "pin_repository.h"
|
#include "pin_repository.h"
|
||||||
#include "pwm_generator.h"
|
#include "pwm_generator.h"
|
||||||
// todo: that's about bench test mode, wrong header for sure!
|
// todo: that's about bench test mode, wrong header for sure!
|
||||||
#include "injector_central.h"
|
#include "bench_test.h"
|
||||||
|
|
||||||
static void setFsioAnalogInputPin(const char *indexStr, const char *pinName) {
|
static void setFsioAnalogInputPin(const char *indexStr, const char *pinName) {
|
||||||
// todo: reduce code duplication between all "set pin methods"
|
// todo: reduce code duplication between all "set pin methods"
|
||||||
|
@ -736,7 +734,6 @@ void initFsioImpl(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
|
||||||
|
|
||||||
EXTERN_ENGINE
|
EXTERN_ENGINE
|
||||||
;
|
;
|
||||||
extern EnginePins enginePins;
|
|
||||||
|
|
||||||
// "Limp-mode" implementation for some RAM-limited configs without FSIO
|
// "Limp-mode" implementation for some RAM-limited configs without FSIO
|
||||||
void runHardcodedFsio(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
|
void runHardcodedFsio(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
#include "main_trigger_callback.h"
|
#include "main_trigger_callback.h"
|
||||||
#include "io_pins.h"
|
#include "io_pins.h"
|
||||||
#include "flash_main.h"
|
#include "flash_main.h"
|
||||||
#include "injector_central.h"
|
#include "bench_test.h"
|
||||||
#include "os_util.h"
|
#include "os_util.h"
|
||||||
#include "engine_math.h"
|
#include "engine_math.h"
|
||||||
#include "allsensors.h"
|
#include "allsensors.h"
|
||||||
|
@ -103,7 +103,6 @@ EXTERN_ENGINE;
|
||||||
#if !EFI_UNIT_TEST
|
#if !EFI_UNIT_TEST
|
||||||
|
|
||||||
extern bool hasFirmwareErrorFlag;
|
extern bool hasFirmwareErrorFlag;
|
||||||
extern EnginePins enginePins;
|
|
||||||
|
|
||||||
static LoggingWithStorage logger("Engine Controller");
|
static LoggingWithStorage logger("Engine Controller");
|
||||||
|
|
||||||
|
@ -604,7 +603,7 @@ void commonInitEngineController(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S
|
||||||
|
|
||||||
#if EFI_ENGINE_CONTROL
|
#if EFI_ENGINE_CONTROL
|
||||||
/**
|
/**
|
||||||
* This has to go after 'initInjectorCentral' in order to
|
* This has to go after 'enginePins.startPins()' in order to
|
||||||
* properly detect un-assigned output pins
|
* properly detect un-assigned output pins
|
||||||
*/
|
*/
|
||||||
prepareShapes(PASS_ENGINE_PARAMETER_SIGNATURE);
|
prepareShapes(PASS_ENGINE_PARAMETER_SIGNATURE);
|
||||||
|
@ -666,7 +665,9 @@ void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX)
|
||||||
addConsoleAction("analoginfo", printAnalogInfo);
|
addConsoleAction("analoginfo", printAnalogInfo);
|
||||||
|
|
||||||
#if EFI_PROD_CODE && EFI_ENGINE_CONTROL
|
#if EFI_PROD_CODE && EFI_ENGINE_CONTROL
|
||||||
initInjectorCentral(sharedLogger);
|
enginePins.startPins();
|
||||||
|
|
||||||
|
initBenchTest(sharedLogger);
|
||||||
#endif /* EFI_PROD_CODE && EFI_ENGINE_CONTROL */
|
#endif /* EFI_PROD_CODE && EFI_ENGINE_CONTROL */
|
||||||
|
|
||||||
commonInitEngineController(sharedLogger);
|
commonInitEngineController(sharedLogger);
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
#include "lcd_menu_tree.h"
|
#include "lcd_menu_tree.h"
|
||||||
#include "memstreams.h"
|
#include "memstreams.h"
|
||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
#include "injector_central.h"
|
#include "bench_test.h"
|
||||||
#include "engine_controller.h"
|
#include "engine_controller.h"
|
||||||
#include "mmc_card.h"
|
#include "mmc_card.h"
|
||||||
#include "idle_thread.h"
|
#include "idle_thread.h"
|
||||||
|
|
|
@ -153,6 +153,12 @@ void EnginePins::unregisterPins() {
|
||||||
#endif /* EFI_PROD_CODE */
|
#endif /* EFI_PROD_CODE */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void EnginePins::startPins() {
|
||||||
|
startInjectionPins();
|
||||||
|
startIgnitionPins();
|
||||||
|
startAuxValves();
|
||||||
|
}
|
||||||
|
|
||||||
void EnginePins::reset() {
|
void EnginePins::reset() {
|
||||||
for (int i = 0; i < INJECTION_PIN_COUNT;i++) {
|
for (int i = 0; i < INJECTION_PIN_COUNT;i++) {
|
||||||
injectors[i].reset();
|
injectors[i].reset();
|
||||||
|
|
|
@ -113,6 +113,7 @@ public:
|
||||||
class EnginePins {
|
class EnginePins {
|
||||||
public:
|
public:
|
||||||
EnginePins();
|
EnginePins();
|
||||||
|
void startPins();
|
||||||
void reset();
|
void reset();
|
||||||
bool stopPins();
|
bool stopPins();
|
||||||
void unregisterPins();
|
void unregisterPins();
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
#include "hardware.h"
|
#include "hardware.h"
|
||||||
#include "rtc_helper.h"
|
#include "rtc_helper.h"
|
||||||
#include "os_util.h"
|
#include "os_util.h"
|
||||||
#include "injector_central.h"
|
#include "bench_test.h"
|
||||||
#include "vehicle_speed.h"
|
#include "vehicle_speed.h"
|
||||||
#include "yaw_rate_sensor.h"
|
#include "yaw_rate_sensor.h"
|
||||||
#include "pin_repository.h"
|
#include "pin_repository.h"
|
||||||
|
|
|
@ -56,7 +56,6 @@
|
||||||
static NamedOutputPin intHold(PROTOCOL_HIP_NAME);
|
static NamedOutputPin intHold(PROTOCOL_HIP_NAME);
|
||||||
|
|
||||||
extern uint32_t lastExecutionCount;
|
extern uint32_t lastExecutionCount;
|
||||||
extern EnginePins enginePins;
|
|
||||||
|
|
||||||
uint32_t hipLastExecutionCount;
|
uint32_t hipLastExecutionCount;
|
||||||
|
|
||||||
|
|
|
@ -28,8 +28,6 @@ EXTERN_ENGINE;
|
||||||
|
|
||||||
static LoggingWithStorage logger("io_pins");
|
static LoggingWithStorage logger("io_pins");
|
||||||
|
|
||||||
extern EnginePins enginePins;
|
|
||||||
|
|
||||||
bool efiReadPin(brain_pin_e pin) {
|
bool efiReadPin(brain_pin_e pin) {
|
||||||
if (brain_pin_is_onchip(pin))
|
if (brain_pin_is_onchip(pin))
|
||||||
return palReadPad(getHwPort("readPin", pin), getHwPin("readPin", pin));
|
return palReadPad(getHwPort("readPin", pin), getHwPin("readPin", pin));
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
#include "main_trigger_callback.h"
|
#include "main_trigger_callback.h"
|
||||||
#include "allsensors.h"
|
#include "allsensors.h"
|
||||||
#include "sensor_chart.h"
|
#include "sensor_chart.h"
|
||||||
#include "injector_central.h"
|
#include "bench_test.h"
|
||||||
#include "engine.h"
|
#include "engine.h"
|
||||||
#include "tunerstudio.h"
|
#include "tunerstudio.h"
|
||||||
#include "trigger_emulator.h"
|
#include "trigger_emulator.h"
|
||||||
|
|
|
@ -16,7 +16,6 @@
|
||||||
#include "advance_map.h"
|
#include "advance_map.h"
|
||||||
|
|
||||||
extern int timeNowUs;
|
extern int timeNowUs;
|
||||||
extern EnginePins enginePins;
|
|
||||||
extern WarningCodeState unitTestWarningCodeState;
|
extern WarningCodeState unitTestWarningCodeState;
|
||||||
extern float testMafValue;
|
extern float testMafValue;
|
||||||
extern float testCltValue;
|
extern float testCltValue;
|
||||||
|
|
|
@ -13,6 +13,8 @@
|
||||||
#include "main_trigger_callback.h"
|
#include "main_trigger_callback.h"
|
||||||
#include "unit_test_framework.h"
|
#include "unit_test_framework.h"
|
||||||
|
|
||||||
|
extern EnginePins enginePins;
|
||||||
|
|
||||||
class EngineTestHelperBase
|
class EngineTestHelperBase
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -8,8 +8,6 @@
|
||||||
#include "engine_test_helper.h"
|
#include "engine_test_helper.h"
|
||||||
#include "spark_logic.h"
|
#include "spark_logic.h"
|
||||||
|
|
||||||
extern EnginePins enginePins;
|
|
||||||
|
|
||||||
TEST(ignition, twoCoils) {
|
TEST(ignition, twoCoils) {
|
||||||
WITH_ENGINE_TEST_HELPER(BMW_M73_F);
|
WITH_ENGINE_TEST_HELPER(BMW_M73_F);
|
||||||
|
|
||||||
|
|
|
@ -293,7 +293,6 @@ static void assertREqualsM(const char *msg, void *expected, void *actual) {
|
||||||
}
|
}
|
||||||
|
|
||||||
extern bool_t debugSignalExecutor;
|
extern bool_t debugSignalExecutor;
|
||||||
extern EnginePins enginePins;
|
|
||||||
|
|
||||||
TEST(misc, testRpmCalculator) {
|
TEST(misc, testRpmCalculator) {
|
||||||
printf("*************************************************** testRpmCalculator\r\n");
|
printf("*************************************************** testRpmCalculator\r\n");
|
||||||
|
|
Loading…
Reference in New Issue