diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp index 5315ad2bac..7215198b6a 100644 --- a/firmware/controllers/trigger/trigger_central.cpp +++ b/firmware/controllers/trigger/trigger_central.cpp @@ -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]); diff --git a/java_console/ui/src/com/rusefi/TriggerImage.java b/java_console/ui/src/com/rusefi/TriggerImage.java index 351ee0395e..96f520172d 100644 --- a/java_console/ui/src/com/rusefi/TriggerImage.java +++ b/java_console/ui/src/com/rusefi/TriggerImage.java @@ -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 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++; }