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

auto-sync

This commit is contained in:
rusEfi 2016-12-26 14:03:16 -05:00
parent 7574064d5f
commit 9ee1d030e1
8 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/config/engines/ford_festiva.cpp
View File

@ -212,7 +212,6 @@ void setFordEscortGt(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->iat.config.bias_resistor = 2700; engineConfiguration->iat.config.bias_resistor = 2700;
// we have a 1999 Auto Miata TB mounted on this car // we have a 1999 Auto Miata TB mounted on this car
engineConfiguration->hasTpsSensor = true;
engineConfiguration->tpsMin = 630; // convert 12to10 bit (ADC/4) engineConfiguration->tpsMin = 630; // convert 12to10 bit (ADC/4)
engineConfiguration->tpsMax = 115; // convert 12to10 bit (ADC/4) engineConfiguration->tpsMax = 115; // convert 12to10 bit (ADC/4)

6
firmware/controllers/algo/engine_configuration_generated_structures.h
View File

@ -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 // begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_ #ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_
@ -1225,7 +1225,7 @@ typedef struct {
bool unusedBit__3 : 1; bool unusedBit__3 : 1;
/** /**
offset 1488 bit 15 */ offset 1488 bit 15 */
bool hasTpsSensor : 1; bool unusedbit_8 : 1;
/** /**
offset 1488 bit 16 */ offset 1488 bit 16 */
bool cutFuelOnHardLimit : 1; bool cutFuelOnHardLimit : 1;
@ -2006,4 +2006,4 @@ typedef struct {
#endif #endif
// end // 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

2
firmware/controllers/algo/rusefi_generated.h
View File

@ -630,7 +630,7 @@
#define isGpsEnabled_offset 1488 #define isGpsEnabled_offset 1488
#define isAlternatorControlEnabled_offset 1488 #define isAlternatorControlEnabled_offset 1488
#define unusedBit__3_offset 1488 #define unusedBit__3_offset 1488
#define hasTpsSensor_offset 1488 #define unusedbit_8_offset 1488
#define cutFuelOnHardLimit_offset 1488 #define cutFuelOnHardLimit_offset 1488
#define cutSparkOnHardLimit_offset 1488 #define cutSparkOnHardLimit_offset 1488
#define step1fuelCutEnable_offset 1488 #define step1fuelCutEnable_offset 1488

2
firmware/controllers/sensors/tps.cpp
View File

@ -129,7 +129,7 @@ bool hasTpsSensor(DECLARE_ENGINE_PARAMETER_F) {
} }
percent_t getTPS(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; return NO_TPS_MAGIC_VALUE;
// todo: if (config->isDualTps) // todo: if (config->isDualTps)
// todo: blah blah // todo: blah blah

2
firmware/controllers/settings.cpp
View File

@ -398,7 +398,7 @@ static void printThermistor(const char *msg, ThermistorConf *config, ThermistorM
static void printTPSInfo(void) { static void printTPSInfo(void) {
#if (EFI_PROD_CODE && HAL_USE_ADC) || defined(__DOXYGEN__) #if (EFI_PROD_CODE && HAL_USE_ADC) || defined(__DOXYGEN__)
if (!engineConfiguration->hasTpsSensor) { if (!hasTpsSensor()) {
scheduleMsg(&logger, "NO TPS SENSOR"); scheduleMsg(&logger, "NO TPS SENSOR");
return; return;
} }

2
firmware/integration/rusefi_config.txt
View File

@ -588,7 +588,7 @@ bit unusedBit__4
bit isGpsEnabled bit isGpsEnabled
bit isAlternatorControlEnabled bit isAlternatorControlEnabled
bit unusedBit__3 bit unusedBit__3
bit hasTpsSensor bit unusedbit_8
bit cutFuelOnHardLimit bit cutFuelOnHardLimit
bit cutSparkOnHardLimit bit cutSparkOnHardLimit
bit step1fuelCutEnable bit step1fuelCutEnable

6
java_console/models/src/com/rusefi/config/Fields.java
View File

@ -1,6 +1,6 @@
package com.rusefi.config; 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 class Fields {
public static final int LE_COMMAND_LENGTH = 200; public static final int LE_COMMAND_LENGTH = 200;
public static final int FSIO_ADC_COUNT = 4; 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 isGpsEnabled_offset = 1488;
public static final int isAlternatorControlEnabled_offset = 1488; public static final int isAlternatorControlEnabled_offset = 1488;
public static final int unusedBit__3_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 cutFuelOnHardLimit_offset = 1488;
public static final int cutSparkOnHardLimit_offset = 1488; public static final int cutSparkOnHardLimit_offset = 1488;
public static final int step1fuelCutEnable_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 ISGPSENABLED = Field.create("ISGPSENABLED", 1488, FieldType.BIT, 12);
public static final Field ISALTERNATORCONTROLENABLED = Field.create("ISALTERNATORCONTROLENABLED", 1488, FieldType.BIT, 13); 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 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 CUTFUELONHARDLIMIT = Field.create("CUTFUELONHARDLIMIT", 1488, FieldType.BIT, 16);
public static final Field CUTSPARKONHARDLIMIT = Field.create("CUTSPARKONHARDLIMIT", 1488, FieldType.BIT, 17); public static final Field CUTSPARKONHARDLIMIT = Field.create("CUTSPARKONHARDLIMIT", 1488, FieldType.BIT, 17);
public static final Field STEP1FUELCUTENABLE = Field.create("STEP1FUELCUTENABLE", 1488, FieldType.BIT, 18); public static final Field STEP1FUELCUTENABLE = Field.create("STEP1FUELCUTENABLE", 1488, FieldType.BIT, 18);

3
java_console/ui/src/com/rusefi/ui/RecentCommands.java
View File

@ -35,6 +35,7 @@ public class RecentCommands {
private static final String TRIGGERINFO = "triggerinfo"; private static final String TRIGGERINFO = "triggerinfo";
private static final String IDLEINFO = "idleinfo"; private static final String IDLEINFO = "idleinfo";
private static final String ALTINFO = "altinfo"; private static final String ALTINFO = "altinfo";
private static final String TPSINFO = "tpsinfo";
private static final String ACCELINFO = "accelinfo"; private static final String ACCELINFO = "accelinfo";
private static final String CANINFO = "caninfo"; private static final String CANINFO = "caninfo";
private static final String TSINFO = "tsinfo"; private static final String TSINFO = "tsinfo";
@ -60,6 +61,7 @@ public class RecentCommands {
COMMAND_ICONS.put(ALTINFO, UiUtils.loadIcon("alternator.jpg")); COMMAND_ICONS.put(ALTINFO, UiUtils.loadIcon("alternator.jpg"));
COMMAND_ICONS.put(ACCELINFO, infoIcon); COMMAND_ICONS.put(ACCELINFO, infoIcon);
COMMAND_ICONS.put(TSINFO, infoIcon); COMMAND_ICONS.put(TSINFO, infoIcon);
COMMAND_ICONS.put(TPSINFO, infoIcon);
COMMAND_ICONS.put(joystickINFO, UiUtils.loadIcon("joystick.png")); COMMAND_ICONS.put(joystickINFO, UiUtils.loadIcon("joystick.png"));
COMMAND_ICONS.put(CANINFO, infoIcon); COMMAND_ICONS.put(CANINFO, infoIcon);
COMMAND_ICONS.put(FUELINFO, infoIcon); COMMAND_ICONS.put(FUELINFO, infoIcon);
@ -135,6 +137,7 @@ public class RecentCommands {
add("fuelbench 5 400 2"); add("fuelbench 5 400 2");
add(IDLEINFO); add(IDLEINFO);
add(ALTINFO); add(ALTINFO);
add(TPSINFO);
add(ACCELINFO); add(ACCELINFO);
add(FUELINFO); add(FUELINFO);
add(TEMPINFO); add(TEMPINFO);