auto-sync

firmware/console/binary/tunerstudio.cpp

@@ -272,9 +272,9 @@ void handleCrc32Check(ts_channel_s *tsChannel, ts_response_format_e mode, uint16
 
 	count = SWAP_UINT16(count);
 
-	count = 14008;
+	count = getTunerStudioPageSize(pageId);
 
-	scheduleMsg(&tsLogger, "CRC32 request: offset %d size %d", offset, count);
+	scheduleMsg(&tsLogger, "CRC32 request: pageId %d offset %d size %d", pageId, offset, count);
 
 	uint32_t crc = SWAP_UINT32(crc32((void * ) getWorkingPageAddr(0), count));
 

firmware/gen_config.bat

@@ -1,2 +1,2 @@
 
-java -jar ../java_tools/ConfigDefinition.jar integration tunerstudio controllers\algo
+java -jar ../java_tools/ConfigDefinition.jar integration tunerstudio controllers\algo ../java_console/io/src

firmware/integration/rusefi_config.txt

@@ -516,6 +516,15 @@ fuel_table_t injectionPhase;
 float[FUEL_LOAD_COUNT] injPhaseLoadBins;;"Load",   1,   0.0,        0,  300.0,   2
 float[FUEL_RPM_COUNT] injPhaseRpmBins;;"RPM",	   1,   0.0,        0,  18000.0, 2
 
+! ignition_table_t ignitionIatCorrTable;
+! float[IGN_LOAD_COUNT] ignitionIatCorrLoadBins;;"Load",   1,   0.0,        0,  300.0,   2
+! float[IGN_RPM_COUNT] ignitionIatCorrRpmBins;;"RPM",	   1,   0.0,        0,  18000.0, 2
+
+
+! float[IAT_CURVE_SIZE] iatIdleCorrBins;;"C",        1,     0,   -100.0,    250.0,  2
+! float[IAT_CURVE_SIZE] iatIdleCorr;;"%",      100,     0,      0.0,    500.0,   2
+
+
 ! ve_table_t ve2Table;
 ! float[FUEL_LOAD_COUNT] ve2LoadBins;;"%",	1,   0.0,        0,  300.0,   2
 ! float[FUEL_RPM_COUNT] ve2RpmBins;;"RPM",	   1,   0.0,        0,  18000.0, 2

firmware/rusefi.cpp

@@ -269,12 +269,12 @@ void firmwareError(const char *errorMsg, ...) {
 
 static char UNUSED_RAM_SIZE[2999];
 
-static char UNUSED_CCM_SIZE[4900] CCM_OPTIONAL;
+static char UNUSED_CCM_SIZE[3600] CCM_OPTIONAL;
 
 int getRusEfiVersion(void) {
 	if (UNUSED_RAM_SIZE[0]== 0)
 		return 1; // this is here to make the compiler happy about the unused array
 	if (UNUSED_CCM_SIZE[0] == 0)
 		return 1; // this is here to make the compiler happy about the unused array
-	return 20150329;
+	return 20150330;
 }

firmware/tunerstudio/rusefi.ini

@@ -14,7 +14,6 @@ enable2ndByteCanID = false
    endianness          = little
    nPages              = 1
   
-   pageSize            = 14008
 
    pageIdentifier      = "\x00\x00"
    pageReadCommand     = "R\x00\x00%2o%2c"
@@ -41,8 +40,9 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated by ConfigDefinition.jar on Sun Mar 29 20:08:13 EDT 2015
+; this section was generated by ConfigDefinition.jar on Mon Mar 30 10:47:35 EDT 2015
 
+pageSize            = 14008
 page = 1
 	engineType					 = bits, S32, 0, [0:2], "AUDI_AAN", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD", "FORD_INLINE_6_1995", "GY6_139QMB"
 ;skipping headerMagicValue offset 4

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

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

java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java

@@ -16,7 +16,6 @@ import java.util.Arrays;
  * 3/6/2015
  */
 public class BinaryProtocol {
-    public static final int IMAGE_SIZE = 14008;
     private static final int BLOCKING_FACTOR = 256;
     private static final byte RESPONSE_OK = 0;
     private static final byte RESPONSE_BURN_OK = 0x04;

java_console/io/src/com/rusefi/io/serial/PortHolder.java

@@ -1,8 +1,8 @@
 package com.rusefi.io.serial;
 
 import com.rusefi.FileLog;
-import com.rusefi.Logger;
 import com.rusefi.Timeouts;
+import com.rusefi.TsPageSize;
 import com.rusefi.binaryprotocol.BinaryProtocol;
 import com.rusefi.core.MessagesCentral;
 import com.rusefi.io.CommandQueue;
@@ -79,7 +79,7 @@ public class PortHolder {
         bp = new BinaryProtocol(FileLog.LOGGER, serialPort);
 
         bp.switchToBinaryProtocol();
-        bp.readImage(BinaryProtocol.IMAGE_SIZE);
+        bp.readImage(TsPageSize.IMAGE_SIZE);
         if (bp.isClosed)
             return false;
 

java_console/ui/src/com/rusefi/binaryprotocol/BinaryProtocolCmd.java

@@ -2,10 +2,7 @@ package com.rusefi.binaryprotocol;
 
 import com.romraider.editor.ecu.ECUEditor;
 import com.romraider.util.SettingsManager;
-import com.rusefi.ConfigurationImage;
-import com.rusefi.Logger;
-import com.rusefi.RomRaiderWrapper;
-import com.rusefi.UploadChanges;
+import com.rusefi.*;
 import com.rusefi.io.serial.PortHolder;
 import jssc.SerialPort;
 
@@ -41,7 +38,7 @@ public class BinaryProtocolCmd {
         logger.info("Looks good");
         bp.switchToBinaryProtocol();
 
-        bp.readImage(BinaryProtocol.IMAGE_SIZE);
+        bp.readImage(TsPageSize.IMAGE_SIZE);
         //
 //        image.saveToFile("rusefi_configuration.bin");
 //