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

migrating console away from text protocol

This commit is contained in:
rusefi 2019-01-13 16:19:32 -05:00
parent 1bcefa5690
commit 2931f8d361
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@ import static com.rusefi.config.Fields.*;
* 2/11/13
*/
public enum Sensor {
MAP("MAP", SensorCategory.SENSOR_INPUTS),
MAP("MAP", SensorCategory.SENSOR_INPUTS, FieldType.FLOAT, /*offset */ 40, BackgroundColor.MUD, 20, 300),
MAP_RAW("MAP_RAW", SensorCategory.SENSOR_INPUTS),
BARO("Baro", SensorCategory.SENSOR_INPUTS),
// todo: unify with ignitionAdvance
@ -26,9 +26,9 @@ public enum Sensor {
/**
* Please note that these enum names are used to make 'set_mock_XXX_voltage' commands
*/
CLT("Coolant", SensorCategory.SENSOR_INPUTS, "temperature, C", -40, 300),
AFR("A/F ratio", SensorCategory.SENSOR_INPUTS, "", 0, 20),
MAF("MAF", SensorCategory.SENSOR_INPUTS, "Volts", 4),
CLT("Coolant", SensorCategory.SENSOR_INPUTS, FieldType.FLOAT, /*offset */ 4, BackgroundColor.MUD, -40, 300),
AFR("A/F ratio", SensorCategory.SENSOR_INPUTS, FieldType.FLOAT, /*offset */ 20, BackgroundColor.MUD, 0, 20),
MAF("MAF", SensorCategory.SENSOR_INPUTS, FieldType.FLOAT, /*offset */ 16, BackgroundColor.MUD, 0, 5),
MAFR("MAFR", SensorCategory.SENSOR_INPUTS, "kg/hr", 4),
knockCount("Knock", SensorCategory.SENSOR_INPUTS, "count", 30),
@ -197,6 +197,12 @@ public enum Sensor {
this(name, category, type, offset, color, 0, 100);
}
/**
* Text-based protocol is not very alive
* @param name
* @param category
*/
@Deprecated
Sensor(String name, SensorCategory category) {
this(name, category, "", 255);
}

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

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