mirror of https://github.com/FOME-Tech/fome-fw.git
auto-sync
This commit is contained in:
parent
4eb6ce6164
commit
141d466062
|
@ -26,6 +26,16 @@
|
||||||
</table>
|
</table>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
<table type="3D" name="Ignition Advance IAT correction" storageaddress="@@ignitionIatCorrTable_hex@@" sizex="16" sizey="16" storagetype="float" endian="big">
|
||||||
|
<scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1" />
|
||||||
|
<table type="X Axis" storageaddress="@@ignitionIatCorrLoadBins_hex@@" storagetype="float" endian="big" logparam="engine_load">
|
||||||
|
<scaling units="temperature, C" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1" />
|
||||||
|
</table>
|
||||||
|
<table type="Y Axis" storageaddress="@@ignitionIatCorrRpmBins_hex@@" storagetype="float" endian="big" logparam="rpm">
|
||||||
|
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1" />
|
||||||
|
</table>
|
||||||
|
</table>
|
||||||
|
|
||||||
<table type="3D" name="Volumetric Efficiency" storageaddress="@@veTable_hex@@" sizex="16" sizey="16" storagetype="float" endian="big">
|
<table type="3D" name="Volumetric Efficiency" storageaddress="@@veTable_hex@@" sizex="16" sizey="16" storagetype="float" endian="big">
|
||||||
<scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1" />
|
<scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1" />
|
||||||
<table type="X Axis" storageaddress="@@veLoadBins_hex@@" storagetype="float" endian="big" logparam="engine_load">
|
<table type="X Axis" storageaddress="@@veLoadBins_hex@@" storagetype="float" endian="big" logparam="engine_load">
|
||||||
|
|
|
@ -16,6 +16,7 @@ public enum FileLog {
|
||||||
SIMULATOR_CONSOLE;
|
SIMULATOR_CONSOLE;
|
||||||
|
|
||||||
private static final String DIR = "out/";
|
private static final String DIR = "out/";
|
||||||
|
public static String currentLogName;
|
||||||
public static final String END_OF_TIMESTAND_TAG = "<EOT>: ";
|
public static final String END_OF_TIMESTAND_TAG = "<EOT>: ";
|
||||||
public static final Logger LOGGER = new Logger() {
|
public static final Logger LOGGER = new Logger() {
|
||||||
@Override
|
@Override
|
||||||
|
@ -52,7 +53,8 @@ public enum FileLog {
|
||||||
return null;
|
return null;
|
||||||
String date = getDate();
|
String date = getDate();
|
||||||
createFolderIfNeeded();
|
createFolderIfNeeded();
|
||||||
String fileName = DIR + name() + "_rfi_report_" + date + ".csv";
|
currentLogName = name() + "_rfi_report_" + date + ".csv";
|
||||||
|
String fileName = DIR + currentLogName;
|
||||||
rlog("Writing to " + fileName);
|
rlog("Writing to " + fileName);
|
||||||
return new FileOutputStream(fileName, true);
|
return new FileOutputStream(fileName, true);
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,6 +17,7 @@ import java.awt.event.MouseEvent;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileFilter;
|
import java.io.FileFilter;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
import java.util.TreeMap;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This tab is the entry point of rusEfi own log browser
|
* This tab is the entry point of rusEfi own log browser
|
||||||
|
@ -120,8 +121,21 @@ public class LogViewer extends JPanel {
|
||||||
for (File file : files)
|
for (File file : files)
|
||||||
fileListModel.addElement(getFileDesc(file));
|
fileListModel.addElement(getFileDesc(file));
|
||||||
|
|
||||||
if (files.length > 0 && LinkManager.isLogViewer())
|
int index = 0;
|
||||||
openFile(files[0]);
|
|
||||||
|
while (files.length > index && LinkManager.isLogViewer()) {
|
||||||
|
File file = files[index];
|
||||||
|
if (file.getName().endsWith(FileLog.currentLogName)) {
|
||||||
|
/**
|
||||||
|
* we do not want to view the log file we've just started to produce.
|
||||||
|
* We are here if the logs are newer then our current time - remember about fime zone differences
|
||||||
|
*/
|
||||||
|
index++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
openFile(file);
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private FileItem getFileDesc(File file) {
|
private FileItem getFileDesc(File file) {
|
||||||
|
|
Loading…
Reference in New Issue