From 9d271b42d41a4f70e1f91862d1f8f1dc698254ec Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Thu, 26 Oct 2023 15:51:25 -0400 Subject: [PATCH] console commands cleanup --- .../controllers/actuators/idle_thread_io.cpp | 56 ------------------ firmware/controllers/can/can_vss.cpp | 9 --- .../java/com/rusefi/ui/RecentCommands.java | 14 ----- .../main/resources/com/rusefi/speedinfo.jpg | Bin 987 -> 0 bytes 4 files changed, 79 deletions(-) delete mode 100644 java_console/ui/src/main/resources/com/rusefi/speedinfo.jpg diff --git a/firmware/controllers/actuators/idle_thread_io.cpp b/firmware/controllers/actuators/idle_thread_io.cpp index 77b9033ea1..789783ca4a 100644 --- a/firmware/controllers/actuators/idle_thread_io.cpp +++ b/firmware/controllers/actuators/idle_thread_io.cpp @@ -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().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; } @@ -144,7 +92,6 @@ static void applyPidSettings() { void setTargetIdleRpm(int value) { setTargetRpmCurve(value); efiPrintf("target idle RPM %d", value); - showIdleInfo(); } void setIdlePFactor(float value) { @@ -171,7 +118,6 @@ void setIdleDFactor(float value) { void startIdleBench(void) { engine->timeToStopIdleTest = getTimeNowUs() + MS2US(3000); // 3 seconds efiPrintf("idle valve bench test"); - showIdleInfo(); } #endif /* EFI_UNIT_TEST */ @@ -235,8 +181,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 diff --git a/firmware/controllers/can/can_vss.cpp b/firmware/controllers/can/can_vss.cpp index f8bd532364..5779f1ae06 100644 --- a/firmware/controllers/can/can_vss.cpp +++ b/firmware/controllers/can/can_vss.cpp @@ -49,13 +49,6 @@ float processW202(const CANRxFrame& frame) { /* End of specific processing functions */ -void canVssInfo(void) { - 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 processCanRxVssImpl(const CANRxFrame& frame) { switch (engineConfiguration->canVssNbcType){ case BMW_e46: @@ -91,8 +84,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; diff --git a/java_console/ui/src/main/java/com/rusefi/ui/RecentCommands.java b/java_console/ui/src/main/java/com/rusefi/ui/RecentCommands.java index 90dcc97355..bdec016307 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/RecentCommands.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/RecentCommands.java @@ -44,10 +44,8 @@ public class RecentCommands { private static final String ACCELINFO = "accelinfo"; 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 COMMAND_ICONS = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); @@ -55,23 +53,16 @@ public class RecentCommands { static { COMMAND_ICONS.put(STOPENGINE, AutoupdateUtil.loadIcon("stop.jpg")); ImageIcon infoIcon = AutoupdateUtil.loadIcon("info.png"); - COMMAND_ICONS.put(SHOWCONFIG, infoIcon); COMMAND_ICONS.put(HELP, AutoupdateUtil.loadIcon("help.jpg")); COMMAND_ICONS.put(SENSORINFO, infoIcon); COMMAND_ICONS.put(CMD_TRIGGERINFO, AutoupdateUtil.loadIcon("trigger.jpg")); - COMMAND_ICONS.put(IDLEINFO, infoIcon); - COMMAND_ICONS.put(ALTINFO, AutoupdateUtil.loadIcon("alternator.jpg")); - COMMAND_ICONS.put(ACCELINFO, infoIcon); COMMAND_ICONS.put(TSINFO, infoIcon); - COMMAND_ICONS.put(TPSINFO, infoIcon); COMMAND_ICONS.put(MAPINFO, infoIcon); COMMAND_ICONS.put(CANINFO, infoIcon); COMMAND_ICONS.put(FUELINFO, infoIcon); COMMAND_ICONS.put(SDINFO, AutoupdateUtil.loadIcon("sdinfo.jpg")); - COMMAND_ICONS.put(FSIOINFO, infoIcon); COMMAND_ICONS.put(PINS, infoIcon); COMMAND_ICONS.put(Fields.CMD_WRITECONFIG, AutoupdateUtil.loadIcon("writeconfig.jpg")); - COMMAND_ICONS.put(SPEEDINFO, AutoupdateUtil.loadIcon("speedinfo.jpg")); } private final JPanel content = new JPanel(new GridLayout(NUMBER_OF_COMMANDS + 1, 1)); @@ -118,7 +109,6 @@ public class RecentCommands { add(SENSORINFO); add(CMD_TRIGGERINFO); add(TSINFO); - add(SPEEDINFO); add(CANINFO); add(Fields.CMD_WRITECONFIG); add("rewriteconfig"); @@ -136,14 +126,10 @@ public class RecentCommands { add("set_idle_position 50"); add("sparkbench 5 400 2"); add("fuelbench 5 400 2"); - add(IDLEINFO); - add(ALTINFO); - add(TPSINFO); add(MAPINFO); add(ACCELINFO); add(FUELINFO); add(SDINFO); - add(FSIOINFO); add(PINS); } diff --git a/java_console/ui/src/main/resources/com/rusefi/speedinfo.jpg b/java_console/ui/src/main/resources/com/rusefi/speedinfo.jpg deleted file mode 100644 index f673da8d1d0b525406a087ed138dc2a04e114892..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 987 zcmex=``2_j6xdp@o1cgOJMMZh|#U;coyG6VInuyV4pa*FVB^NNrR z{vTox>_7<#pcg>CKmaCY7Dm?pw-|VU z8khu_1sE6@??*(OeE9fZo59*kDtg5?MO{s_fm)>m7?_w*wE}grF*5))a{$E|S((Z% zbaq;NGW*OUI&qzQR;-QQ%+D7dSKGaKw3bb?s7L2H&=durE14LXSrHCkU}Rzz6gG4e zQZ!n45o{LF7JJ5gHkTi%+Y%qFd*P(#f4YBZah~gzSLG(D+iFFxUfc;ZNnVhFkp&q3 z2$O&wU=|b-W>FMzTnILZ31m=qZc=xqvz#xhgs16CUkM&9KDTupao&2bU(KqW%dj74 zlBNLA4XjMeoN%LnPGVpY6jBUK6gD&xQ8IQ6Dx7ri64aw?_DnH*b~WjIl(k%TxMF?g zjP0ytVMNhev76Z z6g#;;sE_dsP`j)EC_N&_BhV2HfsTcSi3m>%u&rs75bR}*(d>O1`s>c_%O4(3Fj#Wv zXfvBcOS5*-`9KH12MqgEP99TwrugFPaY;ilCbtR4>ni#)xI0A5n1r8fkMlFgD|}!6 TzPI_$Ujxf6Y-__9|K9`v2dE4`