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

External convertors complete with profile save and reload. 

git-svn-id: https://svn2.assembla.com/svn/romraider/trunk@344 38686702-15cf-42e4-a595-3071df8bf5ea
This commit is contained in:
Dale Schultz 2011-09-26 20:35:32 +00:00
parent 17eb5ebd2c
commit 9eddc34ae1
22 changed files with 111 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
profile.dtd
View File

@ -28,6 +28,7 @@
<!ATTLIST external livedata ( selected ) #IMPLIED >
<!ATTLIST external graph ( selected ) #IMPLIED >
<!ATTLIST external dash ( selected ) #IMPLIED >
<!ATTLIST external units CDATA #IMPLIED >
<!ELEMENT externals ( external* ) >

8
release_notes.txt
View File

@ -59,11 +59,13 @@ This is the eleventh beta release of the upcoming official 0.5.3b release.
-----------------------
--- Logger ---
- TXS Tuner Wideband plugin added curtosy of, nitros
- TXS Tuner Wideband plugin added courtesy of, nitros
- Added support for ECU/TCU Switch filtering
- Added (msec) designation to logged CSV column heading
- Added support for sorting the Selected? & Description paramater list entries.
- Added support for sorting the Selected? & Description parameter list entries.
- Added support for convertors on External data items (F/C, lambda/AFR, etc.)
- Added all defined PLX Sensors according to their documentation
0.5.3b RC10 (09/12/2011)
-----------------------

2
src/com/romraider/logger/ecu/profile/UserProfileImpl.java
View File

@ -102,7 +102,7 @@ public final class UserProfileImpl implements UserProfile {
// Comment out the next line to disable Externals from being saved
// as there seems to be a bug when a profile is reloaded, the
// Logger tries to connect twice causing one or both to fail.
appendLoggerDataElements(builder, "external", external, false);
appendLoggerDataElements(builder, "external", external, true);
builder.append(" </externals>").append(NEW_LINE);
}
builder.append("</profile>").append(NEW_LINE);

16
src/com/romraider/logger/external/aem/plugin/AemDataSource.java vendored
View File

@ -19,14 +19,14 @@
package com.romraider.logger.external.aem.plugin;
import static com.romraider.logger.external.aem.plugin.AemSensorConversions.AFR_146;
import static com.romraider.logger.external.aem.plugin.AemSensorConversions.AFR_147;
import static com.romraider.logger.external.aem.plugin.AemSensorConversions.AFR_155;
import static com.romraider.logger.external.aem.plugin.AemSensorConversions.AFR_172;
import static com.romraider.logger.external.aem.plugin.AemSensorConversions.AFR_34;
import static com.romraider.logger.external.aem.plugin.AemSensorConversions.AFR_64;
import static com.romraider.logger.external.aem.plugin.AemSensorConversions.AFR_90;
import static com.romraider.logger.external.aem.plugin.AemSensorConversions.LAMBDA;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_146;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_147;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_155;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_172;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_34;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_64;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_90;
import static com.romraider.logger.external.core.SensorConversionsAFR.LAMBDA;
import static com.romraider.util.ThreadUtil.runAsDaemon;
import static java.util.Arrays.asList;

16
src/com/romraider/logger/external/aem2/plugin/AemDataSource.java vendored
View File

@ -19,14 +19,14 @@
package com.romraider.logger.external.aem2.plugin;
import static com.romraider.logger.external.aem.plugin.AemSensorConversions.AFR_146;
import static com.romraider.logger.external.aem.plugin.AemSensorConversions.AFR_147;
import static com.romraider.logger.external.aem.plugin.AemSensorConversions.AFR_155;
import static com.romraider.logger.external.aem.plugin.AemSensorConversions.AFR_172;
import static com.romraider.logger.external.aem.plugin.AemSensorConversions.AFR_34;
import static com.romraider.logger.external.aem.plugin.AemSensorConversions.AFR_64;
import static com.romraider.logger.external.aem.plugin.AemSensorConversions.AFR_90;
import static com.romraider.logger.external.aem.plugin.AemSensorConversions.LAMBDA;
import static com.romraider.logger.external.core.SensorConversionsLambda.AFR_146;
import static com.romraider.logger.external.core.SensorConversionsLambda.AFR_147;
import static com.romraider.logger.external.core.SensorConversionsLambda.AFR_155;
import static com.romraider.logger.external.core.SensorConversionsLambda.AFR_172;
import static com.romraider.logger.external.core.SensorConversionsLambda.AFR_34;
import static com.romraider.logger.external.core.SensorConversionsLambda.AFR_64;
import static com.romraider.logger.external.core.SensorConversionsLambda.AFR_90;
import static com.romraider.logger.external.core.SensorConversionsLambda.LAMBDA;
import static com.romraider.util.ThreadUtil.runAsDaemon;
import static java.util.Arrays.asList;

