mirror of https://github.com/rusefi/RomRaider.git
package enginuity -> com.romraider
git-svn-id: https://svn2.assembla.com/svn/romraider/trunk@61 38686702-15cf-42e4-a595-3071df8bf5ea
This commit is contained in:
parent
37af4af939
commit
77a3bd5641
2
.project
2
.project
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>enginuity</name>
|
||||
<name>romraider</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
|
|
|
@ -1,21 +0,0 @@
|
|||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
|
||||
<html>
|
||||
<meta http-equiv="content-type" content="text/html; charset=UTF-8"><head>
|
||||
<STYLE TYPE="text/css" media=screen,print>
|
||||
h1{
|
||||
font-size: 100%;
|
||||
margin: 1em 0 0 0;
|
||||
padding: 0;
|
||||
}
|
||||
div.body {
|
||||
font-size: 100%;
|
||||
margin: 0mm 2mm 0 8mm;
|
||||
padding: 0;
|
||||
}
|
||||
</STYLE>
|
||||
</head>
|
||||
<body>
|
||||
<h1>Installation Path</h1>
|
||||
<div class="body">D:\work\eclipse_workspace\enginuity\3rdparty\IzPack</div><h1>Chosen Installation Packs</h1>
|
||||
<div class="body">Core<br>Utilities</div></body>
|
||||
</html>
|
|
@ -212,7 +212,7 @@
|
|||
<mkdir dir="${build.dir}/classes"/>
|
||||
<mkdir dir="${build.dir}/lib"/>
|
||||
<!-- generate the Version class -->
|
||||
<copy overwrite="true" tofile="${src.dir}/enginuity/Version.java" file="${src.dir}/enginuity/Version.java.template">
|
||||
<copy overwrite="true" tofile="${src.dir}/com/romraider/Version.java" file="src/com/romraider/Version.java.template">
|
||||
<filterset refid="version.filterset"/>
|
||||
</copy>
|
||||
|
||||
|
@ -253,7 +253,7 @@
|
|||
<javadoc windowtitle="${name.package}" header="${javadoc.header}" sourcepath="${src.dir}" author="yes" version="yes" destdir="${javadoc.dir}"
|
||||
breakiterator="yes" maxmemory="96m">
|
||||
<packageset dir="src">
|
||||
<include name="enginuity/**"/>
|
||||
<include name="**"/>
|
||||
</packageset>
|
||||
<bottom>${javadoc.footer}</bottom>
|
||||
<classpath refid="classpath"/>
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 95 KiB |
Before Width: | Height: | Size: 1022 B After Width: | Height: | Size: 1022 B |
Before Width: | Height: | Size: 7.2 KiB After Width: | Height: | Size: 7.2 KiB |
|
@ -341,6 +341,6 @@ Public License instead of this License.
|
|||
|
||||
-----
|
||||
|
||||
Enginuity is created for FREE without any sort of guarantee. The
|
||||
RomRaider is created for FREE without any sort of guarantee. The
|
||||
developers cannot be held liable for any damage incurred as a result of
|
||||
using Enginuity. USE AT YOUR OWN RISK.
|
||||
using RomRaider. USE AT YOUR OWN RISK.
|
|
@ -5,6 +5,6 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
|
|||
log4j.appender.stdout.layout.ConversionPattern=%-5r %-5p [%t] - %m%n
|
||||
|
||||
log4j.appender.file=org.apache.log4j.FileAppender
|
||||
log4j.appender.file.File=enginuity.log
|
||||
log4j.appender.file.File=romraider.log
|
||||
log4j.appender.file.layout=org.apache.log4j.PatternLayout
|
||||
log4j.appender.file.layout.ConversionPattern=%-5r %-5p [%t] - %m%n
|
||||
|
|
2
manifest
2
manifest
|
@ -1,7 +1,7 @@
|
|||
Manifest-Version: 1.0
|
||||
Ant-Version: Apache Ant 1.6.5
|
||||
Created-By: 1.5.0_07-b03 (Sun Microsystems Inc.)
|
||||
Main-Class: enginuity.ECUExec
|
||||
Main-Class: com.romraider.ECUExec
|
||||
Class-Path:
|
||||
lib/BareBonesBrowserLaunch.jar
|
||||
lib/jep.jar
|
||||
|
|
|
@ -1 +1 @@
|
|||
datasource.class=enginuity.logger.aem.plugin.AemDataSource
|
||||
datasource.class=com.romraider.logger.aem.plugin.AemDataSource
|
|
@ -1 +1 @@
|
|||
datasource.class=enginuity.logger.innovate.lc1.plugin.Lc1DataSource
|
||||
datasource.class=com.romraider.logger.innovate.lc1.plugin.Lc1DataSource
|
|
@ -1 +1 @@
|
|||
datasource.class=enginuity.logger.innovate.lm1.plugin.Lm1DataSource
|
||||
datasource.class=com.romraider.logger.innovate.lm1.plugin.Lm1DataSource
|
|
@ -1 +1 @@
|
|||
datasource.class=enginuity.logger.utec.plugin.UtecDataSource
|
||||
datasource.class=com.romraider.logger.utec.plugin.UtecDataSource
|
|
@ -1,16 +1,16 @@
|
|||
- Enginuity 0.4.2 Beta -
|
||||
Open-Source ECU Tuning -- www.enginuity.org
|
||||
- RomRaider 0.4.2 Beta -
|
||||
Open-Source ECU Tuning -- www.romraider.com
|
||||
|
||||
|
||||
PLEASE MAKE SURE TO READ RELEASE _NOTES.TXT_ EACH TIME YOU DOWNLOAD
|
||||
A NEW VERSION OF ENGINUITY. IMPORTANT NOTICES, KNOWN ISSUES AND
|
||||
A NEW VERSION OF ROMRAIDER. IMPORTANT NOTICES, KNOWN ISSUES AND
|
||||
NEW FEATURES WILL BE DISCUSSED.
|
||||
|
||||
Enginuity is a full featured Engine Control Unit editing application
|
||||
RomRaider is a full featured Engine Control Unit editing application
|
||||
for tuning virtually any manufacturer, meant to be used in conjuction
|
||||
with ECU flash and dump utilities. Enginuity will give you full
|
||||
with ECU flash and dump utilities. RomRaider will give you full
|
||||
control over timing, fuel, boost and many other parameters in your
|
||||
ECU, competing with very expensive and proprietary software. Enginuity
|
||||
ECU, competing with very expensive and proprietary software. RomRaider
|
||||
will remove your need for piggyback systems designed to control these
|
||||
functions, and, in most cases, work as well as or better than any
|
||||
stand alone engine management. Reflashing your stock ECU also has the
|
||||
|
@ -19,17 +19,17 @@ performance and saving time tuning idle and low throttle applications
|
|||
while retaining all of the benefit of the research and development
|
||||
manufacturer's spend millions of dollars on.
|
||||
|
||||
Enginuity is currently in BETA TEST status, meaning it is not
|
||||
RomRaider is currently in BETA TEST status, meaning it is not
|
||||
thoroughly tested and not intended for use by inexperienced users. In
|
||||
addition to being incomplete and untested, only experienced tuners
|
||||
with the required tools (ie, wideband oxygen sensor) should modify an
|
||||
ECU image. As with any engine management, changes could result in
|
||||
severe engine damage. Use at your own risk.
|
||||
|
||||
Documentation is available at http://wiki.enginuity.org and the
|
||||
official Enginuity FAQ can be found at
|
||||
http://www.enginuity.org/about444.html. Please be aware that as
|
||||
Enginuity is still in beta status and changing frequently,
|
||||
Documentation is available at http://wiki.romraider.com and the
|
||||
official RomRaider FAQ can be found at
|
||||
http://www.romraider.com/about444.html. Please be aware that as
|
||||
RomRaider is still in beta status and changing frequently,
|
||||
documentation may be incomplete or out of date.
|
||||
|
||||
|
||||
|
|
|
@ -19,27 +19,26 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity;
|
||||
package com.romraider;
|
||||
|
||||
import com.romraider.logger.ecu.ui.handler.table.TableUpdateHandler;
|
||||
import com.romraider.maps.Rom;
|
||||
import com.romraider.maps.Table;
|
||||
import com.romraider.net.URL;
|
||||
import com.romraider.swing.ECUEditorMenuBar;
|
||||
import com.romraider.swing.ECUEditorToolBar;
|
||||
import com.romraider.swing.JProgressPane;
|
||||
import com.romraider.swing.MDIDesktopPane;
|
||||
import com.romraider.swing.RomTree;
|
||||
import com.romraider.swing.RomTreeNode;
|
||||
import com.romraider.swing.RomTreeRootNode;
|
||||
import com.romraider.swing.TableFrame;
|
||||
import com.romraider.util.SettingsManager;
|
||||
import com.romraider.util.SettingsManagerImpl;
|
||||
import com.romraider.xml.DOMRomUnmarshaller;
|
||||
import com.romraider.xml.RomNotFoundException;
|
||||
import com.sun.org.apache.xerces.internal.parsers.DOMParser;
|
||||
import com.sun.org.apache.xerces.internal.xni.parser.XMLParseException;
|
||||
import enginuity.logger.ecu.ui.handler.table.TableUpdateHandler;
|
||||
import enginuity.Version; // this is a generated class - see build.xml
|
||||
import enginuity.maps.Rom;
|
||||
import enginuity.maps.Table;
|
||||
import enginuity.net.URL;
|
||||
import enginuity.swing.ECUEditorMenuBar;
|
||||
import enginuity.swing.ECUEditorToolBar;
|
||||
import enginuity.swing.JProgressPane;
|
||||
import enginuity.swing.MDIDesktopPane;
|
||||
import enginuity.swing.RomTree;
|
||||
import enginuity.swing.RomTreeNode;
|
||||
import enginuity.swing.RomTreeRootNode;
|
||||
import enginuity.swing.TableFrame;
|
||||
import enginuity.util.SettingsManager;
|
||||
import enginuity.util.SettingsManagerImpl;
|
||||
import enginuity.xml.DOMRomUnmarshaller;
|
||||
import enginuity.xml.RomNotFoundException;
|
||||
import org.w3c.dom.Document;
|
||||
import org.xml.sax.InputSource;
|
||||
import javax.swing.ImageIcon;
|
||||
|
@ -123,7 +122,7 @@ public class ECUEditor extends JFrame implements WindowListener, PropertyChangeL
|
|||
this.add(statusPanel, BorderLayout.SOUTH);
|
||||
|
||||
//set remaining window properties
|
||||
setIconImage(new ImageIcon("./graphics/enginuity-ico.gif").getImage());
|
||||
setIconImage(new ImageIcon("./graphics/romraider-ico.gif").getImage());
|
||||
setDefaultCloseOperation(EXIT_ON_CLOSE);
|
||||
addWindowListener(this);
|
||||
setTitle(titleText);
|
|
@ -19,8 +19,9 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity;
|
||||
package com.romraider;
|
||||
|
||||
import com.romraider.ECUEditor;
|
||||
import javax.swing.SwingUtilities;
|
||||
|
||||
public class ECUEditorManager {
|
|
@ -19,10 +19,11 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity;
|
||||
package com.romraider;
|
||||
|
||||
import enginuity.swing.LookAndFeelManager;
|
||||
import enginuity.util.LogManager;
|
||||
import com.romraider.swing.LookAndFeelManager;
|
||||
import com.romraider.util.LogManager;
|
||||
import com.romraider.ECUEditor;
|
||||
import org.apache.log4j.Logger;
|
||||
import java.io.BufferedReader;
|
||||
import java.io.File;
|
|
@ -1,15 +1,15 @@
|
|||
package enginuity.NewGUI;
|
||||
package com.romraider.NewGUI;
|
||||
|
||||
import enginuity.NewGUI.data.ApplicationStateManager;
|
||||
import enginuity.NewGUI.data.TableMetaData;
|
||||
import enginuity.NewGUI.desktop.EDesktopPane;
|
||||
import enginuity.NewGUI.etable.EInternalFrame;
|
||||
import enginuity.NewGUI.interfaces.TuningEntity;
|
||||
import enginuity.NewGUI.interfaces.TuningEntityListener;
|
||||
import enginuity.NewGUI.tree.ETree;
|
||||
import enginuity.NewGUI.tree.ETreeNode;
|
||||
import enginuity.logger.utec.impl.UtecTuningEntityImpl;
|
||||
import enginuity.swing.LookAndFeelManager;
|
||||
import com.romraider.NewGUI.data.ApplicationStateManager;
|
||||
import com.romraider.NewGUI.data.TableMetaData;
|
||||
import com.romraider.NewGUI.desktop.EDesktopPane;
|
||||
import com.romraider.NewGUI.etable.EInternalFrame;
|
||||
import com.romraider.NewGUI.interfaces.TuningEntity;
|
||||
import com.romraider.NewGUI.interfaces.TuningEntityListener;
|
||||
import com.romraider.NewGUI.tree.ETree;
|
||||
import com.romraider.NewGUI.tree.ETreeNode;
|
||||
import com.romraider.logger.utec.impl.UtecTuningEntityImpl;
|
||||
import com.romraider.swing.LookAndFeelManager;
|
||||
import org.apache.log4j.Logger;
|
||||
import javax.swing.JFrame;
|
||||
import javax.swing.JInternalFrame;
|
||||
|
@ -35,7 +35,7 @@ import java.util.Vector;
|
|||
public class NewGUI extends JFrame implements WindowListener, ActionListener,
|
||||
TreeSelectionListener, TuningEntityListener {
|
||||
private static final Logger LOGGER = Logger.getLogger(NewGUI.class);
|
||||
private final String engninuityVersionTitle = "RomRaider v0.5.0 alpha 1";
|
||||
private final String romRaiderVersionTitle = "RomRaider v0.5.0 alpha 1";
|
||||
|
||||
private JPanel mainJPanel = new JPanel();
|
||||
|
||||
|
@ -61,11 +61,11 @@ public class NewGUI extends JFrame implements WindowListener, ActionListener,
|
|||
}
|
||||
|
||||
public static NewGUI getInstance() {
|
||||
if (ApplicationStateManager.getEnginuityInstance() == null) {
|
||||
ApplicationStateManager.setEnginuityInstance(new NewGUI());
|
||||
if (ApplicationStateManager.getRomRaiderInstance() == null) {
|
||||
ApplicationStateManager.setRomRaiderInstance(new NewGUI());
|
||||
}
|
||||
|
||||
return ApplicationStateManager.getEnginuityInstance();
|
||||
return ApplicationStateManager.getRomRaiderInstance();
|
||||
}
|
||||
|
||||
private void initData() {
|
||||
|
@ -81,11 +81,11 @@ public class NewGUI extends JFrame implements WindowListener, ActionListener,
|
|||
|
||||
// Set the frame icon
|
||||
Image img = Toolkit.getDefaultToolkit().getImage(
|
||||
"graphics/enginuity-ico.gif");
|
||||
"graphics/romraider-ico.gif");
|
||||
setIconImage(img);
|
||||
|
||||
// Set frame title
|
||||
this.setTitle(this.engninuityVersionTitle);
|
||||
this.setTitle(this.romRaiderVersionTitle);
|
||||
|
||||
// Set main JFrame size
|
||||
this.setSize(800, 600);
|
||||
|
@ -159,7 +159,7 @@ public class NewGUI extends JFrame implements WindowListener, ActionListener,
|
|||
}
|
||||
|
||||
public void addTuningGroupNameToTitle(String titleAppend) {
|
||||
this.setTitle(this.engninuityVersionTitle + ": " + titleAppend);
|
||||
this.setTitle(this.romRaiderVersionTitle + ": " + titleAppend);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -243,7 +243,7 @@ public class NewGUI extends JFrame implements WindowListener, ActionListener,
|
|||
/*
|
||||
* Helper method that returns the number of maps that have had their data changed.
|
||||
* (non-Javadoc)
|
||||
* @see enginuity.NewGUI.interfaces.TuningEntityListener#getMapChangeCount(enginuity.NewGUI.interfaces.TuningEntity, java.lang.String)
|
||||
* @see com.romraider.NewGUI.interfaces.TuningEntityListener#getMapChangeCount(com.romraider.NewGUI.interfaces.TuningEntity, java.lang.String)
|
||||
*/
|
||||
public int getMapChangeCount(TuningEntity tuningEntity, String tableGroup) {
|
||||
JInternalFrame[] allFrames = this.rightDesktopPane.getAllFrames();
|
||||
|
@ -267,7 +267,7 @@ public class NewGUI extends JFrame implements WindowListener, ActionListener,
|
|||
* Method walks through all opened JInternalFrames in right pane. If an InternFrame claims its
|
||||
* data has been changed, the tuning entity parent is notified.
|
||||
* (non-Javadoc)
|
||||
* @see enginuity.NewGUI.interfaces.TuningEntityListener#saveMaps()
|
||||
* @see com.romraider.NewGUI.interfaces.TuningEntityListener#saveMaps()
|
||||
*/
|
||||
public void saveMaps() {
|
||||
JInternalFrame[] allFrames = this.rightDesktopPane.getAllFrames();
|
||||
|
@ -286,18 +286,18 @@ public class NewGUI extends JFrame implements WindowListener, ActionListener,
|
|||
}
|
||||
|
||||
/**
|
||||
* Getter that returns the title of Enginuity
|
||||
* Getter that returns the title of RomRaider
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public String getEngninuityTitle() {
|
||||
return engninuityVersionTitle;
|
||||
public String getRomRaiderTitle() {
|
||||
return romRaiderVersionTitle;
|
||||
}
|
||||
|
||||
/*
|
||||
* Tuning entity in scope will call this when it is ready to exit. Some entities might need to cleanup connections or save files.
|
||||
* (non-Javadoc)
|
||||
* @see enginuity.NewGUI.interfaces.TuningEntityListener#readyForExit()
|
||||
* @see com.romraider.NewGUI.interfaces.TuningEntityListener#readyForExit()
|
||||
*/
|
||||
public void readyForExit() {
|
||||
LOGGER.info("RomRaider is now exiting as per tuning entity notification: " + ApplicationStateManager.getCurrentTuningEntity().getName());
|
|
@ -1,6 +1,6 @@
|
|||
package enginuity.NewGUI;
|
||||
package com.romraider.NewGUI;
|
||||
|
||||
import enginuity.util.LogManager;
|
||||
import com.romraider.util.LogManager;
|
||||
|
||||
public class TestNewGUI {
|
||||
public static void main(String[] args) {
|
|
@ -1,8 +1,8 @@
|
|||
package enginuity.NewGUI.data;
|
||||
package com.romraider.NewGUI.data;
|
||||
|
||||
import enginuity.NewGUI.NewGUI;
|
||||
import enginuity.NewGUI.interfaces.TuningEntity;
|
||||
import enginuity.NewGUI.interfaces.TuningEntityListener;
|
||||
import com.romraider.NewGUI.NewGUI;
|
||||
import com.romraider.NewGUI.interfaces.TuningEntity;
|
||||
import com.romraider.NewGUI.interfaces.TuningEntityListener;
|
||||
import java.util.Iterator;
|
||||
import java.util.Vector;
|
||||
|
||||
|
@ -18,7 +18,7 @@ public class ApplicationStateManager {
|
|||
private static TuningEntity currentTuningEntity;
|
||||
private static int currentUserLevel = ApplicationStateManager.USER_LEVEL_1;
|
||||
|
||||
private static NewGUI enginuityInstance = null;
|
||||
private static NewGUI romRaiderInstance = null;
|
||||
|
||||
private static String selectedTuningGroup = "";
|
||||
|
||||
|
@ -61,12 +61,12 @@ public class ApplicationStateManager {
|
|||
return currentTuningEntity;
|
||||
}
|
||||
|
||||
public static NewGUI getEnginuityInstance() {
|
||||
return enginuityInstance;
|
||||
public static NewGUI getRomRaiderInstance() {
|
||||
return romRaiderInstance;
|
||||
}
|
||||
|
||||
public static void setEnginuityInstance(NewGUI enginuityInstance) {
|
||||
ApplicationStateManager.enginuityInstance = enginuityInstance;
|
||||
public static void setRomRaiderInstance(NewGUI romRaiderInstance) {
|
||||
ApplicationStateManager.romRaiderInstance = romRaiderInstance;
|
||||
}
|
||||
|
||||
public static String getSelectedTuningGroup() {
|
|
@ -1,6 +1,6 @@
|
|||
package enginuity.NewGUI.data;
|
||||
package com.romraider.NewGUI.data;
|
||||
|
||||
import enginuity.NewGUI.interfaces.TuningEntity;
|
||||
import com.romraider.NewGUI.interfaces.TuningEntity;
|
||||
import java.awt.Dimension;
|
||||
import java.text.DecimalFormat;
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
package enginuity.NewGUI.desktop;
|
||||
package com.romraider.NewGUI.desktop;
|
||||
|
||||
import enginuity.NewGUI.data.TableMetaData;
|
||||
import enginuity.NewGUI.etable.EInternalFrame;
|
||||
import com.romraider.NewGUI.data.TableMetaData;
|
||||
import com.romraider.NewGUI.etable.EInternalFrame;
|
||||
import org.apache.log4j.Logger;
|
||||
import javax.swing.DefaultDesktopManager;
|
||||
import javax.swing.JComponent;
|
|
@ -1,9 +1,9 @@
|
|||
package enginuity.NewGUI.etable;
|
||||
package com.romraider.NewGUI.etable;
|
||||
|
||||
import enginuity.NewGUI.data.TableMetaData;
|
||||
import enginuity.NewGUI.etable.dataJPanel.DataJPanel1DString;
|
||||
import enginuity.NewGUI.etable.dataJPanel.DataJPanel3DDouble;
|
||||
import enginuity.NewGUI.etable.dataJPanel.DataJPanelInterface;
|
||||
import com.romraider.NewGUI.data.TableMetaData;
|
||||
import com.romraider.NewGUI.etable.dataJPanel.DataJPanel1DString;
|
||||
import com.romraider.NewGUI.etable.dataJPanel.DataJPanel3DDouble;
|
||||
import com.romraider.NewGUI.etable.dataJPanel.DataJPanelInterface;
|
||||
import org.apache.log4j.Logger;
|
||||
import javax.swing.ImageIcon;
|
||||
import javax.swing.JInternalFrame;
|
||||
|
@ -54,7 +54,7 @@ public class EInternalFrame extends JInternalFrame implements InternalFrameListe
|
|||
// *****************************
|
||||
// Build up final internal frame
|
||||
// *****************************
|
||||
Image img = Toolkit.getDefaultToolkit().getImage("graphics/enginuity-ico.gif");
|
||||
Image img = Toolkit.getDefaultToolkit().getImage("graphics/romraider-ico.gif");
|
||||
ImageIcon imgIcon = new ImageIcon(img);
|
||||
this.setFrameIcon(imgIcon);
|
||||
this.setVisible(true);
|
|
@ -1,7 +1,7 @@
|
|||
package enginuity.NewGUI.etable;
|
||||
package com.romraider.NewGUI.etable;
|
||||
|
||||
import enginuity.NewGUI.data.TableMetaData;
|
||||
import enginuity.NewGUI.tools.FitData;
|
||||
import com.romraider.NewGUI.data.TableMetaData;
|
||||
import com.romraider.NewGUI.tools.FitData;
|
||||
import org.apache.log4j.Logger;
|
||||
import javax.swing.JTable;
|
||||
import javax.swing.ListSelectionModel;
|
|
@ -1,4 +1,4 @@
|
|||
package enginuity.NewGUI.etable;
|
||||
package com.romraider.NewGUI.etable;
|
||||
|
||||
import com.ecm.graphics.tools.ColorTable;
|
||||
import javax.swing.JTable;
|
|
@ -1,6 +1,6 @@
|
|||
package enginuity.NewGUI.etable;
|
||||
package com.romraider.NewGUI.etable;
|
||||
|
||||
import enginuity.NewGUI.etable.dataJPanel.DataJPanelInterface;
|
||||
import com.romraider.NewGUI.etable.dataJPanel.DataJPanelInterface;
|
||||
import javax.swing.JMenu;
|
||||
import javax.swing.JMenuBar;
|
||||
import javax.swing.JMenuItem;
|
|
@ -1,6 +1,6 @@
|
|||
package enginuity.NewGUI.etable;
|
||||
package com.romraider.NewGUI.etable;
|
||||
|
||||
import enginuity.NewGUI.data.TableMetaData;
|
||||
import com.romraider.NewGUI.data.TableMetaData;
|
||||
import org.apache.log4j.Logger;
|
||||
import javax.swing.table.AbstractTableModel;
|
||||
import java.text.DecimalFormat;
|
|
@ -1,4 +1,4 @@
|
|||
package enginuity.NewGUI.etable;
|
||||
package com.romraider.NewGUI.etable;
|
||||
|
||||
import javax.swing.table.AbstractTableModel;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package enginuity.NewGUI.etable;
|
||||
package com.romraider.NewGUI.etable;
|
||||
|
||||
import org.apache.log4j.Logger;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package enginuity.NewGUI.etable;
|
||||
package com.romraider.NewGUI.etable;
|
||||
|
||||
import javax.swing.event.TableModelEvent;
|
||||
import javax.swing.event.TableModelListener;
|
|
@ -1,6 +1,6 @@
|
|||
package enginuity.NewGUI.etable;
|
||||
package com.romraider.NewGUI.etable;
|
||||
|
||||
import enginuity.NewGUI.data.TableMetaData;
|
||||
import com.romraider.NewGUI.data.TableMetaData;
|
||||
import org.apache.log4j.Logger;
|
||||
import javax.swing.AbstractAction;
|
||||
import javax.swing.Action;
|
|
@ -1,6 +1,6 @@
|
|||
package enginuity.NewGUI.etable.dataJPanel;
|
||||
package com.romraider.NewGUI.etable.dataJPanel;
|
||||
|
||||
import enginuity.NewGUI.data.TableMetaData;
|
||||
import com.romraider.NewGUI.data.TableMetaData;
|
||||
import javax.swing.JMenuBar;
|
||||
import javax.swing.JPanel;
|
||||
import javax.swing.JScrollPane;
|
|
@ -1,13 +1,13 @@
|
|||
package enginuity.NewGUI.etable.dataJPanel;
|
||||
package com.romraider.NewGUI.etable.dataJPanel;
|
||||
|
||||
import enginuity.NewGUI.data.TableMetaData;
|
||||
import enginuity.NewGUI.etable.ETable;
|
||||
import enginuity.NewGUI.etable.ETableMenuBar;
|
||||
import enginuity.NewGUI.etable.ETableRowLabel;
|
||||
import enginuity.NewGUI.etable.ETableSaveState;
|
||||
import enginuity.NewGUI.etable.ETableToolBar;
|
||||
import enginuity.NewGUI.etable.text.RotatedLabel;
|
||||
import enginuity.NewGUI.tools.ClipBoardCopy;
|
||||
import com.romraider.NewGUI.data.TableMetaData;
|
||||
import com.romraider.NewGUI.etable.ETable;
|
||||
import com.romraider.NewGUI.etable.ETableMenuBar;
|
||||
import com.romraider.NewGUI.etable.ETableRowLabel;
|
||||
import com.romraider.NewGUI.etable.ETableSaveState;
|
||||
import com.romraider.NewGUI.etable.ETableToolBar;
|
||||
import com.romraider.NewGUI.etable.text.RotatedLabel;
|
||||
import com.romraider.NewGUI.tools.ClipBoardCopy;
|
||||
import org.apache.log4j.Logger;
|
||||
import javax.swing.JLabel;
|
||||
import javax.swing.JMenuBar;
|
|
@ -1,4 +1,4 @@
|
|||
package enginuity.NewGUI.etable.dataJPanel;
|
||||
package com.romraider.NewGUI.etable.dataJPanel;
|
||||
|
||||
import javax.swing.JMenuBar;
|
||||
import javax.swing.JToolBar;
|
|
@ -1,4 +1,4 @@
|
|||
package enginuity.NewGUI.etable.text;
|
||||
package com.romraider.NewGUI.etable.text;
|
||||
|
||||
import javax.swing.Icon;
|
||||
import javax.swing.JLabel;
|
|
@ -1,4 +1,4 @@
|
|||
package enginuity.NewGUI.interfaces;
|
||||
package com.romraider.NewGUI.interfaces;
|
||||
|
||||
import javax.swing.JMenu;
|
||||
import javax.swing.JToolBar;
|
|
@ -1,6 +1,6 @@
|
|||
package enginuity.NewGUI.interfaces;
|
||||
package com.romraider.NewGUI.interfaces;
|
||||
|
||||
import enginuity.NewGUI.tree.ETreeNode;
|
||||
import com.romraider.NewGUI.tree.ETreeNode;
|
||||
import javax.swing.JMenu;
|
||||
import javax.swing.JToolBar;
|
||||
import java.util.Vector;
|
|
@ -1,6 +1,6 @@
|
|||
package enginuity.NewGUI.tools;
|
||||
package com.romraider.NewGUI.tools;
|
||||
|
||||
import enginuity.NewGUI.etable.ETable;
|
||||
import com.romraider.NewGUI.etable.ETable;
|
||||
import org.apache.log4j.Logger;
|
||||
import javax.swing.JComponent;
|
||||
import javax.swing.JOptionPane;
|
|
@ -1,4 +1,4 @@
|
|||
package enginuity.NewGUI.tools;
|
||||
package com.romraider.NewGUI.tools;
|
||||
|
||||
import Jama.Matrix;
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
package com.romraider.NewGUI.tools;
|
||||
|
||||
public class RomRaiderDataTools {
|
||||
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
package enginuity.NewGUI.tree;
|
||||
package com.romraider.NewGUI.tree;
|
||||
|
||||
import enginuity.NewGUI.data.ApplicationStateManager;
|
||||
import enginuity.NewGUI.data.TableMetaData;
|
||||
import com.romraider.NewGUI.data.ApplicationStateManager;
|
||||
import com.romraider.NewGUI.data.TableMetaData;
|
||||
import org.apache.log4j.Logger;
|
||||
import javax.swing.JTree;
|
||||
import java.awt.Font;
|
||||
|
@ -37,7 +37,7 @@ public class ETree extends JTree implements MouseListener {
|
|||
|
||||
if (selectedObject instanceof ETreeNode) {
|
||||
ETreeNode theNode = (ETreeNode) selectedObject;
|
||||
ApplicationStateManager.getEnginuityInstance().addTuningGroupNameToTitle(theNode.getTableMetaData().getTableGroup());
|
||||
ApplicationStateManager.getRomRaiderInstance().addTuningGroupNameToTitle(theNode.getTableMetaData().getTableGroup());
|
||||
String tableGroup = theNode.getTableMetaData().getTableGroup();
|
||||
if (tableGroup != null && tableGroup != "") {
|
||||
ApplicationStateManager.setSelectedTuningGroup(tableGroup);
|
||||
|
@ -48,7 +48,7 @@ public class ETree extends JTree implements MouseListener {
|
|||
LOGGER.debug("ETree Table data:" + theNode.getTableMetaData().getTableIdentifier());
|
||||
Object[][] tableData = ApplicationStateManager.getCurrentTuningEntity().getTableData(theNode.getTableMetaData().getTableIdentifier());
|
||||
LOGGER.debug("ETree size:" + tableData.length);
|
||||
ApplicationStateManager.getEnginuityInstance().displayInternalFrameTable(tableData, theNode.getTableMetaData());
|
||||
ApplicationStateManager.getRomRaiderInstance().displayInternalFrameTable(tableData, theNode.getTableMetaData());
|
||||
}
|
||||
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
package enginuity.NewGUI.tree;
|
||||
package com.romraider.NewGUI.tree;
|
||||
|
||||
import enginuity.NewGUI.data.ApplicationStateManager;
|
||||
import enginuity.NewGUI.data.TableMetaData;
|
||||
import com.romraider.NewGUI.data.ApplicationStateManager;
|
||||
import com.romraider.NewGUI.data.TableMetaData;
|
||||
import static javax.swing.BorderFactory.createLineBorder;
|
||||
import javax.swing.ImageIcon;
|
||||
import javax.swing.JLabel;
|
|
@ -1,7 +1,7 @@
|
|||
package enginuity.NewGUI.tree;
|
||||
package com.romraider.NewGUI.tree;
|
||||
|
||||
import enginuity.NewGUI.data.ApplicationStateManager;
|
||||
import enginuity.NewGUI.data.TableMetaData;
|
||||
import com.romraider.NewGUI.data.ApplicationStateManager;
|
||||
import com.romraider.NewGUI.data.TableMetaData;
|
||||
import javax.swing.tree.DefaultMutableTreeNode;
|
||||
|
||||
public class ETreeNode extends DefaultMutableTreeNode {
|
|
@ -19,11 +19,11 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity;
|
||||
package com.romraider;
|
||||
|
||||
import enginuity.io.connection.ConnectionProperties;
|
||||
import enginuity.logger.ecu.definition.EcuDefinition;
|
||||
import static enginuity.util.ParamChecker.checkNotNullOrEmpty;
|
||||
import com.romraider.io.connection.ConnectionProperties;
|
||||
import com.romraider.logger.ecu.definition.EcuDefinition;
|
||||
import static com.romraider.util.ParamChecker.checkNotNullOrEmpty;
|
||||
import java.awt.Color;
|
||||
import java.awt.Dimension;
|
||||
import java.awt.Font;
|
|
@ -21,7 +21,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity;
|
||||
package com.romraider;
|
||||
|
||||
public final class Version {
|
||||
public static final String PRODUCT_NAME = "@name.package@";
|
|
@ -19,7 +19,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.io.connection;
|
||||
package com.romraider.io.connection;
|
||||
|
||||
public interface ConnectionProperties {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package enginuity.io.connection;
|
||||
package com.romraider.io.connection;
|
||||
|
||||
public final class ConnectionPropertiesImpl implements ConnectionProperties {
|
||||
private final int baudRate;
|
|
@ -19,7 +19,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.io.connection;
|
||||
package com.romraider.io.connection;
|
||||
|
||||
public interface EcuConnection {
|
||||
|
|
@ -19,12 +19,12 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.io.connection;
|
||||
package com.romraider.io.connection;
|
||||
|
||||
import enginuity.logger.ecu.exception.SerialCommunicationException;
|
||||
import static enginuity.util.ParamChecker.checkNotNull;
|
||||
import static enginuity.util.ParamChecker.checkNotNullOrEmpty;
|
||||
import static enginuity.util.ThreadUtil.sleep;
|
||||
import com.romraider.logger.ecu.exception.SerialCommunicationException;
|
||||
import static com.romraider.util.ParamChecker.checkNotNull;
|
||||
import static com.romraider.util.ParamChecker.checkNotNullOrEmpty;
|
||||
import static com.romraider.util.ThreadUtil.sleep;
|
||||
|
||||
public final class EcuConnectionImpl implements EcuConnection {
|
||||
private final long sendTimeout;
|
|
@ -19,7 +19,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.io.connection;
|
||||
package com.romraider.io.connection;
|
||||
|
||||
import java.io.IOException;
|
||||
|
|
@ -19,15 +19,15 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.io.connection;
|
||||
package com.romraider.io.connection;
|
||||
|
||||
import enginuity.logger.ecu.exception.NotConnectedException;
|
||||
import enginuity.logger.ecu.exception.PortNotFoundException;
|
||||
import enginuity.logger.ecu.exception.SerialCommunicationException;
|
||||
import enginuity.logger.ecu.exception.UnsupportedPortTypeException;
|
||||
import static enginuity.util.HexUtil.asHex;
|
||||
import static enginuity.util.ParamChecker.checkNotNull;
|
||||
import static enginuity.util.ParamChecker.checkNotNullOrEmpty;
|
||||
import com.romraider.logger.ecu.exception.NotConnectedException;
|
||||
import com.romraider.logger.ecu.exception.PortNotFoundException;
|
||||
import com.romraider.logger.ecu.exception.SerialCommunicationException;
|
||||
import com.romraider.logger.ecu.exception.UnsupportedPortTypeException;
|
||||
import static com.romraider.util.HexUtil.asHex;
|
||||
import static com.romraider.util.ParamChecker.checkNotNull;
|
||||
import static com.romraider.util.ParamChecker.checkNotNullOrEmpty;
|
||||
import gnu.io.CommPortIdentifier;
|
||||
import static gnu.io.CommPortIdentifier.PORT_SERIAL;
|
||||
import static gnu.io.CommPortIdentifier.getPortIdentifier;
|
|
@ -1,27 +1,27 @@
|
|||
package enginuity.io.connection;
|
||||
package com.romraider.io.connection;
|
||||
|
||||
import static enginuity.io.protocol.SSMChecksumCalculator.calculateChecksum;
|
||||
import static enginuity.io.protocol.SSMProtocol.ADDRESS_SIZE;
|
||||
import static enginuity.io.protocol.SSMProtocol.DATA_SIZE;
|
||||
import static enginuity.io.protocol.SSMProtocol.DIAGNOSTIC_TOOL_ID;
|
||||
import static enginuity.io.protocol.SSMProtocol.ECU_ID;
|
||||
import static enginuity.io.protocol.SSMProtocol.ECU_INIT_COMMAND;
|
||||
import static enginuity.io.protocol.SSMProtocol.HEADER;
|
||||
import static enginuity.io.protocol.SSMProtocol.READ_ADDRESS_COMMAND;
|
||||
import static enginuity.io.protocol.SSMProtocol.READ_ADDRESS_RESPONSE;
|
||||
import static enginuity.io.protocol.SSMProtocol.READ_MEMORY_COMMAND;
|
||||
import static enginuity.io.protocol.SSMProtocol.READ_MEMORY_RESPONSE;
|
||||
import static enginuity.io.protocol.SSMProtocol.REQUEST_NON_DATA_BYTES;
|
||||
import static enginuity.io.protocol.SSMProtocol.RESPONSE_NON_DATA_BYTES;
|
||||
import static enginuity.io.protocol.SSMProtocol.WRITE_MEMORY_COMMAND;
|
||||
import static enginuity.io.protocol.SSMProtocol.WRITE_MEMORY_RESPONSE;
|
||||
import enginuity.logger.ecu.exception.SerialCommunicationException;
|
||||
import static enginuity.util.ByteUtil.asInt;
|
||||
import static enginuity.util.HexUtil.asBytes;
|
||||
import static enginuity.util.HexUtil.asHex;
|
||||
import static enginuity.util.ParamChecker.checkNotNull;
|
||||
import static enginuity.util.ParamChecker.checkNotNullOrEmpty;
|
||||
import static enginuity.util.ThreadUtil.sleep;
|
||||
import static com.romraider.io.protocol.SSMChecksumCalculator.calculateChecksum;
|
||||
import static com.romraider.io.protocol.SSMProtocol.ADDRESS_SIZE;
|
||||
import static com.romraider.io.protocol.SSMProtocol.DATA_SIZE;
|
||||
import static com.romraider.io.protocol.SSMProtocol.DIAGNOSTIC_TOOL_ID;
|
||||
import static com.romraider.io.protocol.SSMProtocol.ECU_ID;
|
||||
import static com.romraider.io.protocol.SSMProtocol.ECU_INIT_COMMAND;
|
||||
import static com.romraider.io.protocol.SSMProtocol.HEADER;
|
||||
import static com.romraider.io.protocol.SSMProtocol.READ_ADDRESS_COMMAND;
|
||||
import static com.romraider.io.protocol.SSMProtocol.READ_ADDRESS_RESPONSE;
|
||||
import static com.romraider.io.protocol.SSMProtocol.READ_MEMORY_COMMAND;
|
||||
import static com.romraider.io.protocol.SSMProtocol.READ_MEMORY_RESPONSE;
|
||||
import static com.romraider.io.protocol.SSMProtocol.REQUEST_NON_DATA_BYTES;
|
||||
import static com.romraider.io.protocol.SSMProtocol.RESPONSE_NON_DATA_BYTES;
|
||||
import static com.romraider.io.protocol.SSMProtocol.WRITE_MEMORY_COMMAND;
|
||||
import static com.romraider.io.protocol.SSMProtocol.WRITE_MEMORY_RESPONSE;
|
||||
import com.romraider.logger.ecu.exception.SerialCommunicationException;
|
||||
import static com.romraider.util.ByteUtil.asInt;
|
||||
import static com.romraider.util.HexUtil.asBytes;
|
||||
import static com.romraider.util.HexUtil.asHex;
|
||||
import static com.romraider.util.ParamChecker.checkNotNull;
|
||||
import static com.romraider.util.ParamChecker.checkNotNullOrEmpty;
|
||||
import static com.romraider.util.ThreadUtil.sleep;
|
||||
import org.apache.log4j.Logger;
|
||||
import java.util.Random;
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.io.port;
|
||||
package com.romraider.io.port;
|
||||
|
||||
import gnu.io.CommPortIdentifier;
|
||||
import java.util.List;
|
|
@ -19,7 +19,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.io.port;
|
||||
package com.romraider.io.port;
|
||||
|
||||
import gnu.io.CommPortIdentifier;
|
||||
import static gnu.io.CommPortIdentifier.PORT_SERIAL;
|
|
@ -19,7 +19,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.io.port;
|
||||
package com.romraider.io.port;
|
||||
|
||||
import java.util.Set;
|
||||
|
|
@ -19,10 +19,10 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.io.port;
|
||||
package com.romraider.io.port;
|
||||
|
||||
import static enginuity.util.ParamChecker.checkNotNull;
|
||||
import static enginuity.util.ThreadUtil.sleep;
|
||||
import static com.romraider.util.ParamChecker.checkNotNull;
|
||||
import static com.romraider.util.ThreadUtil.sleep;
|
||||
import gnu.io.CommPortIdentifier;
|
||||
import javax.swing.SwingUtilities;
|
||||
import java.util.List;
|
|
@ -19,10 +19,10 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.io.protocol;
|
||||
package com.romraider.io.protocol;
|
||||
|
||||
import enginuity.io.connection.ConnectionProperties;
|
||||
import enginuity.logger.ecu.comms.query.EcuInit;
|
||||
import com.romraider.io.connection.ConnectionProperties;
|
||||
import com.romraider.logger.ecu.comms.query.EcuInit;
|
||||
|
||||
public interface Protocol {
|
||||
|
|
@ -19,9 +19,9 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.io.protocol;
|
||||
package com.romraider.io.protocol;
|
||||
|
||||
import enginuity.logger.ecu.exception.UnsupportedProtocolException;
|
||||
import com.romraider.logger.ecu.exception.UnsupportedProtocolException;
|
||||
|
||||
public final class ProtocolFactory {
|
||||
private static final ProtocolFactory INSTANCE = new ProtocolFactory();
|
|
@ -19,10 +19,10 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.io.protocol;
|
||||
package com.romraider.io.protocol;
|
||||
|
||||
import static enginuity.util.ByteUtil.asByte;
|
||||
import static enginuity.util.ByteUtil.asInt;
|
||||
import static com.romraider.util.ByteUtil.asByte;
|
||||
import static com.romraider.util.ByteUtil.asInt;
|
||||
|
||||
public final class SSMChecksumCalculator {
|
||||
|
|
@ -19,21 +19,21 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.io.protocol;
|
||||
package com.romraider.io.protocol;
|
||||
|
||||
import enginuity.io.connection.ConnectionProperties;
|
||||
import static enginuity.io.protocol.SSMChecksumCalculator.calculateChecksum;
|
||||
import static enginuity.io.protocol.SSMResponseProcessor.extractResponseData;
|
||||
import static enginuity.io.protocol.SSMResponseProcessor.filterRequestFromResponse;
|
||||
import static enginuity.io.protocol.SSMResponseProcessor.validateResponse;
|
||||
import enginuity.logger.ecu.comms.query.EcuInit;
|
||||
import enginuity.logger.ecu.comms.query.SSMEcuInit;
|
||||
import enginuity.logger.ecu.exception.InvalidResponseException;
|
||||
import static enginuity.util.ByteUtil.asByte;
|
||||
import static enginuity.util.HexUtil.asHex;
|
||||
import static enginuity.util.ParamChecker.checkGreaterThanZero;
|
||||
import static enginuity.util.ParamChecker.checkNotNull;
|
||||
import static enginuity.util.ParamChecker.checkNotNullOrEmpty;
|
||||
import com.romraider.io.connection.ConnectionProperties;
|
||||
import static com.romraider.io.protocol.SSMChecksumCalculator.calculateChecksum;
|
||||
import static com.romraider.io.protocol.SSMResponseProcessor.extractResponseData;
|
||||
import static com.romraider.io.protocol.SSMResponseProcessor.filterRequestFromResponse;
|
||||
import static com.romraider.io.protocol.SSMResponseProcessor.validateResponse;
|
||||
import com.romraider.logger.ecu.comms.query.EcuInit;
|
||||
import com.romraider.logger.ecu.comms.query.SSMEcuInit;
|
||||
import com.romraider.logger.ecu.exception.InvalidResponseException;
|
||||
import static com.romraider.util.ByteUtil.asByte;
|
||||
import static com.romraider.util.HexUtil.asHex;
|
||||
import static com.romraider.util.ParamChecker.checkGreaterThanZero;
|
||||
import static com.romraider.util.ParamChecker.checkNotNull;
|
||||
import static com.romraider.util.ParamChecker.checkNotNullOrEmpty;
|
||||
|
||||
public final class SSMProtocol implements Protocol {
|
||||
public static final byte HEADER = (byte) 0x80;
|
|
@ -19,23 +19,23 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.io.protocol;
|
||||
package com.romraider.io.protocol;
|
||||
|
||||
import static enginuity.io.protocol.SSMChecksumCalculator.calculateChecksum;
|
||||
import static enginuity.io.protocol.SSMProtocol.DIAGNOSTIC_TOOL_ID;
|
||||
import static enginuity.io.protocol.SSMProtocol.ECU_ID;
|
||||
import static enginuity.io.protocol.SSMProtocol.ECU_INIT_RESPONSE;
|
||||
import static enginuity.io.protocol.SSMProtocol.HEADER;
|
||||
import static enginuity.io.protocol.SSMProtocol.READ_ADDRESS_RESPONSE;
|
||||
import static enginuity.io.protocol.SSMProtocol.READ_MEMORY_RESPONSE;
|
||||
import static enginuity.io.protocol.SSMProtocol.RESPONSE_NON_DATA_BYTES;
|
||||
import static enginuity.io.protocol.SSMProtocol.WRITE_ADDRESS_RESPONSE;
|
||||
import static enginuity.io.protocol.SSMProtocol.WRITE_MEMORY_RESPONSE;
|
||||
import enginuity.logger.ecu.exception.InvalidResponseException;
|
||||
import static enginuity.util.ByteUtil.asByte;
|
||||
import static enginuity.util.HexUtil.asHex;
|
||||
import static enginuity.util.ParamChecker.checkNotNull;
|
||||
import static enginuity.util.ParamChecker.checkNotNullOrEmpty;
|
||||
import static com.romraider.io.protocol.SSMChecksumCalculator.calculateChecksum;
|
||||
import static com.romraider.io.protocol.SSMProtocol.DIAGNOSTIC_TOOL_ID;
|
||||
import static com.romraider.io.protocol.SSMProtocol.ECU_ID;
|
||||
import static com.romraider.io.protocol.SSMProtocol.ECU_INIT_RESPONSE;
|
||||
import static com.romraider.io.protocol.SSMProtocol.HEADER;
|
||||
import static com.romraider.io.protocol.SSMProtocol.READ_ADDRESS_RESPONSE;
|
||||
import static com.romraider.io.protocol.SSMProtocol.READ_MEMORY_RESPONSE;
|
||||
import static com.romraider.io.protocol.SSMProtocol.RESPONSE_NON_DATA_BYTES;
|
||||
import static com.romraider.io.protocol.SSMProtocol.WRITE_ADDRESS_RESPONSE;
|
||||
import static com.romraider.io.protocol.SSMProtocol.WRITE_MEMORY_RESPONSE;
|
||||
import com.romraider.logger.ecu.exception.InvalidResponseException;
|
||||
import static com.romraider.util.ByteUtil.asByte;
|
||||
import static com.romraider.util.HexUtil.asHex;
|
||||
import static com.romraider.util.ParamChecker.checkNotNull;
|
||||
import static com.romraider.util.ParamChecker.checkNotNullOrEmpty;
|
||||
|
||||
public final class SSMResponseProcessor {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package enginuity.logger.aem.io;
|
||||
package com.romraider.logger.aem.io;
|
||||
|
||||
public interface AemConnection {
|
||||
byte[] read();
|
|
@ -1,13 +1,13 @@
|
|||
package enginuity.logger.aem.io;
|
||||
package com.romraider.logger.aem.io;
|
||||
|
||||
import enginuity.io.connection.ConnectionProperties;
|
||||
import enginuity.io.connection.SerialConnection;
|
||||
import enginuity.io.connection.SerialConnectionImpl;
|
||||
import enginuity.logger.ecu.exception.SerialCommunicationException;
|
||||
import static enginuity.util.HexUtil.asHex;
|
||||
import static enginuity.util.ParamChecker.checkNotNull;
|
||||
import static enginuity.util.ParamChecker.checkNotNullOrEmpty;
|
||||
import static enginuity.util.ThreadUtil.sleep;
|
||||
import com.romraider.io.connection.ConnectionProperties;
|
||||
import com.romraider.io.connection.SerialConnection;
|
||||
import com.romraider.io.connection.SerialConnectionImpl;
|
||||
import com.romraider.logger.ecu.exception.SerialCommunicationException;
|
||||
import static com.romraider.util.HexUtil.asHex;
|
||||
import static com.romraider.util.ParamChecker.checkNotNull;
|
||||
import static com.romraider.util.ParamChecker.checkNotNullOrEmpty;
|
||||
import static com.romraider.util.ThreadUtil.sleep;
|
||||
import org.apache.log4j.Logger;
|
||||
import static java.lang.System.currentTimeMillis;
|
||||
import java.util.ArrayList;
|
|
@ -1,6 +1,6 @@
|
|||
package enginuity.logger.aem.io;
|
||||
package com.romraider.logger.aem.io;
|
||||
|
||||
import enginuity.io.connection.ConnectionProperties;
|
||||
import com.romraider.io.connection.ConnectionProperties;
|
||||
|
||||
public final class AemConnectionProperties implements ConnectionProperties {
|
||||
public int getBaudRate() {
|
|
@ -1,4 +1,4 @@
|
|||
package enginuity.logger.aem.io;
|
||||
package com.romraider.logger.aem.io;
|
||||
|
||||
public interface AemRunner extends Runnable {
|
||||
void stop();
|
|
@ -1,7 +1,7 @@
|
|||
package enginuity.logger.aem.io;
|
||||
package com.romraider.logger.aem.io;
|
||||
|
||||
import enginuity.logger.aem.plugin.AemSettings;
|
||||
import enginuity.logger.aem.plugin.DataListener;
|
||||
import com.romraider.logger.aem.plugin.AemSettings;
|
||||
import com.romraider.logger.aem.plugin.DataListener;
|
||||
|
||||
public final class AemRunnerImpl implements AemRunner {
|
||||
private final AemConnection connection;
|
|
@ -1,4 +1,4 @@
|
|||
package enginuity.logger.aem.plugin;
|
||||
package com.romraider.logger.aem.plugin;
|
||||
|
||||
public interface AemConvertor {
|
||||
double convert(byte[] bytes);
|
|
@ -1,6 +1,6 @@
|
|||
package enginuity.logger.aem.plugin;
|
||||
package com.romraider.logger.aem.plugin;
|
||||
|
||||
import static enginuity.util.HexUtil.asHex;
|
||||
import static com.romraider.util.HexUtil.asHex;
|
||||
import org.apache.log4j.Logger;
|
||||
|
||||
public final class AemConvertorImpl implements AemConvertor {
|
|
@ -1,6 +1,6 @@
|
|||
package enginuity.logger.aem.plugin;
|
||||
package com.romraider.logger.aem.plugin;
|
||||
|
||||
import enginuity.logger.ecu.external.ExternalDataItem;
|
||||
import com.romraider.logger.ecu.external.ExternalDataItem;
|
||||
|
||||
public final class AemDataItem implements ExternalDataItem, DataListener {
|
||||
private final AemConvertor convertor = new AemConvertorImpl();
|
|
@ -1,11 +1,11 @@
|
|||
package enginuity.logger.aem.plugin;
|
||||
package com.romraider.logger.aem.plugin;
|
||||
|
||||
import enginuity.logger.aem.io.AemRunnerImpl;
|
||||
import enginuity.logger.ecu.EcuLogger;
|
||||
import enginuity.logger.ecu.external.ExternalDataItem;
|
||||
import enginuity.logger.ecu.external.ExternalDataSource;
|
||||
import enginuity.logger.ecu.ui.swing.menubar.action.GenericPluginMenuAction;
|
||||
import static enginuity.util.ThreadUtil.runAsDaemon;
|
||||
import com.romraider.logger.aem.io.AemRunnerImpl;
|
||||
import com.romraider.logger.ecu.EcuLogger;
|
||||
import com.romraider.logger.ecu.external.ExternalDataItem;
|
||||
import com.romraider.logger.ecu.external.ExternalDataSource;
|
||||
import com.romraider.logger.ecu.ui.swing.menubar.action.GenericPluginMenuAction;
|
||||
import static com.romraider.util.ThreadUtil.runAsDaemon;
|
||||
import javax.swing.Action;
|
||||
import static java.util.Arrays.asList;
|
||||
import java.util.List;
|
|
@ -1,4 +1,4 @@
|
|||
package enginuity.logger.aem.plugin;
|
||||
package com.romraider.logger.aem.plugin;
|
||||
|
||||
public interface AemSettings {
|
||||
void setPort(String port);
|
|
@ -1,4 +1,4 @@
|
|||
package enginuity.logger.aem.plugin;
|
||||
package com.romraider.logger.aem.plugin;
|
||||
|
||||
public final class AemSettingsImpl implements AemSettings {
|
||||
private String port;
|
|
@ -1,4 +1,4 @@
|
|||
package enginuity.logger.aem.plugin;
|
||||
package com.romraider.logger.aem.plugin;
|
||||
|
||||
public interface DataListener {
|
||||
void setBytes(byte[] bytes);
|
|
@ -19,69 +19,69 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.logger.ecu;
|
||||
package com.romraider.logger.ecu;
|
||||
|
||||
import enginuity.ECUEditor;
|
||||
import enginuity.Settings;
|
||||
import enginuity.io.port.SerialPortRefresher;
|
||||
import enginuity.logger.ecu.comms.controller.LoggerController;
|
||||
import enginuity.logger.ecu.comms.controller.LoggerControllerImpl;
|
||||
import enginuity.logger.ecu.comms.query.EcuInit;
|
||||
import enginuity.logger.ecu.comms.query.EcuInitCallback;
|
||||
import enginuity.logger.ecu.comms.reset.ResetManager;
|
||||
import enginuity.logger.ecu.comms.reset.ResetManagerImpl;
|
||||
import enginuity.logger.ecu.definition.EcuDataLoader;
|
||||
import enginuity.logger.ecu.definition.EcuDataLoaderImpl;
|
||||
import enginuity.logger.ecu.definition.EcuDefinition;
|
||||
import enginuity.logger.ecu.definition.EcuParameter;
|
||||
import enginuity.logger.ecu.definition.EcuSwitch;
|
||||
import enginuity.logger.ecu.definition.ExternalData;
|
||||
import enginuity.logger.ecu.definition.ExternalDataImpl;
|
||||
import enginuity.logger.ecu.definition.LoggerData;
|
||||
import enginuity.logger.ecu.external.ExternalDataItem;
|
||||
import enginuity.logger.ecu.external.ExternalDataSource;
|
||||
import enginuity.logger.ecu.external.ExternalDataSourceLoader;
|
||||
import enginuity.logger.ecu.external.ExternalDataSourceLoaderImpl;
|
||||
import enginuity.logger.ecu.profile.UserProfile;
|
||||
import enginuity.logger.ecu.profile.UserProfileImpl;
|
||||
import enginuity.logger.ecu.profile.UserProfileItem;
|
||||
import enginuity.logger.ecu.profile.UserProfileItemImpl;
|
||||
import enginuity.logger.ecu.profile.UserProfileLoader;
|
||||
import enginuity.logger.ecu.profile.UserProfileLoaderImpl;
|
||||
import enginuity.logger.ecu.ui.DataRegistrationBroker;
|
||||
import enginuity.logger.ecu.ui.DataRegistrationBrokerImpl;
|
||||
import enginuity.logger.ecu.ui.EcuDataComparator;
|
||||
import enginuity.logger.ecu.ui.MessageListener;
|
||||
import enginuity.logger.ecu.ui.SerialPortComboBox;
|
||||
import enginuity.logger.ecu.ui.StatusIndicator;
|
||||
import enginuity.logger.ecu.ui.handler.DataUpdateHandlerManager;
|
||||
import enginuity.logger.ecu.ui.handler.DataUpdateHandlerManagerImpl;
|
||||
import enginuity.logger.ecu.ui.handler.dash.DashboardUpdateHandler;
|
||||
import enginuity.logger.ecu.ui.handler.file.FileLoggerControllerSwitchHandler;
|
||||
import enginuity.logger.ecu.ui.handler.file.FileLoggerControllerSwitchMonitorImpl;
|
||||
import enginuity.logger.ecu.ui.handler.file.FileUpdateHandlerImpl;
|
||||
import enginuity.logger.ecu.ui.handler.graph.GraphUpdateHandler;
|
||||
import enginuity.logger.ecu.ui.handler.injector.InjectorUpdateHandler;
|
||||
import enginuity.logger.ecu.ui.handler.livedata.LiveDataTableModel;
|
||||
import enginuity.logger.ecu.ui.handler.livedata.LiveDataUpdateHandler;
|
||||
import enginuity.logger.ecu.ui.handler.maf.MafUpdateHandler;
|
||||
import enginuity.logger.ecu.ui.handler.table.TableUpdateHandler;
|
||||
import enginuity.logger.ecu.ui.paramlist.ParameterListTable;
|
||||
import enginuity.logger.ecu.ui.paramlist.ParameterListTableModel;
|
||||
import enginuity.logger.ecu.ui.paramlist.ParameterRow;
|
||||
import enginuity.logger.ecu.ui.playback.PlaybackManagerImpl;
|
||||
import enginuity.logger.ecu.ui.swing.menubar.EcuLoggerMenuBar;
|
||||
import enginuity.logger.ecu.ui.swing.menubar.action.ToggleButtonAction;
|
||||
import enginuity.logger.ecu.ui.tab.injector.InjectorTab;
|
||||
import enginuity.logger.ecu.ui.tab.injector.InjectorTabImpl;
|
||||
import enginuity.logger.ecu.ui.tab.maf.MafTab;
|
||||
import enginuity.logger.ecu.ui.tab.maf.MafTabImpl;
|
||||
import static enginuity.util.ParamChecker.checkNotNull;
|
||||
import static enginuity.util.ParamChecker.isNullOrEmpty;
|
||||
import enginuity.util.SettingsManagerImpl;
|
||||
import enginuity.util.ThreadUtil;
|
||||
import static enginuity.util.ThreadUtil.runAsDaemon;
|
||||
import static enginuity.util.ThreadUtil.sleep;
|
||||
import com.romraider.ECUEditor;
|
||||
import com.romraider.Settings;
|
||||
import com.romraider.io.port.SerialPortRefresher;
|
||||
import com.romraider.logger.ecu.comms.controller.LoggerController;
|
||||
import com.romraider.logger.ecu.comms.controller.LoggerControllerImpl;
|
||||
import com.romraider.logger.ecu.comms.query.EcuInit;
|
||||
import com.romraider.logger.ecu.comms.query.EcuInitCallback;
|
||||
import com.romraider.logger.ecu.comms.reset.ResetManager;
|
||||
import com.romraider.logger.ecu.comms.reset.ResetManagerImpl;
|
||||
import com.romraider.logger.ecu.definition.EcuDataLoader;
|
||||
import com.romraider.logger.ecu.definition.EcuDataLoaderImpl;
|
||||
import com.romraider.logger.ecu.definition.EcuDefinition;
|
||||
import com.romraider.logger.ecu.definition.EcuParameter;
|
||||
import com.romraider.logger.ecu.definition.EcuSwitch;
|
||||
import com.romraider.logger.ecu.definition.ExternalData;
|
||||
import com.romraider.logger.ecu.definition.ExternalDataImpl;
|
||||
import com.romraider.logger.ecu.definition.LoggerData;
|
||||
import com.romraider.logger.ecu.external.ExternalDataItem;
|
||||
import com.romraider.logger.ecu.external.ExternalDataSource;
|
||||
import com.romraider.logger.ecu.external.ExternalDataSourceLoader;
|
||||
import com.romraider.logger.ecu.external.ExternalDataSourceLoaderImpl;
|
||||
import com.romraider.logger.ecu.profile.UserProfile;
|
||||
import com.romraider.logger.ecu.profile.UserProfileImpl;
|
||||
import com.romraider.logger.ecu.profile.UserProfileItem;
|
||||
import com.romraider.logger.ecu.profile.UserProfileItemImpl;
|
||||
import com.romraider.logger.ecu.profile.UserProfileLoader;
|
||||
import com.romraider.logger.ecu.profile.UserProfileLoaderImpl;
|
||||
import com.romraider.logger.ecu.ui.DataRegistrationBroker;
|
||||
import com.romraider.logger.ecu.ui.DataRegistrationBrokerImpl;
|
||||
import com.romraider.logger.ecu.ui.EcuDataComparator;
|
||||
import com.romraider.logger.ecu.ui.MessageListener;
|
||||
import com.romraider.logger.ecu.ui.SerialPortComboBox;
|
||||
import com.romraider.logger.ecu.ui.StatusIndicator;
|
||||
import com.romraider.logger.ecu.ui.handler.DataUpdateHandlerManager;
|
||||
import com.romraider.logger.ecu.ui.handler.DataUpdateHandlerManagerImpl;
|
||||
import com.romraider.logger.ecu.ui.handler.dash.DashboardUpdateHandler;
|
||||
import com.romraider.logger.ecu.ui.handler.file.FileLoggerControllerSwitchHandler;
|
||||
import com.romraider.logger.ecu.ui.handler.file.FileLoggerControllerSwitchMonitorImpl;
|
||||
import com.romraider.logger.ecu.ui.handler.file.FileUpdateHandlerImpl;
|
||||
import com.romraider.logger.ecu.ui.handler.graph.GraphUpdateHandler;
|
||||
import com.romraider.logger.ecu.ui.handler.injector.InjectorUpdateHandler;
|
||||
import com.romraider.logger.ecu.ui.handler.livedata.LiveDataTableModel;
|
||||
import com.romraider.logger.ecu.ui.handler.livedata.LiveDataUpdateHandler;
|
||||
import com.romraider.logger.ecu.ui.handler.maf.MafUpdateHandler;
|
||||
import com.romraider.logger.ecu.ui.handler.table.TableUpdateHandler;
|
||||
import com.romraider.logger.ecu.ui.paramlist.ParameterListTable;
|
||||
import com.romraider.logger.ecu.ui.paramlist.ParameterListTableModel;
|
||||
import com.romraider.logger.ecu.ui.paramlist.ParameterRow;
|
||||
import com.romraider.logger.ecu.ui.playback.PlaybackManagerImpl;
|
||||
import com.romraider.logger.ecu.ui.swing.menubar.EcuLoggerMenuBar;
|
||||
import com.romraider.logger.ecu.ui.swing.menubar.action.ToggleButtonAction;
|
||||
import com.romraider.logger.ecu.ui.tab.injector.InjectorTab;
|
||||
import com.romraider.logger.ecu.ui.tab.injector.InjectorTabImpl;
|
||||
import com.romraider.logger.ecu.ui.tab.maf.MafTab;
|
||||
import com.romraider.logger.ecu.ui.tab.maf.MafTabImpl;
|
||||
import static com.romraider.util.ParamChecker.checkNotNull;
|
||||
import static com.romraider.util.ParamChecker.isNullOrEmpty;
|
||||
import com.romraider.util.SettingsManagerImpl;
|
||||
import com.romraider.util.ThreadUtil;
|
||||
import static com.romraider.util.ThreadUtil.runAsDaemon;
|
||||
import static com.romraider.util.ThreadUtil.sleep;
|
||||
import org.apache.log4j.Logger;
|
||||
import static javax.swing.BorderFactory.createLoweredBevelBorder;
|
||||
import javax.swing.ImageIcon;
|
||||
|
@ -149,7 +149,7 @@ TODO: Add log analysis tab (or maybe new window?), including log playback, custo
|
|||
|
||||
public final class EcuLogger extends JFrame implements WindowListener, PropertyChangeListener, MessageListener {
|
||||
private static final Logger LOGGER = Logger.getLogger(EcuLogger.class);
|
||||
private static final String ENGINUITY_ECU_LOGGER_TITLE = "RomRaider ECU Logger";
|
||||
private static final String ECU_LOGGER_TITLE = "RomRaider ECU Logger";
|
||||
private static final String HEADING_PARAMETERS = "Parameters";
|
||||
private static final String HEADING_SWITCHES = "Switches";
|
||||
private static final String HEADING_EXTERNAL = "External";
|
||||
|
@ -202,12 +202,12 @@ public final class EcuLogger extends JFrame implements WindowListener, PropertyC
|
|||
private List<EcuParameter> ecuParams;
|
||||
|
||||
public EcuLogger(Settings settings) {
|
||||
super(ENGINUITY_ECU_LOGGER_TITLE);
|
||||
super(ECU_LOGGER_TITLE);
|
||||
construct(settings);
|
||||
}
|
||||
|
||||
public EcuLogger(ECUEditor ecuEditor) {
|
||||
super(ENGINUITY_ECU_LOGGER_TITLE);
|
||||
super(ECU_LOGGER_TITLE);
|
||||
this.ecuEditor = ecuEditor;
|
||||
construct(ecuEditor.getSettings());
|
||||
}
|
||||
|
@ -272,7 +272,7 @@ public final class EcuLogger extends JFrame implements WindowListener, PropertyC
|
|||
injectorTab = new InjectorTabImpl(injectorTabBroker, ecuEditor);
|
||||
injectorUpdateHandler.setInjectorTab(injectorTab);
|
||||
resetManager = new ResetManagerImpl(settings, this);
|
||||
messageLabel = new JLabel(ENGINUITY_ECU_LOGGER_TITLE);
|
||||
messageLabel = new JLabel(ECU_LOGGER_TITLE);
|
||||
calIdLabel = new JLabel(buildEcuInfoLabelText(CAL_ID_LABEL, null));
|
||||
ecuIdLabel = new JLabel(buildEcuInfoLabelText(ECU_ID_LABEL, null));
|
||||
statsLabel = buildStatsLabel();
|
||||
|
@ -1008,8 +1008,8 @@ public final class EcuLogger extends JFrame implements WindowListener, PropertyC
|
|||
|
||||
public void setTitle(String title) {
|
||||
if (title != null) {
|
||||
if (!title.startsWith(ENGINUITY_ECU_LOGGER_TITLE)) {
|
||||
title = ENGINUITY_ECU_LOGGER_TITLE + (title.length() == 0 ? "" : " - " + title);
|
||||
if (!title.startsWith(ECU_LOGGER_TITLE)) {
|
||||
title = ECU_LOGGER_TITLE + (title.length() == 0 ? "" : " - " + title);
|
||||
}
|
||||
super.setTitle(title);
|
||||
}
|
||||
|
@ -1047,7 +1047,7 @@ public final class EcuLogger extends JFrame implements WindowListener, PropertyC
|
|||
// set remaining window properties
|
||||
ecuLogger.pack();
|
||||
ecuLogger.setSize(settings.getLoggerWindowSize());
|
||||
ecuLogger.setIconImage(new ImageIcon("./graphics/enginuity-ico.gif").getImage());
|
||||
ecuLogger.setIconImage(new ImageIcon("./graphics/romraider-ico.gif").getImage());
|
||||
ecuLogger.addWindowListener(ecuLogger);
|
||||
|
||||
// display the window
|
|
@ -19,12 +19,12 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.logger.ecu;
|
||||
package com.romraider.logger.ecu;
|
||||
|
||||
import enginuity.Settings;
|
||||
import enginuity.swing.LookAndFeelManager;
|
||||
import enginuity.util.LogManager;
|
||||
import enginuity.util.SettingsManagerImpl;
|
||||
import com.romraider.Settings;
|
||||
import com.romraider.swing.LookAndFeelManager;
|
||||
import com.romraider.util.LogManager;
|
||||
import com.romraider.util.SettingsManagerImpl;
|
||||
import static javax.swing.WindowConstants.EXIT_ON_CLOSE;
|
||||
|
||||
public final class EcuLoggerExec {
|
|
@ -19,11 +19,11 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.logger.ecu.comms.controller;
|
||||
package com.romraider.logger.ecu.comms.controller;
|
||||
|
||||
import enginuity.logger.ecu.definition.LoggerData;
|
||||
import enginuity.logger.ecu.ui.StatusChangeListener;
|
||||
import enginuity.logger.ecu.ui.handler.file.FileLoggerControllerSwitchMonitor;
|
||||
import com.romraider.logger.ecu.definition.LoggerData;
|
||||
import com.romraider.logger.ecu.ui.StatusChangeListener;
|
||||
import com.romraider.logger.ecu.ui.handler.file.FileLoggerControllerSwitchMonitor;
|
||||
|
||||
public interface LoggerController {
|
||||
|
|
@ -19,19 +19,19 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.logger.ecu.comms.controller;
|
||||
package com.romraider.logger.ecu.comms.controller;
|
||||
|
||||
import enginuity.Settings;
|
||||
import enginuity.logger.ecu.comms.manager.QueryManager;
|
||||
import enginuity.logger.ecu.comms.manager.QueryManagerImpl;
|
||||
import enginuity.logger.ecu.comms.query.EcuInitCallback;
|
||||
import enginuity.logger.ecu.definition.LoggerData;
|
||||
import enginuity.logger.ecu.ui.MessageListener;
|
||||
import enginuity.logger.ecu.ui.StatusChangeListener;
|
||||
import enginuity.logger.ecu.ui.handler.DataUpdateHandler;
|
||||
import enginuity.logger.ecu.ui.handler.file.FileLoggerControllerSwitchMonitor;
|
||||
import static enginuity.util.ParamChecker.checkNotNull;
|
||||
import static enginuity.util.ThreadUtil.runAsDaemon;
|
||||
import com.romraider.Settings;
|
||||
import com.romraider.logger.ecu.comms.manager.QueryManager;
|
||||
import com.romraider.logger.ecu.comms.manager.QueryManagerImpl;
|
||||
import com.romraider.logger.ecu.comms.query.EcuInitCallback;
|
||||
import com.romraider.logger.ecu.definition.LoggerData;
|
||||
import com.romraider.logger.ecu.ui.MessageListener;
|
||||
import com.romraider.logger.ecu.ui.StatusChangeListener;
|
||||
import com.romraider.logger.ecu.ui.handler.DataUpdateHandler;
|
||||
import com.romraider.logger.ecu.ui.handler.file.FileLoggerControllerSwitchMonitor;
|
||||
import static com.romraider.util.ParamChecker.checkNotNull;
|
||||
import static com.romraider.util.ThreadUtil.runAsDaemon;
|
||||
import org.apache.log4j.Logger;
|
||||
|
||||
public final class LoggerControllerImpl implements LoggerController {
|
|
@ -19,9 +19,9 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.logger.ecu.comms.io.connection;
|
||||
package com.romraider.logger.ecu.comms.io.connection;
|
||||
|
||||
import enginuity.logger.ecu.comms.query.EcuQuery;
|
||||
import com.romraider.logger.ecu.comms.query.EcuQuery;
|
||||
import java.util.Collection;
|
||||
|
||||
public interface LoggerConnection {
|
|
@ -19,10 +19,10 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.logger.ecu.comms.io.connection;
|
||||
package com.romraider.logger.ecu.comms.io.connection;
|
||||
|
||||
import enginuity.io.connection.ConnectionProperties;
|
||||
import enginuity.logger.ecu.exception.UnsupportedProtocolException;
|
||||
import com.romraider.io.connection.ConnectionProperties;
|
||||
import com.romraider.logger.ecu.exception.UnsupportedProtocolException;
|
||||
|
||||
public final class LoggerConnectionFactory {
|
||||
private static final LoggerConnectionFactory INSTANCE = new LoggerConnectionFactory();
|
|
@ -19,19 +19,19 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.logger.ecu.comms.io.connection;
|
||||
package com.romraider.logger.ecu.comms.io.connection;
|
||||
|
||||
import enginuity.io.connection.ConnectionProperties;
|
||||
import enginuity.io.connection.SerialConnection;
|
||||
import enginuity.io.connection.SerialConnectionImpl;
|
||||
import enginuity.logger.ecu.comms.io.protocol.LoggerProtocol;
|
||||
import enginuity.logger.ecu.comms.io.protocol.SSMLoggerProtocol;
|
||||
import enginuity.logger.ecu.comms.query.EcuQuery;
|
||||
import enginuity.logger.ecu.exception.SerialCommunicationException;
|
||||
import static enginuity.util.HexUtil.asHex;
|
||||
import static enginuity.util.ParamChecker.checkNotNull;
|
||||
import static enginuity.util.ParamChecker.checkNotNullOrEmpty;
|
||||
import static enginuity.util.ThreadUtil.sleep;
|
||||
import com.romraider.io.connection.ConnectionProperties;
|
||||
import com.romraider.io.connection.SerialConnection;
|
||||
import com.romraider.io.connection.SerialConnectionImpl;
|
||||
import com.romraider.logger.ecu.comms.io.protocol.LoggerProtocol;
|
||||
import com.romraider.logger.ecu.comms.io.protocol.SSMLoggerProtocol;
|
||||
import com.romraider.logger.ecu.comms.query.EcuQuery;
|
||||
import com.romraider.logger.ecu.exception.SerialCommunicationException;
|
||||
import static com.romraider.util.HexUtil.asHex;
|
||||
import static com.romraider.util.ParamChecker.checkNotNull;
|
||||
import static com.romraider.util.ParamChecker.checkNotNullOrEmpty;
|
||||
import static com.romraider.util.ThreadUtil.sleep;
|
||||
import org.apache.log4j.Logger;
|
||||
import java.util.Collection;
|
||||
|
|
@ -19,9 +19,9 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.logger.ecu.comms.io.protocol;
|
||||
package com.romraider.logger.ecu.comms.io.protocol;
|
||||
|
||||
import enginuity.logger.ecu.comms.query.EcuQuery;
|
||||
import com.romraider.logger.ecu.comms.query.EcuQuery;
|
||||
import java.util.Collection;
|
||||
|
||||
public interface LoggerProtocol {
|
|
@ -19,18 +19,18 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.logger.ecu.comms.io.protocol;
|
||||
package com.romraider.logger.ecu.comms.io.protocol;
|
||||
|
||||
import enginuity.io.protocol.Protocol;
|
||||
import enginuity.io.protocol.SSMProtocol;
|
||||
import static enginuity.io.protocol.SSMProtocol.ADDRESS_SIZE;
|
||||
import static enginuity.io.protocol.SSMProtocol.DATA_SIZE;
|
||||
import static enginuity.io.protocol.SSMProtocol.REQUEST_NON_DATA_BYTES;
|
||||
import static enginuity.io.protocol.SSMProtocol.RESPONSE_NON_DATA_BYTES;
|
||||
import static enginuity.io.protocol.SSMResponseProcessor.extractResponseData;
|
||||
import static enginuity.io.protocol.SSMResponseProcessor.filterRequestFromResponse;
|
||||
import enginuity.logger.ecu.comms.query.EcuQuery;
|
||||
import static enginuity.util.ParamChecker.checkNotNullOrEmpty;
|
||||
import com.romraider.io.protocol.Protocol;
|
||||
import com.romraider.io.protocol.SSMProtocol;
|
||||
import static com.romraider.io.protocol.SSMProtocol.ADDRESS_SIZE;
|
||||
import static com.romraider.io.protocol.SSMProtocol.DATA_SIZE;
|
||||
import static com.romraider.io.protocol.SSMProtocol.REQUEST_NON_DATA_BYTES;
|
||||
import static com.romraider.io.protocol.SSMProtocol.RESPONSE_NON_DATA_BYTES;
|
||||
import static com.romraider.io.protocol.SSMResponseProcessor.extractResponseData;
|
||||
import static com.romraider.io.protocol.SSMResponseProcessor.filterRequestFromResponse;
|
||||
import com.romraider.logger.ecu.comms.query.EcuQuery;
|
||||
import static com.romraider.util.ParamChecker.checkNotNullOrEmpty;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.HashMap;
|
|
@ -19,11 +19,11 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.logger.ecu.comms.manager;
|
||||
package com.romraider.logger.ecu.comms.manager;
|
||||
|
||||
import enginuity.logger.ecu.definition.LoggerData;
|
||||
import enginuity.logger.ecu.ui.StatusChangeListener;
|
||||
import enginuity.logger.ecu.ui.handler.file.FileLoggerControllerSwitchMonitor;
|
||||
import com.romraider.logger.ecu.definition.LoggerData;
|
||||
import com.romraider.logger.ecu.ui.StatusChangeListener;
|
||||
import com.romraider.logger.ecu.ui.handler.file.FileLoggerControllerSwitchMonitor;
|
||||
|
||||
public interface QueryManager extends Runnable {
|
||||
|
|
@ -19,33 +19,33 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.logger.ecu.comms.manager;
|
||||
package com.romraider.logger.ecu.comms.manager;
|
||||
|
||||
import enginuity.Settings;
|
||||
import enginuity.io.connection.EcuConnection;
|
||||
import enginuity.io.connection.EcuConnectionImpl;
|
||||
import enginuity.io.protocol.Protocol;
|
||||
import enginuity.io.protocol.ProtocolFactory;
|
||||
import enginuity.logger.ecu.comms.query.EcuInitCallback;
|
||||
import enginuity.logger.ecu.comms.query.EcuQuery;
|
||||
import enginuity.logger.ecu.comms.query.EcuQueryImpl;
|
||||
import enginuity.logger.ecu.comms.query.ExternalQuery;
|
||||
import enginuity.logger.ecu.comms.query.ExternalQueryImpl;
|
||||
import enginuity.logger.ecu.comms.query.Query;
|
||||
import enginuity.logger.ecu.comms.query.Response;
|
||||
import enginuity.logger.ecu.comms.query.ResponseImpl;
|
||||
import enginuity.logger.ecu.definition.EcuData;
|
||||
import static enginuity.logger.ecu.definition.EcuDataType.EXTERNAL;
|
||||
import enginuity.logger.ecu.definition.ExternalData;
|
||||
import enginuity.logger.ecu.definition.LoggerData;
|
||||
import enginuity.logger.ecu.ui.MessageListener;
|
||||
import enginuity.logger.ecu.ui.StatusChangeListener;
|
||||
import enginuity.logger.ecu.ui.handler.DataUpdateHandler;
|
||||
import enginuity.logger.ecu.ui.handler.file.FileLoggerControllerSwitchMonitor;
|
||||
import static enginuity.util.HexUtil.asHex;
|
||||
import static enginuity.util.ParamChecker.checkNotNull;
|
||||
import static enginuity.util.ThreadUtil.runAsDaemon;
|
||||
import static enginuity.util.ThreadUtil.sleep;
|
||||
import com.romraider.Settings;
|
||||
import com.romraider.io.connection.EcuConnection;
|
||||
import com.romraider.io.connection.EcuConnectionImpl;
|
||||
import com.romraider.io.protocol.Protocol;
|
||||
import com.romraider.io.protocol.ProtocolFactory;
|
||||
import com.romraider.logger.ecu.comms.query.EcuInitCallback;
|
||||
import com.romraider.logger.ecu.comms.query.EcuQuery;
|
||||
import com.romraider.logger.ecu.comms.query.EcuQueryImpl;
|
||||
import com.romraider.logger.ecu.comms.query.ExternalQuery;
|
||||
import com.romraider.logger.ecu.comms.query.ExternalQueryImpl;
|
||||
import com.romraider.logger.ecu.comms.query.Query;
|
||||
import com.romraider.logger.ecu.comms.query.Response;
|
||||
import com.romraider.logger.ecu.comms.query.ResponseImpl;
|
||||
import com.romraider.logger.ecu.definition.EcuData;
|
||||
import static com.romraider.logger.ecu.definition.EcuDataType.EXTERNAL;
|
||||
import com.romraider.logger.ecu.definition.ExternalData;
|
||||
import com.romraider.logger.ecu.definition.LoggerData;
|
||||
import com.romraider.logger.ecu.ui.MessageListener;
|
||||
import com.romraider.logger.ecu.ui.StatusChangeListener;
|
||||
import com.romraider.logger.ecu.ui.handler.DataUpdateHandler;
|
||||
import com.romraider.logger.ecu.ui.handler.file.FileLoggerControllerSwitchMonitor;
|
||||
import static com.romraider.util.HexUtil.asHex;
|
||||
import static com.romraider.util.ParamChecker.checkNotNull;
|
||||
import static com.romraider.util.ThreadUtil.runAsDaemon;
|
||||
import static com.romraider.util.ThreadUtil.sleep;
|
||||
import org.apache.log4j.Logger;
|
||||
import javax.swing.SwingUtilities;
|
||||
import java.text.DecimalFormat;
|
|
@ -19,9 +19,9 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.logger.ecu.comms.manager;
|
||||
package com.romraider.logger.ecu.comms.manager;
|
||||
|
||||
import enginuity.logger.ecu.comms.query.EcuQuery;
|
||||
import com.romraider.logger.ecu.comms.query.EcuQuery;
|
||||
import java.util.Collection;
|
||||
|
||||
public interface TransmissionManager {
|
|
@ -19,15 +19,15 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.logger.ecu.comms.manager;
|
||||
package com.romraider.logger.ecu.comms.manager;
|
||||
|
||||
import enginuity.Settings;
|
||||
import enginuity.logger.ecu.comms.io.connection.LoggerConnection;
|
||||
import enginuity.logger.ecu.comms.io.connection.LoggerConnectionFactory;
|
||||
import enginuity.logger.ecu.comms.query.EcuQuery;
|
||||
import enginuity.logger.ecu.exception.NotConnectedException;
|
||||
import enginuity.logger.ecu.exception.SerialCommunicationException;
|
||||
import static enginuity.util.ParamChecker.checkNotNull;
|
||||
import com.romraider.Settings;
|
||||
import com.romraider.logger.ecu.comms.io.connection.LoggerConnection;
|
||||
import com.romraider.logger.ecu.comms.io.connection.LoggerConnectionFactory;
|
||||
import com.romraider.logger.ecu.comms.query.EcuQuery;
|
||||
import com.romraider.logger.ecu.exception.NotConnectedException;
|
||||
import com.romraider.logger.ecu.exception.SerialCommunicationException;
|
||||
import static com.romraider.util.ParamChecker.checkNotNull;
|
||||
import org.apache.log4j.Logger;
|
||||
import java.util.Collection;
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.logger.ecu.comms.query;
|
||||
package com.romraider.logger.ecu.comms.query;
|
||||
|
||||
public interface EcuInit {
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.logger.ecu.comms.query;
|
||||
package com.romraider.logger.ecu.comms.query;
|
||||
|
||||
public interface EcuInitCallback {
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.logger.ecu.comms.query;
|
||||
package com.romraider.logger.ecu.comms.query;
|
||||
|
||||
public interface EcuQuery extends Query {
|
||||
|
|
@ -19,12 +19,12 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.logger.ecu.comms.query;
|
||||
package com.romraider.logger.ecu.comms.query;
|
||||
|
||||
import enginuity.logger.ecu.definition.EcuData;
|
||||
import enginuity.logger.ecu.definition.LoggerData;
|
||||
import static enginuity.util.HexUtil.asHex;
|
||||
import static enginuity.util.ParamChecker.checkNotNull;
|
||||
import com.romraider.logger.ecu.definition.EcuData;
|
||||
import com.romraider.logger.ecu.definition.LoggerData;
|
||||
import static com.romraider.util.HexUtil.asHex;
|
||||
import static com.romraider.util.ParamChecker.checkNotNull;
|
||||
|
||||
public final class EcuQueryImpl implements EcuQuery {
|
||||
private final EcuData ecuData;
|
|
@ -1,4 +1,4 @@
|
|||
package enginuity.logger.ecu.comms.query;
|
||||
package com.romraider.logger.ecu.comms.query;
|
||||
|
||||
public interface ExternalQuery extends Query {
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
package enginuity.logger.ecu.comms.query;
|
||||
package com.romraider.logger.ecu.comms.query;
|
||||
|
||||
import enginuity.logger.ecu.definition.ExternalData;
|
||||
import enginuity.logger.ecu.definition.LoggerData;
|
||||
import static enginuity.util.ParamChecker.checkNotNull;
|
||||
import com.romraider.logger.ecu.definition.ExternalData;
|
||||
import com.romraider.logger.ecu.definition.LoggerData;
|
||||
import static com.romraider.util.ParamChecker.checkNotNull;
|
||||
|
||||
public final class ExternalQueryImpl implements ExternalQuery {
|
||||
private final ExternalData externalData;
|
|
@ -0,0 +1,11 @@
|
|||
package com.romraider.logger.ecu.comms.query;
|
||||
|
||||
import com.romraider.logger.ecu.definition.LoggerData;
|
||||
|
||||
public interface Query {
|
||||
|
||||
LoggerData getLoggerData();
|
||||
|
||||
double getResponse();
|
||||
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
package enginuity.logger.ecu.comms.query;
|
||||
package com.romraider.logger.ecu.comms.query;
|
||||
|
||||
import enginuity.logger.ecu.definition.LoggerData;
|
||||
import com.romraider.logger.ecu.definition.LoggerData;
|
||||
import java.util.Set;
|
||||
|
||||
public interface Response {
|
|
@ -1,6 +1,6 @@
|
|||
package enginuity.logger.ecu.comms.query;
|
||||
package com.romraider.logger.ecu.comms.query;
|
||||
|
||||
import enginuity.logger.ecu.definition.LoggerData;
|
||||
import com.romraider.logger.ecu.definition.LoggerData;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
|
@ -19,10 +19,10 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.logger.ecu.comms.query;
|
||||
package com.romraider.logger.ecu.comms.query;
|
||||
|
||||
import static enginuity.util.HexUtil.asHex;
|
||||
import static enginuity.util.ParamChecker.checkNotNullOrEmpty;
|
||||
import static com.romraider.util.HexUtil.asHex;
|
||||
import static com.romraider.util.ParamChecker.checkNotNullOrEmpty;
|
||||
|
||||
public final class SSMEcuInit implements EcuInit {
|
||||
private byte[] ecuInitBytes;
|
|
@ -1,4 +1,4 @@
|
|||
package enginuity.logger.ecu.comms.reset;
|
||||
package com.romraider.logger.ecu.comms.reset;
|
||||
|
||||
public interface ResetManager {
|
||||
boolean resetEcu();
|
|
@ -1,13 +1,13 @@
|
|||
package enginuity.logger.ecu.comms.reset;
|
||||
package com.romraider.logger.ecu.comms.reset;
|
||||
|
||||
import enginuity.Settings;
|
||||
import enginuity.io.connection.EcuConnection;
|
||||
import enginuity.io.connection.EcuConnectionImpl;
|
||||
import enginuity.io.protocol.Protocol;
|
||||
import enginuity.io.protocol.ProtocolFactory;
|
||||
import enginuity.logger.ecu.ui.MessageListener;
|
||||
import static enginuity.util.HexUtil.asHex;
|
||||
import static enginuity.util.ParamChecker.checkNotNull;
|
||||
import com.romraider.Settings;
|
||||
import com.romraider.io.connection.EcuConnection;
|
||||
import com.romraider.io.connection.EcuConnectionImpl;
|
||||
import com.romraider.io.protocol.Protocol;
|
||||
import com.romraider.io.protocol.ProtocolFactory;
|
||||
import com.romraider.logger.ecu.ui.MessageListener;
|
||||
import static com.romraider.util.HexUtil.asHex;
|
||||
import static com.romraider.util.ParamChecker.checkNotNull;
|
||||
import org.apache.log4j.Logger;
|
||||
|
||||
public final class ResetManagerImpl implements ResetManager {
|
|
@ -19,7 +19,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package enginuity.logger.ecu.definition;
|
||||
package com.romraider.logger.ecu.definition;
|
||||
|
||||
public interface ConvertorUpdateListener {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package enginuity.logger.ecu.definition;
|
||||
package com.romraider.logger.ecu.definition;
|
||||
|
||||
public interface EcuAddress {
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue