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

Move project files; Replace TTS with warning sound file; Fix run scripts

This commit is contained in:
Robin K 2022-04-03 16:22:20 +02:00
parent 9736e3eeeb
commit d37c5eb786
33 changed files with 73 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.classpath
View File

@ -13,13 +13,6 @@
<classpathentry kind="lib" path="lib/common/jep.jar"/>
<classpathentry kind="lib" path="lib/common/jamlab.jar"/>
<classpathentry kind="lib" path="lib/common/log4j-1.2.14.jar"/>
<classpathentry kind="lib" path="lib/common/cmu_time_awb.jar"/>
<classpathentry kind="lib" path="lib/common/cmu_us_kal.jar"/>
<classpathentry kind="lib" path="lib/common/cmudict04.jar"/>
<classpathentry kind="lib" path="lib/common/cmulex.jar"/>
<classpathentry kind="lib" path="lib/common/cmutimelex.jar"/>
<classpathentry kind="lib" path="lib/common/en_us.jar"/>
<classpathentry kind="lib" path="lib/common/freetts.jar"/>
<classpathentry kind="lib" path="lib/common/jfreechart-1.0.9.jar"/>
<classpathentry kind="lib" path="lib/common/jcommon-1.0.12.jar"/>
<classpathentry kind="lib" path="lib/common/jna.jar">

2
.gitignore vendored
View File

@ -1,4 +1,4 @@
src/main/java/com/romraider/Version.java
build/
target/
tmp/
tmp/

19
build.xml
View File

@ -72,11 +72,11 @@
<condition property="os" value="${os.windows}" else="${os.linux}">
<os family="windows" />
</condition>
<condition property="is.windows">
<equals arg1="${os}" arg2="${os.windows}" />
</condition>
<property name="izpack.compile.${os.windows}" value="compile.bat" />
<property name="izpack.compile.${os.linux}" value="compile" />
@ -86,8 +86,9 @@
<condition property="bootclasspath.dir" value="${env.JRE_DIR}/lib"
else="C:\Program Files (x86)\Java\jdk1.6.0_45\jre\lib">
<isset property="env.JRE_DIR" />
</condition>
<property name="debug" value="off" />
</condition>
<property name="debug" value="off" />
<property name="deprecation" value="on" />
<property name="javac.verbose" value="off" />
@ -394,20 +395,16 @@
</javac>
</sequential>
</macrodef>
<macrodef name="macro_standalone">
<attribute name="os" />
<sequential>
<zip destfile="${dist.dir}/@{os}/${name.package}${version.major}.${version.minor}.${version.patch}${version.extra}${version.extra1}-@{os}.zip">
<zipfileset file="build/@{os}/lib/${jar.package}" prefix="${name.package}" />
<zipfileset file="run.${ext.@{os}}" prefix="${name.package}" filemode="755" />
<zipfileset file="scripts/run.${ext.@{os}}" prefix="${name.package}" filemode="755" />
<zipfileset file="license.txt" prefix="${name.package}" />
<zipfileset file="release_notes.txt" prefix="${name.package}" />
<zipfileset file="log4j.properties" prefix="${name.package}" />
<zipfileset file="cars_def.dtd" prefix="${name.package}" />
<zipfileset file="ecu_defs.dtd" prefix="${name.package}" />
<zipfileset file="logger.dtd" prefix="${name.package}" />
<zipfileset file="profile.dtd" prefix="${name.package}" />
<zipfileset file="lib/log4j.properties" prefix="${name.package}/lib"/>
<zipfileset dir="plugins" prefix="${name.package}/plugins" />
<zipfileset dir="lib/common" prefix="${name.package}/lib/common" />
<zipfileset dir="lib/@{os}" prefix="${name.package}/lib/@{os}" />

BIN
customize/warningSound.wav Normal file
View File

Binary file not shown.

0
cars_def.dtd → definitions/cars_def.dtd
View File

0
cars_def.xml → definitions/cars_def.xml
View File

0
ecu_defs.dtd → definitions/ecu_defs.dtd
View File

0
docs/logger/log_defs.xml → definitions/log_defs.xml
View File

0
logger.dtd → definitions/logger.dtd
View File

0
profile.dtd → definitions/profile.dtd
View File

0
Building_RomRaider.txt → docs/Building_RomRaider.txt
View File

0
Building_RomRaider_VSCode.md → docs/Building_RomRaider_VSCode.md
View File

0
docs/logger/ssm_info.txt → docs/ssm_info.txt
View File

BIN
lib/common/cmu_time_awb.jar
View File

