mirror of https://github.com/rusefi/rusefi-1.git
auto-sync
This commit is contained in:
parent
effaa33c81
commit
3c6f0aa948
|
@ -98,7 +98,9 @@ typedef struct {
|
|||
float knockLevel;
|
||||
int totalTriggerErrorCounter;
|
||||
float wallFuelAmount;
|
||||
int unused3[8];
|
||||
float totalFuelCorrection;
|
||||
floatms_t wallFuelCorrection;
|
||||
int unused3[6];
|
||||
} TunerStudioOutputChannels;
|
||||
|
||||
#endif /* TUNERSTUDIO_CONFIGURATION_H_ */
|
||||
|
|
|
@ -600,6 +600,8 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
|
|||
tsOutputChannels->hasFatalError = hasFirmwareError();
|
||||
tsOutputChannels->totalTriggerErrorCounter = triggerCentral.triggerState.totalTriggerErrorCounter;
|
||||
tsOutputChannels->wallFuelAmount = wallFuel.getWallFuel(0);
|
||||
tsOutputChannels->totalFuelCorrection = engine->totalFuelCorrection;
|
||||
tsOutputChannels->wallFuelCorrection = engine->wallFuelCorrection;
|
||||
|
||||
tsOutputChannels->checkEngine = hasErrorCodes();
|
||||
#if EFI_PROD_CODE || defined(__DOXYGEN__)
|
||||
|
|
|
@ -35,11 +35,11 @@ static Logging *logger;
|
|||
WallFuel wallFuel;
|
||||
|
||||
WallFuel::WallFuel() {
|
||||
memset(wallFuel, 0, sizeof(wallFuel));
|
||||
reset();
|
||||
}
|
||||
|
||||
void WallFuel::reset() {
|
||||
|
||||
memset(wallFuel, 0, sizeof(wallFuel));
|
||||
}
|
||||
|
||||
floatms_t WallFuel::adjust(int injectorIndex, floatms_t target DECLARE_ENGINE_PARAMETER_S) {
|
||||
|
|
|
@ -67,6 +67,7 @@
|
|||
#endif
|
||||
|
||||
extern bool hasFirmwareErrorFlag;
|
||||
extern WallFuel wallFuel;
|
||||
|
||||
persistent_config_container_s persistentState CCM_OPTIONAL;
|
||||
|
||||
|
@ -226,11 +227,12 @@ static void periodicSlowCallback(Engine *engine) {
|
|||
}
|
||||
#endif
|
||||
|
||||
#if (EFI_PROD_CODE && EFI_ENGINE_CONTROL && EFI_INTERNAL_FLASH) || defined(__DOXYGEN__)
|
||||
if (!engine->rpmCalculator.isRunning()) {
|
||||
#if (EFI_PROD_CODE && EFI_ENGINE_CONTROL && EFI_INTERNAL_FLASH) || defined(__DOXYGEN__)
|
||||
writeToFlashIfPending();
|
||||
}
|
||||
#endif
|
||||
wallFuel.reset();
|
||||
}
|
||||
|
||||
if (versionForConfigurationListeners.isOld()) {
|
||||
/**
|
||||
|
|
|
@ -291,5 +291,5 @@ int getRusEfiVersion(void) {
|
|||
return 123; // this is here to make the compiler happy about the unused array
|
||||
if (UNUSED_CCM_SIZE[0] * 0 != 0)
|
||||
return 3211; // this is here to make the compiler happy about the unused array
|
||||
return 20150901;
|
||||
return 20150903;
|
||||
}
|
||||
|
|
|
@ -91,6 +91,8 @@ public enum Sensor {
|
|||
MAP_ACCEL_DELTA(SensorCategory.OPERATIONS, FieldType.FLOAT, 124, BackgroundColor.MUD),
|
||||
TPS_ACCEL_FUEL(SensorCategory.OPERATIONS, FieldType.FLOAT, 128, BackgroundColor.MUD),
|
||||
WALL_FUEL(SensorCategory.OPERATIONS, FieldType.FLOAT, 160, BackgroundColor.MUD),
|
||||
temperatureFuelCorrection(SensorCategory.OPERATIONS, FieldType.FLOAT, 164, BackgroundColor.MUD),
|
||||
wallFuelCorrection(SensorCategory.OPERATIONS, FieldType.FLOAT, 168, BackgroundColor.MUD),
|
||||
|
||||
INJ_1_2_DELTA("inj 1-2 delta", SensorCategory.SNIFFING),
|
||||
INJ_3_4_DELTA("inj 3-4 delta", SensorCategory.SNIFFING),
|
||||
|
|
|
@ -32,7 +32,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
|
|||
* @see com.rusefi.StartupFrame
|
||||
*/
|
||||
public class Launcher {
|
||||
public static final int CONSOLE_VERSION = 20150902;
|
||||
public static final int CONSOLE_VERSION = 20150903;
|
||||
public static final boolean SHOW_STIMULATOR = false;
|
||||
private static final String TAB_INDEX = "main_tab";
|
||||
protected static final String PORT_KEY = "port";
|
||||
|
|
Loading…
Reference in New Issue