mirror of https://github.com/rusefi/rusefi-1.git
auto-sync
This commit is contained in:
parent
2bf830e86c
commit
a74f74f0c4
|
@ -123,7 +123,8 @@ typedef struct {
|
||||||
int timeSeconds; // 224
|
int timeSeconds; // 224
|
||||||
float engineLoadDelta; // 228
|
float engineLoadDelta; // 228
|
||||||
float speedToRpmRatio; // 232
|
float speedToRpmRatio; // 232
|
||||||
int unused3[10];
|
int warningCounter; // 236
|
||||||
|
int unused3[9];
|
||||||
} TunerStudioOutputChannels;
|
} TunerStudioOutputChannels;
|
||||||
|
|
||||||
#endif /* TUNERSTUDIO_CONFIGURATION_H_ */
|
#endif /* TUNERSTUDIO_CONFIGURATION_H_ */
|
||||||
|
|
|
@ -195,6 +195,8 @@ static void printSensors(Logging *log, bool fileFormat) {
|
||||||
reportSensorF(log, fileFormat, "sp2rpm", "x", vehicleSpeed / rpm, 2);
|
reportSensorF(log, fileFormat, "sp2rpm", "x", vehicleSpeed / rpm, 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
reportSensorI(log, fileFormat, "warn", "count", engine->engineState.warningCounter);
|
||||||
|
|
||||||
reportSensorF(log, fileFormat, "knck_c", "count", engine->knockCount, 0);
|
reportSensorF(log, fileFormat, "knck_c", "count", engine->knockCount, 0);
|
||||||
reportSensorF(log, fileFormat, "knck_v", "v", engine->knockVolts, 2);
|
reportSensorF(log, fileFormat, "knck_v", "v", engine->knockVolts, 2);
|
||||||
|
|
||||||
|
@ -701,6 +703,8 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
|
||||||
tsOutputChannels->isIatError = !isValidIntakeAirTemperature(getIntakeAirTemperature(PASS_ENGINE_PARAMETER_F));
|
tsOutputChannels->isIatError = !isValidIntakeAirTemperature(getIntakeAirTemperature(PASS_ENGINE_PARAMETER_F));
|
||||||
#endif /* EFI_PROD_CODE */
|
#endif /* EFI_PROD_CODE */
|
||||||
|
|
||||||
|
tsOutputChannels->warningCounter = engine->engineState.warningCounter;
|
||||||
|
|
||||||
tsOutputChannels->knockNowIndicator = engine->knockCount > 0;
|
tsOutputChannels->knockNowIndicator = engine->knockCount > 0;
|
||||||
tsOutputChannels->knockEverIndicator = engine->knockEver;
|
tsOutputChannels->knockEverIndicator = engine->knockEver;
|
||||||
|
|
||||||
|
|
|
@ -133,6 +133,7 @@ EngineState::EngineState() {
|
||||||
dwellAngle = 0;
|
dwellAngle = 0;
|
||||||
engineNoiseHipLevel = 0;
|
engineNoiseHipLevel = 0;
|
||||||
injectorLag = 0;
|
injectorLag = 0;
|
||||||
|
warningCounter = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void EngineState::updateSlowSensors(DECLARE_ENGINE_PARAMETER_F) {
|
void EngineState::updateSlowSensors(DECLARE_ENGINE_PARAMETER_F) {
|
||||||
|
|
|
@ -122,6 +122,8 @@ public:
|
||||||
float iat;
|
float iat;
|
||||||
float clt;
|
float clt;
|
||||||
|
|
||||||
|
int warningCounter;
|
||||||
|
|
||||||
float airMass;
|
float airMass;
|
||||||
|
|
||||||
float engineNoiseHipLevel;
|
float engineNoiseHipLevel;
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
#include "io_pins.h"
|
#include "io_pins.h"
|
||||||
#include "memstreams.h"
|
#include "memstreams.h"
|
||||||
#include "efilib2.h"
|
#include "efilib2.h"
|
||||||
|
#include "engine.h"
|
||||||
|
|
||||||
#if EFI_HD44780_LCD
|
#if EFI_HD44780_LCD
|
||||||
#include "lcd_HD44780.h"
|
#include "lcd_HD44780.h"
|
||||||
|
@ -18,6 +19,8 @@
|
||||||
static time_t timeOfPreviousWarning = -10;
|
static time_t timeOfPreviousWarning = -10;
|
||||||
static LoggingWithStorage logger("error handling");
|
static LoggingWithStorage logger("error handling");
|
||||||
|
|
||||||
|
EXTERN_ENGINE;
|
||||||
|
|
||||||
#define WARNING_PREFIX "WARNING: "
|
#define WARNING_PREFIX "WARNING: "
|
||||||
|
|
||||||
extern int warningEnabled;
|
extern int warningEnabled;
|
||||||
|
@ -52,7 +55,6 @@ static char warningBuffer[WARNING_BUFFER_SIZE];
|
||||||
static bool isWarningStreamInitialized = false;
|
static bool isWarningStreamInitialized = false;
|
||||||
static MemoryStream warningStream;
|
static MemoryStream warningStream;
|
||||||
|
|
||||||
static int warningCounter = 0;
|
|
||||||
/**
|
/**
|
||||||
* OBD_PCM_Processor_Fault is the general error code for now
|
* OBD_PCM_Processor_Fault is the general error code for now
|
||||||
*
|
*
|
||||||
|
@ -67,7 +69,7 @@ int warning(obd_code_e code, const char *fmt, ...) {
|
||||||
return true; // we just had another warning, let's not spam
|
return true; // we just had another warning, let's not spam
|
||||||
timeOfPreviousWarning = now;
|
timeOfPreviousWarning = now;
|
||||||
|
|
||||||
warningCounter++;
|
engine->engineState.warningCounter++;
|
||||||
|
|
||||||
resetLogging(&logger); // todo: is 'reset' really needed here?
|
resetLogging(&logger); // todo: is 'reset' really needed here?
|
||||||
appendMsgPrefix(&logger);
|
appendMsgPrefix(&logger);
|
||||||
|
|
|
@ -298,5 +298,5 @@ int getRusEfiVersion(void) {
|
||||||
return 123; // this is here to make the compiler happy about the unused array
|
return 123; // this is here to make the compiler happy about the unused array
|
||||||
if (UNUSED_CCM_SIZE[0] * 0 != 0)
|
if (UNUSED_CCM_SIZE[0] * 0 != 0)
|
||||||
return 3211; // this is here to make the compiler happy about the unused array
|
return 3211; // this is here to make the compiler happy about the unused array
|
||||||
return 20160707;
|
return 20160713;
|
||||||
}
|
}
|
||||||
|
|
|
@ -841,6 +841,7 @@ fileVersion = { 20160702 }
|
||||||
debugIntField3 = scalar, U32, 220, "val", 1, 0.0;
|
debugIntField3 = scalar, U32, 220, "val", 1, 0.0;
|
||||||
engineLoadDelta = scalar,F32, 228, "value", 1, 0
|
engineLoadDelta = scalar,F32, 228, "value", 1, 0
|
||||||
speedToRpmRatio = scalar,F32, 232, "value", 1, 0
|
speedToRpmRatio = scalar,F32, 232, "value", 1, 0
|
||||||
|
warningCounter = scalar,U32, 236, "count", 1, 0
|
||||||
|
|
||||||
egoCorrection = { 100 }
|
egoCorrection = { 100 }
|
||||||
time = { timeNow }
|
time = { timeNow }
|
||||||
|
@ -1130,6 +1131,7 @@ fileVersion = { 20160702 }
|
||||||
debugIntField2Gauge = debugIntField2, "debug i2", "%", 0, 100, 0, 0, 100, 100, 0, 0
|
debugIntField2Gauge = debugIntField2, "debug i2", "%", 0, 100, 0, 0, 100, 100, 0, 0
|
||||||
debugIntField3Gauge = debugIntField3, "debug i3", "%", 0, 100, 0, 0, 100, 100, 0, 0
|
debugIntField3Gauge = debugIntField3, "debug i3", "%", 0, 100, 0, 0, 100, 100, 0, 0
|
||||||
speedToRpmRatioGauge = speedToRpmRatio, "speed2rpm", "", 0, 100, 0, 0, 100, 100, 4, 4
|
speedToRpmRatioGauge = speedToRpmRatio, "speed2rpm", "", 0, 100, 0, 0, 100, 100, 4, 4
|
||||||
|
warningCounterGauge = warningCounter, "warn", "", 0, 100, 0, 0, 100, 100, 0, 0
|
||||||
|
|
||||||
|
|
||||||
[FrontPage]
|
[FrontPage]
|
||||||
|
@ -1229,6 +1231,7 @@ fileVersion = { 20160702 }
|
||||||
entry = debugIntField1, "debug i1",int,"%d"
|
entry = debugIntField1, "debug i1",int,"%d"
|
||||||
entry = debugIntField2, "debug i2",int,"%d"
|
entry = debugIntField2, "debug i2",int,"%d"
|
||||||
entry = debugIntField3, "debug i3",int,"%d"
|
entry = debugIntField3, "debug i3",int,"%d"
|
||||||
|
entry = warningCounter, "warn",int,"%d"
|
||||||
|
|
||||||
entry = tCharge, "tCharge",float,"%.3f"
|
entry = tCharge, "tCharge",float,"%.3f"
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,22 @@
|
||||||
|
<component name="ProjectRunConfigurationManager">
|
||||||
|
<configuration default="false" name="AverageAnglesUtil" type="Application" factoryName="Application" nameIsGenerated="true">
|
||||||
|
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
|
||||||
|
<pattern>
|
||||||
|
<option name="PATTERN" value="com.rusefi.*" />
|
||||||
|
<option name="ENABLED" value="true" />
|
||||||
|
</pattern>
|
||||||
|
</extension>
|
||||||
|
<option name="MAIN_CLASS_NAME" value="com.rusefi.AverageAnglesUtil" />
|
||||||
|
<option name="VM_PARAMETERS" value="" />
|
||||||
|
<option name="PROGRAM_PARAMETERS" value="a.csv" />
|
||||||
|
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
||||||
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||||
|
<option name="ALTERNATIVE_JRE_PATH" />
|
||||||
|
<option name="ENABLE_SWING_INSPECTOR" value="false" />
|
||||||
|
<option name="ENV_VARIABLES" />
|
||||||
|
<option name="PASS_PARENT_ENVS" value="true" />
|
||||||
|
<module name="models" />
|
||||||
|
<envs />
|
||||||
|
<method />
|
||||||
|
</configuration>
|
||||||
|
</component>
|
|
@ -92,6 +92,7 @@ public enum Sensor {
|
||||||
T_CHARGE(SensorCategory.FUEL, FieldType.FLOAT, 52, BackgroundColor.MUD, 30, 140),
|
T_CHARGE(SensorCategory.FUEL, FieldType.FLOAT, 52, BackgroundColor.MUD, 30, 140),
|
||||||
DWELL(SensorCategory.OPERATIONS, FieldType.FLOAT, 60, BackgroundColor.MUD, 1, 10),
|
DWELL(SensorCategory.OPERATIONS, FieldType.FLOAT, 60, BackgroundColor.MUD, 1, 10),
|
||||||
actualLastInjection(SensorCategory.FUEL, FieldType.FLOAT, 64, BackgroundColor.MUD, 0, 30, "ms"),
|
actualLastInjection(SensorCategory.FUEL, FieldType.FLOAT, 64, BackgroundColor.MUD, 0, 30, "ms"),
|
||||||
|
debugFloatField1(SensorCategory.OPERATIONS, FieldType.FLOAT, 68, BackgroundColor.MUD, 0, 5),
|
||||||
VSS(SensorCategory.OPERATIONS, FieldType.FLOAT, 76, BackgroundColor.BLUE),
|
VSS(SensorCategory.OPERATIONS, FieldType.FLOAT, 76, BackgroundColor.BLUE),
|
||||||
FIRMWARE_VERSION(SensorCategory.OPERATIONS, FieldType.INT, 84, BackgroundColor.BLUE),
|
FIRMWARE_VERSION(SensorCategory.OPERATIONS, FieldType.INT, 84, BackgroundColor.BLUE),
|
||||||
CURRENT_VE(SensorCategory.FUEL, FieldType.FLOAT, 112, BackgroundColor.MUD),
|
CURRENT_VE(SensorCategory.FUEL, FieldType.FLOAT, 112, BackgroundColor.MUD),
|
||||||
|
@ -108,12 +109,17 @@ public enum Sensor {
|
||||||
CHARGE_AIR_MASS(SensorCategory.OPERATIONS, FieldType.FLOAT, 180, BackgroundColor.MUD),
|
CHARGE_AIR_MASS(SensorCategory.OPERATIONS, FieldType.FLOAT, 180, BackgroundColor.MUD),
|
||||||
cltCorrection(SensorCategory.OPERATIONS, FieldType.FLOAT, 184, BackgroundColor.MUD, 0, 5),
|
cltCorrection(SensorCategory.OPERATIONS, FieldType.FLOAT, 184, BackgroundColor.MUD, 0, 5),
|
||||||
runningFuel(SensorCategory.OPERATIONS, FieldType.FLOAT, 188, BackgroundColor.MUD, 0, 15, "ms"),
|
runningFuel(SensorCategory.OPERATIONS, FieldType.FLOAT, 188, BackgroundColor.MUD, 0, 15, "ms"),
|
||||||
|
debugIntField1(SensorCategory.OPERATIONS, FieldType.INT, 192, BackgroundColor.MUD, 0, 5),
|
||||||
injectorLagMs(SensorCategory.FUEL, FieldType.FLOAT, 196, BackgroundColor.MUD, 0, 15, "ms"),
|
injectorLagMs(SensorCategory.FUEL, FieldType.FLOAT, 196, BackgroundColor.MUD, 0, 15, "ms"),
|
||||||
|
|
||||||
debugFloatField2(SensorCategory.OPERATIONS, FieldType.FLOAT, 200, BackgroundColor.MUD, 0, 5),
|
debugFloatField2(SensorCategory.OPERATIONS, FieldType.FLOAT, 200, BackgroundColor.MUD, 0, 5),
|
||||||
debugFloatField3(SensorCategory.OPERATIONS, FieldType.FLOAT, 204, BackgroundColor.MUD, 0, 5),
|
debugFloatField3(SensorCategory.OPERATIONS, FieldType.FLOAT, 204, BackgroundColor.MUD, 0, 5),
|
||||||
debugFloatField4(SensorCategory.OPERATIONS, FieldType.FLOAT, 208, BackgroundColor.MUD, 0, 5),
|
debugFloatField4(SensorCategory.OPERATIONS, FieldType.FLOAT, 208, BackgroundColor.MUD, 0, 5),
|
||||||
debugFloatField5(SensorCategory.OPERATIONS, FieldType.FLOAT, 212, BackgroundColor.MUD, 0, 5),
|
debugFloatField5(SensorCategory.OPERATIONS, FieldType.FLOAT, 212, BackgroundColor.MUD, 0, 5),
|
||||||
|
debugIntField2(SensorCategory.OPERATIONS, FieldType.INT, 216, BackgroundColor.MUD, 0, 5),
|
||||||
|
debugIntField3(SensorCategory.OPERATIONS, FieldType.INT, 220, BackgroundColor.MUD, 0, 5),
|
||||||
|
|
||||||
|
warningCounter(SensorCategory.OPERATIONS, FieldType.INT, 236, BackgroundColor.MUD, 0, 5),
|
||||||
|
|
||||||
RPM(SensorCategory.SENSOR_INPUTS, FieldType.INT, 0, BackgroundColor.RED, 0, 8000),
|
RPM(SensorCategory.SENSOR_INPUTS, FieldType.INT, 0, BackgroundColor.RED, 0, 8000),
|
||||||
TIME_SECONDS(SensorCategory.OPERATIONS, FieldType.INT, 224, BackgroundColor.MUD, 0, 5),
|
TIME_SECONDS(SensorCategory.OPERATIONS, FieldType.INT, 224, BackgroundColor.MUD, 0, 5),
|
||||||
|
|
|
@ -39,7 +39,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
|
||||||
* @see EngineSnifferPanel
|
* @see EngineSnifferPanel
|
||||||
*/
|
*/
|
||||||
public class Launcher {
|
public class Launcher {
|
||||||
public static final int CONSOLE_VERSION = 20160707;
|
public static final int CONSOLE_VERSION = 20160713;
|
||||||
public static final boolean SHOW_STIMULATOR = false;
|
public static final boolean SHOW_STIMULATOR = false;
|
||||||
private static final String TAB_INDEX = "main_tab";
|
private static final String TAB_INDEX = "main_tab";
|
||||||
protected static final String PORT_KEY = "port";
|
protected static final String PORT_KEY = "port";
|
||||||
|
|
|
@ -35,6 +35,15 @@ public class SensorLogger {
|
||||||
Sensor.injectorLagMs,
|
Sensor.injectorLagMs,
|
||||||
Sensor.VSS,
|
Sensor.VSS,
|
||||||
Sensor.SPEED2RPM,
|
Sensor.SPEED2RPM,
|
||||||
|
Sensor.debugFloatField1,
|
||||||
|
Sensor.debugFloatField2,
|
||||||
|
Sensor.debugFloatField3,
|
||||||
|
Sensor.debugFloatField4,
|
||||||
|
Sensor.debugFloatField5,
|
||||||
|
Sensor.debugIntField1,
|
||||||
|
Sensor.debugIntField2,
|
||||||
|
Sensor.debugIntField3,
|
||||||
|
Sensor.warningCounter,
|
||||||
|
|
||||||
Sensor.MAF, Sensor.IAT};
|
Sensor.MAF, Sensor.IAT};
|
||||||
private static long fileStartTime;
|
private static long fileStartTime;
|
||||||
|
|
Loading…
Reference in New Issue