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

live data: consistent naming

This commit is contained in:
rusefi 2019-08-31 23:39:30 -04:00
parent fa51007994
commit 7ce9b2890e
6 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/console/binary/tunerstudio.cpp
View File

@ -252,18 +252,18 @@ extern Pid etbPid;
static const void * getStructAddr(int structId) {
switch (structId) {
case LDS_CLT_INDEX:
case LDS_CLT_STATE_INDEX:
return static_cast<thermistor_state_s*>(&engine->engineState.cltCurve);
case LDS_IAT_INDEX:
case LDS_IAT_STATE_INDEX:
return static_cast<thermistor_state_s*>(&engine->engineState.iatCurve);
case LDS_ENGINE_STATE_INDEX:
return static_cast<engine_state2_s*>(&engine->engineState);
case LDS_FUEL_TRIM_INDEX:
case LDS_FUEL_TRIM_STATE_INDEX:
return static_cast<wall_fuel_state*>(&engine->wallFuel);
case LDS_TRIGGER_INDEX:
case LDS_TRIGGER_STATE_INDEX:
return static_cast<trigger_central_s*>(&engine->triggerCentral);
#if EFI_ELECTRONIC_THROTTLE_BODY
case LDS_ETB:
case LDS_ETB_STATE_INDEX:
return static_cast<pid_state_s*>(&etbPid);
#endif /* EFI_ELECTRONIC_THROTTLE_BODY */

14
firmware/controllers/generated/rusefi_generated.h
View File

@ -1328,14 +1328,14 @@
#define knockVThreshold_offset_hex 5e8
#define lcdThreadPeriodMs_offset 720
#define lcdThreadPeriodMs_offset_hex 2d0
#define LDS_CLT_INDEX 0
#define LDS_CLT_STATE_INDEX 0
#define LDS_ENGINE_STATE_INDEX 3
#define LDS_ETB 7
#define LDS_FUEL_TRIM_INDEX 4
#define LDS_IAT_INDEX 1
#define LDS_SPEED_DENSITY_INDEX 2
#define LDS_TPS_TPS_ENEICHMENT_INDEX 5
#define LDS_TRIGGER_INDEX 6
#define LDS_ETB_STATE_INDEX 7
#define LDS_FUEL_TRIM_STATE_INDEX 4
#define LDS_IAT_STATE_INDEX 1
#define LDS_SPEED_DENSITY_STATE_INDEX 2
#define LDS_TPS_TPS_ENEICHMENT_STATE_INDEX 5
#define LDS_TRIGGER_STATE_INDEX 6
#define LE_COMMAND_LENGTH 200
#define LIS302DLCsPin_offset 2043
#define LIS302DLCsPin_offset_hex 7fb

14
firmware/integration/rusefi_config.txt
View File

@ -1148,14 +1148,14 @@ end_struct
#define MOCK_IAT_COMMAND "mock_iat_voltage"
! Live Documentation Structure
#define LDS_CLT_INDEX 0
#define LDS_IAT_INDEX 1
#define LDS_SPEED_DENSITY_INDEX 2
#define LDS_CLT_STATE_INDEX 0
#define LDS_IAT_STATE_INDEX 1
#define LDS_SPEED_DENSITY_STATE_INDEX 2
#define LDS_ENGINE_STATE_INDEX 3
#define LDS_FUEL_TRIM_INDEX 4
#define LDS_TPS_TPS_ENEICHMENT_INDEX 5
#define LDS_TRIGGER_INDEX 6
#define LDS_ETB 7
#define LDS_FUEL_TRIM_STATE_INDEX 4
#define LDS_TPS_TPS_ENEICHMENT_STATE_INDEX 5
#define LDS_TRIGGER_STATE_INDEX 6
#define LDS_ETB_STATE_INDEX 7

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

@ -1,6 +1,6 @@
package com.rusefi.config.generated;
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Aug 31 17:47:54 EDT 2019
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Aug 31 23:31:57 EDT 2019
// by class com.rusefi.output.JavaFieldsConsumer
import com.rusefi.config.*;
@ -871,14 +871,14 @@ public class Fields {
public static final int knockNoiseRpmBins_offset = 1852;
public static final int knockVThreshold_offset = 1512;
public static final int lcdThreadPeriodMs_offset = 720;
public static final int LDS_CLT_INDEX = 0;
public static final int LDS_CLT_STATE_INDEX = 0;
public static final int LDS_ENGINE_STATE_INDEX = 3;
public static final int LDS_ETB = 7;
public static final int LDS_FUEL_TRIM_INDEX = 4;
public static final int LDS_IAT_INDEX = 1;
public static final int LDS_SPEED_DENSITY_INDEX = 2;
public static final int LDS_TPS_TPS_ENEICHMENT_INDEX = 5;
public static final int LDS_TRIGGER_INDEX = 6;
public static final int LDS_ETB_STATE_INDEX = 7;
public static final int LDS_FUEL_TRIM_STATE_INDEX = 4;
public static final int LDS_IAT_STATE_INDEX = 1;
public static final int LDS_SPEED_DENSITY_STATE_INDEX = 2;
public static final int LDS_TPS_TPS_ENEICHMENT_STATE_INDEX = 5;
public static final int LDS_TRIGGER_STATE_INDEX = 6;
public static final int LE_COMMAND_LENGTH = 200;
public static final int LIS302DLCsPin_offset = 2043;
public static final int logFormat_offset = 496;

8
java_console/ui/src/com/rusefi/ui/livedocs/LiveDocPanel.java
View File

@ -204,7 +204,7 @@ public class LiveDocPanel {
EngineState.VALUES, IdleThreadMeta.CONTENT), CONSTRAINTS);
// todo: fix the defect - we request ETB structure but decode it as EngineState
liveDocs.add(createPanel("ETB", "", Fields.LDS_ETB,
liveDocs.add(createPanel("ETB", "", Fields.LDS_ETB_STATE_INDEX,
EngineState.VALUES, ElectronicThrottleMeta.CONTENT), CONSTRAINTS);
return liveDocs;
@ -213,16 +213,16 @@ public class LiveDocPanel {
public static JPanel createSensorsLiveDataPanel() {
JPanel liveDocs = new JPanel(new MigLayout(LAYOUT));
liveDocs.add(createPanel("Coolant Sensor", "CLT", Fields.LDS_CLT_INDEX,
liveDocs.add(createPanel("Coolant Sensor", "CLT", Fields.LDS_CLT_STATE_INDEX,
ThermistorState.VALUES, ThermistorsMeta.CONTENT), CONSTRAINTS);
liveDocs.add(createPanel("Intake Air Sensor", "IAT", Fields.LDS_IAT_INDEX,
liveDocs.add(createPanel("Intake Air Sensor", "IAT", Fields.LDS_IAT_STATE_INDEX,
ThermistorState.VALUES, ThermistorsMeta.CONTENT), CONSTRAINTS);
liveDocs.add(createPanel("Throttle Position Sensor", "", Fields.LDS_ENGINE_STATE_INDEX,
EngineState.VALUES, TpsMeta.TPS_SECTION), CONSTRAINTS);
liveDocs.add(createPanel("Trigger", "", Fields.LDS_TRIGGER_INDEX,
liveDocs.add(createPanel("Trigger", "", Fields.LDS_TRIGGER_STATE_INDEX,
TriggerState.VALUES, TriggerDecoderMeta.CONTENT), CONSTRAINTS);
return liveDocs;

8
java_console/ui/src/com/rusefi/ui/livedocs/LiveDocsSandbox.java
View File

@ -10,8 +10,8 @@ import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import java.awt.*;
import static com.rusefi.config.generated.Fields.LDS_CLT_INDEX;
import static com.rusefi.config.generated.Fields.LDS_IAT_INDEX;
import static com.rusefi.config.generated.Fields.LDS_CLT_STATE_INDEX;
import static com.rusefi.config.generated.Fields.LDS_IAT_STATE_INDEX;
import static com.rusefi.ui.livedocs.controls.Toolbox.setTransparentLineBorder;
public class LiveDocsSandbox {
@ -21,8 +21,8 @@ public class LiveDocsSandbox {
comment.setForeground(Color.blue);
JPanel panels = new JPanel(new MigLayout("fillx, gap 0, insets 0"));
panels.add(LiveDocPanel.createPanel("Coolant Sensor", "CLT", LDS_CLT_INDEX, ThermistorState.VALUES, ThermistorsMeta.CONTENT), "wrap");
panels.add(LiveDocPanel.createPanel("Intake Air Sensor", "IAT", LDS_IAT_INDEX, ThermistorState.VALUES, ThermistorsMeta.CONTENT), "wrap");
panels.add(LiveDocPanel.createPanel("Coolant Sensor", "CLT", LDS_CLT_STATE_INDEX, ThermistorState.VALUES, ThermistorsMeta.CONTENT), "wrap");
panels.add(LiveDocPanel.createPanel("Intake Air Sensor", "IAT", LDS_IAT_STATE_INDEX, ThermistorState.VALUES, ThermistorsMeta.CONTENT), "wrap");
panels.add(getTChargePanel(), "wrap, grow");