auto-sync

firmware/config/engines/GY6_139QMB.cpp

@@ -20,7 +20,7 @@ void setGy6139qmbDefaultEngineConfiguration(
 	engineConfiguration->analogInputDividerCoefficient = 1.52;
 	engineConfiguration->algorithm = LM_MAP;
 	engineConfiguration->globalTriggerAngleOffset = 45;
-	engineConfiguration->bc.analogChartMode = AC_MAP;
+	engineConfiguration->bc.sensorChartMode = SC_MAP;
 	engineConfiguration->specs.displacement = 0.072; // 72cc
 	engineConfiguration->specs.cylindersCount = 1;
 	setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR);

firmware/config/engines/bmw_e34.cpp

@@ -60,7 +60,7 @@ void setBmwE34(DECLARE_ENGINE_PARAMETER_F) {
 	setAlgorithm(LM_SPEED_DENSITY PASS_ENGINE_PARAMETER);
 
 	// for best performance at high RPM, we need to turn off 'Engine Sniffer' and 'Sensor Sniffer'
-	boardConfiguration->analogChartMode = AC_OFF;
+	boardConfiguration->sensorChartMode = SC_OFF;
 	engineConfiguration->isDigitalChartEnabled = false;
 
 	engineConfiguration->isCylinderCleanupEnabled = false;

firmware/config/engines/dodge_neon.cpp

@@ -182,7 +182,7 @@ void setDodgeNeon1995EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
 	setThermistorConfiguration(&engineConfiguration->clt, 0, 32500, 30, 7550, 100, 700);
 	engineConfiguration->clt.bias_resistor = 2700;
 
-	engineConfiguration->analogChartFrequency = 7;
+	engineConfiguration->sensorChartFrequency = 7;
 }
 
 void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
@@ -357,7 +357,7 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
 	engineConfiguration->cltAdcChannel = EFI_ADC_12;
 
 
-	boardConfiguration->analogChartMode = AC_MAP;
+	boardConfiguration->sensorChartMode = SC_MAP;
 	boardConfiguration->isFastAdcEnabled = true;
 	engineConfiguration->map.sensor.type = MT_DODGE_NEON_2003;
 

firmware/config/engines/dodge_ram.cpp

