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-28 23:04:37 -06:00
parent db691c6166
commit 496e73e465
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/tunerstudio/rusefi.ini
View File

@ -646,7 +646,7 @@ fileVersion = { 20150216 }
curve = cltFuelCorrCurve, "Coolant temp fuel correction"
columnLabel = "Coolant", "Correction"
xAxis = -40, 120, 10
yAxis = -300, 300, 10
yAxis = 3, 300, 10
xBins = cltFuelCorrBins, coolant
yBins = cltFuelCorr
gauge = CLTGauge
@ -852,14 +852,14 @@ fileVersion = { 20150216 }
subMenu = crankingFuelCurve, "Cranking Coolant Temp correction"
subMenu = crankingDurationCurve, "Cranking Duration correction"
subMenu = std_separator
subMenu = ignitionTableTbl, "Ignition Table"
subMenu = fuelTableTbl, "Fuel Table", {algorithm != 3}
subMenu = iatFuelCorrCurve, "Intake air temp fuel correction"
subMenu = cltFuelCorrCurve, "Coolant temp fuel correction"
subMenu = veTableTbl, "VE Table", {algorithm == 3}
subMenu = afrTableTbl, "Targe AFR Table", {algorithm == 3}
subMenu = injPhaseTableTbl, "Injection Phase"
subMenu = std_separator
subMenu = ignitionTableTbl, "Ignition Table"
subMenu = iatFuelCorrCurve, "Intake air temp fuel correction"
subMenu = cltFuelCorrCurve, "Coolant temp fuel correction"
subMenu = mafDecodingCurve, "MAF Decoding Curve"
subMenu = std_separator
; subMenu = otherSettings

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

@ -91,9 +91,9 @@ public class StartupFrame {
if (ProcessStatusWindow.isWindows()) {
leftPanel.add(new HorizontalLine());
leftPanel.add(FirmwareFlasher.getContent());
// leftPanel.add(new HorizontalLine());
// leftPanel.add(new EraseChip().getButton());
leftPanel.add(new FirmwareFlasher().getButton());
leftPanel.add(new HorizontalLine());
leftPanel.add(new EraseChip().getButton());
}
JPanel rightPanel = new JPanel(new VerticalFlowLayout());

6
java_console/ui/src/com/rusefi/maintenance/EraseChip.java
View File

@ -13,9 +13,11 @@ public class EraseChip extends ProcessStatusWindow {
button.addActionListener(new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
if (JOptionPane.showConfirmDialog(button, "Do you really want to reset stm32 chip?") !=
JOptionPane.YES_OPTION)
int dialogResult = JOptionPane.showConfirmDialog(button, "Do you really want to reset stm32 chip and all settings?",
"Are you sure?", JOptionPane.YES_NO_OPTION);
if (dialogResult != JOptionPane.YES_OPTION)
return;
showFrame();
submitAction(new Runnable() {
@Override
public void run() {

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

@ -17,6 +17,7 @@ public class FirmwareFlasher extends ProcessStatusWindow {
IMAGE_FILE +
" verify reset exit 0x08000000\"";
private static final String SUCCESS_MESSAGE_TAG = "shutdown command invoked";
private static final String FAILED_MESSAGE_TAG = "failed";
private final JButton button = new JButton("Program Firmware");
@ -43,14 +44,15 @@ public class FirmwareFlasher extends ProcessStatusWindow {
return;
}
StringBuffer error = executeCommand(OPEN_OCD_COMMAND);
if (error.toString().contains(SUCCESS_MESSAGE_TAG)) {
if (error.toString().contains(SUCCESS_MESSAGE_TAG) && !error.toString().contains(FAILED_MESSAGE_TAG)) {
appendMsg("!!! Looks good!!!");
} else {
appendMsg("!!! FIRMWARE FLASH: DOES NOT LOOK RIGHT !!!");
}
}
public static Component getContent() {
return new FirmwareFlasher().button;
public JButton getButton() {
return button;
}
}