mirror of https://github.com/FOME-Tech/fome-fw.git
Merge branch 'master' of https://github.com/fome-tech/fome-fw
This commit is contained in:
commit
519094d93f
|
@ -28,66 +28,14 @@
|
|||
#include "dc_motors.h"
|
||||
#include "idle_hardware.h"
|
||||
|
||||
static void showIdleInfo() {
|
||||
const char * idleModeStr = getIdle_mode_e(engineConfiguration->idleMode);
|
||||
efiPrintf("useStepperIdle=%s useHbridges=%s useRawOutput=%s",
|
||||
boolToString(engineConfiguration->useStepperIdle),
|
||||
boolToString(engineConfiguration->useHbridgesToDriveIdleStepper),
|
||||
boolToString(engineConfiguration->useRawOutputToDriveIdleStepper));
|
||||
efiPrintf("idleMode=%s position=%.2f",
|
||||
idleModeStr, getIdlePosition());
|
||||
|
||||
if (engineConfiguration->useStepperIdle) {
|
||||
if (engineConfiguration->useRawOutputToDriveIdleStepper) {
|
||||
efiPrintf(" A+=%s", hwPortname(engineConfiguration->stepper_raw_output[0]));
|
||||
efiPrintf(" A-=%s", hwPortname(engineConfiguration->stepper_raw_output[1]));
|
||||
efiPrintf(" B+=%s", hwPortname(engineConfiguration->stepper_raw_output[2]));
|
||||
efiPrintf(" B-=%s", hwPortname(engineConfiguration->stepper_raw_output[3]));
|
||||
} else if (engineConfiguration->useHbridgesToDriveIdleStepper) {
|
||||
efiPrintf("Coil A:");
|
||||
efiPrintf(" pin1=%s", hwPortname(engineConfiguration->stepperDcIo[0].directionPin1));
|
||||
efiPrintf(" pin2=%s", hwPortname(engineConfiguration->stepperDcIo[0].directionPin2));
|
||||
showDcMotorInfo(2);
|
||||
efiPrintf("Coil B:");
|
||||
efiPrintf(" pin1=%s", hwPortname(engineConfiguration->stepperDcIo[1].directionPin1));
|
||||
efiPrintf(" pin2=%s", hwPortname(engineConfiguration->stepperDcIo[1].directionPin2));
|
||||
showDcMotorInfo(3);
|
||||
} else {
|
||||
efiPrintf("directionPin=%s reactionTime=%.2f", hwPortname(engineConfiguration->idle.stepperDirectionPin),
|
||||
engineConfiguration->idleStepperReactionTime);
|
||||
efiPrintf("stepPin=%s steps=%d", hwPortname(engineConfiguration->idle.stepperStepPin),
|
||||
engineConfiguration->idleStepperTotalSteps);
|
||||
efiPrintf("enablePin=%s/%d", hwPortname(engineConfiguration->stepperEnablePin),
|
||||
engineConfiguration->stepperEnablePinMode);
|
||||
}
|
||||
} else {
|
||||
if (!engineConfiguration->isDoubleSolenoidIdle) {
|
||||
efiPrintf("idle valve freq=%d on %s", engineConfiguration->idle.solenoidFrequency,
|
||||
hwPortname(engineConfiguration->idle.solenoidPin));
|
||||
} else {
|
||||
efiPrintf("idle valve freq=%d on %s", engineConfiguration->idle.solenoidFrequency,
|
||||
hwPortname(engineConfiguration->idle.solenoidPin));
|
||||
efiPrintf(" and %s", hwPortname(engineConfiguration->secondSolenoidPin));
|
||||
}
|
||||
}
|
||||
|
||||
#if EFI_IDLE_CONTROL
|
||||
if (engineConfiguration->idleMode == IM_AUTO) {
|
||||
engine->module<IdleController>().unmock().getIdlePid()->showPidStatus("idle");
|
||||
}
|
||||
#endif // EFI_IDLE_CONTROL
|
||||
}
|
||||
|
||||
void setIdleMode(idle_mode_e value) {
|
||||
engineConfiguration->idleMode = value ? IM_AUTO : IM_MANUAL;
|
||||
showIdleInfo();
|
||||
}
|
||||
|
||||
void setManualIdleValvePosition(int positionPercent) {
|
||||
if (positionPercent < 1 || positionPercent > 99)
|
||||
return;
|
||||
efiPrintf("setting idle valve position %d", positionPercent);
|
||||
showIdleInfo();
|
||||
// todo: this is not great that we have to write into configuration here
|
||||
engineConfiguration->manIdlePosition = positionPercent;
|
||||
}
|
||||
|
@ -143,7 +91,6 @@ static void applyPidSettings() {
|
|||
void setTargetIdleRpm(int value) {
|
||||
setTargetRpmCurve(value);
|
||||
efiPrintf("target idle RPM %d", value);
|
||||
showIdleInfo();
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -152,7 +99,6 @@ void setTargetIdleRpm(int value) {
|
|||
void startIdleBench(void) {
|
||||
engine->timeToStopIdleTest = getTimeNowUs() + MS2US(3000); // 3 seconds
|
||||
efiPrintf("idle valve bench test");
|
||||
showIdleInfo();
|
||||
}
|
||||
|
||||
#endif /* EFI_UNIT_TEST */
|
||||
|
@ -216,8 +162,6 @@ void startIdleThread() {
|
|||
|
||||
#if ! EFI_UNIT_TEST
|
||||
|
||||
addConsoleAction("idleinfo", showIdleInfo);
|
||||
|
||||
addConsoleActionII("blipidle", blipIdle);
|
||||
|
||||
// split this whole file into manual controller and auto controller? move these commands into the file
|
||||
|
|
|
@ -47,13 +47,6 @@ float processW202(const CANRxFrame& frame) {
|
|||
|
||||
/* End of specific processing functions */
|
||||
|
||||
static void canVssInfo() {
|
||||
efiPrintf("vss using can option selected %x", engineConfiguration->canVssNbcType);
|
||||
efiPrintf("vss filter for %x canID", filterCanID);
|
||||
efiPrintf("Vss module is %d", isInit);
|
||||
efiPrintf("CONFIG_enableCanVss is %d", engineConfiguration->enableCanVss);
|
||||
}
|
||||
|
||||
expected<float> processCanRxVssImpl(const CANRxFrame& frame) {
|
||||
switch (engineConfiguration->canVssNbcType){
|
||||
case BMW_e46:
|
||||
|
@ -89,8 +82,6 @@ void processCanRxVss(const CANRxFrame& frame, efitick_t nowNt) {
|
|||
}
|
||||
|
||||
void initCanVssSupport() {
|
||||
addConsoleAction("canvssinfo", canVssInfo);
|
||||
|
||||
if (engineConfiguration->enableCanVss) {
|
||||
if (auto canId = look_up_can_id(engineConfiguration->canVssNbcType)) {
|
||||
filterCanID = canId.Value;
|
||||
|
@ -104,7 +95,6 @@ void initCanVssSupport() {
|
|||
|
||||
void setCanVss(int type) {
|
||||
engineConfiguration->canVssNbcType = (can_vss_nbc_e)type;
|
||||
canVssInfo();
|
||||
}
|
||||
|
||||
#endif // EFI_CAN_SUPPORT
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
#pragma once
|
||||
#define VCS_DATE 20231026
|
||||
#define VCS_DATE 20231027
|
||||
|
|
|
@ -425,6 +425,22 @@ void commonInitEngineController() {
|
|||
}
|
||||
#endif
|
||||
|
||||
#if !EFI_UNIT_TEST && EFI_ENGINE_CONTROL
|
||||
initBenchTest();
|
||||
#endif /* EFI_PROD_CODE && EFI_ENGINE_CONTROL */
|
||||
|
||||
#if EFI_ALTERNATOR_CONTROL
|
||||
initAlternatorCtrl();
|
||||
#endif /* EFI_ALTERNATOR_CONTROL */
|
||||
|
||||
#if EFI_VVT_PID
|
||||
initVvtActuators();
|
||||
#endif /* EFI_VVT_PID */
|
||||
|
||||
#if EFI_MALFUNCTION_INDICATOR
|
||||
initMalfunctionIndicator();
|
||||
#endif /* EFI_MALFUNCTION_INDICATOR */
|
||||
|
||||
#if !EFI_UNIT_TEST
|
||||
// This is tested independently - don't configure sensors for tests.
|
||||
// This lets us selectively mock them for each test.
|
||||
|
@ -601,10 +617,6 @@ bool validateConfig() {
|
|||
void initEngineController() {
|
||||
addConsoleAction("sensorinfo", printSensorInfo);
|
||||
|
||||
#if EFI_PROD_CODE && EFI_ENGINE_CONTROL
|
||||
initBenchTest();
|
||||
#endif /* EFI_PROD_CODE && EFI_ENGINE_CONTROL */
|
||||
|
||||
commonInitEngineController();
|
||||
|
||||
#if EFI_LOGIC_ANALYZER
|
||||
|
@ -624,23 +636,6 @@ void initEngineController() {
|
|||
#if EFI_PWM_TESTER
|
||||
initPwmTester();
|
||||
#endif /* EFI_PWM_TESTER */
|
||||
|
||||
#if EFI_ALTERNATOR_CONTROL
|
||||
initAlternatorCtrl();
|
||||
#endif /* EFI_ALTERNATOR_CONTROL */
|
||||
|
||||
#if EFI_VVT_PID
|
||||
initVvtActuators();
|
||||
#endif /* EFI_VVT_PID */
|
||||
|
||||
#if EFI_MALFUNCTION_INDICATOR
|
||||
initMalfunctionIndicator();
|
||||
#endif /* EFI_MALFUNCTION_INDICATOR */
|
||||
|
||||
#if EFI_PROD_CODE
|
||||
addConsoleAction("reset_accel", resetAccel);
|
||||
#endif /* EFI_PROD_CODE */
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -457,7 +457,7 @@ static void disable(const char *param) {
|
|||
/**
|
||||
* See 'LimpManager::isEngineStop' for code which actually stops engine
|
||||
*/
|
||||
void scheduleStopEngine(void) {
|
||||
void scheduleStopEngine() {
|
||||
doScheduleStopEngine();
|
||||
}
|
||||
|
||||
|
@ -601,7 +601,7 @@ static void setValue(const char *paramStr, const char *valueStr) {
|
|||
engine->resetEngineSnifferIfInTestMode();
|
||||
}
|
||||
|
||||
void initSettings(void) {
|
||||
void initSettings() {
|
||||
#if EFI_SIMULATOR
|
||||
printf("initSettings\n");
|
||||
#endif // EFI_SIMULATOR
|
||||
|
|
|
@ -10,9 +10,9 @@
|
|||
|
||||
#include "engine_configuration_generated_structures.h"
|
||||
|
||||
void initSettings(void);
|
||||
void initSettings();
|
||||
void printConfiguration(const engine_configuration_s *engineConfiguration);
|
||||
void scheduleStopEngine(void);
|
||||
void scheduleStopEngine();
|
||||
|
||||
void setEngineType(int value);
|
||||
void setEngineType(engine_type_e value);
|
||||
|
|
|
@ -35,14 +35,11 @@ public class RecentCommands {
|
|||
private static final String STOPENGINE = "stopengine";
|
||||
private static final String HELP = "help";
|
||||
private static final String SENSORINFO = "sensorinfo";
|
||||
private static final String IDLEINFO = "idleinfo";
|
||||
private static final String MAPINFO = "mapinfo";
|
||||
private static final String CANINFO = "caninfo";
|
||||
private static final String TSINFO = "tsinfo";
|
||||
private static final String SPEEDINFO = "speedinfo";
|
||||
private static final String FUELINFO = "fuelinfo";
|
||||
private static final String SDINFO = "sdinfo";
|
||||
private static final String FSIOINFO = "fsioinfo";
|
||||
private static final String PINS = "pins";
|
||||
|
||||
private final static Map<String, Icon> COMMAND_ICONS = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
|
||||
|
@ -53,16 +50,13 @@ public class RecentCommands {
|
|||
COMMAND_ICONS.put(HELP, UiUtils.loadIcon("help.jpg"));
|
||||
COMMAND_ICONS.put(SENSORINFO, infoIcon);
|
||||
COMMAND_ICONS.put(CMD_TRIGGERINFO, UiUtils.loadIcon("trigger.jpg"));
|
||||
COMMAND_ICONS.put(IDLEINFO, infoIcon);
|
||||
COMMAND_ICONS.put(TSINFO, infoIcon);
|
||||
COMMAND_ICONS.put(MAPINFO, infoIcon);
|
||||
COMMAND_ICONS.put(CANINFO, infoIcon);
|
||||
COMMAND_ICONS.put(FUELINFO, infoIcon);
|
||||
COMMAND_ICONS.put(SDINFO, UiUtils.loadIcon("sdinfo.jpg"));
|
||||
COMMAND_ICONS.put(FSIOINFO, infoIcon);
|
||||
COMMAND_ICONS.put(PINS, infoIcon);
|
||||
COMMAND_ICONS.put(Fields.CMD_WRITECONFIG, UiUtils.loadIcon("writeconfig.jpg"));
|
||||
COMMAND_ICONS.put(SPEEDINFO, UiUtils.loadIcon("speedinfo.jpg"));
|
||||
}
|
||||
|
||||
private final JPanel content = new JPanel(new GridLayout(NUMBER_OF_COMMANDS + 1, 1));
|
||||
|
@ -108,7 +102,6 @@ public class RecentCommands {
|
|||
add(SENSORINFO);
|
||||
add(CMD_TRIGGERINFO);
|
||||
add(TSINFO);
|
||||
add(SPEEDINFO);
|
||||
add(CANINFO);
|
||||
add(Fields.CMD_WRITECONFIG);
|
||||
add("rewriteconfig");
|
||||
|
@ -126,11 +119,9 @@ public class RecentCommands {
|
|||
add("set_idle_position 50");
|
||||
add("sparkbench 5 400 2");
|
||||
add("fuelbench 5 400 2");
|
||||
add(IDLEINFO);
|
||||
add(MAPINFO);
|
||||
add(FUELINFO);
|
||||
add(SDINFO);
|
||||
add(FSIOINFO);
|
||||
add(PINS);
|
||||
}
|
||||
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 987 B |
|
@ -108,7 +108,6 @@ void rusEfiFunctionalTest(void) {
|
|||
|
||||
initTriggerCentral();
|
||||
initTriggerEmulator();
|
||||
initVvtActuators();
|
||||
|
||||
startStatusThreads();
|
||||
|
||||
|
|
Loading…
Reference in New Issue