rusefi
/
rusefi
mirror of https://github.com/rusefi/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

trigger and VSS hw integrated testing #1668

This commit is contained in:
rusefi 2020-08-08 11:45:02 -04:00
parent af37b12082
commit 5925ca5125
5 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/config/engines/engines.mk
View File

@ -29,10 +29,7 @@ ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \
$(PROJECT_DIR)/config/engines/dodge_ram.cpp \
$(PROJECT_DIR)/config/engines/vw.cpp \
$(PROJECT_DIR)/config/engines/vw_b6.cpp \
$(PROJECT_DIR)/config/engines/dodge_stratus.cpp \
$(PROJECT_DIR)/config/engines/chevrolet_camaro_4.cpp \
$(PROJECT_DIR)/config/engines/suzuki_vitara.cpp \
$(PROJECT_DIR)/config/engines/daihatsu.cpp \
$(PROJECT_DIR)/config/engines/chevrolet_c20_1973.cpp \
$(PROJECT_DIR)/config/engines/toyota_jzs147.cpp \
$(PROJECT_DIR)/config/engines/lada_kalina.cpp \

15
firmware/controllers/algo/engine_configuration.cpp
View File

@ -43,7 +43,6 @@
#include "dodge_neon.h"
#include "dodge_ram.h"
#include "dodge_stratus.h"
#include "ford_aspire.h"
#include "ford_fiesta.h"
@ -69,9 +68,7 @@
#include "vw.h"
#include "me7pnp.h"
#include "vw_b6.h"
#include "daihatsu.h"
#include "chevrolet_camaro_4.h"
#include "suzuki_vitara.h"
#include "chevrolet_c20_1973.h"
#include "toyota_jzs147.h"
#include "ford_festiva.h"
@ -1199,6 +1196,9 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
// todo: is it time to replace MICRO_RUS_EFI, PROTEUS, PROMETHEUS_DEFAULTS with MINIMAL_PINS? maybe rename MINIMAL_PINS to DEFAULT?
case PROTEUS:
case PROMETHEUS_DEFAULTS:
case DAIHATSU:
case DODGE_STRATUS:
case SUZUKI_VITARA:
case MINIMAL_PINS:
// all basic settings are already set in prepareVoidConfiguration(), no need to set anything here
// nothing to do - we do it all in setBoardConfigurationOverrides
@ -1331,9 +1331,6 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
case MAZDA_626:
setMazda626EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case SUZUKI_VITARA:
setSuzukiVitara(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case FORD_ESCORT_GT:
setFordEscortGt(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
@ -1361,9 +1358,6 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
case DODGE_RAM:
setDodgeRam1996(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case DODGE_STRATUS:
setDodgeStratus(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case VW_ABA:
setVwAba(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
@ -1385,9 +1379,6 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
case SACHS:
setSachs(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case DAIHATSU:
setDaihatsu(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case CAMARO_4:
setCamaro4(PASS_CONFIG_PARAMETER_SIGNATURE);
break;

4
firmware/controllers/settings.cpp
View File

@ -890,7 +890,7 @@ static void enableOrDisable(const char *param, bool isEnabled) {
engineConfiguration->verboseTriggerSynchDetails = isEnabled;
} else if (strEqualCaseInsensitive(param, "ignition")) {
engineConfiguration->isIgnitionEnabled = isEnabled;
} else if (strEqualCaseInsensitive(param, "self_stimulation")) {
} else if (strEqualCaseInsensitive(param, CMD_SELF_STIMULATION)) {
engine->directSelfStimulation = isEnabled;
} else if (strEqualCaseInsensitive(param, "engine_control")) {
engineConfiguration->isEngineControlEnabled = isEnabled;
@ -1272,7 +1272,7 @@ static void setValue(const char *paramStr, const char *valueStr) {
} else if (strEqualCaseInsensitive(paramStr, "tps_min")) {
engineConfiguration->tpsMin = valueI;
#if EFI_EMULATE_POSITION_SENSORS
} else if (strEqualCaseInsensitive(paramStr, "rpm")) {
} else if (strEqualCaseInsensitive(paramStr, CMD_RPM)) {
setTriggerEmulatorRPM(valueI);
#endif /* EFI_EMULATE_POSITION_SENSORS */
} else if (strEqualCaseInsensitive(paramStr, "vvt_offset")) {

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

@ -179,7 +179,7 @@ void initTriggerEmulatorLogic(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUF
s->getSize(), s->wave.switchTimes, PWM_PHASE_MAX_WAVE_PER_PWM,
pinStates, updateTriggerWaveformIfNeeded, (pwm_gen_callback*)emulatorApplyPinState);
addConsoleActionI("rpm", setTriggerEmulatorRPM);
addConsoleActionI(CMD_RPM, setTriggerEmulatorRPM);
addConsoleActionI("stop_stimulator_at_index", setEmulatorAtIndex);
addConsoleAction("resume_stimulator", resumeStimulator);
}

2
firmware/integration/rusefi_config.txt
View File

@ -1561,6 +1561,8 @@ end_struct
#define CMD_CALIBRATE_PEDAL_UP "calibrate_pedal_up"
#define CMD_CALIBRATE_PEDAL_DOWN "calibrate_pedal_down"
#define CMD_ETB_DUTY "set_etb_duty"
#define CMD_SELF_STIMULATION "self_stimulation"
#define CMD_RPM "rpm"
#define CMD_RESET_ENGINE_SNIFFER "reset_engine_chart"
#define CMD_FUNCTIONAL_TEST_MODE "test_mode"