From c8ed6374b3c2a2797b7bb42d47e625cea0c9b39a Mon Sep 17 00:00:00 2001 From: rusefillc Date: Thu, 2 Jan 2025 22:15:40 -0500 Subject: [PATCH] refactoring: reducing complexity? handling trigger same as everything else? only:uaefi --- firmware/controllers/trigger/trigger_central.txt | 3 +-- firmware/integration/LiveData.yaml | 4 +--- firmware/integration/rusefi_config_shared.txt | 3 +++ .../src/main/java/com/rusefi/ldmp/LiveDataProcessor.java | 4 +--- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/firmware/controllers/trigger/trigger_central.txt b/firmware/controllers/trigger/trigger_central.txt index 91278d17a8..3f81d713b2 100644 --- a/firmware/controllers/trigger/trigger_central.txt +++ b/firmware/controllers/trigger/trigger_central.txt @@ -1,5 +1,4 @@ -! technically that's PWM_PHASE_MAX_WAVE_PER_PWM * 2 -#define HW_EVENT_TYPES 4 + struct_no_prefix trigger_central_s diff --git a/firmware/integration/LiveData.yaml b/firmware/integration/LiveData.yaml index cda88c9090..3e49169807 100644 --- a/firmware/integration/LiveData.yaml +++ b/firmware/integration/LiveData.yaml @@ -161,9 +161,7 @@ Usages: - name: trigger_central java: TriggerCentral.java folder: controllers/trigger - withCDefines: true -# something special about 'error: "ts_show_vbatt" redefined'' why is trigger.h special? -# prepend: integration/rusefi_config.txt + prepend: integration/rusefi_config_shared.txt constexpr: "engine->triggerCentral" conditional_compilation: "EFI_SHAFT_POSITION_INPUT" diff --git a/firmware/integration/rusefi_config_shared.txt b/firmware/integration/rusefi_config_shared.txt index 0d82e864f5..3b2c33e0da 100644 --- a/firmware/integration/rusefi_config_shared.txt +++ b/firmware/integration/rusefi_config_shared.txt @@ -21,6 +21,9 @@ #define PACK_MULT_FUEL_FLOW 200 #define PACK_MULT_VSS 100 +! technically that's PWM_PHASE_MAX_WAVE_PER_PWM * 2 +#define HW_EVENT_TYPES 4 + #define STFT_BANK_COUNT 2 #define TCU_GEAR_COUNT 10 diff --git a/java_tools/configuration_definition_base/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java index 21cbd60812..ec8f4628b2 100644 --- a/java_tools/configuration_definition_base/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java +++ b/java_tools/configuration_definition_base/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java @@ -260,10 +260,8 @@ public class LiveDataProcessor { if (cppFileName == null) cppFileName = name; String conditional = (String) entry.get("conditional_compilation"); - Boolean withCDefines = (Boolean) entry.get("withCDefines"); Boolean isPtr = (Boolean) entry.get("isPtr"); - // Defaults to false if not specified - withCDefines = withCDefines != null && withCDefines; + boolean withCDefines = false; isPtr = isPtr != null && isPtr; Object outputNames = entry.get("output_name");