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

auto-sync

This commit is contained in:
rusEfi 2015-04-07 10:05:59 -05:00
parent eabb1d6085
commit 55519eb0f8
4 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/integration/rusefi.xml
View File

@ -26,6 +26,16 @@
</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">
<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">

4
java_console/io/src/com/rusefi/FileLog.java
View File

@ -16,6 +16,7 @@ public enum FileLog {
SIMULATOR_CONSOLE;
private static final String DIR = "out/";
public static String currentLogName;
public static final String END_OF_TIMESTAND_TAG = "<EOT>: ";
public static final Logger LOGGER = new Logger() {
@Override
@ -52,7 +53,8 @@ public enum FileLog {
return null;
String date = getDate();
createFolderIfNeeded();
String fileName = DIR + name() + "_rfi_report_" + date + ".csv";
currentLogName = name() + "_rfi_report_" + date + ".csv";
String fileName = DIR + currentLogName;
rlog("Writing to " + fileName);
return new FileOutputStream(fileName, true);
}

10
java_console/rusefi.xml
View File

@ -26,6 +26,16 @@
</table>
</table>
<table type="3D" name="Ignition Advance IAT correction" storageaddress="20b8" 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="24b8" 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="24f8" 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="32b8" 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="36b8" storagetype="float" endian="big" logparam="engine_load">

18
java_console/ui/src/com/rusefi/ui/logview/LogViewer.java
View File

@ -17,6 +17,7 @@ import java.awt.event.MouseEvent;
import java.io.File;
import java.io.FileFilter;
import java.util.Arrays;
import java.util.TreeMap;
/**
* This tab is the entry point of rusEfi own log browser
@ -120,8 +121,21 @@ public class LogViewer extends JPanel {
for (File file : files)
fileListModel.addElement(getFileDesc(file));
if (files.length > 0 && LinkManager.isLogViewer())
openFile(files[0]);
int index = 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) {