rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

consistent better debug field names everywhere

This commit is contained in:
rusefi 2017-07-23 20:43:28 -04:00
parent 41da5acc71
commit 95dc1e0e9c
7 changed files with 66 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
firmware/console/status_loop.cpp
View File

@ -233,18 +233,20 @@ static void printSensors(Logging *log, bool fileFormat) {
if (fileFormat) {
#if EFI_TUNER_STUDIO || defined(__DOXYGEN__)
reportSensorF(log, fileFormat, "debugF1", "v", tsOutputChannels.debugFloatField1, 4);
reportSensorF(log, fileFormat, "debugF2", "v", tsOutputChannels.debugFloatField2, 4);
reportSensorF(log, fileFormat, "debugF3", "v", tsOutputChannels.debugFloatField3, 4);
reportSensorF(log, fileFormat, "debugF4", "v", tsOutputChannels.debugFloatField4, 4);
reportSensorF(log, fileFormat, "debugF5", "v", tsOutputChannels.debugFloatField5, 4);
reportSensorF(log, fileFormat, "debugF6", "v", tsOutputChannels.debugFloatField6, 4);
reportSensorF(log, fileFormat, "debugF7", "v", tsOutputChannels.debugFloatField7, 4);
#define DEBUG_F_PRECISION 6
reportSensorI(log, fileFormat, "debugInt1", "v", tsOutputChannels.debugIntField1);
reportSensorI(log, fileFormat, "debugInt2", "v", tsOutputChannels.debugIntField2);
reportSensorI(log, fileFormat, "debugInt3", "v", tsOutputChannels.debugIntField3);
#if EFI_TUNER_STUDIO || defined(__DOXYGEN__)
reportSensorF(log, fileFormat, GAUGE_NAME_DEBUG_F1, "v", tsOutputChannels.debugFloatField1, DEBUG_F_PRECISION);
reportSensorF(log, fileFormat, GAUGE_NAME_DEBUG_F1, "v", tsOutputChannels.debugFloatField2, DEBUG_F_PRECISION);
reportSensorF(log, fileFormat, GAUGE_NAME_DEBUG_F1, "v", tsOutputChannels.debugFloatField3, DEBUG_F_PRECISION);
reportSensorF(log, fileFormat, GAUGE_NAME_DEBUG_F1, "v", tsOutputChannels.debugFloatField4, DEBUG_F_PRECISION);
reportSensorF(log, fileFormat, GAUGE_NAME_DEBUG_F1, "v", tsOutputChannels.debugFloatField5, DEBUG_F_PRECISION);
reportSensorF(log, fileFormat, GAUGE_NAME_DEBUG_F1, "v", tsOutputChannels.debugFloatField6, DEBUG_F_PRECISION);
reportSensorF(log, fileFormat, GAUGE_NAME_DEBUG_F1, "v", tsOutputChannels.debugFloatField7, DEBUG_F_PRECISION);
reportSensorI(log, fileFormat, GAUGE_NAME_DEBUG_I1, "v", tsOutputChannels.debugIntField1);
reportSensorI(log, fileFormat, GAUGE_NAME_DEBUG_I2, "v", tsOutputChannels.debugIntField2);
reportSensorI(log, fileFormat, GAUGE_NAME_DEBUG_I3, "v", tsOutputChannels.debugIntField3);
#endif /* EFI_TUNER_STUDIO */
reportSensorF(log, fileFormat, GAUGE_NAME_TCHARGE, "K", engine->engineState.tChargeK, 2); // log column #8

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

@ -1592,5 +1592,15 @@
#define GAUGE_NAME_TARGET_AFR "fuel: target AFR"
#define GAUGE_NAME_AFR "Air/Fuel Ratio"
#define GAUGE_NAME_IAC "Idle Air Valve"
#define GAUGE_NAME_DEBUG_F1 "debug f1"
#define GAUGE_NAME_DEBUG_F2 "debug f2: iTerm"
#define GAUGE_NAME_DEBUG_F3 "debug f3: prevError"
#define GAUGE_NAME_DEBUG_F4 "debug f4: iParam"
#define GAUGE_NAME_DEBUG_F5 "debug f5: dParam"
#define GAUGE_NAME_DEBUG_F6 "debug f6: dTerm"
#define GAUGE_NAME_DEBUG_F7 "debug f7"
#define GAUGE_NAME_DEBUG_I1 "debug i1: pParam"
#define GAUGE_NAME_DEBUG_I2 "debug i2: offset"
#define GAUGE_NAME_DEBUG_I3 "debug i3"
#define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle"
#define GAUGE_COIL_DWELL_TIME "dwell: coil charge time"

13
firmware/integration/rusefi_config.txt
View File

@ -927,6 +927,19 @@ end_struct
#define GAUGE_NAME_AFR "Air/Fuel Ratio"
#define GAUGE_NAME_IAC "Idle Air Valve"
#define GAUGE_NAME_DEBUG_F1 "debug f1"
#define GAUGE_NAME_DEBUG_F2 "debug f2: iTerm"
#define GAUGE_NAME_DEBUG_F3 "debug f3: prevError"
#define GAUGE_NAME_DEBUG_F4 "debug f4: iParam"
#define GAUGE_NAME_DEBUG_F5 "debug f5: dParam"
#define GAUGE_NAME_DEBUG_F6 "debug f6: dTerm"
#define GAUGE_NAME_DEBUG_F7 "debug f7"
#define GAUGE_NAME_DEBUG_I1 "debug i1: pParam"
#define GAUGE_NAME_DEBUG_I2 "debug i2: offset"
#define GAUGE_NAME_DEBUG_I3 "debug i3"
#define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle"

2
firmware/rusefi.cpp
View File

@ -260,5 +260,5 @@ int getRusEfiVersion(void) {
if (initBootloader() != 0)
return 123;
#endif /* EFI_BOOTLOADER_INCLUDE_CODE */
return 20170709;
return 20170723;
}

34
firmware/tunerstudio/rusefi.input
View File

@ -521,13 +521,13 @@ fileVersion = { 20161225 }
lastErrorCodeGauge = lastErrorCode, "error", "", 0, 8000, 0, 0, 8000, 8000, 0, 0
gaugeCategory = Debug
debugFloatField1Gauge = debugFloatField1, "debug f1", "%", 0, 100, 0, 0, 100, 100, 4, 4
debugFloatField2Gauge = debugFloatField2, "debug f2: iTerm", "%", -100, 100, 0, 0, 100, 100, 4, 4
debugFloatField3Gauge = debugFloatField3, "debug f3: prevError", "%", -100, 100, 0, 0, 100, 100, 4, 4
debugFloatField4Gauge = debugFloatField4, "debug f4: iParam", "%", 0, 100, 0, 0, 100, 100, 4, 4
debugFloatField5Gauge = debugFloatField5, "debug f5: dParam", "%", 0, 100, 0, 0, 100, 100, 4, 4
debugFloatField6Gauge = debugFloatField6, "debug f6: dTerm", "%", -100, 100, 0, 0, 100, 100, 4, 4
debugFloatField7Gauge = debugFloatField7, "debug f7", "%", 0, 100, 0, 0, 100, 100, 4, 4
debugFloatField1Gauge = debugFloatField1, @@GAUGE_NAME_DEBUG_F1@@, "%", 0, 100, 0, 0, 100, 100, 4, 4
debugFloatField2Gauge = debugFloatField2, @@GAUGE_NAME_DEBUG_F2@@, "%", -100, 100, 0, 0, 100, 100, 4, 4
debugFloatField3Gauge = debugFloatField3, @@GAUGE_NAME_DEBUG_F3@@, "%", -100, 100, 0, 0, 100, 100, 4, 4
debugFloatField4Gauge = debugFloatField4, @@GAUGE_NAME_DEBUG_F4@@, "%", 0, 100, 0, 0, 100, 100, 4, 4
debugFloatField5Gauge = debugFloatField5, @@GAUGE_NAME_DEBUG_F5@@, "%", 0, 100, 0, 0, 100, 100, 4, 4
debugFloatField6Gauge = debugFloatField6, @@GAUGE_NAME_DEBUG_F6@@, "%", -100, 100, 0, 0, 100, 100, 4, 4
debugFloatField7Gauge = debugFloatField7, @@GAUGE_NAME_DEBUG_F7@@, "%", 0, 100, 0, 0, 100, 100, 4, 4
debugIntField1Gauge = debugIntField1, "debug i1: pParam", "%", 0, 100, 0, 0, 100, 100, 0, 0
debugIntField2Gauge = debugIntField2, "debug i2: offset", "%", 0, 100, 0, 0, 100, 100, 0, 0
debugIntField3Gauge = debugIntField3, "debug i3", "%", 0, 100, 0, 0, 100, 100, 0, 0
@ -683,37 +683,37 @@ gaugeCategory = Fuel Data
; is there a way to log parameter? entry = debugMode, "debugMode",int,"%d"
; Alternator_PID: alternator duty cycle
; DBG_TPS_ACCEL: from TPS
entry = debugFloatField1, "debug f1",float,"%.4f"
entry = debugFloatField1, @@GAUGE_NAME_DEBUG_F1@@,float,"%.4f"
; Alternator_PID: current integration term
; DBG_TPS_ACCEL: to TPS
entry = debugFloatField2, "debug f2: iTerm",float,"%.4f"
entry = debugFloatField2, @@GAUGE_NAME_DEBUG_F2@@,float,"%.4f"
; Alternator_PID: previous error
; DBG_TPS_ACCEL: tps<>tps table value
entry = debugFloatField3, "debug f3: prevError",float,"%.4f"
entry = debugFloatField3, @@GAUGE_NAME_DEBUG_F3@@,float,"%.4f"
; Alternator_PID: I setting
; DBG_TPS_ACCEL: extra fuel
entry = debugFloatField4, "debug f4: iParam",float,"%.4f"
entry = debugFloatField4, @@GAUGE_NAME_DEBUG_F4@@,float,"%.4f"
; Alternator_PID: D setting
entry = debugFloatField5, "debug f5: dParam",float,"%.4f"
entry = debugFloatField5, @@GAUGE_NAME_DEBUG_F5@@,float,"%.4f"
; Alternator_PID: dTerm
entry = debugFloatField6, "debug f6: dTerm",float,"%.4f"
entry = debugFloatField6, @@GAUGE_NAME_DEBUG_F6@@,float,"%.4f"
entry = debugFloatField7, "debug f7",float,"%.4f"
entry = debugFloatField7, @@GAUGE_NAME_DEBUG_F7@@,float,"%.4f"
; Alternator_PID: P setting
entry = debugIntField1, "debug i1: pParam",int,"%d"
entry = debugIntField1, @@GAUGE_NAME_DEBUG_I1@@,int,"%d"
; Alternator_PID: offset setting
entry = debugIntField2, "debug i2: offset",int,"%d"
entry = debugIntField2, @@GAUGE_NAME_DEBUG_I2@@,int,"%d"
; Alternator_PID: PID reset counter
entry = debugIntField3, "debug i3",int,"%d"
entry = debugIntField3, @@GAUGE_NAME_DEBUG_I3@@,int,"%d"
entry = engineMode, "mode",int,"%d"

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

@ -1,6 +1,6 @@
package com.rusefi.config;
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jul 15 15:30:50 EDT 2017
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jul 23 20:33:56 EDT 2017
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int BLOCKING_FACTOR = 400;
@ -1097,6 +1097,16 @@ public class Fields {
public static final String GAUGE_NAME_TARGET_AFR = "fuel: target AFR";
public static final String GAUGE_NAME_AFR = "Air/Fuel Ratio";
public static final String GAUGE_NAME_IAC = "Idle Air Valve";
public static final String GAUGE_NAME_DEBUG_F1 = "debug f1";
public static final String GAUGE_NAME_DEBUG_F2 = "debug f2: iTerm";
public static final String GAUGE_NAME_DEBUG_F3 = "debug f3: prevError";
public static final String GAUGE_NAME_DEBUG_F4 = "debug f4: iParam";
public static final String GAUGE_NAME_DEBUG_F5 = "debug f5: dParam";
public static final String GAUGE_NAME_DEBUG_F6 = "debug f6: dTerm";
public static final String GAUGE_NAME_DEBUG_F7 = "debug f7";
public static final String GAUGE_NAME_DEBUG_I1 = "debug i1: pParam";
public static final String GAUGE_NAME_DEBUG_I2 = "debug i2: offset";
public static final String GAUGE_NAME_DEBUG_I3 = "debug i3";
public static final String GAUGE_NAME_DWELL_DUTY = "dwell: coil duty cycle";
public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time";
public static final Field ENGINETYPE = Field.create("ENGINETYPE", 0, FieldType.INT);

2
java_console/ui/src/com/rusefi/Launcher.java
View File

@ -45,7 +45,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
* @see EngineSnifferPanel
*/
public class Launcher {
public static final int CONSOLE_VERSION = 20170713;
public static final int CONSOLE_VERSION = 20170723;
public static final boolean SHOW_STIMULATOR = false;
private static final String TAB_INDEX = "main_tab";
protected static final String PORT_KEY = "port";