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

Minor corrections after some real ECU testing. I think the MTS DLL is crashing Java on RomRaider exit. May have to switch back to non-event driven query handling. 

git-svn-id: https://svn2.assembla.com/svn/romraider/trunk@352 38686702-15cf-42e4-a595-3071df8bf5ea
This commit is contained in:
Dale Schultz 2011-10-03 03:18:23 +00:00
parent 75d1a7afa3
commit 0ee6bc1031
5 changed files with 925 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1072
logger.xml
View File

File diff suppressed because it is too large Load Diff

34
src/com/romraider/logger/ecu/EcuLogger.java
View File

@ -772,11 +772,13 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
private void clearAllSelectedParameters(ParameterListTableModel paramListTableModel) { private void clearAllSelectedParameters(ParameterListTableModel paramListTableModel) {
List<ParameterRow> rows = paramListTableModel.getParameterRows(); List<ParameterRow> rows = paramListTableModel.getParameterRows();
for (ParameterRow row : rows) { for (ParameterRow row : rows) {
LoggerData loggerData = row.getLoggerData(); if (row.isSelected()) {
if (loggerData.isSelected() && row.isSelected()) { row.getLoggerData().setSelected(false);
paramListTableModel.selectParam(loggerData, false); row.setSelected(false);
paramListTableModel.selectParam(row.getLoggerData(), false);
} }
} }
paramListTableModel.fireTableDataChanged();
} }
private JButton buildUnselectAllButton() { private JButton buildUnselectAllButton() {
@ -797,15 +799,23 @@ public final class EcuLogger extends AbstractFrame implements MessageListener {
private static final long serialVersionUID = 723232894767995265L; private static final long serialVersionUID = 723232894767995265L;
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
clearAllSelectedParameters(dataTabParamListTableModel); try {
clearAllSelectedParameters(dataTabSwitchListTableModel); clearAllSelectedParameters(dataTabParamListTableModel);
clearAllSelectedParameters(dataTabExternalListTableModel); clearAllSelectedParameters(dataTabSwitchListTableModel);
clearAllSelectedParameters(graphTabParamListTableModel); clearAllSelectedParameters(dataTabExternalListTableModel);
clearAllSelectedParameters(graphTabSwitchListTableModel); clearAllSelectedParameters(graphTabParamListTableModel);
clearAllSelectedParameters(graphTabExternalListTableModel); clearAllSelectedParameters(graphTabSwitchListTableModel);
clearAllSelectedParameters(dashboardTabParamListTableModel); clearAllSelectedParameters(graphTabExternalListTableModel);
clearAllSelectedParameters(dashboardTabSwitchListTableModel); clearAllSelectedParameters(dashboardTabParamListTableModel);
clearAllSelectedParameters(dashboardTabExternalListTableModel); clearAllSelectedParameters(dashboardTabSwitchListTableModel);
clearAllSelectedParameters(dashboardTabExternalListTableModel);
}
catch (Exception cae) {
LOGGER.error("Un-select ALL error: " + cae);
}
finally {
LOGGER.info("Un-select all parameters by user action");
}
} }
}); });
return button; return button;

2
src/com/romraider/logger/ecu/ui/swing/menubar/EcuLoggerMenuBar.java
View File

@ -86,7 +86,7 @@ public class EcuLoggerMenuBar extends JMenuBar {
settingsMenu.add(new MenuItem("Log File Output Location...", new LogFileLocationAction(logger), VK_O, getKeyStroke(VK_O, CTRL_MASK))); settingsMenu.add(new MenuItem("Log File Output Location...", new LogFileLocationAction(logger), VK_O, getKeyStroke(VK_O, CTRL_MASK)));
settingsMenu.add(new JSeparator()); settingsMenu.add(new JSeparator());
settingsMenu.add(new RadioButtonMenuItem("Control File Logging With Defogger Switch", VK_C, getKeyStroke(VK_C, CTRL_MASK), new LogFileControllerSwitchAction(logger), logger.getSettings().isFileLoggingControllerSwitchActive())); settingsMenu.add(new RadioButtonMenuItem("Control File Logging With Defogger Switch", VK_C, getKeyStroke(VK_C, CTRL_MASK), new LogFileControllerSwitchAction(logger), logger.getSettings().isFileLoggingControllerSwitchActive()));
RadioButtonMenuItem fastPoll = new RadioButtonMenuItem("Fast polling mode", VK_M, getKeyStroke(VK_M, CTRL_MASK), new FastPollModeAction(logger), logger.getSettings().isFastPoll()); RadioButtonMenuItem fastPoll = new RadioButtonMenuItem("Enable Fast Polling Mode", VK_M, getKeyStroke(VK_M, CTRL_MASK), new FastPollModeAction(logger), logger.getSettings().isFastPoll());
fastPoll.setToolTipText("Select to enable faster polling of the ECU"); fastPoll.setToolTipText("Select to enable faster polling of the ECU");
settingsMenu.add(fastPoll); settingsMenu.add(fastPoll);
settingsMenu.add(new RadioButtonMenuItem("Use Absolute Timestamp In Log File", VK_T, getKeyStroke(VK_T, CTRL_MASK), new LogFileAbsoluteTimestampAction(logger), logger.getSettings().isFileLoggingAbsoluteTimestamp())); settingsMenu.add(new RadioButtonMenuItem("Use Absolute Timestamp In Log File", VK_T, getKeyStroke(VK_T, CTRL_MASK), new LogFileAbsoluteTimestampAction(logger), logger.getSettings().isFileLoggingAbsoluteTimestamp()));

5
src/com/romraider/logger/external/innovate/generic/mts/io/MTSConnector.java vendored
View File

@ -61,6 +61,11 @@ public final class MTSConnector {
mts(mtsPort); mts(mtsPort);
} }
public void dispose() {
mts.disconnect();
mts.dispose();
}
private void createMts() { private void createMts() {
// create mts interface // create mts interface
this.mts = createMTS(); this.mts = createMTS();

1
src/com/romraider/logger/external/innovate/lm2/mts/plugin/Lm2MtsDataSource.java vendored
View File

@ -77,6 +77,7 @@ public final class Lm2MtsDataSource implements ExternalDataSource {
)); ));
} }
} }
connector.dispose();
} }
public String getId() { public String getId() {