From 5886b64d595c8a0facb6a545e3899981f574a623 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 13 Dec 2014 18:03:15 -0600 Subject: [PATCH] auto-sync --- firmware/config/engines/dodge_neon.cpp | 1 + firmware/controllers/engine_controller.cpp | 8 +++++--- firmware/controllers/settings.cpp | 5 +++-- firmware/rusefi.cpp | 2 +- firmware/tunerstudio/rusefi.ini | 1 + java_console/ui/src/com/irnems/Launcher.java | 2 +- java_console/ui/src/com/rusefi/ui/LogViewer.java | 5 ++++- 7 files changed, 16 insertions(+), 8 deletions(-) diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index 7cd443e05a..993339b4e7 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -208,6 +208,7 @@ void setDodgeNeonNGCEngineConfiguration(engine_configuration_s *engineConfigurat // I want to start with a simple Alpha-N engineConfiguration->algorithm = LM_ALPHA_N; +// engineConfiguration->algorithm = LM_SPEED_DENSITY; setFuelLoadBin(engineConfiguration, 0, 100); setTimingLoadBin(engineConfiguration, 0, 100); diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 263a8dd34e..80ce45a8ce 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -424,8 +424,10 @@ static void setUserOutput(const char *indexStr, const char *quotedLine, Engine * showFsioInfo(); } -static void setInt(const char *offsetStr, const char *valueStr) { - +static void setInt(const int offset, const int value) { + int *ptr = (int *) (&((char *) engine->engineConfiguration)[offset]); + *ptr = value; + scheduleMsg(&logger, "setting int @%d to %d", offset, value); } static void getInt(int offset) { @@ -577,7 +579,7 @@ void initEngineContoller(Engine *engine) { addConsoleActionII("set_fsio_frequency", (VoidIntInt) setFsioFrequency); addConsoleActionSS("set_float", (VoidCharPtrCharPtr) setFloat); - addConsoleActionSS("set_int", (VoidCharPtrCharPtr) setInt); + addConsoleActionII("set_int", (VoidIntInt) setInt); addConsoleActionI("get_float", getFloat); addConsoleActionI("get_int", getInt); diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index 9e4cd0a879..0b7a3fb709 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -95,8 +95,9 @@ static void printOutputs(engine_configuration_s *engineConfiguration, engine_con */ void printConfiguration(engine_configuration_s *engineConfiguration, engine_configuration2_s *engineConfiguration2) { - scheduleMsg(&logger, "Template %s/%d trigger %s", getConfigurationName(engineConfiguration->engineType), - engineConfiguration->engineType, getTrigger_type_e(engineConfiguration->triggerConfig.triggerType)); + scheduleMsg(&logger, "Template %s/%d trigger %s/%s", getConfigurationName(engineConfiguration->engineType), + engineConfiguration->engineType, getTrigger_type_e(engineConfiguration->triggerConfig.triggerType), + getEngine_load_mode_e(engineConfiguration->algorithm)); scheduleMsg(&logger, "configurationVersion=%d", getGlobalConfigurationVersion()); diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 28a1a750e8..cf361241d0 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -265,5 +265,5 @@ int getRusEfiVersion(void) { return 1; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE == 0) return 1; // this is here to make the compiler happy about the unused array - return 20141212; + return 20141213; } diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 006a57c154..10c01c4e2d 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -968,6 +968,7 @@ fileVersion = { 20141103 } ; Tuning->General dialog = generalSettings, "General" + field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed field = "RPM Hard Limit", rpmHardLimit field = "" field = "Fuel Algorithm", fuelAlgorithm diff --git a/java_console/ui/src/com/irnems/Launcher.java b/java_console/ui/src/com/irnems/Launcher.java index d25b2b8280..b6a6beb074 100644 --- a/java_console/ui/src/com/irnems/Launcher.java +++ b/java_console/ui/src/com/irnems/Launcher.java @@ -19,7 +19,7 @@ import javax.swing.*; * @see WavePanel */ public class Launcher extends FrameHelper { - public static final int CONSOLE_VERSION = 20141210; + public static final int CONSOLE_VERSION = 20141213; public static final boolean SHOW_STIMULATOR = true; private final String port; diff --git a/java_console/ui/src/com/rusefi/ui/LogViewer.java b/java_console/ui/src/com/rusefi/ui/LogViewer.java index 81b0feebc1..a2efe14581 100644 --- a/java_console/ui/src/com/rusefi/ui/LogViewer.java +++ b/java_console/ui/src/com/rusefi/ui/LogViewer.java @@ -15,6 +15,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.io.File; import java.io.FileFilter; +import java.util.Arrays; /** * 7/27/13 @@ -106,6 +107,8 @@ public class LogViewer extends JPanel { throw new IllegalStateException("Not directory: " + folder); File[] files = folder.listFiles(FILE_FILTER); + Arrays.sort(files); + fileListModel.removeAllElements(); for (File file : files) fileListModel.addElement(getFileDesc(file)); @@ -170,4 +173,4 @@ public class LogViewer extends JPanel { WavePanel.getInstance().reloadFile(); refreshCountPanel(); } -} \ No newline at end of file +}