diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index e644c7b052..39e8948e5a 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1520,6 +1520,9 @@ #define GAUGE_NAME_VBAT "VBatt" #define GAUGE_NAME_ENGINE_LOAD "Engine Load" #define GAUGE_NAME_CPU_TEMP "CPU Temperature" +#define INDICATOR_NAME_CLUTCH_UP "clutch: up" +#define INDICATOR_NAME_CLUTCH_DOWN "clutch: down" +#define INDICATOR_NAME_BRAKE_DOWN "brake: down" #define GAUGE_NAME_WARNING_LAST "warning: last" #define GAUGE_NAME_WARNING_COUNTER "warning: counter" #define GAUGE_NAME_KNOCK_LEVEL "knock: current level" diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 9bb90d51d8..bcea3bcda9 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -890,6 +890,11 @@ end_struct #define GAUGE_NAME_ENGINE_LOAD "Engine Load" #define GAUGE_NAME_CPU_TEMP "CPU Temperature" +#define INDICATOR_NAME_CLUTCH_UP "clutch: up" +#define INDICATOR_NAME_CLUTCH_DOWN "clutch: down" +#define INDICATOR_NAME_BRAKE_DOWN "brake: down" + + #define GAUGE_NAME_WARNING_LAST "warning: last" #define GAUGE_NAME_WARNING_COUNTER "warning: counter" diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index f5f149c4b8..18aa846062 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -45,7 +45,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon May 15 20:09:29 EDT 2017 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon May 15 20:14:12 EDT 2017 pageSize = 16376 page = 1 @@ -1398,7 +1398,7 @@ fileVersion = { 20161225 } entry = clutchUpState, "clutch: up",int,"%d" entry = clutchDownState, "clutch: down",int,"%d" - entry = brakePedalIndicator, "brake pedal",int,"%d" + entry = brakePedalIndicator, "brake: down",int,"%d" ; tpsADC = U16, "ADC", diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index e0b815edfe..e3657d3dee 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -656,9 +656,9 @@ fileVersion = { 20161225 } entry = tCharge, "tCharge",float,"%.3f" - entry = clutchUpState, "clutch: up",int,"%d" - entry = clutchDownState, "clutch: down",int,"%d" - entry = brakePedalIndicator, "brake pedal",int,"%d" + entry = clutchUpState, @@INDICATOR_NAME_CLUTCH_UP@@,int,"%d" + entry = clutchDownState, @@INDICATOR_NAME_CLUTCH_DOWN@@,int,"%d" + entry = brakePedalIndicator, @@INDICATOR_NAME_BRAKE_DOWN@@,int,"%d" ; tpsADC = U16, "ADC", diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 75868a22fb..62cce4fb75 100644 --- a/java_console/models/src/com/rusefi/config/Fields.java +++ b/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 Mon May 15 04:47:12 EDT 2017 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon May 15 20:14:12 EDT 2017 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int FSIO_ADC_COUNT = 4; @@ -1044,6 +1044,9 @@ public class Fields { public static final String GAUGE_NAME_VBAT = "VBatt"; public static final String GAUGE_NAME_ENGINE_LOAD = "Engine Load"; public static final String GAUGE_NAME_CPU_TEMP = "CPU Temperature"; + public static final String INDICATOR_NAME_CLUTCH_UP = "clutch: up"; + public static final String INDICATOR_NAME_CLUTCH_DOWN = "clutch: down"; + public static final String INDICATOR_NAME_BRAKE_DOWN = "brake: down"; public static final String GAUGE_NAME_WARNING_LAST = "warning: last"; public static final String GAUGE_NAME_WARNING_COUNTER = "warning: counter"; public static final String GAUGE_NAME_KNOCK_LEVEL = "knock: current level";