@@ -17,8 +17,7 @@ void setDodgeRam1996(DECLARE_ENGINE_PARAMETER_F) {
 	board_configuration_s * boardConfiguration = &engineConfiguration->bc;
 
 	setOperationMode(engineConfiguration, FOUR_STROKE_CAM_SENSOR);
-	engineConfiguration->trigger.type = TT_ONE_PLUS_TOOTHED_WHEEL_60_2;
-
+	engineConfiguration->trigger.type = TT_DODGE_RAM;
 
 	//Base engine setting
 	engineConfiguration->specs.cylindersCount = 8;

firmware/config/engines/mazda_626.cpp

@@ -26,8 +26,8 @@ void setMazda626EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
 
 	engineConfiguration->digitalChartSize = 150;
 
-	boardConfiguration->analogChartMode = AC_TRIGGER;
-	engineConfiguration->analogChartFrequency = 2;
+	boardConfiguration->sensorChartMode = SC_TRIGGER;
+	engineConfiguration->sensorChartFrequency = 2;
 
 	engineConfiguration->injector.flow = 330;
 	engineConfiguration->specs.displacement = 2.0;

firmware/config/engines/subaru.cpp

@@ -22,5 +22,5 @@ void setSubaru2003Wrx(engine_configuration_s *engineConfiguration) {
 	engineConfiguration->trigger.customTotalToothCount = 5;
 	engineConfiguration->trigger.customSkippedToothCount = 1;
 
-	engineConfiguration->analogChartFrequency = 2;
+	engineConfiguration->sensorChartFrequency = 2;
 }

firmware/controllers/algo/engine_configuration.cpp

@@ -296,7 +296,7 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
 	engineConfiguration->fixedModeTiming = 50;
 
 	// performance optimization
-	boardConfiguration->analogChartMode = AC_OFF;
+	boardConfiguration->sensorChartMode = SC_OFF;
 
 	engineConfiguration->map.sensor.hwChannel = EFI_ADC_4;
 	engineConfiguration->baroSensor.hwChannel = EFI_ADC_4;
@@ -310,7 +310,7 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
 	engineConfiguration->injectionAngle = 0;
 	engineConfiguration->ignitionBaseAngle = 0;
 	engineConfiguration->overrideCrankingIgnition = true;
-	engineConfiguration->analogChartFrequency = 20;
+	engineConfiguration->sensorChartFrequency = 20;
 
 	engineConfiguration->algorithm = LM_PLAIN_MAF;
 

firmware/controllers/algo/engine_configuration_generated_structures.h

@@ -1,4 +1,4 @@
-// this section was generated by config_definition.jar on Sat Apr 18 18:59:21 EDT 2015
+// this section was generated by config_definition.jar on Thu Apr 23 14:13:44 EDT 2015
 // begin
 #include "rusefi_types.h"
 typedef struct {
@@ -604,7 +604,7 @@ typedef struct {
 	/**
 	 * offset 784
 	 */
-	analog_chart_e analogChartMode;
+	sensor_chart_e sensorChartMode;
 	/**
 	 * offset 788
 	 */
@@ -839,7 +839,7 @@ typedef struct {
 	/**
 	 * offset 512
 	 */
-	int analogChartFrequency;
+	int sensorChartFrequency;
 	/**
 	 * offset 516
 	 */
@@ -1283,4 +1283,4 @@ typedef struct {
 } persistent_config_s;
 
 // end
-// this section was generated by config_definition.jar on Sat Apr 18 18:59:21 EDT 2015
+// this section was generated by config_definition.jar on Thu Apr 23 14:13:44 EDT 2015

firmware/controllers/algo/rusefi_enums.h

@@ -542,14 +542,14 @@ typedef enum {
 } can_device_mode_e;
 
 typedef enum {
-	AC_OFF = 0,
+	SC_OFF = 0,
 	/**
 	 * You would use this value if you want to see a detailed graph of your trigger events
 	 */
-	AC_TRIGGER = 1, AC_MAP = 2,
+	SC_TRIGGER = 1, SC_MAP = 2,
 
-	Internal_ForceMyEnumIntSize_analog_chart = ENUM_32_BITS,
-} analog_chart_e;
+	Internal_ForceMyEnumIntSize_sensor_chart = ENUM_32_BITS,
+} sensor_chart_e;
 
 typedef enum {
 	CUSTOM = 0,

firmware/controllers/engine_controller.cpp

@@ -21,6 +21,7 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <sensor_chart.h>
 #include "main.h"
 #include "engine_configuration.h"
 #include "trigger_central.h"
@@ -39,7 +40,6 @@
 #include "engine_math.h"
 #include "wave_analyzer.h"
 #include "allsensors.h"
-#include "analog_chart.h"
 #include "electronic_throttle.h"
 #include "map_averaging.h"
 #include "malfunction_central.h"
@@ -469,7 +469,7 @@ void initEngineContoller(Logging *sharedLogger, Engine *engine) {
 #endif
 
 #if EFI_ANALOG_CHART || defined(__DOXYGEN__)
-	initAnalogChart();
+	initSensorChart();
 #endif /* EFI_ANALOG_CHART */
 
 	initAlgo(sharedLogger, engineConfiguration);

firmware/controllers/map_averaging.cpp

@@ -35,7 +35,7 @@
 #include "engine_math.h"
 
 #if EFI_ANALOG_CHART
-#include "analog_chart.h"
+#include <sensor_chart.h>
 #endif /* EFI_ANALOG_CHART */
 
 #define FAST_MAP_CHART_SKIP_FACTOR 16
@@ -108,7 +108,7 @@ static void startAveraging(void *arg) {
  * as fast as possible
  */
 void mapAveragingCallback(adcsample_t adcValue) {
-	if(!isAveraging && boardConfiguration->analogChartMode != AC_MAP) {
+	if(!isAveraging && boardConfiguration->sensorChartMode != SC_MAP) {
 		return;
 	}
 
@@ -118,11 +118,11 @@ void mapAveragingCallback(adcsample_t adcValue) {
 
 
 #if (EFI_ANALOG_CHART && EFI_ANALOG_SENSORS) || defined(__DOXYGEN__)
-	if (boardConfiguration->analogChartMode == AC_MAP)
+	if (boardConfiguration->sensorChartMode == SC_MAP)
 		if (perRevolutionCounter % FAST_MAP_CHART_SKIP_FACTOR == 0) {
 			float voltage = adcToVoltsDivided(adcValue);
 			float currentPressure = getMapByVoltage(voltage);
-			acAddData(getCrankshaftAngleNt(getTimeNowNt() PASS_ENGINE_PARAMETER), currentPressure);
+			scAddData(getCrankshaftAngleNt(getTimeNowNt() PASS_ENGINE_PARAMETER), currentPressure);
 		}
 #endif /* EFI_ANALOG_CHART */
 

firmware/controllers/settings.cpp

@@ -352,8 +352,8 @@ static void setMalfunctionIndicatorPinMode(int value) {
 	doPrintConfiguration(engine);
 }
 
-static void setAnalogChartMode(int value) {
-	boardConfiguration->analogChartMode = (analog_chart_e) value;
+static void setSensorChartMode(int value) {
+	boardConfiguration->sensorChartMode = (sensor_chart_e) value;
 	doPrintConfiguration(engine);
 }
 
@@ -915,7 +915,7 @@ void initSettings(engine_configuration_s *engineConfiguration) {
 	addConsoleActionF("set_ignition_offset", setIgnitionOffset);
 	addConsoleActionF("set_injection_offset", setInjectionOffset);
 	addConsoleActionF("set_global_trigger_offset_angle", setGlobalTriggerAngleOffset);
-	addConsoleActionI("set_analog_chart_mode", setAnalogChartMode);
+	addConsoleActionI("set_sensor_chart_mode", setSensorChartMode);
 	addConsoleActionI("set_fixed_mode_timing", setFixedModeTiming);
 	addConsoleActionI("set_timing_mode", setTimingMode);
 	addConsoleActionI("set_engine_type", setEngineType);

firmware/controllers/trigger/rpm_calculator.cpp

@@ -25,7 +25,7 @@
 #endif
 
 #if ! EFI_UNIT_TEST
-#include "analog_chart.h"
+#include <sensor_chart.h>
 #endif
 
 #include "efilib2.h"
@@ -146,8 +146,8 @@ void rpmShaftPositionCallback(trigger_event_e ckpSignalType, uint32_t index DECL
 
 	if (index != 0) {
 #if EFI_ANALOG_CHART || defined(__DOXYGEN__)
-		if (boardConfiguration->analogChartMode == AC_TRIGGER)
-			acAddData(getCrankshaftAngleNt(nowNt PASS_ENGINE_PARAMETER), 1000 * ckpSignalType + index);
+		if (boardConfiguration->sensorChartMode == SC_TRIGGER)
+			scAddData(getCrankshaftAngleNt(nowNt PASS_ENGINE_PARAMETER), 1000 * ckpSignalType + index);
 #endif
 		return;
 	}
@@ -174,8 +174,8 @@ void rpmShaftPositionCallback(trigger_event_e ckpSignalType, uint32_t index DECL
 	rpmState->onNewEngineCycle();
 	rpmState->lastRpmEventTimeNt = nowNt;
 #if EFI_ANALOG_CHART || defined(__DOXYGEN__)
-	if (boardConfiguration->analogChartMode == AC_TRIGGER)
-		acAddData(getCrankshaftAngleNt(nowNt PASS_ENGINE_PARAMETER), index);
+	if (boardConfiguration->sensorChartMode == SC_TRIGGER)
+		scAddData(getCrankshaftAngleNt(nowNt PASS_ENGINE_PARAMETER), index);
 #endif
 	engine->m.rpmCbTime = GET_TIMESTAMP() - engine->m.beforeRpmCb;
 }

firmware/controllers/trigger/trigger_chrysler.cpp

@@ -7,6 +7,17 @@
 
 #include "trigger_chrysler.h"
 
+void initDodgeRam(TriggerShape *s) {
+
+	s->reset(FOUR_STROKE_CAM_SENSOR, false);
+	s->useRiseEdge = true;
+
+	s->isSynchronizationNeeded = false;
+
+	s->addEvent(540, T_PRIMARY, TV_HIGH);
+	s->addEvent(720, T_PRIMARY, TV_LOW);
+}
+
 void configureNeon2003TriggerShape(TriggerShape *s) {
 	s->reset(FOUR_STROKE_CAM_SENSOR, false);
 

firmware/controllers/trigger/trigger_chrysler.h

@@ -14,5 +14,6 @@
 
 void configureNeon1995TriggerShape(TriggerShape *s);
 void configureNeon2003TriggerShape(TriggerShape *s);
+void initDodgeRam(TriggerShape *s);
 
 #endif /* TRIGGER_CHRYSLER_H_ */

firmware/controllers/trigger/trigger_decoder.cpp

@@ -391,6 +391,10 @@ void initializeTriggerShape(Logging *logger, engine_configuration_s const *engin
 		initializeMitsubishi4g18(triggerShape);
 		break;
 
+	case TT_DODGE_RAM:
+		initDodgeRam(triggerShape);
+		break;
+
 	default:
 		firmwareError("initializeTriggerShape() not implemented: %d", triggerConfig->type);
 		;

firmware/development/analog_chart.h

@@ -1,16 +0,0 @@
-/**
- * @file	analog_chart.h
- *
- * @date Dec 20, 2013
- * @author Andrey Belomutskiy, (c) 2012-2015
- */
-
-#ifndef ANALOG_CHART_H_
-#define ANALOG_CHART_H_
-
-#include "global.h"
-
-void acAddData(float angle, float value);
-void initAnalogChart(void);
-
-#endif /* ANALOG_CHART_H_ */

firmware/development/development.mk

@@ -4,7 +4,7 @@ DEV_SRC = development/test/test.c \
 	
 DEV_SRC_CPP = development/trigger_emulator.cpp \
 	development/hw_layer/poten.cpp \
-	development/analog_chart.cpp \
+	development/sensor_chart.cpp \
 	development/rfi_perftest.cpp \
 	development/engine_emulator.cpp \
 	$(PROJECT_DIR)/development/wave_chart.cpp \

firmware/development/sensor_chart.cpp

@@ -5,8 +5,8 @@
  * @author Andrey Belomutskiy, (c) 2012-2015
  */
 
+#include <sensor_chart.h>
 #include "main.h"
-#include "analog_chart.h"
 #include "engine.h"
 #include "rpm_calculator.h"
 #include "status_loop.h"
@@ -21,12 +21,12 @@ static int initialized = FALSE;
 
 extern engine_configuration_s *engineConfiguration;
 
-void acAddData(float angle, float value) {
+void scAddData(float angle, float value) {
 	if (!initialized) {
 		return; // this is possible because of initialization sequence
 	}
 
-	if (engineConfiguration->analogChartFrequency < 2) {
+	if (engineConfiguration->sensorChartFrequency < 2) {
 		/**
 		 * analog chart frequency cannot be 1 because of the way
 		 * data flush is implemented, see below
@@ -35,7 +35,7 @@ void acAddData(float angle, float value) {
 		return;
 	}
 
-	if (getRevolutionCounter() % engineConfiguration->analogChartFrequency != 0) {
+	if (getRevolutionCounter() % engineConfiguration->sensorChartFrequency != 0) {
 		/**
 		 * We are here if we do NOT need to add an event to the analog chart
 		 */
@@ -66,12 +66,12 @@ void acAddData(float angle, float value) {
 	}
 }
 
-static void setAnalogChartFrequency(int value) {
-	engineConfiguration->analogChartFrequency = value;
+static void setSensorChartFrequency(int value) {
+	engineConfiguration->sensorChartFrequency = value;
 }
 
-void initAnalogChart(void) {
-	addConsoleActionI("set_analog_chart_freq", setAnalogChartFrequency);
+void initSensorChart(void) {
+	addConsoleActionI("set_sensor_chart_freq", setSensorChartFrequency);
 
 	initialized = true;
 }

firmware/development/sensor_chart.h

@@ -0,0 +1,16 @@
+/**
+ * @file	sensor_chart.h
+ *
+ * @date Dec 20, 2013
+ * @author Andrey Belomutskiy, (c) 2012-2015
+ */
+
+#ifndef SENSOR_CHART_H_
+#define SENSOR_CHART_H_
+
+#include "global.h"
+
+void scAddData(float angle, float value);
+void initSensorChart(void);
+
+#endif /* SENSOR_CHART_H_ */

firmware/integration/Fields.java

@@ -5,8 +5,8 @@ package com.rusefi.config;
  */
 
 public class Fields {
-    public static final Field SENSOR_SNIFFER_FREQUENCY = new Field(@@analogChartFrequency@@, FieldType.INT);
-    public static final Field SENSOR_SNIFFER_MODE = new Field(@@analogChartMode@@, FieldType.ANALOG_CHART_E);
+    public static final Field SENSOR_SNIFFER_FREQUENCY = new Field(@@sensorChartFrequency@@, FieldType.INT);
+    public static final Field SENSOR_SNIFFER_MODE = new Field(@@sensorChartMode@@, FieldType.ANALOG_CHART_E);
     public static final Field GLOBAL_FUEL_CORRECTION = new Field(@@globalFuelCorrection@@, FieldType.FLOAT);
     public static final Field ENGINE_SNIFFER_SIZE = new Field(@@digitalChartSize@@, FieldType.INT);
     public static final Field isDigitalChartEnabled = new Field(@@isDigitalChartEnabled@@, FieldType.BIT, 5);

firmware/integration/rusefi_config.txt

@@ -197,7 +197,7 @@ log_format_e logFormat;
 	
 	adc_channel_e tpsAdcChannel;
 	int overrideCrankingIgnition;
-	int analogChartFrequency;;"index",      1,      0,       0, 300,      0 ; size 4
+	int sensorChartFrequency;;"index",      1,      0,       0, 300,      0 ; size 4
 
 struct trigger_config_s @brief Trigger wheel(s) configuration
 
@@ -393,8 +393,8 @@ custom fsio_setting_t 4 scalar,  F32,   @OFFSET@, 		"Val",	   1,	   0,       0,
 	brain_pin_e joystickCPin;
 	brain_pin_e joystickDPin;
 
-custom analog_chart_e 4 bits, S32, @OFFSET@, [0:1], "none", "trigger", "MAP", "INVALID"		
-analog_chart_e analogChartMode;
+custom sensor_chart_e 4 bits, S32, @OFFSET@, [0:1], "none", "trigger", "MAP", "INVALID"		
+sensor_chart_e sensorChartMode;
 maf_sensor_type_e mafSensorType;
 
 brain_pin_e vehicleSpeedSensorInputPin;

firmware/rusefi.cpp

@@ -290,5 +290,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 20150421;
+	return 20150423;
 }

java_console/ui/src/com/rusefi/AnalogChartPanel.java

@@ -2,6 +2,7 @@ package com.rusefi;
 
 import com.rusefi.config.Fields;
 import com.rusefi.ui.RpmModel;
+import com.rusefi.ui.config.EnumConfigField;
 import com.rusefi.ui.util.UiUtils;
 import com.rusefi.ui.engine.EngineSnifferPanel;
 import com.rusefi.ui.config.ConfigField;
@@ -106,7 +107,7 @@ public class AnalogChartPanel {
         lowerPanel.setBorder(BorderFactory.createLineBorder(Color.white));
         content.add(lowerPanel, BorderLayout.SOUTH);
 
-        lowerPanel.add(new ConfigField(Fields.SENSOR_SNIFFER_MODE, "Sensor chart mode").getContent());
+        lowerPanel.add(new EnumConfigField(Fields.SENSOR_SNIFFER_MODE, "Mode", "Off", "Trigger", "MAP").getContent());
         lowerPanel.add(new ConfigField(Fields.SENSOR_SNIFFER_FREQUENCY, "Every XXX engine cycles").getContent());
         lowerPanel.add(new ConfigField(Fields.GLOBAL_FUEL_CORRECTION, "Global Fuel Correction").getContent());
     }

java_console/ui/src/com/rusefi/Launcher.java

@@ -32,7 +32,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
  * @see com.rusefi.StartupFrame
  */
 public class Launcher {
-    public static final int CONSOLE_VERSION = 20150422;
+    public static final int CONSOLE_VERSION = 20150423;
     public static final boolean SHOW_STIMULATOR = false;
     private static final String TAB_INDEX = "main_tab";
     protected static final String PORT_KEY = "port";

java_console/ui/src/com/rusefi/ui/config/EnumConfigField.java

@@ -0,0 +1,48 @@
+package com.rusefi.ui.config;
+
+import com.rusefi.config.Field;
+import com.rusefi.core.MessagesCentral;
+import com.rusefi.core.Pair;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class EnumConfigField extends BaseConfigField {
+    private final JComboBox<String> view = new JComboBox<>();
+    private boolean ec;
+
+    public EnumConfigField(final Field field, String caption, String... options) {
+        super(field);
+
+        for (String option : options)
+            view.addItem(option);
+
+        createUi(caption, view);
+
+        MessagesCentral.getInstance().addListener(new MessagesCentral.MessageListener() {
+            @Override
+            public void onMessage(Class clazz, String message) {
+                if (Field.isIntValueMessage(message)) {
+                    Pair<Integer, ?> p = Field.parseResponse(message);
+                    if (p != null && p.first == field.getOffset()) {
+                        int value = (Integer) p.second;
+                        ec = true;
+                        view.setSelectedIndex(value);
+                        onValueArrived();
+                        ec = false;
+                    }
+                }
+            }
+        });
+
+        view.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (ec)
+                    return;
+                sendValue(field, Integer.toString(view.getSelectedIndex()));
+            }
+        });
+    }
+}

unit_tests/test_trigger_decoder.cpp

@@ -509,6 +509,8 @@ void testTriggerDecoder(void) {
 	// lame duty cycle implementation!
 	testTriggerDecoder2("ford aspire", FORD_ASPIRE_1996, 4, 0.0, 0.5);
 
+	testTriggerDecoder2("dodge ram", DODGE_RAM, 0, 0.7500, 0);
+
 	//testTriggerDecoder2("bmw", BMW_E34, 0, 0.9750, 0.5167);
 	testTriggerDecoder2("bmw", BMW_E34, 0, 0.4667, 0.0);