andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2017-01-02 08:02:41 -05:00
parent 887d2628f3
commit acf403f84b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/console/binary/tunerstudio_io.h
View File

@ -35,7 +35,7 @@ typedef enum {
// see 'blockingFactor' in rusefi.ini todo: move to rusefi_config.txt // see 'blockingFactor' in rusefi.ini todo: move to rusefi_config.txt
// see BLOCKING_FACTOR in java console code // see BLOCKING_FACTOR in java console code
#define BLOCKING_FACTOR 320 #define BLOCKING_FACTOR 400
typedef struct { typedef struct {
BaseChannel * channel; BaseChannel * channel;

2
firmware/rusefi.cpp
View File

@ -283,5 +283,5 @@ int getRusEfiVersion(void) {
return 123; // this is here to make the compiler happy about the unused array return 123; // this is here to make the compiler happy about the unused array
if (UNUSED_CCM_SIZE[0] * 0 != 0) if (UNUSED_CCM_SIZE[0] * 0 != 0)
return 3211; // this is here to make the compiler happy about the unused array return 3211; // this is here to make the compiler happy about the unused array
return 20161227; return 20170102;
} }

2
java_console/ui/src/com/rusefi/StartupFrame.java
View File

@ -207,7 +207,7 @@ public class StartupFrame {
private static JComboBox<String> createSpeedCombo() { private static JComboBox<String> createSpeedCombo() {
JComboBox<String> combo = new JComboBox<>(); JComboBox<String> combo = new JComboBox<>();
String defaultSpeed = getConfig().getRoot().getProperty(Launcher.SPEED_KEY, "115200"); 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.addItem(Integer.toString(speed));
combo.setSelectedItem(defaultSpeed); combo.setSelectedItem(defaultSpeed);
return combo; return combo;