From b961edc654325132648e297393090874c93161c4 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 30 Nov 2019 16:49:40 -0500 Subject: [PATCH] refactoring --- .../algo/engine_configuration_generated_structures.h | 5 +++-- .../kinetis/config/controllers/algo/rusefi_generated.h | 1 + firmware/controllers/actuators/electronic_throttle.h | 4 ---- firmware/controllers/generated/rusefi_generated.h | 1 + firmware/integration/rusefi_config.txt | 2 ++ .../models/src/com/rusefi/config/generated/Fields.java | 3 ++- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index f337f7b0dd..38fd74d6ac 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sat Nov 30 10:08:11 EST 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sat Nov 30 16:44:43 EST 2019 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -531,6 +531,7 @@ #define etb2_offset 3964 #define etb2_offset_hex f7c #define ETB_BIAS_CURVE_LENGTH 8 +#define ETB_COUNT 2 #define etb_dFactor_offset 1744 #define etb_dFactor_offset_hex 6d0 #define etb_iFactor_offset 1740 @@ -4962,4 +4963,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sat Nov 30 10:08:11 EST 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sat Nov 30 16:44:43 EST 2019 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index f660ad92ca..0857aca881 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -529,6 +529,7 @@ #define etb2_offset 3964 #define etb2_offset_hex f7c #define ETB_BIAS_CURVE_LENGTH 8 +#define ETB_COUNT 2 #define etb_dFactor_offset 1744 #define etb_dFactor_offset_hex 6d0 #define etb_iFactor_offset 1740 diff --git a/firmware/controllers/actuators/electronic_throttle.h b/firmware/controllers/actuators/electronic_throttle.h index 3a8b0537a0..c2dc136aa5 100644 --- a/firmware/controllers/actuators/electronic_throttle.h +++ b/firmware/controllers/actuators/electronic_throttle.h @@ -14,10 +14,6 @@ #include "engine.h" #include "periodic_task.h" -#ifndef ETB_COUNT -#define ETB_COUNT 2 -#endif /* ETB_COUNT */ - class DcMotor; class EtbController final : public PeriodicTimerController { diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index c80a11f8de..d14cc9a701 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -529,6 +529,7 @@ #define etb2_offset 3964 #define etb2_offset_hex f7c #define ETB_BIAS_CURVE_LENGTH 8 +#define ETB_COUNT 2 #define etb_dFactor_offset 1744 #define etb_dFactor_offset_hex 6d0 #define etb_iFactor_offset 1740 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 2395c753f1..eda0aa8fc1 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -87,6 +87,8 @@ struct_no_prefix engine_configuration_s #define CLT_TIMING_CURVE_SIZE 8 #define IDLE_VE_CURVE_SIZE 8 +#define ETB_COUNT 2 + #define AUX_DIGITAL_VALVE_COUNT 2 #define IAT_CURVE_SIZE 16 diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index 88fe1aa6d5..3a6d22d7d5 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/com/rusefi/config/generated/Fields.java @@ -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 Nov 30 10:03:19 EST 2019 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Nov 30 16:44:31 EST 2019 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -347,6 +347,7 @@ public class Fields { public static final int etb2_directionPin2_offset = 3965; public static final int etb2_offset = 3964; public static final int ETB_BIAS_CURVE_LENGTH = 8; + public static final int ETB_COUNT = 2; public static final int etb_dFactor_offset = 1744; public static final int etb_iFactor_offset = 1740; public static final int etb_iTermMax_offset = 3958;