6
src/com/romraider/logger/external/aem/plugin/AemSensorConversions.java → src/com/romraider/logger/external/core/SensorConversionsAFR.java vendored
View File

@ -17,11 +17,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
package com.romraider.logger.external.aem.plugin;
package com.romraider.logger.external.core;
import com.romraider.logger.external.core.ExternalSensorConversions;
public enum AemSensorConversions implements ExternalSensorConversions {
public enum SensorConversionsAFR implements ExternalSensorConversions {
// AFR conversion assumes reported DATA value is Gas AFR
LAMBDA ("Lambda", "x*0.0680272108843537", "0.00"),
AFR_147 ("AFR Gasoline", "x", "0.00"), // gasoline
@ -36,7 +36,7 @@ public enum AemSensorConversions implements ExternalSensorConversions {
private final String expression;
private final String format;
AemSensorConversions(String units, String expression, String format) {
SensorConversionsAFR(String units, String expression, String format) {
this.units = units;
this.expression = expression;
this.format = format;

7
src/com/romraider/logger/external/aem2/plugin/AemSensorConversions.java → src/com/romraider/logger/external/core/SensorConversionsLambda.java vendored
View File

@ -17,11 +17,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
package com.romraider.logger.external.aem2.plugin;
package com.romraider.logger.external.core;
import com.romraider.logger.external.core.ExternalSensorConversions;
public enum AemSensorConversions implements ExternalSensorConversions {
public enum SensorConversionsLambda implements ExternalSensorConversions {
// AFR conversion assumes reported DATA value is Lambda
LAMBDA ("Lambda", "x", "0.00"),
AFR_147 ("AFR Gasoline", "x*14.7", "0.00"),// gasoline
AFR_90 ("AFR Ethonal", "x*9.0", "0.00"), // ethanol
@ -35,7 +36,7 @@ public enum AemSensorConversions implements ExternalSensorConversions {
private final String expression;
private final String format;
AemSensorConversions(String units, String expression, String format) {
SensorConversionsLambda(String units, String expression, String format) {
this.units = units;
this.expression = expression;
this.format = format;

29
src/com/romraider/logger/external/fourteenpoint7/plugin/NawSensorConversions.java → src/com/romraider/logger/external/core/SensorConversionsOther.java vendored
View File

@ -17,25 +17,32 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
package com.romraider.logger.external.fourteenpoint7.plugin;
package com.romraider.logger.external.core;
import com.romraider.logger.external.core.ExternalSensorConversions;
public enum NawSensorConversions implements ExternalSensorConversions {
LAMBDA ("Lambda", "x", "0.00"),
AFR_147 ("AFR Gasoline", "x*14.7", "0.00"),// gasoline
AFR_90 ("AFR Ethonal", "x*9.0", "0.00"), // ethanol
AFR_146 ("AFR Diesel", "x*14.6", "0.00"), // diesel
AFR_64 ("AFR Methonal", "x*6.4", "0.00"), // methanol
AFR_155 ("AFR LPG", "x*15.5", "0.00"), // LPG
AFR_172 ("AFR CNG", "x*17.2", "0.00"), // CNG
AFR_34 ("AFR Hydrogen", "x*34", "0.00"); // Hydrogen
public enum SensorConversionsOther implements ExternalSensorConversions {
DEG_C ("C", "x", "0.0"),
DEG_F ("F", "x", "0.0"),
DEG_F2C ("C", "(x-32)*5/9", "0.0"),
DEG_C2F ("F", "x*9/5+32 ", "0.0"),
PSI ("psi", "x", "0.00"),
PSI2BAR ("bar", "x*0.0689475728", "0.00"), // converts from PSI to bar
PSI2KPA ("kPa", "x*6.89475728", "0.0"), // converts from PSI to kpa
PSI2KGCM2 ("kg/cm^2", "x*0.0703068835943", "0.0"),// converts from PSI to kpa
KPA2PSI ("psi", "x*0.14503774", "0.00"), // converts from kPa
KPA2BAR ("bar", "x*0.01", "0.00"), // converts from kPa
KPA ("kPa", "x", "0.0"),
KPA2KGCM2 ("kg/cm^2", "x*0.01019716", "0.00"), // converts from kPa
PERCENT ("%", "x", "0.0"),
VOLTS_DC("vdc", "x", "0.0");
private final String units;
private final String expression;
private final String format;
NawSensorConversions(String units, String expression, String format) {
SensorConversionsOther(String units, String expression, String format) {
this.units = units;
this.expression = expression;
this.format = format;

16
src/com/romraider/logger/external/fourteenpoint7/plugin/NawDataSource.java vendored
View File

@ -19,14 +19,14 @@
package com.romraider.logger.external.fourteenpoint7.plugin;
import static com.romraider.logger.external.fourteenpoint7.plugin.NawSensorConversions.AFR_146;
import static com.romraider.logger.external.fourteenpoint7.plugin.NawSensorConversions.AFR_147;
import static com.romraider.logger.external.fourteenpoint7.plugin.NawSensorConversions.AFR_155;
import static com.romraider.logger.external.fourteenpoint7.plugin.NawSensorConversions.AFR_172;
import static com.romraider.logger.external.fourteenpoint7.plugin.NawSensorConversions.AFR_34;
import static com.romraider.logger.external.fourteenpoint7.plugin.NawSensorConversions.AFR_64;
import static com.romraider.logger.external.fourteenpoint7.plugin.NawSensorConversions.AFR_90;
import static com.romraider.logger.external.fourteenpoint7.plugin.NawSensorConversions.LAMBDA;
import static com.romraider.logger.external.core.SensorConversionsLambda.AFR_146;
import static com.romraider.logger.external.core.SensorConversionsLambda.AFR_147;
import static com.romraider.logger.external.core.SensorConversionsLambda.AFR_155;
import static com.romraider.logger.external.core.SensorConversionsLambda.AFR_172;
import static com.romraider.logger.external.core.SensorConversionsLambda.AFR_34;
import static com.romraider.logger.external.core.SensorConversionsLambda.AFR_64;
import static com.romraider.logger.external.core.SensorConversionsLambda.AFR_90;
import static com.romraider.logger.external.core.SensorConversionsLambda.LAMBDA;
import static com.romraider.util.ThreadUtil.runAsDaemon;
import static java.util.Arrays.asList;

24
src/com/romraider/logger/external/innovate/generic/serial/plugin/DataConvertor.java vendored
View File

@ -1,24 +0,0 @@
/*
* RomRaider Open-Source Tuning, Logging and Reflashing
* Copyright (C) 2006-2010 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.logger.external.innovate.generic.serial.plugin;
public interface DataConvertor {
double convert(byte[] bytes);
}

16
src/com/romraider/logger/external/innovate/generic/serial/plugin/InnovateDataSource.java vendored
View File

@ -19,14 +19,14 @@
package com.romraider.logger.external.innovate.generic.serial.plugin;
import static com.romraider.logger.external.innovate.generic.serial.plugin.InnovateSensorConversions.AFR_146;
import static com.romraider.logger.external.innovate.generic.serial.plugin.InnovateSensorConversions.AFR_147;
import static com.romraider.logger.external.innovate.generic.serial.plugin.InnovateSensorConversions.AFR_155;
import static com.romraider.logger.external.innovate.generic.serial.plugin.InnovateSensorConversions.AFR_172;
import static com.romraider.logger.external.innovate.generic.serial.plugin.InnovateSensorConversions.AFR_34;
import static com.romraider.logger.external.innovate.generic.serial.plugin.InnovateSensorConversions.AFR_64;
import static com.romraider.logger.external.innovate.generic.serial.plugin.InnovateSensorConversions.AFR_90;
import static com.romraider.logger.external.innovate.generic.serial.plugin.InnovateSensorConversions.LAMBDA;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_146;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_147;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_155;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_172;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_34;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_64;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_90;
import static com.romraider.logger.external.core.SensorConversionsAFR.LAMBDA;
import static com.romraider.util.ThreadUtil.runAsDaemon;
import static java.util.Arrays.asList;

48
src/com/romraider/logger/external/innovate/generic/serial/plugin/InnovateSensorConversions.java vendored
View File

@ -1,48 +0,0 @@
/*
* RomRaider Open-Source Tuning, Logging and Reflashing
* Copyright (C) 2006-2010 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.logger.external.innovate.generic.serial.plugin;
import com.romraider.logger.external.core.ExternalSensorConversions;
public enum InnovateSensorConversions implements ExternalSensorConversions {
// AFR conversion assumes reported DATA value is Gas AFR
LAMBDA ("Lambda", "x*0.0680272108843537", "0.00"),
AFR_147 ("AFR Gasoline", "x", "0.00"), // gasoline
AFR_90 ("AFR Ethonal", "x*0.6122448979591837", "0.00"), // ethanol
AFR_146 ("AFR Diesel", "x*0.9931972789115646", "0.00"), // diesel
AFR_64 ("AFR Methonal", "x*0.4353741496598639", "0.00"),// methanol
AFR_155 ("AFR LPG", "x*1.054421768707483", "0.00"), // LPG
AFR_172 ("AFR CNG", "x*1.170068027210884", "0.00"), // CNG
AFR_34 ("AFR Hydrogen", "x*2.312925170068027", "0.00"); // Hydrogen
private final String units;
private final String expression;
private final String format;
InnovateSensorConversions(String units, String expression, String format) {
this.units = units;
this.expression = expression;
this.format = format;
}
public String units() { return units; }
public String expression() { return expression; }
public String format() { return format; }
}

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

@ -19,14 +19,14 @@
package com.romraider.logger.external.innovate.lm2.mts.plugin;
import static com.romraider.logger.external.innovate.lm2.mts.plugin.Lm2SensorConversions.AFR_146;
import static com.romraider.logger.external.innovate.lm2.mts.plugin.Lm2SensorConversions.AFR_147;
import static com.romraider.logger.external.innovate.lm2.mts.plugin.Lm2SensorConversions.AFR_155;
import static com.romraider.logger.external.innovate.lm2.mts.plugin.Lm2SensorConversions.AFR_172;
import static com.romraider.logger.external.innovate.lm2.mts.plugin.Lm2SensorConversions.AFR_34;
import static com.romraider.logger.external.innovate.lm2.mts.plugin.Lm2SensorConversions.AFR_64;
import static com.romraider.logger.external.innovate.lm2.mts.plugin.Lm2SensorConversions.AFR_90;
import static com.romraider.logger.external.innovate.lm2.mts.plugin.Lm2SensorConversions.LAMBDA;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_146;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_147;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_155;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_172;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_34;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_64;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_90;
import static com.romraider.logger.external.core.SensorConversionsAFR.LAMBDA;
import static com.romraider.util.ThreadUtil.runAsDaemon;
import static java.lang.Integer.parseInt;
import static java.util.Arrays.asList;

10
src/com/romraider/logger/external/innovate/lm2/mts/plugin/Lm2SensorConversions.java vendored
View File

@ -22,15 +22,7 @@ package com.romraider.logger.external.innovate.lm2.mts.plugin;
import com.romraider.logger.external.core.ExternalSensorConversions;
public enum Lm2SensorConversions implements ExternalSensorConversions {
// AFR conversion assumes reported DATA value is Gas AFR
LAMBDA ("Lambda", "x*0.0680272108843537", "0.00"),
AFR_147 ("AFR Gasoline", "x", "0.00"), // gasoline
AFR_90 ("AFR Ethonal", "x*0.6122448979591837", "0.00"), // ethanol
AFR_146 ("AFR Diesel", "x*0.9931972789115646", "0.00"), // diesel
AFR_64 ("AFR Methonal", "x*0.4353741496598639", "0.00"),// methanol
AFR_155 ("AFR LPG", "x*1.054421768707483", "0.00"), // LPG
AFR_172 ("AFR CNG", "x*1.170068027210884", "0.00"), // CNG
AFR_34 ("AFR Hydrogen", "x*2.312925170068027", "0.00"); // Hydrogen
AFR_xx ("AFR Hydrogen", "x*2.312925170068027", "0.00"); // Hydrogen
private final String units;
private final String expression;

38
src/com/romraider/logger/external/mrf/plugin/MrfDataSource.java vendored
View File

@ -19,19 +19,19 @@
package com.romraider.logger.external.mrf.plugin;
import static com.romraider.logger.external.mrf.plugin.MrfSensorConversions.AFR_146;
import static com.romraider.logger.external.mrf.plugin.MrfSensorConversions.AFR_147;
import static com.romraider.logger.external.mrf.plugin.MrfSensorConversions.AFR_155;
import static com.romraider.logger.external.mrf.plugin.MrfSensorConversions.AFR_172;
import static com.romraider.logger.external.mrf.plugin.MrfSensorConversions.AFR_34;
import static com.romraider.logger.external.mrf.plugin.MrfSensorConversions.AFR_64;
import static com.romraider.logger.external.mrf.plugin.MrfSensorConversions.AFR_90;
import static com.romraider.logger.external.mrf.plugin.MrfSensorConversions.BAR;
import static com.romraider.logger.external.mrf.plugin.MrfSensorConversions.DEG_C;
import static com.romraider.logger.external.mrf.plugin.MrfSensorConversions.DEG_F;
import static com.romraider.logger.external.mrf.plugin.MrfSensorConversions.KPA;
import static com.romraider.logger.external.mrf.plugin.MrfSensorConversions.LAMBDA;
import static com.romraider.logger.external.mrf.plugin.MrfSensorConversions.PSI;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_146;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_147;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_155;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_172;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_34;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_64;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_90;
import static com.romraider.logger.external.core.SensorConversionsAFR.LAMBDA;
import static com.romraider.logger.external.core.SensorConversionsOther.DEG_F;
import static com.romraider.logger.external.core.SensorConversionsOther.DEG_F2C;
import static com.romraider.logger.external.core.SensorConversionsOther.PSI;
import static com.romraider.logger.external.core.SensorConversionsOther.PSI2BAR;
import static com.romraider.logger.external.core.SensorConversionsOther.PSI2KPA;
import static com.romraider.logger.external.mrf.plugin.MrfSensorType.AFR;
import static com.romraider.logger.external.mrf.plugin.MrfSensorType.EGT;
import static com.romraider.logger.external.mrf.plugin.MrfSensorType.FUEL_PRESS;
@ -61,12 +61,12 @@ public final class MrfDataSource implements ExternalDataSource {
{
dataItems.put(AFR, new MrfDataItem("Wideband", AFR_147, LAMBDA, AFR_90, AFR_146, AFR_64, AFR_155, AFR_172, AFR_34));
dataItems.put(MAP, new MrfDataItem("MAP", PSI, BAR, KPA));
dataItems.put(EGT, new MrfDataItem("EGT", DEG_F, DEG_C));
dataItems.put(OIL_TEMP, new MrfDataItem("Oil Temp", DEG_F, DEG_C));
dataItems.put(OIL_PRESS, new MrfDataItem("Oil Press", PSI, KPA, BAR));
dataItems.put(FUEL_PRESS, new MrfDataItem("Fuel Press", PSI, KPA, BAR));
dataItems.put(MANIFOLD_TEMP, new MrfDataItem("Manifold Temp", DEG_F, DEG_C));
dataItems.put(MAP, new MrfDataItem("MAP", PSI, PSI2BAR, PSI2KPA));
dataItems.put(EGT, new MrfDataItem("EGT", DEG_F, DEG_F2C));
dataItems.put(OIL_TEMP, new MrfDataItem("Oil Temp", DEG_F, DEG_F2C));
dataItems.put(OIL_PRESS, new MrfDataItem("Oil Press", PSI, PSI2BAR, PSI2KPA));
dataItems.put(FUEL_PRESS, new MrfDataItem("Fuel Press", PSI, PSI2BAR, PSI2KPA));
dataItems.put(MANIFOLD_TEMP, new MrfDataItem("Manifold Temp", DEG_F, DEG_F2C));
}
public String getId() {

53
src/com/romraider/logger/external/mrf/plugin/MrfSensorConversions.java vendored
View File

@ -1,53 +0,0 @@
/*
* RomRaider Open-Source Tuning, Logging and Reflashing
* Copyright (C) 2006-2010 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.logger.external.mrf.plugin;
import com.romraider.logger.external.core.ExternalSensorConversions;
public enum MrfSensorConversions implements ExternalSensorConversions {
// AFR conversion assumes reported DATA value is Gas AFR
LAMBDA ("Lambda", "x*0.0680272108843537", "0.00"),
AFR_147 ("AFR Gasoline", "x", "0.00"), // gasoline
AFR_90 ("AFR Ethonal", "x*0.6122448979591837", "0.00"), // ethanol
AFR_146 ("AFR Diesel", "x*0.9931972789115646", "0.00"), // diesel
AFR_64 ("AFR Methonal", "x*0.4353741496598639", "0.00"),// methanol
AFR_155 ("AFR LPG", "x*1.054421768707483", "0.00"), // LPG
AFR_172 ("AFR CNG", "x*1.170068027210884", "0.00"), // CNG
AFR_34 ("AFR Hydrogen", "x*2.312925170068027", "0.00"), // Hydrogen
DEG_F ("F", "x", "0.0"),
DEG_C ("C", "(x-32)*5/9", "0.0"),
PSI ("psi", "x", "0.00"),
BAR ("bar", "x*0.0689475728", "0.00"), // converts from PSI to bar
KPA ("kPa", "x*6.89475728", "0.0"); // converts from PSI to kpa
private final String units;
private final String expression;
private final String format;
MrfSensorConversions(String units, String expression, String format) {
this.units = units;
this.expression = expression;
this.format = format;
}
public String units() { return units; }
public String expression() { return expression; }
public String format() { return format; }
}

10
src/com/romraider/logger/external/plx/plugin/PlxDataSource.java vendored
View File

@ -19,6 +19,10 @@
package com.romraider.logger.external.plx.plugin;
import static com.romraider.logger.external.core.SensorConversionsOther.KPA;
import static com.romraider.logger.external.core.SensorConversionsOther.KPA2BAR;
import static com.romraider.logger.external.core.SensorConversionsOther.KPA2KGCM2;
import static com.romraider.logger.external.core.SensorConversionsOther.KPA2PSI;
import static com.romraider.logger.external.plx.plugin.PlxSensorConversions.AFR_146;
import static com.romraider.logger.external.plx.plugin.PlxSensorConversions.AFR_147;
import static com.romraider.logger.external.plx.plugin.PlxSensorConversions.AFR_155;
@ -46,10 +50,6 @@ import static com.romraider.logger.external.plx.plugin.PlxSensorConversions.KPH;
import static com.romraider.logger.external.plx.plugin.PlxSensorConversions.LAMBDA;
import static com.romraider.logger.external.plx.plugin.PlxSensorConversions.MAF_GS;
import static com.romraider.logger.external.plx.plugin.PlxSensorConversions.MAF_LB;
import static com.romraider.logger.external.plx.plugin.PlxSensorConversions.MAP_BAR;
import static com.romraider.logger.external.plx.plugin.PlxSensorConversions.MAP_KGCM2;
import static com.romraider.logger.external.plx.plugin.PlxSensorConversions.MAP_KPA;
import static com.romraider.logger.external.plx.plugin.PlxSensorConversions.MAP_PSI;
import static com.romraider.logger.external.plx.plugin.PlxSensorConversions.MPH;
import static com.romraider.logger.external.plx.plugin.PlxSensorConversions.NB_P;
import static com.romraider.logger.external.plx.plugin.PlxSensorConversions.NB_V;
@ -110,7 +110,7 @@ public final class PlxDataSource implements ExternalDataSource {
dataItems.put(ENGINE_LOAD, new PlxDataItemImpl("Engine Load", 0, PERCENT));
dataItems.put(FLUID_PRESSURE, new PlxDataItemImpl("Fuel/0il Pressure", 0, FLUID_PSI, FLUID_BAR, FLUID_KPA, FLUID_KGCM2));
dataItems.put(TIMING, new PlxDataItemImpl("Engine Timing", 0, DEGREES));
dataItems.put(MANIFOLD_ABSOLUTE_PRESSURE, new PlxDataItemImpl("Manifold Absolute Pressure", 0, MAP_PSI, MAP_BAR, MAP_KPA, MAP_KGCM2));
dataItems.put(MANIFOLD_ABSOLUTE_PRESSURE, new PlxDataItemImpl("Manifold Absolute Pressure", 0, KPA2PSI, KPA2BAR, KPA, KPA2KGCM2));
dataItems.put(MASS_AIR_FLOW, new PlxDataItemImpl("Mass Air Flow", 0, MAF_GS, MAF_LB));
dataItems.put(SHORT_TERM_FUEL_TRIM, new PlxDataItemImpl("Fuel Trim - Short Term", 0, FUEL_TRIM));
dataItems.put(LONG_TERM_FUEL_TRIM, new PlxDataItemImpl("Fuel Trim - Long Term", 0, FUEL_TRIM));

4
src/com/romraider/logger/external/plx/plugin/PlxSensorConversions.java vendored
View File

@ -47,10 +47,6 @@ public enum PlxSensorConversions implements ExternalSensorConversions {
FLUID_KPA ("kPa", "x*1.34794864", "0.00"), // converts from PSI to kpa
FLUID_KGCM2 ("kg/cm^2", "x/72.73", "0.00"),
DEGREES ("deg", "x-64", "0.00"),
MAP_PSI ("psi", "x*0.14503774", "0.00"), // converts from kPa
MAP_BAR ("bar", "x*0.01", "0.00"), // converts from kPa
MAP_KPA ("kPa", "x", "0.0"),
MAP_KGCM2 ("kg/cm^2", "x*0.01019716", "0.00"), // converts from kPa
MAF_GS ("g/sec", "x", "0.00"),
MAF_LB ("lb/min", "x/7.54", "0.00"),
FUEL_TRIM ("%", "x-100", "0.00"),

16
src/com/romraider/logger/external/txstuner/plugin/TxsTunerDataSource.java vendored
View File

@ -19,14 +19,14 @@
package com.romraider.logger.external.txstuner.plugin;
import static com.romraider.logger.external.txstuner.plugin.TxsTunerSensorConversions.AFR_146;
import static com.romraider.logger.external.txstuner.plugin.TxsTunerSensorConversions.AFR_147;
import static com.romraider.logger.external.txstuner.plugin.TxsTunerSensorConversions.AFR_155;
import static com.romraider.logger.external.txstuner.plugin.TxsTunerSensorConversions.AFR_172;
import static com.romraider.logger.external.txstuner.plugin.TxsTunerSensorConversions.AFR_34;
import static com.romraider.logger.external.txstuner.plugin.TxsTunerSensorConversions.AFR_64;
import static com.romraider.logger.external.txstuner.plugin.TxsTunerSensorConversions.AFR_90;
import static com.romraider.logger.external.txstuner.plugin.TxsTunerSensorConversions.LAMBDA;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_146;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_147;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_155;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_172;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_34;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_64;
import static com.romraider.logger.external.core.SensorConversionsAFR.AFR_90;
import static com.romraider.logger.external.core.SensorConversionsAFR.LAMBDA;
import static com.romraider.util.ThreadUtil.runAsDaemon;
import static java.util.Arrays.asList;

48
src/com/romraider/logger/external/txstuner/plugin/TxsTunerSensorConversions.java vendored
View File

@ -1,48 +0,0 @@
/*
* RomRaider Open-Source Tuning, Logging and Reflashing
* Copyright (C) 2006-2010 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.logger.external.txstuner.plugin;
import com.romraider.logger.external.core.ExternalSensorConversions;
public enum TxsTunerSensorConversions implements ExternalSensorConversions {
// AFR conversion assumes reported DATA value is Gas AFR
LAMBDA ("Lambda", "x*0.0680272108843537", "0.00"),
AFR_147 ("AFR Gasoline", "x", "0.00"), // gasoline
AFR_90 ("AFR Ethonal", "x*0.6122448979591837", "0.00"), // ethanol
AFR_146 ("AFR Diesel", "x*0.9931972789115646", "0.00"), // diesel
AFR_64 ("AFR Methonal", "x*0.4353741496598639", "0.00"),// methanol
AFR_155 ("AFR LPG", "x*1.054421768707483", "0.00"), // LPG
AFR_172 ("AFR CNG", "x*1.170068027210884", "0.00"), // CNG
AFR_34 ("AFR Hydrogen", "x*2.312925170068027", "0.00"); // Hydrogen
private final String units;
private final String expression;
private final String format;
TxsTunerSensorConversions(String units, String expression, String format) {
this.units = units;
this.expression = expression;
this.format = format;
}
public String units() { return units; }
public String expression() { return expression; }
public String format() { return format; }
}

12
src/com/romraider/logger/external/zt2/plugin/ZT2DataSource.java vendored
View File

@ -25,6 +25,10 @@ import static com.romraider.logger.external.core.ExternalSensorType.MAP;
import static com.romraider.logger.external.core.ExternalSensorType.TPS;
import static com.romraider.logger.external.core.ExternalSensorType.USER1;
import static com.romraider.logger.external.core.ExternalSensorType.WIDEBAND;
import static com.romraider.logger.external.core.SensorConversionsOther.DEG_C;
import static com.romraider.logger.external.core.SensorConversionsOther.DEG_C2F;
import static com.romraider.logger.external.core.SensorConversionsOther.PERCENT;
import static com.romraider.logger.external.core.SensorConversionsOther.VOLTS_DC;
import static com.romraider.logger.external.zt2.plugin.ZT2SensorConversions.AFR_146;
import static com.romraider.logger.external.zt2.plugin.ZT2SensorConversions.AFR_147;
import static com.romraider.logger.external.zt2.plugin.ZT2SensorConversions.AFR_155;
@ -36,12 +40,8 @@ import static com.romraider.logger.external.zt2.plugin.ZT2SensorConversions.BOOS
import static com.romraider.logger.external.zt2.plugin.ZT2SensorConversions.BOOST_KGCM2;
import static com.romraider.logger.external.zt2.plugin.ZT2SensorConversions.BOOST_KPA;
import static com.romraider.logger.external.zt2.plugin.ZT2SensorConversions.BOOST_PSI;
import static com.romraider.logger.external.zt2.plugin.ZT2SensorConversions.DEG_C;
import static com.romraider.logger.external.zt2.plugin.ZT2SensorConversions.DEG_F;
import static com.romraider.logger.external.zt2.plugin.ZT2SensorConversions.LAMBDA;
import static com.romraider.logger.external.zt2.plugin.ZT2SensorConversions.PERCENT;
import static com.romraider.logger.external.zt2.plugin.ZT2SensorConversions.RPM;
import static com.romraider.logger.external.zt2.plugin.ZT2SensorConversions.VDC;
import static com.romraider.util.ThreadUtil.runAsDaemon;
import static java.util.Collections.unmodifiableList;
@ -68,8 +68,8 @@ public final class ZT2DataSource implements ExternalDataSource {
dataItems.put(TPS, new ZT2DataItemImpl("Throttle Poistion", PERCENT));
dataItems.put(ENGINE_SPEED, new ZT2DataItemImpl("Engine Speed", RPM));
dataItems.put(MAP, new ZT2DataItemImpl("MAP", BOOST_PSI, BOOST_BAR, BOOST_KPA, BOOST_KGCM2));
dataItems.put(EGT, new ZT2DataItemImpl("EGT", DEG_C, DEG_F));
dataItems.put(USER1, new ZT2DataItemImpl("User Input", VDC));
dataItems.put(EGT, new ZT2DataItemImpl("EGT", DEG_C, DEG_C2F));
dataItems.put(USER1, new ZT2DataItemImpl("User Input", VOLTS_DC));
}
public String getId() {

4
src/com/romraider/logger/external/zt2/plugin/ZT2SensorConversions.java vendored
View File

@ -31,14 +31,10 @@ public enum ZT2SensorConversions implements ExternalSensorConversions {
AFR_155 ("AFR LPG", "x*0.1054421768707483", "0.00"), // LPG
AFR_172 ("AFR CNG", "x*0.1170068027210884", "0.00"), // CNG
AFR_34 ("AFR Hydrogen", "x*0.2312925170068027", "0.00"), // Hydrogen
PERCENT ("%", "x", "0.0"),
DEG_C ("C", "x", "0.0"),
DEG_F ("F", "(x/.555+32)", "0.0"),
BOOST_PSI ("psi", "x*0.1", "0.00"),
BOOST_BAR ("bar", "x*0.0068947573", "0.00"), // converts from PSI
BOOST_KPA ("kPa", "x*0.6894757282", "0.0"), // converts from PSI
BOOST_KGCM2 ("kg/cm^2", "x*0.0070306958", "0.00"), // converts from PSI
VDC ("vdc", "x", "0.00"),
RPM ("rpm", "round(((1000000/x)*4.59)/2)", "0");
private final String units;