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

auto-sync

This commit is contained in:
rusEfi 2015-02-05 21:06:30 -06:00
parent 9e77ce55f4
commit e475c4ae22
2 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@ package com.rusefi;
import com.rusefi.io.LinkManager;
import com.rusefi.io.tcp.TcpConnector;
import com.rusefi.maintenance.FirmwareFlasher;
import com.rusefi.ui.UiUtils;
import com.rusefi.ui.widgets.URLLabel;
import jssc.SerialPortList;

56
java_console/ui/src/com/rusefi/FirmwareFlasher.java → java_console/ui/src/com/rusefi/maintenance/FirmwareFlasher.java
View File

@ -1,4 +1,4 @@
package com.rusefi;
package com.rusefi.maintenance;
import com.rusefi.ui.FrameHelper;
@ -6,17 +6,24 @@ import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.*;
/**
* (c) Andrey Belomutskiy 2013-2015
* 2/4/15
*/
public class FirmwareFlasher {
private static final String OPEN_OCD_COMMAND = "openocd/bin/openocd-0.8.0.exe -f interface/stlink-v2.cfg -f board/stm32f4discovery.cfg -c init -c targets -c \"halt\" -c \"flash write_image erase rusefi.elf\" -c \"verify_image rusefi.elf\" -c \"reset run\" -c shutdown";
public static final String IMAGE_ELF = "rusefi.elf";
private static final String OPEN_OCD_COMMAND = "openocd/bin/openocd-0.8.0.exe " +
"-f interface/stlink-v2.cfg " +
"-f board/stm32f4discovery.cfg " +
"-c init " +
"-c targets " +
"-c \"halt\" " +
"-c \"flash write_image erase " + IMAGE_ELF + "\" " +
"-c \"verify_image " + IMAGE_ELF + "\" " +
"-c \"reset run\" " +
"-c shutdown";
private final JButton button = new JButton("wip");
private final JTextArea log = new JTextArea();
@ -28,27 +35,36 @@ public class FirmwareFlasher {
@Override
public void actionPerformed(ActionEvent event) {
FrameHelper f = new FrameHelper();
appendMsg("Executing " + OPEN_OCD_COMMAND);
f.showFrame(log, false);
StringBuffer output = new StringBuffer();
StringBuffer error = new StringBuffer();
try {
Process p = Runtime.getRuntime().exec(OPEN_OCD_COMMAND);
startStreamThread(p, p.getInputStream(), "output", output);
startStreamThread(p, p.getErrorStream(), "error", error);
p.waitFor();
} catch (IOException e) {
appendMsg("IOError: " + e);
} catch (InterruptedException e) {
appendMsg("WaitError: " + e);
if (!new File(IMAGE_ELF).exists()) {
appendMsg(IMAGE_ELF + " not found, cannot proceed !!!");
return;
}
appendMsg("!!! FIRMWARE FLASH: DOES NOT LOOK RIGHT !!!");
doFlashFirmware();
}
});
}
private void doFlashFirmware() {
appendMsg("Executing " + OPEN_OCD_COMMAND);
StringBuffer output = new StringBuffer();
StringBuffer error = new StringBuffer();
try {
Process p = Runtime.getRuntime().exec(OPEN_OCD_COMMAND);
startStreamThread(p, p.getInputStream(), "output", output);
startStreamThread(p, p.getErrorStream(), "error", error);
p.waitFor();
} catch (IOException e) {
appendMsg("IOError: " + e);
} catch (InterruptedException e) {
appendMsg("WaitError: " + e);
}
appendMsg("!!! FIRMWARE FLASH: DOES NOT LOOK RIGHT !!!");
}
/**
* This method listens to a data stream from the process, appends messages to UI
* and accumulates output in a buffer