Binary file not shown.

BIN
lib/common/cmu_us_kal.jar
View File

Binary file not shown.

BIN
lib/common/cmudict04.jar
View File

Binary file not shown.

BIN
lib/common/cmulex.jar
View File

Binary file not shown.

BIN
lib/common/cmutimelex.jar
View File

Binary file not shown.

BIN
lib/common/en_us.jar
View File

Binary file not shown.

BIN
lib/common/freetts.jar
View File

Binary file not shown.

0
log4j.properties → lib/log4j.properties
View File

30
manifest
View File

@ -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

14
run.bat
View File

@ -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

12
run.sh
View File

@ -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

0
post-install-tasks.bat → scripts/post-install-tasks.bat
View File

0
post-install-tasks.sh → scripts/post-install-tasks.sh
View File

14
scripts/run.bat Normal file
View File

@ -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

12
scripts/run.sh Executable file
View File

@ -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

41
src/main/java/com/romraider/logger/ecu/ui/handler/dash/PlainGaugeStyle.java
View File

@ -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) {

54
src/main/java/com/romraider/tts/Speaker.java
View File

@ -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();
}
}

2
src/main/java/com/romraider/util/LogManager.java
View File

@ -28,6 +28,6 @@ public final class LogManager {
}
public static void initDebugLogging() {
configureAndWatch("log4j.properties");
configureAndWatch("lib/log4j.properties");
}
}

12
templates/install-linux.xml.template
View File

@ -43,16 +43,12 @@
<file src="license.txt" targetdir="$INSTALL_PATH"/>
<file src="release_notes.txt" targetdir="$INSTALL_PATH"/>
<file src="log4j.properties" targetdir="$INSTALL_PATH"/>
<file src="cars_def.dtd" targetdir="$INSTALL_PATH"/>
<file src="ecu_defs.dtd" targetdir="$INSTALL_PATH"/>
<file src="logger.dtd" targetdir="$INSTALL_PATH"/>
<file src="profile.dtd" targetdir="$INSTALL_PATH"/>
<file src="lib/log4j.properties" targetdir="$INSTALL_PATH/lib"/>
<file src="src/main/resources/graphics/romraider-ico.ico" targetdir="$INSTALL_PATH"/>
<file src="src/main/resources/graphics/icon-close.png" targetdir="$INSTALL_PATH"/>
<file src="post-install-tasks.sh" targetdir="$INSTALL_PATH"/>
<file src="scripts/post-install-tasks.sh" targetdir="$INSTALL_PATH"/>
<file src="scripts/run.sh" targetdir="$INSTALL_PATH"/>
<file src="plugins/aem2.plugin" targetdir="$INSTALL_PATH/plugins"/>
<file src="plugins/aem.plugin" targetdir="$INSTALL_PATH/plugins"/>
@ -102,7 +98,7 @@
</pack>
<pack name="Source Files" required="no">
<pack name="Source Files" required="no" preselected="no">
<description>@name.package@ Source Files</description>
<file src="src" targetdir="$INSTALL_PATH"/>
</pack>

17
templates/install-windows.xml.template
View File

@ -49,14 +49,10 @@
<file src="license.txt" targetdir="$INSTALL_PATH"/>
<file src="release_notes.txt" targetdir="$INSTALL_PATH"/>
<file src="log4j.properties" targetdir="$INSTALL_PATH"/>
<file src="cars_def.dtd" targetdir="$INSTALL_PATH"/>
<file src="ecu_defs.dtd" targetdir="$INSTALL_PATH"/>
<file src="logger.dtd" targetdir="$INSTALL_PATH"/>
<file src="profile.dtd" targetdir="$INSTALL_PATH"/>
<file src="post-install-tasks.bat" targetdir="$INSTALL_PATH"/>
<file src="lib/log4j.properties" targetdir="$INSTALL_PATH/lib"/>
<file src="scripts/post-install-tasks.bat" targetdir="$INSTALL_PATH"/>
<file src="scripts/run.bat" targetdir="$INSTALL_PATH"/>
<fileset dir="plugins" targetdir="$INSTALL_PATH/plugins"/>
<fileset dir="customize" targetdir="$INSTALL_PATH/customize"/>
@ -94,9 +90,10 @@
</pack>
<pack name="Source Files" required="no">
<pack name="Source Files" required="no" preselected="no">
<description>@name.package@ Source Files</description>
<file src="src" targetdir="$INSTALL_PATH" />
<preselected>no</preselected>
<file src="src" targetdir="$INSTALL_PATH"/>
</pack>
</packs>
</installation>