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

PID errorAmplificationCoef to LiveData

This commit is contained in:
rusefi 2019-08-30 17:11:12 -04:00
parent afdeecb87e
commit 4a1b78f9a4
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/engine_controller.cpp
View File

@ -812,6 +812,6 @@ int getRusEfiVersion(void) {
if (initBootloader() != 0)
return 123;
#endif /* EFI_BOOTLOADER_INCLUDE_CODE */
return 20190827;
return 20190829;
}
#endif /* EFI_UNIT_TEST */

10
firmware/controllers/generated/engine_state_generated.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/engine_state.txt Wed Aug 28 00:23:00 EDT 2019
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/engine_state.txt Fri Aug 30 17:08:45 EDT 2019
// by class com.rusefi.output.CHeaderConsumer
// begin
#ifndef CONTROLLERS_GENERATED_ENGINE_STATE_GENERATED_H
@ -30,7 +30,11 @@ struct pid_state_s {
* offset 16
*/
float output = (float)0;
/** total size 20*/
/**
* offset 20
*/
float errorAmplificationCoef = (float)0;
/** total size 24*/
};
typedef struct pid_state_s pid_state_s;
@ -239,4 +243,4 @@ typedef struct engine_state2_s engine_state2_s;
#endif
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/engine_state.txt Wed Aug 28 00:23:00 EDT 2019
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/engine_state.txt Fri Aug 30 17:08:45 EDT 2019

2
firmware/integration/engine_state.txt
View File

@ -5,7 +5,7 @@ struct_no_prefix pid_state_s
float target;only used for logging
float input;only used for logging
float output;only used for logging
float errorAmplificationCoef;
end_struct

2
firmware/util/math/pid.h
View File

@ -72,7 +72,7 @@ private:
pid_s *pid;
float previousError;
float errorAmplificationCoef;
private:
virtual void updateITerm(float value);

4
java_console/models/src/com/rusefi/config/generated/EngineState.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/engine_state.txt Wed Aug 28 00:23:00 EDT 2019
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/engine_state.txt Fri Aug 30 17:08:45 EDT 2019
// by class com.rusefi.output.JavaFieldsConsumer
import com.rusefi.config.*;
@ -11,6 +11,7 @@ public class EngineState {
public static final Field TARGET = Field.create("TARGET", 8, FieldType.FLOAT);
public static final Field INPUT = Field.create("INPUT", 12, FieldType.FLOAT);
public static final Field OUTPUT = Field.create("OUTPUT", 16, FieldType.FLOAT);
public static final Field ERRORAMPLIFICATIONCOEF = Field.create("ERRORAMPLIFICATIONCOEF", 20, FieldType.FLOAT);
public static final Field ISTCHARGEAIRMODEL = Field.create("ISTCHARGEAIRMODEL", 0, FieldType.BIT, 0);
public static final Field AIRMASSINONECYLINDER = Field.create("AIRMASSINONECYLINDER", 4, FieldType.FLOAT);
public static final Field TCHARGE = Field.create("TCHARGE", 8, FieldType.FLOAT);
@ -51,6 +52,7 @@ public class EngineState {
TARGET,
INPUT,
OUTPUT,
ERRORAMPLIFICATIONCOEF,
ISTCHARGEAIRMODEL,
AIRMASSINONECYLINDER,
TCHARGE,

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

@ -48,7 +48,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
* @see EngineSnifferPanel
*/
public class Launcher {
public static final int CONSOLE_VERSION = 20190827;
public static final int CONSOLE_VERSION = 20190829;
public static final String INPUT_FILES_PATH = System.getProperty("input_files_path", "..");
public static final String TOOLS_PATH = System.getProperty("tools_path", ".");
private static final String TAB_INDEX = "main_tab";