From acf403f84b3296537ee51699bacdeaefaa775a39 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Mon, 2 Jan 2017 08:02:41 -0500 Subject: [PATCH] auto-sync --- firmware/console/binary/tunerstudio_io.h | 2 +- firmware/rusefi.cpp | 2 +- java_console/ui/src/com/rusefi/StartupFrame.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/firmware/console/binary/tunerstudio_io.h b/firmware/console/binary/tunerstudio_io.h index eb68a2de83..7994228c47 100644 --- a/firmware/console/binary/tunerstudio_io.h +++ b/firmware/console/binary/tunerstudio_io.h @@ -35,7 +35,7 @@ typedef enum { // see 'blockingFactor' in rusefi.ini todo: move to rusefi_config.txt // see BLOCKING_FACTOR in java console code -#define BLOCKING_FACTOR 320 +#define BLOCKING_FACTOR 400 typedef struct { BaseChannel * channel; diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index ddf082d39c..6a204dd5a6 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -283,5 +283,5 @@ int getRusEfiVersion(void) { return 123; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE[0] * 0 != 0) return 3211; // this is here to make the compiler happy about the unused array - return 20161227; + return 20170102; } diff --git a/java_console/ui/src/com/rusefi/StartupFrame.java b/java_console/ui/src/com/rusefi/StartupFrame.java index ded9775470..9b1e5513b0 100644 --- a/java_console/ui/src/com/rusefi/StartupFrame.java +++ b/java_console/ui/src/com/rusefi/StartupFrame.java @@ -207,7 +207,7 @@ public class StartupFrame { private static JComboBox createSpeedCombo() { JComboBox combo = new JComboBox<>(); String defaultSpeed = getConfig().getRoot().getProperty(Launcher.SPEED_KEY, "115200"); - for (int speed : new int[]{9600, 14400, 19200, 38400, 115200, 460800, 921600}) + for (int speed : new int[]{9600, 14400, 19200, 38400, 57600, 115200, 460800, 921600}) combo.addItem(Integer.toString(speed)); combo.setSelectedItem(defaultSpeed); return combo;