rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2016-07-07 22:02:55 -04:00
parent c93669cef5
commit a21428a9e9
5 changed files with 80 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
firmware/integration/rusefi.xml
View File

@ -30,7 +30,7 @@
<table type="3D" name="Ignition Advance IAT correction"
category="Ignition"
storageaddress="@@ignitionIatCorrTable_offset_hex@@"
sizex="@@IGN_LOAD_COUNT@@" sizey="@@IGN_RPM_COUNT@@" storagetype="float" endian="big">
sizex="@@IGN_RPM_COUNT@@" sizey="@@IGN_LOAD_COUNT@@" storagetype="float" endian="big">
<scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
coarseincrement="1"/>
<table type="X Axis" storageaddress="@@ignitionIatCorrRpmBins_offset_hex@@" storagetype="float" endian="big"
@ -47,7 +47,7 @@
<table type="3D" name="Volumetric Efficiency"
category="Fuel"
storageaddress="@@veTable_offset_hex@@"
sizex="@@FUEL_LOAD_COUNT@@" sizey="@@FUEL_RPM_COUNT@@" storagetype="float" endian="big">
sizex="@@FUEL_RPM_COUNT@@" sizey="@@FUEL_LOAD_COUNT@@" storagetype="float" endian="big">
<scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
coarseincrement="1"/>
<table type="X Axis" storageaddress="@@veRpmBins_offset_hex@@" storagetype="float" endian="big"
@ -63,18 +63,18 @@
<table type="3D" name="Fuel Table"
category="Fuel"
storageaddress="@@fuelTable_offset_hex@@" sizex="@@FUEL_LOAD_COUNT@@"
sizey="@@FUEL_RPM_COUNT@@" storagetype="float" endian="big">
storageaddress="@@fuelTable_offset_hex@@" sizex="@@FUEL_RPM_COUNT@@"
sizey="@@FUEL_LOAD_COUNT@@" storagetype="float" endian="big">
<scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
coarseincrement="1"/>
<table type="X Axis" storageaddress="@@fuelLoadBins_offset_hex@@" storagetype="float" endian="big"
<table type="X Axis" storageaddress="@@fuelRpmBins_offset_hex@@" storagetype="float" endian="big"
logparam="engine_load">
<scaling units="degree" expression="x" to_byte="x" format="0.00" fineincrement=".1"
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
coarseincrement="1"/>
</table>
<table type="Y Axis" storageaddress="@@fuelRpmBins_offset_hex@@" storagetype="float" endian="big"
<table type="Y Axis" storageaddress="@@fuelLoadBins_offset_hex@@" storagetype="float" endian="big"
logparam="rpm">
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
<scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
</table>
</table>
@ -84,14 +84,14 @@
sizey="@@FSIO_TABLE_8@@" storagetype="float" endian="big">
<scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
coarseincrement="1"/>
<table type="X Axis" storageaddress="@@fsioTable1LoadBins_offset_hex@@" storagetype="float" endian="big"
logparam="engine_load">
<scaling units="degree" expression="x" to_byte="x" format="0.00" fineincrement=".1"
<table type="X Axis" storageaddress="@@fsioTable1RpmBins_offset_hex@@" storagetype="float" endian="big"
logparam="">
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
coarseincrement="1"/>
</table>
<table type="Y Axis" storageaddress="@@fsioTable1RpmBins_offset_hex@@" storagetype="float" endian="big"
<table type="Y Axis" storageaddress="@@fsioTable1LoadBins_offset_hex@@" storagetype="float" endian="big"
logparam="rpm">
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
<scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
</table>
</table>
@ -101,14 +101,14 @@
sizey="@@FSIO_TABLE_8@@" storagetype="uint8" endian="big">
<scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
coarseincrement="1"/>
<table type="X Axis" storageaddress="@@fsioTable2LoadBins_offset_hex@@" storagetype="float" endian="big"
<table type="X Axis" storageaddress="@@fsioTable2RpmBins_offset_hex@@" storagetype="float" endian="big"
logparam="engine_load">
<scaling units="degree" expression="x" to_byte="x" format="0.00" fineincrement=".1"
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
coarseincrement="1"/>
</table>
<table type="Y Axis" storageaddress="@@fsioTable2RpmBins_offset_hex@@" storagetype="float" endian="big"
<table type="Y Axis" storageaddress="@@fsioTable2LoadBins_offset_hex@@" storagetype="float" endian="big"
logparam="rpm">
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
<scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
</table>
</table>
@ -118,14 +118,14 @@
sizey="@@FSIO_TABLE_8@@" storagetype="uint8" endian="big">
<scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
coarseincrement="1"/>
<table type="X Axis" storageaddress="@@fsioTable3LoadBins_offset_hex@@" storagetype="float" endian="big"
logparam="engine_load">
<scaling units="degree" expression="x" to_byte="x" format="0.00" fineincrement=".1"
<table type="X Axis" storageaddress="@@fsioTable3RpmBins_offset_hex@@" storagetype="float" endian="big"
logparam="">
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
coarseincrement="1"/>
</table>
<table type="Y Axis" storageaddress="@@fsioTable3RpmBins_offset_hex@@" storagetype="float" endian="big"
<table type="Y Axis" storageaddress="@@fsioTable3LoadBins_offset_hex@@" storagetype="float" endian="big"
logparam="rpm">
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
<scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
</table>
</table>
@ -135,14 +135,14 @@
sizey="@@FSIO_TABLE_8@@" storagetype="uint8" endian="big">
<scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
coarseincrement="1"/>
<table type="X Axis" storageaddress="@@fsioTable4LoadBins_offset_hex@@" storagetype="float" endian="big"
<table type="X Axis" storageaddress="@@fsioTable4RpmBins_offset_hex@@" storagetype="float" endian="big"
logparam="engine_load">
<scaling units="degree" expression="x" to_byte="x" format="0.00" fineincrement=".1"
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
coarseincrement="1"/>
</table>
<table type="Y Axis" storageaddress="@@fsioTable4RpmBins_offset_hex@@" storagetype="float" endian="big"
logparam="rpm">
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
<table type="Y Axis" storageaddress="@@fsioTable4LoadBins_offset_hex@@" storagetype="float" endian="big"
logparam="engine_load">
<scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
</table>
</table>
@ -152,12 +152,12 @@
sizey="@@FUEL_RPM_COUNT@@" storagetype="uint8" endian="big">
<scaling units="Engine Load" expression="x/10" to_byte="x*10" format="0.00" fineincrement=".1"
coarseincrement="1"/>
<table type="X Axis" storageaddress="@@afrLoadBins_offset_hex@@" storagetype="float" endian="big">
<scaling units="degree" expression="x" to_byte="x" format="0.00" fineincrement=".1"
<table type="X Axis" storageaddress="@@afrRpmBins_offset_hex@@" storagetype="float" endian="big">
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
coarseincrement="1"/>
</table>
<table type="Y Axis" storageaddress="@@afrRpmBins_offset_hex@@" storagetype="float" endian="big">
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
<table type="Y Axis" storageaddress="@@afrLoadBins_offset_hex@@" storagetype="float" endian="big">
<scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
</table>
</table>

