From f51810bec93aec8a5fa7a4065f10ab5fbd1618eb Mon Sep 17 00:00:00 2001
From: rusefi <arro239+rusefi@gmail.com>
Date: Sun, 3 Dec 2017 16:11:39 -0500
Subject: [PATCH] #490 FSIO curves to console table editor

---
 firmware/integration/rusefi.xml              | 20 ++++++++++++++++++
 firmware/rusefi.cpp                          |  2 +-
 java_console/rusefi.xml                      | 22 +++++++++++++++++++-
 java_console/ui/src/com/rusefi/Launcher.java |  2 +-
 4 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/firmware/integration/rusefi.xml b/firmware/integration/rusefi.xml
index c414ee927e..c03ea3db81 100644
--- a/firmware/integration/rusefi.xml
+++ b/firmware/integration/rusefi.xml
@@ -188,6 +188,26 @@
             </table>
         </table>
 
+        <table type="2D" name="FSIO Curve #1" storageaddress="@@fsioCurve1_offset_hex@@"
+        category="FSIO"
+               sizex="@@FSIO_CURVE_16@@" storagetype="float" endian="big">
+            <scaling units="Compensation (%)" expression="x" to_byte="x" format="0.00"
+                     fineincrement=".01" coarseincrement="0.1"/>
+            <table type="X Axis" storageaddress="@@fsioCurve1Bins_offset_hex@@" storagetype="float" endian="big">
+                <scaling units="uni" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
+            </table>
+        </table>
+
+        <table type="2D" name="FSIO Curve #2" storageaddress="@@fsioCurve2_offset_hex@@"
+        category="FSIO"
+               sizex="@@FSIO_CURVE_16@@" storagetype="float" endian="big">
+            <scaling units="Compensation (%)" expression="x" to_byte="x" format="0.00"
+                     fineincrement=".01" coarseincrement="0.1"/>
+            <table type="X Axis" storageaddress="@@fsioCurve2Bins_offset_hex@@" storagetype="float" endian="big">
+                <scaling units="uni" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
+            </table>
+        </table>
+
         <table type="2D" name="Coolant temperature-based extra idle air" storageaddress="@@cltIdleCorr_offset_hex@@"
                sizex="@@CLT_CURVE_SIZE@@" storagetype="float" endian="big">
             <scaling units="Compensation (%)" expression="x" to_byte="x" format="0.00"
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index 0d941620d0..b655d824df 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -260,5 +260,5 @@ int getRusEfiVersion(void) {
 	if (initBootloader() != 0)
 		return 123;
 #endif /* EFI_BOOTLOADER_INCLUDE_CODE */
-	return 20171202;
+	return 20171203;
 }
diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml
index ac2b1a4b20..6461645bb6 100644
--- a/java_console/rusefi.xml
+++ b/java_console/rusefi.xml
@@ -1,6 +1,6 @@
 <roms>
 
-<!-- Generated by ConfigDefinition utility on Sun Nov 19 13:55:55 EST 2017 -->
+<!-- Generated by ConfigDefinition utility on Sun Dec 03 16:09:13 EST 2017 -->
 
     <rom>
         <romid>
@@ -188,6 +188,26 @@
             </table>
         </table>
 
+        <table type="2D" name="FSIO Curve #1" storageaddress="ba8"
+        category="FSIO"
+               sizex="16" storagetype="float" endian="big">
+            <scaling units="Compensation (%)" expression="x" to_byte="x" format="0.00"
+                     fineincrement=".01" coarseincrement="0.1"/>
+            <table type="X Axis" storageaddress="b68" storagetype="float" endian="big">
+                <scaling units="uni" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
+            </table>
+        </table>
+
+        <table type="2D" name="FSIO Curve #2" storageaddress="c28"
+        category="FSIO"
+               sizex="16" storagetype="float" endian="big">
+            <scaling units="Compensation (%)" expression="x" to_byte="x" format="0.00"
+                     fineincrement=".01" coarseincrement="0.1"/>
+            <table type="X Axis" storageaddress="be8" storagetype="float" endian="big">
+                <scaling units="uni" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
+            </table>
+        </table>
+
         <table type="2D" name="Coolant temperature-based extra idle air" storageaddress="29e0"
                sizex="16" storagetype="float" endian="big">
             <scaling units="Compensation (%)" expression="x" to_byte="x" format="0.00"
diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java
index f3affa2dc4..96eba9d7a9 100644
--- a/java_console/ui/src/com/rusefi/Launcher.java
+++ b/java_console/ui/src/com/rusefi/Launcher.java
@@ -45,7 +45,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
  * @see EngineSnifferPanel
  */
 public class Launcher {
-    public static final int CONSOLE_VERSION = 20171119;
+    public static final int CONSOLE_VERSION = 20171203;
     public static final boolean SHOW_STIMULATOR = false;
     private static final String TAB_INDEX = "main_tab";
     protected static final String PORT_KEY = "port";