auto-sync

firmware/console/status_loop.cpp

@@ -517,6 +517,8 @@ static THD_WORKING_AREA(tsThreadStack, UTILITY_THREAD_STACK_SIZE);
 
 #if EFI_TUNER_STUDIO
 
+extern Map3D1616 veMap;
+
 void updateTunerStudioState(Engine *engine, TunerStudioOutputChannels *tsOutputChannels) {
 #if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__)
 	int rpm = getRpmE(engine);
@@ -543,6 +545,7 @@ void updateTunerStudioState(Engine *engine, TunerStudioOutputChannels *tsOutputC
 	tsOutputChannels->throttlePositon = tps;
 	tsOutputChannels->massAirFlowVoltage = getMaf();
 	tsOutputChannels->massAirFlowValue = getRealMaf();
+	tsOutputChannels->massAirFlowValue = veMap.getValue(getMap(), rpm);
 	tsOutputChannels->airFuelRatio = getAfr();
 	tsOutputChannels->v_batt = getVBatt(engineConfiguration);
 	tsOutputChannels->tpsADC = getTPS10bitAdc(PASS_ENGINE_PARAMETER_F);

firmware/console/tunerstudio/tunerstudio_configuration.h

@@ -16,10 +16,10 @@
 /**
  * this is used to confirm that firmware and TunerStudio are using the same rusefi.ini version
  */
-#define TS_FILE_VERSION 20150211
+#define TS_FILE_VERSION 20150216
 
 #define PAGE_0_SIZE 15160
-#define TS_OUTPUT_SIZE 116
+#define TS_OUTPUT_SIZE 196
 
 typedef struct {
 	uint16_t values[EGT_CHANNEL_COUNT];
@@ -82,7 +82,8 @@ typedef struct {
 	egt_values_s egtValues;
 	float rpmAcceleration;
 	float massAirFlowValue;
-	int unused3[1];
+	float veValue;
+	int unused3[20];
 } TunerStudioOutputChannels;
 
 #endif /* TUNERSTUDIO_CONFIGURATION_H_ */

firmware/controllers/math/speed_density.cpp

@@ -22,7 +22,7 @@
 #define rpmMin 500
 #define rpmMax 8000
 
-static Map3D1616 veMap;
+Map3D1616 veMap;
 Map3D1616 ve2Map;
 Map3D1616 afrMap;
 

firmware/controllers/trigger/trigger_chrysler.cpp

@@ -18,7 +18,7 @@ void configureNeon2003TriggerShape(TriggerShape *s) {
 	s->gapBothDirections = true;
 
 	// are these non-default values really needed here now that the gap is finally precise?
-	s->setTriggerSynchronizationGap2(0.8 * CHRYSLER_NGC_GAP, 1.55 * CHRYSLER_NGC_GAP);
+	s->setTriggerSynchronizationGap2(0.5 * CHRYSLER_NGC_GAP, 1.5 * CHRYSLER_NGC_GAP);
 
 	/*
 	s->addEvent(base + 26, T_PRIMARY, TV_HIGH);

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

@@ -41,12 +41,18 @@ public class AnalogChartPanel {
 
         AnalogChartCentral.addListener(new AnalogChartCentral.AnalogChartListener() {
             @Override
-            public void onAnalogChart(String message) {
-                unpackValues(values, message);
-                if (!paused) {
-                    processValues();
-                    UiUtils.trueRepaint(canvas);
-                }
+            public void onAnalogChart(final String message) {
+                // this callback is invoked from the connectivity thread, need to handle in AWT for thread-safety
+                SwingUtilities.invokeLater(new Runnable() {
+                    @Override
+                    public void run() {
+                        unpackValues(values, message);
+                        if (!paused) {
+                            processValues();
+                            UiUtils.trueRepaint(canvas);
+                        }
+                    }
+                });
             }
         });