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

Add the ability to read table names from properties file

This commit is contained in:
Dale Schultz 2018-12-19 20:54:12 -05:00
parent edb18e5be0
commit 46d967ab6a
No known key found for this signature in database
GPG Key ID: EA2C8AD6CB5C2AF2
1 changed files with 53 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/main/java/com/romraider/logger/ecu/comms/learning/SSMLearningTableValues.java
View File

@ -24,6 +24,9 @@ import static javax.swing.JOptionPane.ERROR_MESSAGE;
import static javax.swing.JOptionPane.WARNING_MESSAGE;
import static javax.swing.JOptionPane.showMessageDialog;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@ -31,6 +34,7 @@ import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import javax.swing.SwingWorker;
@ -72,14 +76,14 @@ public final class SSMLearningTableValues extends SwingWorker<Void, Void>
private static final Logger LOGGER =
Logger.getLogger(SSMLearningTableValues.class);
private static final List<String> AF_TABLE_NAMES = Arrays.asList(
private static List<String> AF_TABLE_NAMES = Arrays.asList(
"A/F Learning #1 Airflow Ranges",
"A/F Learning #1 Airflow Ranges ",
"A/F Learning Airflow Ranges");
private static final List<String> FLKC_LOAD_TABLE_NAMES = Arrays.asList(
private static List<String> FLKC_LOAD_TABLE_NAMES = Arrays.asList(
"Fine Correction Columns (Load)",
"Fine Correction Columns (Load) ");
private static final List<String> FLKC_RPM_TABLE_NAMES = Arrays.asList(
private static List<String> FLKC_RPM_TABLE_NAMES = Arrays.asList(
"Fine Correction Rows (RPM)",
"Fine Correction Rows (RPM) ");
private final Map<String, Object> vehicleInfo =
@ -110,6 +114,7 @@ public final class SSMLearningTableValues extends SwingWorker<Void, Void>
this.ecuDef = ecuDef;
this.flkc = null;
this.flkcAddr = 0;
loadProperties();
}
@Override
@ -569,4 +574,49 @@ public final class SSMLearningTableValues extends SwingWorker<Void, Void>
}
return null;
}
/**
* Load ECU def table names from a user customized properties file.
* The file will replace the Class defined names if it is present.
* Names in the file should be separated by the : character
* @exception FileNotFoundException if the directory or file is not present
* @exception IOException if there's some kind of IO error
*/
private void loadProperties() {
final Properties learning = new Properties();
FileInputStream propFile;
try {
propFile = new FileInputStream("./customize/ssmlearning.properties");
learning.load(propFile);
final String af_table_names =
learning.getProperty("af_table_names");
String[] names = af_table_names.split(":", 0);
AF_TABLE_NAMES = new ArrayList<String>();
for (String name : names) {
if (ParamChecker.isNullOrEmpty(name)) continue;
AF_TABLE_NAMES.add(name);
}
final String flkc_table_column_names =
learning.getProperty("flkc_table_column_names");
names = flkc_table_column_names.split(":", 0);
FLKC_LOAD_TABLE_NAMES = new ArrayList<String>();
for (String name : names) {
if (ParamChecker.isNullOrEmpty(name)) continue;
FLKC_LOAD_TABLE_NAMES.add(name);
}
final String flkc_table_row_names =
learning.getProperty("flkc_table_row_names");
names = flkc_table_row_names.split(":", 0);
FLKC_RPM_TABLE_NAMES = new ArrayList<String>();
for (String name : names) {
if (ParamChecker.isNullOrEmpty(name)) continue;
FLKC_RPM_TABLE_NAMES.add(name);
}
propFile.close();
LOGGER.info("SSMLearningTableValues loaded table names from file: ./customize/ssmlearning.properties");
} catch (FileNotFoundException e) {
LOGGER.error("SSMLearningTableValues properties file: " + e.getLocalizedMessage());
} catch (IOException e) {
LOGGER.error("SSMLearningTableValues IOException: " + e.getLocalizedMessage());
}
}
}