diff --git a/firmware/config/engines/ford_festiva.cpp b/firmware/config/engines/ford_festiva.cpp index 028cf224f7..97acd7f31c 100644 --- a/firmware/config/engines/ford_festiva.cpp +++ b/firmware/config/engines/ford_festiva.cpp @@ -212,7 +212,6 @@ void setFordEscortGt(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->iat.config.bias_resistor = 2700; // we have a 1999 Auto Miata TB mounted on this car - engineConfiguration->hasTpsSensor = true; engineConfiguration->tpsMin = 630; // convert 12to10 bit (ADC/4) engineConfiguration->tpsMax = 115; // convert 12to10 bit (ADC/4) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 5372aa0850..13ed383ce0 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Dec 25 10:23:53 EST 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Dec 26 13:28:23 EST 2016 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1225,7 +1225,7 @@ typedef struct { bool unusedBit__3 : 1; /** offset 1488 bit 15 */ - bool hasTpsSensor : 1; + bool unusedbit_8 : 1; /** offset 1488 bit 16 */ bool cutFuelOnHardLimit : 1; @@ -2006,4 +2006,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Dec 25 10:23:53 EST 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Dec 26 13:28:23 EST 2016 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index f213798d83..50084c4af0 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -630,7 +630,7 @@ #define isGpsEnabled_offset 1488 #define isAlternatorControlEnabled_offset 1488 #define unusedBit__3_offset 1488 -#define hasTpsSensor_offset 1488 +#define unusedbit_8_offset 1488 #define cutFuelOnHardLimit_offset 1488 #define cutSparkOnHardLimit_offset 1488 #define step1fuelCutEnable_offset 1488 diff --git a/firmware/controllers/sensors/tps.cpp b/firmware/controllers/sensors/tps.cpp index 3c7f813af0..1fbb1be714 100644 --- a/firmware/controllers/sensors/tps.cpp +++ b/firmware/controllers/sensors/tps.cpp @@ -129,7 +129,7 @@ bool hasTpsSensor(DECLARE_ENGINE_PARAMETER_F) { } percent_t getTPS(DECLARE_ENGINE_PARAMETER_F) { - if (!engineConfiguration->hasTpsSensor) + if (!hasTpsSensor(PASS_ENGINE_PARAMETER_F)) return NO_TPS_MAGIC_VALUE; // todo: if (config->isDualTps) // todo: blah blah diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index 5ff98fc663..065f893804 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -398,7 +398,7 @@ static void printThermistor(const char *msg, ThermistorConf *config, ThermistorM static void printTPSInfo(void) { #if (EFI_PROD_CODE && HAL_USE_ADC) || defined(__DOXYGEN__) - if (!engineConfiguration->hasTpsSensor) { + if (!hasTpsSensor()) { scheduleMsg(&logger, "NO TPS SENSOR"); return; } diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index e7803f8451..9b693b7fb8 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -588,7 +588,7 @@ bit unusedBit__4 bit isGpsEnabled bit isAlternatorControlEnabled bit unusedBit__3 - bit hasTpsSensor + bit unusedbit_8 bit cutFuelOnHardLimit bit cutSparkOnHardLimit bit step1fuelCutEnable diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index c6944cfc8d..df7ee5150b 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 Sun Dec 25 12:28:24 EST 2016 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Dec 26 13:28:23 EST 2016 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int FSIO_ADC_COUNT = 4; @@ -634,7 +634,7 @@ public class Fields { public static final int isGpsEnabled_offset = 1488; public static final int isAlternatorControlEnabled_offset = 1488; public static final int unusedBit__3_offset = 1488; - public static final int hasTpsSensor_offset = 1488; + public static final int unusedbit_8_offset = 1488; public static final int cutFuelOnHardLimit_offset = 1488; public static final int cutSparkOnHardLimit_offset = 1488; public static final int step1fuelCutEnable_offset = 1488; @@ -1387,7 +1387,7 @@ public class Fields { public static final Field ISGPSENABLED = Field.create("ISGPSENABLED", 1488, FieldType.BIT, 12); public static final Field ISALTERNATORCONTROLENABLED = Field.create("ISALTERNATORCONTROLENABLED", 1488, FieldType.BIT, 13); public static final Field UNUSEDBIT__3 = Field.create("UNUSEDBIT__3", 1488, FieldType.BIT, 14); - public static final Field HASTPSSENSOR = Field.create("HASTPSSENSOR", 1488, FieldType.BIT, 15); + public static final Field UNUSEDBIT_8 = Field.create("UNUSEDBIT_8", 1488, FieldType.BIT, 15); public static final Field CUTFUELONHARDLIMIT = Field.create("CUTFUELONHARDLIMIT", 1488, FieldType.BIT, 16); public static final Field CUTSPARKONHARDLIMIT = Field.create("CUTSPARKONHARDLIMIT", 1488, FieldType.BIT, 17); public static final Field STEP1FUELCUTENABLE = Field.create("STEP1FUELCUTENABLE", 1488, FieldType.BIT, 18); diff --git a/java_console/ui/src/com/rusefi/ui/RecentCommands.java b/java_console/ui/src/com/rusefi/ui/RecentCommands.java index e774cbfc99..61f90d51c7 100644 --- a/java_console/ui/src/com/rusefi/ui/RecentCommands.java +++ b/java_console/ui/src/com/rusefi/ui/RecentCommands.java @@ -35,6 +35,7 @@ public class RecentCommands { private static final String TRIGGERINFO = "triggerinfo"; private static final String IDLEINFO = "idleinfo"; private static final String ALTINFO = "altinfo"; + private static final String TPSINFO = "tpsinfo"; private static final String ACCELINFO = "accelinfo"; private static final String CANINFO = "caninfo"; private static final String TSINFO = "tsinfo"; @@ -60,6 +61,7 @@ public class RecentCommands { COMMAND_ICONS.put(ALTINFO, UiUtils.loadIcon("alternator.jpg")); COMMAND_ICONS.put(ACCELINFO, infoIcon); COMMAND_ICONS.put(TSINFO, infoIcon); + COMMAND_ICONS.put(TPSINFO, infoIcon); COMMAND_ICONS.put(joystickINFO, UiUtils.loadIcon("joystick.png")); COMMAND_ICONS.put(CANINFO, infoIcon); COMMAND_ICONS.put(FUELINFO, infoIcon); @@ -135,6 +137,7 @@ public class RecentCommands { add("fuelbench 5 400 2"); add(IDLEINFO); add(ALTINFO); + add(TPSINFO); add(ACCELINFO); add(FUELINFO); add(TEMPINFO);