17
java_console/.idea/runConfigurations/Launcher_COM5.xml Normal file
View File

@ -0,0 +1,17 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Launcher COM5" type="Application" factoryName="Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" value="com.rusefi.Launcher" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="COM5" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<module name="ui" />
<envs />
<method />
</configuration>
</component>

8
java_console/models/src/com/rusefi/core/Sensor.java
View File

@ -68,10 +68,6 @@ public enum Sensor {
PERIOD0("Period", SensorCategory.SNIFFING, "dg", 0, 400),
DUTY0("Duty0", SensorCategory.SNIFFING, "%", 0, 100, BackgroundColor.RED),
DUTY1("Duty1", SensorCategory.SNIFFING, "%", 0, 100, BackgroundColor.RED),
FUEL("Fuel", SensorCategory.FUEL, "ms", 0, 30),
FUEL_IAT("F IAT", SensorCategory.FUEL, "", 0, 10),
FUEL_CLT("F CLT", SensorCategory.FUEL, "", 0, 10),
FUEL_LAG("F Lag", SensorCategory.FUEL, "", 0, 30),
IDLE_SWITCH("idle switch", SensorCategory.OTHERS),
@ -88,6 +84,10 @@ public enum Sensor {
INJECTOR_3_DWELL("inj #3", SensorCategory.SNIFFING),
INJECTOR_4_DWELL("inj #4", SensorCategory.SNIFFING),
FUEL("Fuel", SensorCategory.FUEL, "ms", 0, 30),
FUEL_IAT("F IAT", SensorCategory.FUEL, "", 0, 10),
FUEL_CLT("F CLT", SensorCategory.FUEL, "", 0, 10),
FUEL_LAG("F Lag", SensorCategory.FUEL, "", 0, 30),
FUEL_BASE(SensorCategory.FUEL, FieldType.FLOAT, 48, BackgroundColor.MUD, 0, 30, "ms"),
T_CHARGE(SensorCategory.FUEL, FieldType.FLOAT, 52, BackgroundColor.MUD, 30, 140),
DWELL(SensorCategory.OPERATIONS, FieldType.FLOAT, 60, BackgroundColor.MUD, 1, 10),

54
java_console/rusefi.xml
View File

@ -67,14 +67,14 @@
sizey="16" storagetype="float" endian="big">
<scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
coarseincrement="1"/>
<table type="X Axis" storageaddress="30f8" storagetype="float" endian="big"
<table type="X Axis" storageaddress="3138" storagetype="float" endian="big"
logparam="engine_load">
<scaling units="degree" expression="x" to_byte="x" format="0.00" fineincrement=".1"
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
coarseincrement="1"/>
</table>
<table type="Y Axis" storageaddress="3138" storagetype="float" endian="big"
<table type="Y Axis" storageaddress="30f8" storagetype="float" endian="big"
logparam="rpm">
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
<scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
</table>
</table>
@ -84,14 +84,14 @@
sizey="8" storagetype="float" endian="big">
<scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
coarseincrement="1"/>
<table type="X Axis" storageaddress="3e38" storagetype="float" endian="big"
logparam="engine_load">
<scaling units="degree" expression="x" to_byte="x" format="0.00" fineincrement=".1"
<table type="X Axis" storageaddress="3e58" storagetype="float" endian="big"
logparam="">
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
coarseincrement="1"/>
</table>
<table type="Y Axis" storageaddress="3e58" storagetype="float" endian="big"
<table type="Y Axis" storageaddress="3e38" storagetype="float" endian="big"
logparam="rpm">
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
<scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
</table>
</table>
@ -101,14 +101,14 @@
sizey="8" storagetype="uint8" endian="big">
<scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
coarseincrement="1"/>
<table type="X Axis" storageaddress="3eb8" storagetype="float" endian="big"
<table type="X Axis" storageaddress="3ed8" storagetype="float" endian="big"
logparam="engine_load">
<scaling units="degree" expression="x" to_byte="x" format="0.00" fineincrement=".1"
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
coarseincrement="1"/>
</table>
<table type="Y Axis" storageaddress="3ed8" storagetype="float" endian="big"
<table type="Y Axis" storageaddress="3eb8" storagetype="float" endian="big"
logparam="rpm">
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
<scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
</table>
</table>
@ -118,14 +118,14 @@
sizey="8" storagetype="uint8" endian="big">
<scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
coarseincrement="1"/>
<table type="X Axis" storageaddress="3f38" storagetype="float" endian="big"
logparam="engine_load">
<scaling units="degree" expression="x" to_byte="x" format="0.00" fineincrement=".1"
<table type="X Axis" storageaddress="3f58" storagetype="float" endian="big"
logparam="">
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
coarseincrement="1"/>
</table>
<table type="Y Axis" storageaddress="3f58" storagetype="float" endian="big"
<table type="Y Axis" storageaddress="3f38" storagetype="float" endian="big"
logparam="rpm">
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
<scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
</table>
</table>
@ -135,14 +135,14 @@
sizey="8" storagetype="uint8" endian="big">
<scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1"
coarseincrement="1"/>
<table type="X Axis" storageaddress="3fb8" storagetype="float" endian="big"
<table type="X Axis" storageaddress="3fd8" storagetype="float" endian="big"
logparam="engine_load">
<scaling units="degree" expression="x" to_byte="x" format="0.00" fineincrement=".1"
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
coarseincrement="1"/>
</table>
<table type="Y Axis" storageaddress="3fd8" storagetype="float" endian="big"
logparam="rpm">
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
<table type="Y Axis" storageaddress="3fb8" storagetype="float" endian="big"
logparam="engine_load">
<scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
</table>
</table>
@ -152,12 +152,12 @@
sizey="16" storagetype="uint8" endian="big">
<scaling units="Engine Load" expression="x/10" to_byte="x*10" format="0.00" fineincrement=".1"
coarseincrement="1"/>
<table type="X Axis" storageaddress="3b78" storagetype="float" endian="big">
<scaling units="degree" expression="x" to_byte="x" format="0.00" fineincrement=".1"
<table type="X Axis" storageaddress="3bb8" storagetype="float" endian="big">
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1"
coarseincrement="1"/>
</table>
<table type="Y Axis" storageaddress="3bb8" storagetype="float" endian="big">
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
<table type="Y Axis" storageaddress="3b78" storagetype="float" endian="big">
<scaling units="engine_load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
</table>
</table>

2
java_console/ui/src/com/rusefi/Launcher.java
View File

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