From 9e428cfe571a76ad75e413a41ad5966ebe8ba5c6 Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 2 Jul 2020 22:46:37 -0400 Subject: [PATCH] steps towards Android --- java_console/io/io.iml | 2 ++ .../src/main/java/com/rusefi/ConsoleUI.java | 2 +- .../main/java/com/rusefi/EcuStimulator.java | 4 ++-- .../java/com/rusefi/etb/TestSequenceStep.java | 2 +- .../java/com/rusefi/ui/RecentCommands.java | 2 +- .../rusefi/ui/etb/EtbMonteCarloSequence.java | 17 ++++++++------- .../com/rusefi/ui/etb/EtbReturnToNeutral.java | 7 ++++--- .../com/rusefi/ui/etb/MagicSpotsFinder.java | 21 ++++++++++--------- .../com/rusefi/ui/widgets/AnyCommand.java | 18 ++++++++-------- .../com/rusefi/ui/widgets/PotCommand.java | 3 ++- 10 files changed, 42 insertions(+), 36 deletions(-) diff --git a/java_console/io/io.iml b/java_console/io/io.iml index 12d5ac8949..724684b2c3 100644 --- a/java_console/io/io.iml +++ b/java_console/io/io.iml @@ -12,5 +12,7 @@ + + \ No newline at end of file diff --git a/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java b/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java index d08e6a678b..3a0f28b8fe 100644 --- a/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java +++ b/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java @@ -231,7 +231,7 @@ public class ConsoleUI { new ConsoleUI(port); } else { for (String p : LinkManager.getCommPorts()) - MessagesCentral.getInstance().postMessage(Launcher.class, "Available port: " + p); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, Launcher.class, "Available port: " + p); new StartupFrame().chooseSerialPort(); } diff --git a/java_console/ui/src/main/java/com/rusefi/EcuStimulator.java b/java_console/ui/src/main/java/com/rusefi/EcuStimulator.java index 9c266130d6..c17cfd82f1 100644 --- a/java_console/ui/src/main/java/com/rusefi/EcuStimulator.java +++ b/java_console/ui/src/main/java/com/rusefi/EcuStimulator.java @@ -100,7 +100,7 @@ public class EcuStimulator { putValue("engine_load", engineLoad) + putValue("advance", advance) + putValue("dwell", dwell); - MessagesCentral.getInstance().postMessage(EcuStimulator.class, msg); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, EcuStimulator.class, msg); try { csv.write(msg + "\r\n"); @@ -232,7 +232,7 @@ public class EcuStimulator { } private static void log(String message) { - MessagesCentral.getInstance().postMessage(EcuStimulator.class, message); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, EcuStimulator.class, message); FileLog.MAIN.logLine(message); } diff --git a/java_console/ui/src/main/java/com/rusefi/etb/TestSequenceStep.java b/java_console/ui/src/main/java/com/rusefi/etb/TestSequenceStep.java index 398a7c9365..09ee5d3d84 100644 --- a/java_console/ui/src/main/java/com/rusefi/etb/TestSequenceStep.java +++ b/java_console/ui/src/main/java/com/rusefi/etb/TestSequenceStep.java @@ -40,7 +40,7 @@ public abstract class TestSequenceStep { next.execute(executor); } } else { - MessagesCentral.getInstance().postMessage(TestSequenceStep.class, "ETB test sequence done!"); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, TestSequenceStep.class, "ETB test sequence done!"); } } 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 d594ab4142..da30787c6a 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 @@ -293,7 +293,7 @@ public class RecentCommands { } catch (IOException e) { throw new IllegalStateException(e); } - MessagesCentral.getInstance().postMessage(AverageAnglesUtil.class, report); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, AverageAnglesUtil.class, report); } } }); diff --git a/java_console/ui/src/main/java/com/rusefi/ui/etb/EtbMonteCarloSequence.java b/java_console/ui/src/main/java/com/rusefi/ui/etb/EtbMonteCarloSequence.java index 41f3ee3516..5eb9f16e0c 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/etb/EtbMonteCarloSequence.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/etb/EtbMonteCarloSequence.java @@ -1,5 +1,6 @@ package com.rusefi.ui.etb; +import com.rusefi.FileLog; import com.rusefi.core.MessagesCentral; import com.rusefi.core.Sensor; import com.rusefi.core.SensorCentral; @@ -61,14 +62,14 @@ public class EtbMonteCarloSequence { ":pFactor:" + pFactor + ":iFactor:" + iFactor + ":dFactor:" + dFactor; - MessagesCentral.getInstance().postMessage(EtbMonteCarloSequence.class, stats); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, EtbMonteCarloSequence.class, stats); uiContext.getCommandQueue().write("etbreset"); uiContext.getCommandQueue().write("set etb_o " + offset); uiContext.getCommandQueue().write("set etb_p " + pFactor); uiContext.getCommandQueue().write("set etb_i " + iFactor); uiContext.getCommandQueue().write("set etb_d " + dFactor); - MessagesCentral.getInstance().postMessage(EtbMonteCarloSequence.class, + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, EtbMonteCarloSequence.class, uiContext.sensorLogger.getSecondsSinceFileStart() + " running " + stats); TestSequenceStep firstStep = new EtbTarget(uiContext, 10 * SECOND, DEFAULT_POSITION, null, TestSequenceStep.Condition.YES); @@ -78,7 +79,7 @@ public class EtbMonteCarloSequence { double currentValue = StandardTestSequence.metric.getStandardDeviation(); boolean shouldRun = currentValue < bestResultSoFar; if (!shouldRun) { - MessagesCentral.getInstance().postMessage(EtbMonteCarloSequence.class, + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, EtbMonteCarloSequence.class, "Two much error accumulated, aborting! " + currentValue + " > " + bestResultSoFar); } @@ -92,7 +93,7 @@ public class EtbMonteCarloSequence { Runnable onEachStep = () -> SwingUtilities.invokeLater(() -> { String state = stepCounter.incrementAndGet() + "/" + totalSteps.get(); double value = StandardTestSequence.metric.getStandardDeviation(); - MessagesCentral.getInstance().postMessage(EtbMonteCarloSequence.class,"Running " + state + ", current=" + value); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, EtbMonteCarloSequence.class,"Running " + state + ", current=" + value); }); TestSequenceStep last = StandardTestSequence.addSequence(uiContext, firstStep, onEachStep, condition); @@ -108,18 +109,18 @@ public class EtbMonteCarloSequence { double cycleResult = SensorCentral.getInstance().getValue(Sensor.ETB_CONTROL_QUALITY); if (cycleResult < bestResultSoFar) { bestResultSoFar = cycleResult; - MessagesCentral.getInstance().postMessage(EtbMonteCarloSequence.class, + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, EtbMonteCarloSequence.class, uiContext.sensorLogger.getSecondsSinceFileStart() + ":" + stats + ":new_record:" + bestResultSoFar); } - MessagesCentral.getInstance().postMessage(EtbMonteCarloSequence.class, + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, EtbMonteCarloSequence.class, uiContext.sensorLogger.getSecondsSinceFileStart() + ":" + stats + ":result:" + cycleResult); if (counter == TOTAL_CYCLES_COUNT) { stopETB(); - MessagesCentral.getInstance().postMessage(EtbTestSequence.class, "ETB MC sequence done!"); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, EtbTestSequence.class, "ETB MC sequence done!"); return; } counter++; - MessagesCentral.getInstance().postMessage(EtbTestSequence.class, "Starting " + counter + " of " + TOTAL_CYCLES_COUNT); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, EtbTestSequence.class, "Starting " + counter + " of " + TOTAL_CYCLES_COUNT); runRandomCycle(); } diff --git a/java_console/ui/src/main/java/com/rusefi/ui/etb/EtbReturnToNeutral.java b/java_console/ui/src/main/java/com/rusefi/ui/etb/EtbReturnToNeutral.java index 4fc9bdf62d..2b80fb57d1 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/etb/EtbReturnToNeutral.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/etb/EtbReturnToNeutral.java @@ -1,5 +1,6 @@ package com.rusefi.ui.etb; +import com.rusefi.FileLog; import com.rusefi.core.MessagesCentral; import com.rusefi.core.Sensor; import com.rusefi.core.SensorCentral; @@ -81,7 +82,7 @@ public class EtbReturnToNeutral { uiContext.getCommandQueue().write(ZERO_DUTY_CYCLE_COMMAND); // CommandQueue.getInstance().write(DirectDrivePanel.CANCEL_DIRECT_DRIVE_COMMAND); - MessagesCentral.getInstance().postMessage(getClass(), "Cycles = " + CYCLES_COUNT + ", errors = " + errorCount); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, getClass(), "Cycles = " + CYCLES_COUNT + ", errors = " + errorCount); } /** @@ -89,10 +90,10 @@ public class EtbReturnToNeutral { */ private boolean assertPosition(String msg, float expectedPosition) { double tps = SensorCentral.getInstance().getValue(Sensor.TPS); - MessagesCentral.getInstance().postMessage(getClass(), msg + " TPS=" + tps); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, getClass(), msg + " TPS=" + tps); boolean isError = Math.abs(tps - expectedPosition) > ACCEPTABLE_ERROR; if (isError) - MessagesCentral.getInstance().postMessage(getClass(), msg + " NOT GREAT " + tps + " while expected " + expectedPosition); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, getClass(), msg + " NOT GREAT " + tps + " while expected " + expectedPosition); return isError; } diff --git a/java_console/ui/src/main/java/com/rusefi/ui/etb/MagicSpotsFinder.java b/java_console/ui/src/main/java/com/rusefi/ui/etb/MagicSpotsFinder.java index 9781dd42d3..8f553cc378 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/etb/MagicSpotsFinder.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/etb/MagicSpotsFinder.java @@ -1,5 +1,6 @@ package com.rusefi.ui.etb; +import com.rusefi.FileLog; import com.rusefi.core.MessagesCentral; import com.rusefi.core.Sensor; import com.rusefi.core.SensorCentral; @@ -65,7 +66,7 @@ public class MagicSpotsFinder { sleep(SLEEP); double tpsPosition = SensorCentral.getInstance().getValue(Sensor.TPS); - MessagesCentral.getInstance().postMessage(getClass(), "ETB duty " + currentDutyCycle + ": tps=" + tpsPosition); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, getClass(), "ETB duty " + currentDutyCycle + ": tps=" + tpsPosition); if (tpsPosition >= 100 - MEASURMENT_PRECISION) { currentDutyCycle -= DUTY_CYCLE_STEP; @@ -76,7 +77,7 @@ public class MagicSpotsFinder { // if that's the first we've moved let's remember duty cycle value startedToCloseValue = currentDutyCycle; startedToCloseValueLabel.setText(String.format("Started Close %.1f", startedToCloseValue)); - MessagesCentral.getInstance().postMessage(getClass(), "Started to close at " + startedToCloseValue); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, getClass(), "Started to close at " + startedToCloseValue); } currentDutyCycle -= DUTY_CYCLE_STEP; @@ -84,10 +85,10 @@ public class MagicSpotsFinder { } else { backToZeroValue = currentDutyCycle; backToZeroValueLabel.setText(String.format("Back Zero %.1f", backToZeroValue)); - MessagesCentral.getInstance().postMessage(getClass(), "Back closed to close at " + backToZeroValue); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, getClass(), "Back closed to close at " + backToZeroValue); - MessagesCentral.getInstance().postMessage(getClass(), "startedToOpenValue = " + startedToOpenValue + ", reached100Value = " + reached100Value); - MessagesCentral.getInstance().postMessage(getClass(), "startedToCloseValue = " + startedToCloseValue + ", backToZeroValue = " + backToZeroValue); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, getClass(), "startedToOpenValue = " + startedToOpenValue + ", reached100Value = " + reached100Value); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, getClass(), "startedToCloseValue = " + startedToCloseValue + ", backToZeroValue = " + backToZeroValue); button.setEnabled(true); button.setText(MAGIC_SPOTS_FINDER); } @@ -107,7 +108,7 @@ public class MagicSpotsFinder { sleep(SLEEP); double tpsPosition = SensorCentral.getInstance().getValue(Sensor.TPS); - MessagesCentral.getInstance().postMessage(getClass(), "ETB duty " + currentDutyCycle + ": tps=" + tpsPosition); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, getClass(), "ETB duty " + currentDutyCycle + ": tps=" + tpsPosition); if (tpsPosition < defaultTpsPosition + MEASURMENT_PRECISION) { // ETB has not moved yet, keep going up @@ -119,7 +120,7 @@ public class MagicSpotsFinder { // if that's the first we've moved let's remember duty cycle value startedToOpenValue = currentDutyCycle; startedToOpenValueLabel.setText(String.format("Start to open: %.1f", startedToOpenValue)); - MessagesCentral.getInstance().postMessage(getClass(), "Started to open at " + startedToOpenValue); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, getClass(), "Started to open at " + startedToOpenValue); } @@ -131,7 +132,7 @@ public class MagicSpotsFinder { // looks like we have reached 100%, cool! reached100Value = currentDutyCycle; reached100ValueLabel.setText(String.format("Reached 100: %.1f", reached100Value)); - MessagesCentral.getInstance().postMessage(getClass(), "startedToOpenValue = " + startedToOpenValue + ", reached100Value = " + reached100Value); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, getClass(), "startedToOpenValue = " + startedToOpenValue + ", reached100Value = " + reached100Value); currentDutyCycle -= DUTY_CYCLE_STEP; uiContext.getCommandQueue().write(CMD_ETB_DUTY + " " + currentDutyCycle, goingDown); @@ -156,7 +157,7 @@ public class MagicSpotsFinder { public void run() { state = State.START; - MessagesCentral.getInstance().postMessage(getClass(), "Start!"); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, getClass(), "Start!"); resetValues(); uiContext.getCommandQueue().write(CMD_ETB_DUTY + " " + currentDutyCycle, goingUp); @@ -209,7 +210,7 @@ public class MagicSpotsFinder { private void sleep(long millis) { try { - MessagesCentral.getInstance().postMessage(getClass(), "Sleeping " + millis + "ms"); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, getClass(), "Sleeping " + millis + "ms"); Thread.sleep(millis); } catch (InterruptedException unexpected) { unexpected.printStackTrace(); diff --git a/java_console/ui/src/main/java/com/rusefi/ui/widgets/AnyCommand.java b/java_console/ui/src/main/java/com/rusefi/ui/widgets/AnyCommand.java index 124d05da4d..6fbb9ed825 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/widgets/AnyCommand.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/widgets/AnyCommand.java @@ -136,9 +136,9 @@ public class AnyCommand { String result = prepareEvalCommand(rawCommand); if (result.equals(rawCommand)) { // result was not translated - MessagesCentral.getInstance().postMessage(AnyCommand.class, "Not valid expression"); - MessagesCentral.getInstance().postMessage(AnyCommand.class, "Please try eval \"2 + 2\""); - MessagesCentral.getInstance().postMessage(AnyCommand.class, "For RPN use rpn_eval \"2 2 +\""); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, AnyCommand.class, "Not valid expression"); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, AnyCommand.class, "Please try eval \"2 + 2\""); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, AnyCommand.class, "For RPN use rpn_eval \"2 2 +\""); } return result; } else if (rawCommand.toLowerCase().startsWith("stim_check" + " ")) { @@ -165,7 +165,7 @@ public class AnyCommand { private static void handleStimulationSelfCheck(String rawCommand, LinkManager linkManager) { String[] parts = rawCommand.split(" ", 4); if (parts.length != 4) { - MessagesCentral.getInstance().postMessage(AnyCommand.class, "Invalid command length " + parts); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, AnyCommand.class, "Invalid command length " + parts); return; // let's ignore invalid command } int rpm = Integer.parseInt(parts[1]); @@ -174,14 +174,14 @@ public class AnyCommand { new Thread(new Runnable() { @Override public void run() { - MessagesCentral.getInstance().postMessage(AnyCommand.class, "Will test with RPM " + rpm + ", settle time" + settleTime + "s and duration" + durationTime + "s"); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, AnyCommand.class, "Will test with RPM " + rpm + ", settle time" + settleTime + "s and duration" + durationTime + "s"); Function callback = new Function() { @Override public Object apply(String status) { if (status == null) { - MessagesCentral.getInstance().postMessage(AnyCommand.class, rpm + " worked!"); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, AnyCommand.class, rpm + " worked!"); } else { - MessagesCentral.getInstance().postMessage(AnyCommand.class, rpm + " failed " + status); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, AnyCommand.class, rpm + " failed " + status); } return null; } @@ -201,12 +201,12 @@ public class AnyCommand { private static void handleDecodeRpn(String rawCommand) { String[] parts = rawCommand.split(" ", 2); if (parts.length != 2) { - MessagesCentral.getInstance().postMessage(AnyCommand.class, "Failed to parse, one argument expected"); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, AnyCommand.class, "Failed to parse, one argument expected"); return; } String argument = unquote(parts[1]); String humanForm = InfixConverter.getHumanInfixFormOrError(argument); - MessagesCentral.getInstance().postMessage(AnyCommand.class, "Human form is \"" + humanForm + "\""); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, AnyCommand.class, "Human form is \"" + humanForm + "\""); } public static String prepareEvalCommand(String rawCommand) { diff --git a/java_console/ui/src/main/java/com/rusefi/ui/widgets/PotCommand.java b/java_console/ui/src/main/java/com/rusefi/ui/widgets/PotCommand.java index 509fcd81c5..4195834a81 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/widgets/PotCommand.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/widgets/PotCommand.java @@ -1,5 +1,6 @@ package com.rusefi.ui.widgets; +import com.rusefi.FileLog; import com.rusefi.core.MessagesCentral; import com.rusefi.core.Sensor; import com.rusefi.core.SensorCentral; @@ -90,7 +91,7 @@ public class PotCommand { public static int getPotResistance(double vout, double vRef) { double r = getR1InVoltageDivider3(vout, vRef, EcuStimulator.getInstance().getInputs().getEngineLoadR2Resistance()); - MessagesCentral.getInstance().postMessage(PotCommand.class, "VRef=" + vRef + ", needed resistance: " + r); + MessagesCentral.getInstance().postMessage(FileLog.LOGGER, PotCommand.class, "VRef=" + vRef + ", needed resistance: " + r); // pot command accept resistance and does the conversion itself return (int) r; }