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

auto-sync

This commit is contained in:
rusEfi 2016-04-09 13:02:13 -04:00
parent 2807b09b89
commit 8079167179
6 changed files with 71 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/console/status_loop.cpp
View File

@ -612,6 +612,12 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->debugIntField1 = engine->tpsAccelEnrichment.cb.getSize();
}
if (engineConfiguration->debugMode == TRIGGER_COUNT) {
tsOutputChannels->debugIntField1 = engine->triggerCentral.getHwEventCounter(0);
tsOutputChannels->debugIntField2 = engine->triggerCentral.getHwEventCounter(1);
tsOutputChannels->debugIntField3 = engine->triggerCentral.getHwEventCounter(2);
}
tsOutputChannels->wallFuelAmount = ENGINE(wallFuel).getWallFuel(0);
tsOutputChannels->wallFuelCorrection = ENGINE(wallFuelCorrection);
// TPS acceleration

3
firmware/gen_trigger_images.bat Normal file
View File

@ -0,0 +1,3 @@
rem This takes triggers.txt generated by unit_test binary and produces a bunch of .png files
java -cp ../java_console_binary/rusefi_console.jar com.rusefi.TriggerImage

2
firmware/rusefi.cpp
View File

@ -292,5 +292,5 @@ int getRusEfiVersion(void) {
return 123; // this is here to make the compiler happy about the unused array
if (UNUSED_CCM_SIZE[0] * 0 != 0)
return 3211; // this is here to make the compiler happy about the unused array
return 20160404;
return 20160409;
}

22
java_console/.idea/runConfigurations/IniFileModel.xml Normal file
View File

@ -0,0 +1,22 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="IniFileModel" type="Application" factoryName="Application" nameIsGenerated="true">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
<pattern>
<option name="PATTERN" value="com.rusefi.ui.config.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="MAIN_CLASS_NAME" value="com.rusefi.ui.config.IniFileModel" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<module name="ui" />
<envs />
<method />
</configuration>
</component>

22
java_console/.idea/runConfigurations/TriggerImage.xml Normal file
View File

@ -0,0 +1,22 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="TriggerImage" type="Application" factoryName="Application" nameIsGenerated="true">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
<pattern>
<option name="PATTERN" value="com.rusefi.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="MAIN_CLASS_NAME" value="com.rusefi.TriggerImage" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<module name="ui" />
<envs />
<method />
</configuration>
</component>

34
java_console/ui/src/com/rusefi/TriggerImage.java
View File

@ -18,14 +18,15 @@ import java.util.List;
/**
* This utility produces images of trigger signals supported by rusEfi
*
* 06235/15
* 06/23/15
* (c) Andrey Belomutskiy 2013-2016
*/
public class TriggerImage {
public static final String TRIGGERTYPE = "TRIGGERTYPE";
public static final String TRIGGERS = "triggers";
public static final String TRIGGERS_TXT = "triggers.txt";
private static final String TRIGGERTYPE = "TRIGGERTYPE";
private static final String OUTPUT_FOLDER = "triggers";
private static final String INPUT_FILE_NAME = "triggers.txt";
private static final String TOP_MESSAGE = "(c) rusEfi 2016";
private static final String DEFAULT_WORK_FOLDER = ".." + File.separator + "unit_tests";
private static int WIDTH = 320;
/**
* number of extra frames
@ -33,11 +34,11 @@ public class TriggerImage {
public static int EXTRA_COUNT = 1;
public static void main(String[] args) throws IOException, InvocationTargetException, InterruptedException {
final String path;
final String workingFolder;
if (args.length != 1) {
path = ".." + File.separator + "unit_tests";
workingFolder = DEFAULT_WORK_FOLDER;
} else {
path = args[0];
workingFolder = args[0];
}
FrameHelper f = new FrameHelper();
@ -55,7 +56,7 @@ public class TriggerImage {
@Override
public void run() {
try {
generateImages(path, triggerPanel);
generateImages(workingFolder, triggerPanel);
} catch (IOException e) {
throw new IllegalStateException(e);
}
@ -64,8 +65,8 @@ public class TriggerImage {
System.exit(-1);
}
private static void generateImages(String path, TriggerPanel trigger) throws IOException {
BufferedReader br = new BufferedReader(new FileReader(path + File.separator + TRIGGERS_TXT));
private static void generateImages(String workingFolder, TriggerPanel trigger) throws IOException {
BufferedReader br = new BufferedReader(new FileReader(workingFolder + File.separator + INPUT_FILE_NAME));
String line;
while ((line = br.readLine()) != null) {
@ -118,8 +119,8 @@ public class TriggerImage {
UiUtils.trueLayout(triggerPanel);
UiUtils.trueRepaint(triggerPanel);
new File(TRIGGERS).mkdir();
UiUtils.saveImage(TRIGGERS + File.separator + "trigger_" + id + ".png", triggerPanel);
new File(OUTPUT_FOLDER).mkdir();
UiUtils.saveImage(OUTPUT_FOLDER + File.separator + "trigger_" + id + ".png", triggerPanel);
}
@NotNull
@ -208,11 +209,10 @@ public class TriggerImage {
int w = getWidth();
String line = "(c) rusEfi 2015";
int off = g.getFontMetrics().stringWidth(line);
g.drawString(line, w - off, g.getFont().getSize());
int off = g.getFontMetrics().stringWidth(TOP_MESSAGE);
g.drawString(TOP_MESSAGE, w - off, g.getFont().getSize());
line = new Date().toString();
String line = new Date().toString();
off = g.getFontMetrics().stringWidth(line);
g.drawString(line, w - off, 2 * g.getFont().getSize());