From 7b86f1553dca34bf9c4ee593875971d80ef5e6fa Mon Sep 17 00:00:00 2001 From: rusEfi Date: Wed, 5 Nov 2014 21:03:10 -0600 Subject: [PATCH] auto-sync --- firmware/config/engines/bmw_e34.cpp | 8 ++++++++ java_console/models/src/com/irnems/core/Sensor.java | 2 +- java_console/ui/src/com/rusefi/ui/RpmPanel.java | 11 +++-------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/firmware/config/engines/bmw_e34.cpp b/firmware/config/engines/bmw_e34.cpp index 328fb6d6d1..71b170f3d3 100644 --- a/firmware/config/engines/bmw_e34.cpp +++ b/firmware/config/engines/bmw_e34.cpp @@ -24,7 +24,15 @@ void setBmwE43(engine_configuration_s *engineConfiguration) { engineConfiguration->injectionMode = IM_SIMULTANEOUS; engineConfiguration->ignitionMode = IM_WASTED_SPARK; + // todo: check the digital sniffer while simulating + // set_global_trigger_offset_angle 84 + engineConfiguration->globalTriggerAngleOffset = 84; + + setWholeFuelMap(engineConfiguration, 6); + setWholeTimingTable(engineConfiguration, 10); + board_configuration_s *bc = &engineConfiguration->bc; + bc->malfunctionIndicatorPin = GPIO_NONE; bc->ignitionPins[0] = GPIOC_7; // #1 bc->ignitionPins[1] = GPIO_NONE; // #2 diff --git a/java_console/models/src/com/irnems/core/Sensor.java b/java_console/models/src/com/irnems/core/Sensor.java index c9990232c2..d2219c5af9 100644 --- a/java_console/models/src/com/irnems/core/Sensor.java +++ b/java_console/models/src/com/irnems/core/Sensor.java @@ -11,7 +11,7 @@ public enum Sensor { MAP("MAP"), MAP_RAW("MAP_RAW"), BARO("Baro"), - TIMING("Timing", "deg", -180, 180), + TIMING("Timing Advance", "deg", -180, 180), /** * Please note that these enum names are used to make 'set_mock_XXX_voltage' commands diff --git a/java_console/ui/src/com/rusefi/ui/RpmPanel.java b/java_console/ui/src/com/rusefi/ui/RpmPanel.java index 7a953f064c..22fd1b76dd 100644 --- a/java_console/ui/src/com/rusefi/ui/RpmPanel.java +++ b/java_console/ui/src/com/rusefi/ui/RpmPanel.java @@ -32,18 +32,13 @@ public class RpmPanel { JPanel gauges = new JPanel(new GridLayout(2, 3)); gauges.setBorder(BorderFactory.createLineBorder(Color.black)); -// gauges.add(GaugesPanel.createCoolantGauge()); - gauges.add(SensorGauge.createGauge(Sensor.DWELL0)); - gauges.add(SensorGauge.createGauge(Sensor.DUTY0)); + gauges.add(SensorGauge.createGauge(Sensor.CLT)); gauges.add(SensorGauge.createGauge(Sensor.FUEL)); - //gauges.add(GaugesPanel.createGauge(Sensor.ADVANCE0)); + gauges.add(SensorGauge.createGauge(Sensor.TIMING)); gauges.add(SensorGauge.createGauge(Sensor.VREF)); gauges.add(SensorGauge.createGauge(Sensor.MAF)); - gauges.add(SensorGauge.createGauge(Sensor.DWELL1)); -// gauges.add(GaugesPanel.createGauge(Sensor.ADVANCE1)); -// gauges.add(GaugesPanel.createGauge(Sensor.MAF)); - + gauges.add(SensorGauge.createGauge(Sensor.TPS)); startConnectionWatchDog();