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-12-15 22:01:31 -05:00
parent 57b719c5c9
commit 2d14cbbe77
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -236,6 +236,9 @@ void printAllTriggers() {
for (int triggerId = 1; triggerId < TT_UNUSED; triggerId++) {
trigger_type_e tt = (trigger_type_e) triggerId;
// if (triggerId != 20)
// continue;
printf("Exporting %s\r\n", getTrigger_type_e(tt));
persistent_config_s pc;
@ -252,13 +255,13 @@ void printAllTriggers() {
TriggerShape *s = &engine->triggerShape;
s->initializeTriggerShape(NULL PASS_ENGINE_PARAMETER);
fprintf(fp, "TRIGGERTYPE %d %d %s\r\n", triggerId, s->getSize(), getTrigger_type_e(tt));
fprintf(fp, "TRIGGERTYPE %d %d %s\r\n", triggerId, s->getLength(), getTrigger_type_e(tt));
fprintf(fp, "# duty %f %f\r\n", s->dutyCycle[0], s->dutyCycle[1]);
for (int i = 0; i < s->getSize(); i++) {
for (int i = 0; i < s->getLength(); i++) {
int triggerDefinitionCoordinate = (s->getTriggerShapeSynchPointIndex() + i) % s->getLength();
int triggerDefinitionCoordinate = (s->getTriggerShapeSynchPointIndex() + i) % s->getSize();
fprintf(fp, "event %d %d %f\r\n", i, s->triggerSignals[triggerDefinitionCoordinate], s->eventAngles[i]);

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

@ -88,7 +88,7 @@ public class TriggerImage {
int eventCount = Integer.parseInt(eventCountStr);
int id = Integer.parseInt(idStr);
// if (id != 4)
// if (id != 20)
// return;
System.out.println("id=" + id + ", count=" + eventCount + ", name=" + triggerName);
@ -96,6 +96,7 @@ public class TriggerImage {
List<WaveState> waves = readTrigger(reader, eventCount);
EngineReport re0 = new EngineReport(waves.get(0).list, 720, 720 * (1 + EXTRA_COUNT));
System.out.println(re0);
EngineReport re1 = new EngineReport(waves.get(1).list, 720, 720 * (1 + EXTRA_COUNT));
triggerPanel.removeAll();
@ -138,7 +139,9 @@ public class TriggerImage {
String angleStr = tokens[3];
double angle = Double.parseDouble(angleStr);
signals.add(new Signal(signal, angle));
Signal s = new Signal(signal, angle);
// System.out.println(s);
signals.add(s);
index++;
}