auto-sync

firmware/console/status_loop.cpp

@@ -368,6 +368,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels) {
 	tsOutputChannels->mass_air_flow = getMaf();
 	tsOutputChannels->air_fuel_ratio = getAfr();
 	tsOutputChannels->v_batt = getVBatt();
+	tsOutputChannels->tsConfigVersion = TS_FILE_VERSION;
 	tsOutputChannels->tpsADC = getTPS10bitAdc();
 	tsOutputChannels->atmospherePressure = getBaroPressure();
 	tsOutputChannels->manifold_air_pressure = getMap();

firmware/console/tunerstudio/tunerstudio_configuration.h

@@ -11,6 +11,12 @@
 #ifndef TUNERSTUDIO_CONFIGURATION_H_
 #define TUNERSTUDIO_CONFIGURATION_H_
 
+/**
+ * this is used to confirm that firmware and TunerStudio are using the same rusefi.ini version
+ */
+#define TS_FILE_VERSION 20140910
+
+
 /**
  * please be aware that current "stable" version of TunerStudio does not
  * support 'float' (F32) type. You would need a beta version to handle floats
@@ -56,7 +62,8 @@ typedef struct {
 	unsigned int isCltError : 1; // bit 1
 	unsigned int isMapError : 1; // bit 2
 	unsigned int isIatError : 1; // bit 3
-	int unused[8];
+	int tsConfigVersion;
+	int unused[7];
 } TunerStudioOutputChannels;
 
 #endif /* TUNERSTUDIO_CONFIGURATION_H_ */

firmware/controllers/algo/engine_configuration.h

@@ -213,16 +213,13 @@ typedef struct {
  *  todo: re-arrange this structure one we have a stable code version
  */
 typedef struct {
-	float injectorLag;	// size 4, offset 0
+	// WARNING: by default, our small enums are ONE BYTE. but if the are surrounded by non-enums - alignments do the trick
+	engine_type_e engineType;
 	/**
-	 * cc/min, cubic centimeter per minute
-	 *
-	 * By the way, g/s = 0.125997881 * (lb/hr)
-	 * g/s = 0.125997881 * (cc/min)/10.5
-	 * g/s = 0.0119997981 * cc/min
-	 *
+	 * this magic number is used to make sure that what we read from Flash is in fact some configuration
 	 */
-	float injectorFlow; // size 4, offset 4
+	int headerMagicValue;
+
 	float battInjectorLagCorrBins[VBAT_INJECTOR_CURVE_SIZE]; // size 32, offset 8
 	float battInjectorLagCorr[VBAT_INJECTOR_CURVE_SIZE]; // size 32, offset 40
 
@@ -277,8 +274,8 @@ typedef struct {
 	 */
 	float fixedModeTiming;
 
-	// WARNING: by default, our small enums are ONE BYTE. but if the are surrounded by non-enums - alignments do the trick
-	engine_type_e engineType;
+	float injectorLag;	// size 4, offset 0
+
 
 	float fuelLoadBins[FUEL_LOAD_COUNT]; //
 	// RPM is float and not integer in order to use unified methods for interpolation
@@ -409,8 +406,17 @@ typedef struct {
 	bool needSecondTriggerInput : 1; // bit 4
 
 	int digitalChartSize;
+	/**
+	 * cc/min, cubic centimeter per minute
+	 *
+	 * By the way, g/s = 0.125997881 * (lb/hr)
+	 * g/s = 0.125997881 * (cc/min)/10.5
+	 * g/s = 0.0119997981 * cc/min
+	 *
+	 */
+	float injectorFlow; // size 4
 
-	int unused3[7];
+	int unused3[6];
 
 } engine_configuration_s;
 

firmware/controllers/flash_main.h

@@ -11,7 +11,7 @@
 
 #include "engine_configuration.h"
 
-#define FLASH_DATA_VERSION 4560
+#define FLASH_DATA_VERSION 4615
 
 #ifdef __cplusplus
 extern "C"