diff --git a/.classpath b/.classpath index 074d6c22..2b20699b 100644 --- a/.classpath +++ b/.classpath @@ -13,13 +13,6 @@ - - - - - - - diff --git a/.gitignore b/.gitignore index b1290f2a..60511633 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ src/main/java/com/romraider/Version.java build/ target/ -tmp/ +tmp/ \ No newline at end of file diff --git a/build.xml b/build.xml index 6ce783d5..621959be 100644 --- a/build.xml +++ b/build.xml @@ -72,11 +72,11 @@ - + - + @@ -86,8 +86,9 @@ - - + + + @@ -394,20 +395,16 @@ - + - + - - - - - + diff --git a/customize/warningSound.wav b/customize/warningSound.wav new file mode 100644 index 00000000..7af34c37 Binary files /dev/null and b/customize/warningSound.wav differ diff --git a/cars_def.dtd b/definitions/cars_def.dtd similarity index 100% rename from cars_def.dtd rename to definitions/cars_def.dtd diff --git a/cars_def.xml b/definitions/cars_def.xml similarity index 100% rename from cars_def.xml rename to definitions/cars_def.xml diff --git a/ecu_defs.dtd b/definitions/ecu_defs.dtd similarity index 100% rename from ecu_defs.dtd rename to definitions/ecu_defs.dtd diff --git a/docs/logger/log_defs.xml b/definitions/log_defs.xml similarity index 100% rename from docs/logger/log_defs.xml rename to definitions/log_defs.xml diff --git a/logger.dtd b/definitions/logger.dtd similarity index 100% rename from logger.dtd rename to definitions/logger.dtd diff --git a/profile.dtd b/definitions/profile.dtd similarity index 100% rename from profile.dtd rename to definitions/profile.dtd diff --git a/Building_RomRaider.txt b/docs/Building_RomRaider.txt similarity index 100% rename from Building_RomRaider.txt rename to docs/Building_RomRaider.txt diff --git a/Building_RomRaider_VSCode.md b/docs/Building_RomRaider_VSCode.md similarity index 100% rename from Building_RomRaider_VSCode.md rename to docs/Building_RomRaider_VSCode.md diff --git a/docs/logger/ssm_info.txt b/docs/ssm_info.txt similarity index 100% rename from docs/logger/ssm_info.txt rename to docs/ssm_info.txt diff --git a/lib/common/cmu_time_awb.jar b/lib/common/cmu_time_awb.jar deleted file mode 100644 index 31f9a1ae..00000000 Binary files a/lib/common/cmu_time_awb.jar and /dev/null differ diff --git a/lib/common/cmu_us_kal.jar b/lib/common/cmu_us_kal.jar deleted file mode 100644 index 6e0a9208..00000000 Binary files a/lib/common/cmu_us_kal.jar and /dev/null differ diff --git a/lib/common/cmudict04.jar b/lib/common/cmudict04.jar deleted file mode 100644 index d953ce2f..00000000 Binary files a/lib/common/cmudict04.jar and /dev/null differ diff --git a/lib/common/cmulex.jar b/lib/common/cmulex.jar deleted file mode 100644 index 88b3ccd0..00000000 Binary files a/lib/common/cmulex.jar and /dev/null differ diff --git a/lib/common/cmutimelex.jar b/lib/common/cmutimelex.jar deleted file mode 100644 index 9a2fbf56..00000000 Binary files a/lib/common/cmutimelex.jar and /dev/null differ diff --git a/lib/common/en_us.jar b/lib/common/en_us.jar deleted file mode 100644 index 470a51f7..00000000 Binary files a/lib/common/en_us.jar and /dev/null differ diff --git a/lib/common/freetts.jar b/lib/common/freetts.jar deleted file mode 100644 index 5a4660ee..00000000 Binary files a/lib/common/freetts.jar and /dev/null differ diff --git a/log4j.properties b/lib/log4j.properties similarity index 100% rename from log4j.properties rename to lib/log4j.properties diff --git a/manifest b/manifest deleted file mode 100644 index c3acd77e..00000000 --- a/manifest +++ /dev/null @@ -1,30 +0,0 @@ -Manifest-Version: 1.0 -Ant-Version: Apache Ant 1.6.5 -Created-By: 1.5.0_07-b03 (Sun Microsystems Inc.) -Main-Class: com.romraider.ECUExec -Class-Path: - lib/BareBonesBrowserLaunch.jar - lib/jep.jar - lib/log4j-1.2.14.jar - lib/Jama.jar - lib/jamlab.jar - lib/swing-layout-1.0.jar - lib/jcommon-1.0.12.jar - lib/jfreechart-1.0.9.jar - lib/jinvoke-3.0.3.jar - lib/RXTXcomm.jar - lib/jdic.jar - lib/jama-1.0.2.jar - lib/Graph3d.jar - lib/j3dcore.jar - lib/j3dutils.jar - lib/vecmath.jar - lib/swing-layout-1.0.jar - lib/jdic_stub.jar - lib/log4j-1.2.14.jar - lib/cmu_time_awb.jar - lib/cmu_us_kal.jar - lib/cmutimelex.jar - lib/en_us.jar - lib/freetts.jar -X-COMMENT: Main-Class will be added automatically by build \ No newline at end of file diff --git a/run.bat b/run.bat deleted file mode 100644 index 7860226c..00000000 --- a/run.bat +++ /dev/null @@ -1,14 +0,0 @@ -:: Uncomment the line for the mode you wish to run. Comment all other lines. -:: Adjust path to javaw.exe as required for your Java system installation -set java_path= -:: Start Editor with console redirected to %HOMEPATH%\.RomRaider\romraider_sout.log -start %java_path%javaw -Djava.library.path=lib/windows/32 -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=true -Xms64M -Xmx512M -jar RomRaider.jar 1>>"%HOMEPATH%\.RomRaider\romraider_sout.log" 2>&1 - -:: Start Logger -rem start %java_path%javaw -Djava.library.path=lib/windows/32 -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=true -Xms64M -Xmx512M -jar RomRaider.jar -logger 1>>"%HOMEPATH%\.RomRaider\romraider_sout.log" 2>&1 - -:: Start Logger in full screen mode -rem start %java_path%javaw -Djava.library.path=lib/windows/32 -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=true -Xms64M -Xmx512M -jar RomRaider.jar -logger.fullscreen 1>>"%HOMEPATH%\.RomRaider\romraider_sout.log" 2>&1 - -:: Start Logger in Touch screen mode -rem start %java_path%javaw -Djava.library.path=lib/windows/32 -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=true -Xms64M -Xmx512M -jar RomRaider.jar -logger.touch 1>>"%HOMEPATH%\.RomRaider\romraider_sout.log" 2>&1 diff --git a/run.sh b/run.sh deleted file mode 100755 index d773d20b..00000000 --- a/run.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -# To change your ZIP install startup preference, uncomment the preferred line. -# Make sure only one line is uncommented -# Java is expected to be available on your PATH - -java -Djava.library.path=lib/linux/32 -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=false -Xms64M -Xmx512M -XX:-UseParallelGC -XX:CompileThreshold=10000 -jar RomRaider.jar >> "$HOME/.RomRaider/romraider_sout.log" 2>&1 -#java -Djava.library.path=lib/linux/32 -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=false -Xms64M -Xmx512M -XX:-UseParallelGC -XX:CompileThreshold=10000 -jar RomRaider.jar -logger >> "$HOME/.RomRaider/romraider_sout.log" 2>&1 -#java -Djava.library.path=lib/linux/32 -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=false -Xms64M -Xmx512M -XX:-UseParallelGC -XX:CompileThreshold=10000 -jar RomRaider.jar -logger.fullscreen >> "$HOME/.RomRaider/romraider_sout.log" 2>&1 -#java -Djava.library.path=lib/linux/32 -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=false -Xms64M -Xmx512M -XX:-UseParallelGC -XX:CompileThreshold=10000 -jar RomRaider.jar -logger.touch >> "$HOME/.RomRaider/romraider_sout.log" 2>&1 - -exit 0 diff --git a/post-install-tasks.bat b/scripts/post-install-tasks.bat similarity index 100% rename from post-install-tasks.bat rename to scripts/post-install-tasks.bat diff --git a/post-install-tasks.sh b/scripts/post-install-tasks.sh similarity index 100% rename from post-install-tasks.sh rename to scripts/post-install-tasks.sh diff --git a/scripts/run.bat b/scripts/run.bat new file mode 100644 index 00000000..fbf555db --- /dev/null +++ b/scripts/run.bat @@ -0,0 +1,14 @@ +:: Uncomment the line for the mode you wish to run. Comment all other lines. +:: Adjust path to javaw.exe as required for your Java system installation +set java_path= +:: Start Editor with console redirected to %HOMEPATH%\.RomRaider\romraider_sout.log +start %java_path%javaw -Djava.library.path=lib/windows -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=true -Xms64M -Xmx512M -jar RomRaider.jar 1>>"%HOMEPATH%\.RomRaider\romraider_sout.log" 2>&1 + +:: Start Logger +rem start %java_path%javaw -Djava.library.path=lib/windows -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=true -Xms64M -Xmx512M -jar RomRaider.jar -logger 1>>"%HOMEPATH%\.RomRaider\romraider_sout.log" 2>&1 + +:: Start Logger in full screen mode +rem start %java_path%javaw -Djava.library.path=lib/windows -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=true -Xms64M -Xmx512M -jar RomRaider.jar -logger.fullscreen 1>>"%HOMEPATH%\.RomRaider\romraider_sout.log" 2>&1 + +:: Start Logger in Touch screen mode +rem start %java_path%javaw -Djava.library.path=lib/windows -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=true -Xms64M -Xmx512M -jar RomRaider.jar -logger.touch 1>>"%HOMEPATH%\.RomRaider\romraider_sout.log" 2>&1 diff --git a/scripts/run.sh b/scripts/run.sh new file mode 100755 index 00000000..f03f9b9b --- /dev/null +++ b/scripts/run.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +# To change your ZIP install startup preference, uncomment the preferred line. +# Make sure only one line is uncommented +# Java is expected to be available on your PATH + +java -Djava.library.path=lib/linux -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=false -Xms64M -Xmx512M -XX:-UseParallelGC -XX:CompileThreshold=10000 -jar RomRaider.jar >> "$HOME/.RomRaider/romraider_sout.log" 2>&1 +#java -Djava.library.path=lib/linux -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=false -Xms64M -Xmx512M -XX:-UseParallelGC -XX:CompileThreshold=10000 -jar RomRaider.jar -logger >> "$HOME/.RomRaider/romraider_sout.log" 2>&1 +#java -Djava.library.path=lib/linux -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=false -Xms64M -Xmx512M -XX:-UseParallelGC -XX:CompileThreshold=10000 -jar RomRaider.jar -logger.fullscreen >> "$HOME/.RomRaider/romraider_sout.log" 2>&1 +#java -Djava.library.path=lib/linux -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.d3d=false -Xms64M -Xmx512M -XX:-UseParallelGC -XX:CompileThreshold=10000 -jar RomRaider.jar -logger.touch >> "$HOME/.RomRaider/romraider_sout.log" 2>&1 + +exit 0 diff --git a/src/main/java/com/romraider/logger/ecu/ui/handler/dash/PlainGaugeStyle.java b/src/main/java/com/romraider/logger/ecu/ui/handler/dash/PlainGaugeStyle.java index 514a28d0..23e64ea2 100644 --- a/src/main/java/com/romraider/logger/ecu/ui/handler/dash/PlainGaugeStyle.java +++ b/src/main/java/com/romraider/logger/ecu/ui/handler/dash/PlainGaugeStyle.java @@ -20,7 +20,6 @@ package com.romraider.logger.ecu.ui.handler.dash; import com.romraider.logger.ecu.definition.LoggerData; -import com.romraider.tts.Speaker; import com.romraider.util.ResourceUtil; import static com.romraider.util.ParamChecker.checkNotNull; @@ -32,6 +31,9 @@ import static java.awt.Color.WHITE; import static java.awt.Font.BOLD; import static java.awt.Font.PLAIN; import static javax.swing.BorderFactory.createLineBorder; + +import javax.sound.sampled.AudioSystem; +import javax.sound.sampled.Clip; import javax.swing.JCheckBox; import javax.swing.JComboBox; import javax.swing.JLabel; @@ -45,6 +47,7 @@ import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.io.File; import java.util.ResourceBundle; public class PlainGaugeStyle implements GaugeStyle, ActionListener { @@ -72,6 +75,7 @@ public class PlainGaugeStyle implements GaugeStyle, ActionListener { private double max = Double.MAX_VALUE * -1; private double min = Double.MAX_VALUE; private JPanel panel = new JPanel(); + private String warningFilePath = "customize/warningSound.wav"; public PlainGaugeStyle(LoggerData loggerData) { checkNotNull(loggerData, "loggerData"); @@ -248,21 +252,28 @@ public class PlainGaugeStyle implements GaugeStyle, ActionListener { return Double.parseDouble(warnTextField.getText()); } - private void setWarning(final boolean enabled) { - SwingUtilities.invokeLater(new Runnable() { - public void run() { - if (enabled) { - panel.setBackground(RED); - liveValuePanel.setBackground(RED); - progressBar.setForeground(RED); - Speaker.say("Warning!"); - } else { - panel.setBackground(LIGHT_GREY); - liveValuePanel.setBackground(LIGHT_GREY); - progressBar.setForeground(GREEN); - } + private void setWarning(boolean enabled) { + if (enabled) { + panel.setBackground(RED); + liveValuePanel.setBackground(RED); + progressBar.setForeground(RED); + + // Play Warning Sound + try + { + Clip clip = AudioSystem.getClip(); + clip.open(AudioSystem.getAudioInputStream(new File(warningFilePath))); + clip.start(); } - }); + catch (Exception exc) + { + exc.printStackTrace(); + } + } else { + panel.setBackground(LIGHT_GREY); + liveValuePanel.setBackground(LIGHT_GREY); + progressBar.setForeground(GREEN); + } } private String format(LoggerData loggerData, double value) { diff --git a/src/main/java/com/romraider/tts/Speaker.java b/src/main/java/com/romraider/tts/Speaker.java deleted file mode 100644 index a5d5076c..00000000 --- a/src/main/java/com/romraider/tts/Speaker.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * RomRaider Open-Source Tuning, Logging and Reflashing - * Copyright (C) 2006-2012 RomRaider.com - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -package com.romraider.tts; - -import static com.romraider.util.ThreadUtil.runAsDaemon; -import com.sun.speech.freetts.Voice; -import com.sun.speech.freetts.VoiceManager; - -public class Speaker { - private static final String VOICE_NAME = "kevin16"; - private static final VoiceManager VOICE_MANAGER = VoiceManager.getInstance(); - private static final Voice VOICE = VOICE_MANAGER.getVoice(VOICE_NAME); - - static { - VOICE.allocate(); - } - - private Speaker() { - throw new UnsupportedOperationException(); - } - - public static void say(final String message) { - runAsDaemon(new Runnable() { - public void run() { - try { - VOICE.speak(message); - } catch (Exception e) { - // ignore - } - } - }); - } - - public static void end() { - VOICE.deallocate(); - } -} diff --git a/src/main/java/com/romraider/util/LogManager.java b/src/main/java/com/romraider/util/LogManager.java index 4d3834ed..c1f17af3 100644 --- a/src/main/java/com/romraider/util/LogManager.java +++ b/src/main/java/com/romraider/util/LogManager.java @@ -28,6 +28,6 @@ public final class LogManager { } public static void initDebugLogging() { - configureAndWatch("log4j.properties"); + configureAndWatch("lib/log4j.properties"); } } diff --git a/templates/install-linux.xml.template b/templates/install-linux.xml.template index 9bdd0d68..aa42be74 100644 --- a/templates/install-linux.xml.template +++ b/templates/install-linux.xml.template @@ -43,16 +43,12 @@ - - - - - - + - + + @@ -102,7 +98,7 @@ - + @name.package@ Source Files diff --git a/templates/install-windows.xml.template b/templates/install-windows.xml.template index e1981714..b3b4ba5d 100644 --- a/templates/install-windows.xml.template +++ b/templates/install-windows.xml.template @@ -49,14 +49,10 @@ - - - - - - - - + + + + @@ -94,9 +90,10 @@ - + @name.package@ Source Files - + no +