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

fixed #3

This commit is contained in:
rusefi 2017-02-21 11:46:49 -05:00
parent 4264dec996
commit 5301249105
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/trigger/trigger_central.cpp
View File

@ -357,7 +357,7 @@ void printAllTriggers() {
TriggerShape *s = &engine->triggerShape; TriggerShape *s = &engine->triggerShape;
s->initializeTriggerShape(NULL PASS_ENGINE_PARAMETER); s->initializeTriggerShape(NULL PASS_ENGINE_PARAMETER);
fprintf(fp, "TRIGGERTYPE %d %d %s\r\n", triggerId, s->getLength(), getTrigger_type_e(tt)); fprintf(fp, "TRIGGERTYPE %d %d %s %f\r\n", triggerId, s->getLength(), getTrigger_type_e(tt), s->tdcPosition);
fprintf(fp, "# duty %f %f\r\n", s->dutyCycle[0], s->dutyCycle[1]); fprintf(fp, "# duty %f %f\r\n", s->dutyCycle[0], s->dutyCycle[1]);

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

@ -85,6 +85,7 @@ public class TriggerImage {
String idStr = tokens[1]; String idStr = tokens[1];
String eventCountStr = tokens[2]; String eventCountStr = tokens[2];
String triggerName = tokens[3]; String triggerName = tokens[3];
triggerPanel.tdcPosition = Double.parseDouble(tokens[4]);
int eventCount = Integer.parseInt(eventCountStr); int eventCount = Integer.parseInt(eventCountStr);
int id = Integer.parseInt(idStr); int id = Integer.parseInt(idStr);
@ -211,6 +212,7 @@ public class TriggerImage {
private static class TriggerPanel extends JPanel { private static class TriggerPanel extends JPanel {
public String name = ""; public String name = "";
public int id; public int id;
public double tdcPosition;
@Override @Override
public void paint(Graphics g) { public void paint(Graphics g) {
@ -234,6 +236,20 @@ public class TriggerImage {
g.drawString(name, 0, (int) (h * 0.75)); g.drawString(name, 0, (int) (h * 0.75));
g.drawString("#" + id, 0, (int) (h * 0.9)); g.drawString("#" + id, 0, (int) (h * 0.9));
g.setColor(Color.green);
int tdcFontSize = (int) (f.getSize() * 1.5);
g.setFont(new Font(f.getName(), Font.BOLD, tdcFontSize));
g.drawString("tdcPosition " + formatTdcPosition(), 0, tdcFontSize);
int tdcX = (int) (w / 720.0 * tdcPosition);
g.drawLine(tdcX, 0, tdcX, h);
}
private String formatTdcPosition() {
if ((int) tdcPosition == tdcPosition)
return Integer.toString((int) tdcPosition);
return Double.toString(tdcPosition);
} }
} }
} }