auto-sync

firmware/controllers/algo/engine_configuration_generated_structures.h

@@ -1,4 +1,4 @@
-// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Mar 01 22:57:52 EST 2016
+// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Mar 03 21:43:13 EST 2016
 // begin
 #ifndef ENGINE_CONFIGURATION_GENERATED_H_
 #define ENGINE_CONFIGURATION_GENERATED_H_
@@ -1643,9 +1643,35 @@ typedef struct {
 	 * offset 16024
 	 */
 	float afrRpmBins[FUEL_RPM_COUNT];
-	/** total size 16088*/
+	/**
+	 * offset 16088
+	 */
+	fsio_table_8x8_t fsioTable1;
+	/**
+	 * offset 16344
+	 */
+	float fsioTable1LoadBins[FSIO_TABLE_8];
+	/**
+	 * RPM is float and not integer in order to use unified methods for interpolation
+	 * offset 16376
+	 */
+	float fsioTable1RpmBins[FSIO_TABLE_8];
+	/**
+	 * offset 16408
+	 */
+	fsio_table_8x8_t fsioTable2;
+	/**
+	 * offset 16664
+	 */
+	float fsioTable2LoadBins[FSIO_TABLE_8];
+	/**
+	 * RPM is float and not integer in order to use unified methods for interpolation
+	 * offset 16696
+	 */
+	float fsioTable2RpmBins[FSIO_TABLE_8];
+	/** total size 16728*/
 } persistent_config_s;
 
 #endif
 // end
-// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Mar 01 22:57:52 EST 2016
+// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Mar 03 21:43:13 EST 2016

firmware/controllers/algo/rusefi_generated.h

@@ -810,4 +810,14 @@
 #define afrTable_offset 14936
 #define afrLoadBins_offset 15960
 #define afrRpmBins_offset 16024
-#define TOTAL_CONFIG_SIZE 16088
+#define fsioTable1_offset 16088
+#define fsioTable1LoadBins_offset 16344
+#define fsioTable1RpmBins_offset 16376
+#define fsioTable2_offset 16408
+#define fsioTable2_offset_hex 4018
+#define fsioTable2LoadBins_offset 16664
+#define fsioTable2LoadBins_offset_hex 4118
+#define fsioTable2RpmBins_offset 16696
+#define fsioTable2RpmBins_offset_hex 4138
+#define TOTAL_CONFIG_SIZE 16728
+#define TOTAL_CONFIG_SIZE_hex 4158

firmware/rusefi.cpp

@@ -275,5 +275,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 20160302;
+	return 20160303;
 }

java_console/io/src/com/rusefi/TsPageSize.java

@@ -1,5 +1,5 @@
 package com.rusefi;
 
 public interface TsPageSize {
-    int IMAGE_SIZE = 16088;
+    int IMAGE_SIZE = 16728;
 }

java_console/models/src/com/rusefi/config/Fields.java

@@ -1,6 +1,6 @@
 package com.rusefi.config;
 
-// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Feb 28 00:56:56 EST 2016
+// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Mar 03 21:43:13 EST 2016
 public class Fields {
 	public static final int LE_COMMAND_LENGTH = 200;
 	public static final int TS_FILE_VERSION = 20160122;
@@ -26,6 +26,7 @@ public class Fields {
 	public static final int LE_COMMAND_COUNT = 16;
 	public static final int FUEL_RPM_COUNT = 16;
 	public static final int FUEL_LOAD_COUNT = 16;
+	public static final int FSIO_TABLE_8 = 8;
 	public static final int BARO_CORR_SIZE = 4;
 	public static final int MAF_DECODING_COUNT = 256;
 	public static final int engineConfiguration_offset = 0;
@@ -813,7 +814,17 @@ public class Fields {
 	public static final int afrTable_offset = 14936;
 	public static final int afrLoadBins_offset = 15960;
 	public static final int afrRpmBins_offset = 16024;
-	public static final int TOTAL_CONFIG_SIZE = 16088;
+	public static final int fsioTable1_offset = 16088;
+	public static final int fsioTable1LoadBins_offset = 16344;
+	public static final int fsioTable1RpmBins_offset = 16376;
+	public static final int fsioTable2_offset = 16408;
+	public static final int fsioTable2_offset_hex = 4018;
+	public static final int fsioTable2LoadBins_offset = 16664;
+	public static final int fsioTable2LoadBins_offset_hex = 4118;
+	public static final int fsioTable2RpmBins_offset = 16696;
+	public static final int fsioTable2RpmBins_offset_hex = 4138;
+	public static final int TOTAL_CONFIG_SIZE = 16728;
+	public static final int TOTAL_CONFIG_SIZE_hex = 4158;
 	public static final Field ENGINETYPE = Field.create("ENGINETYPE", 0, FieldType.INT);
 	public static final Field ENGINESNIFFERRPMTHRESHOLD = Field.create("ENGINESNIFFERRPMTHRESHOLD", 4, FieldType.INT);
 	public static final Field INJECTOR_FLOW = Field.create("INJECTOR_FLOW", 8, FieldType.FLOAT);
@@ -1311,4 +1322,6 @@ public class Fields {
 	public static final Field IGNITIONTABLE = Field.create("IGNITIONTABLE", 12632, FieldType.INT);
 	public static final Field VETABLE = Field.create("VETABLE", 13784, FieldType.INT);
 	public static final Field AFRTABLE = Field.create("AFRTABLE", 14936, FieldType.INT);
+	public static final Field FSIOTABLE1 = Field.create("FSIOTABLE1", 16088, FieldType.INT);
+	public static final Field FSIOTABLE2 = Field.create("FSIOTABLE2", 16408, FieldType.INT);
 }

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

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