From 2bb575629cf25bb4f9fe5959f80bbb05c5f67f47 Mon Sep 17 00:00:00 2001 From: rusefillc <48498823+rusefillc@users.noreply.github.com> Date: Sun, 15 Jan 2023 05:33:34 -0500 Subject: [PATCH 1/3] poke --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 51e2665ea2..80165f1dbd 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@
- rusEFI GPL open-source DIY ECU From a0800cd54ff7a515a3b70e802123e13ee9f88962 Mon Sep 17 00:00:00 2001 From: Andrey Date: Sun, 15 Jan 2023 05:55:54 -0500 Subject: [PATCH 2/3] live_data_e part of the process was broken? --- firmware/gen_enum_to_string.sh | 4 ---- firmware/gen_live_documentation.sh | 3 +++ .../io/src/main/java/com/rusefi/enums/live_data_e.java | 5 ++++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/firmware/gen_enum_to_string.sh b/firmware/gen_enum_to_string.sh index 3211f329d4..2bbc9daa26 100755 --- a/firmware/gen_enum_to_string.sh +++ b/firmware/gen_enum_to_string.sh @@ -4,10 +4,6 @@ echo "This batch files reads rusefi_enums.h and produces auto_generated_enums.* rm gen_enum_to_string.log -# todo: remove me soon, UsageReader generates java by itself now! -#java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum2string.jar com.rusefi.ToJavaEnum -enumInputFile console/binary/generated/live_data_ids.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums -#[ $? -eq 0 ] || { echo "ERROR generating live data ids"; exit 1; } - java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum2string.jar com.rusefi.ToJavaEnum -enumInputFile controllers/sensors/sensor_type.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums [ $? -eq 0 ] || { echo "ERROR generating sensors"; exit 1; } diff --git a/firmware/gen_live_documentation.sh b/firmware/gen_live_documentation.sh index 2d35a3c85e..e282965064 100755 --- a/firmware/gen_live_documentation.sh +++ b/firmware/gen_live_documentation.sh @@ -7,4 +7,7 @@ java -DSystemOut.name=logs/gen_live_documentation \ com.rusefi.ldmp.LiveDataProcessor integration/LiveData.yaml [ $? -eq 0 ] || { echo "ERROR generating"; exit 1; } +java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum2string.jar com.rusefi.ToJavaEnum -enumInputFile console/binary/generated/live_data_ids.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums +[ $? -eq 0 ] || { echo "ERROR generating live data ids"; exit 1; } + bash gen_output_channels.sh diff --git a/java_console/io/src/main/java/com/rusefi/enums/live_data_e.java b/java_console/io/src/main/java/com/rusefi/enums/live_data_e.java index 1a873b05f7..911d1d5d32 100644 --- a/java_console/io/src/main/java/com/rusefi/enums/live_data_e.java +++ b/java_console/io/src/main/java/com/rusefi/enums/live_data_e.java @@ -1,15 +1,18 @@ package com.rusefi.enums; +// based on ./console/binary/generated/live_data_ids.h //auto-generated by ToJavaEnum.java public enum live_data_e { + LDS_fuel_computer, + LDS_timing_state, LDS_output_channels, LDS_knock_controller, LDS_high_pressure_fuel_pump, LDS_injector_model, - LDS_fuel_computer, LDS_launch_control_state, + LDS_antilag_system_state, LDS_boost_control, LDS_ac_control, LDS_fan_control, From ace53609d17cfce9770bdd315a9a545a657c7cb0 Mon Sep 17 00:00:00 2001 From: Andrey Date: Sun, 15 Jan 2023 06:04:45 -0500 Subject: [PATCH 3/3] totalFuel and totalIgnition correction gauges in Tunerstudio #4955 --- .../io/src/main/java/com/rusefi/ldmp/StateDictionary.java | 2 ++ .../src/test/java/com/rusefi/ldmp/StateDictionaryTest.java | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/java_console/io/src/main/java/com/rusefi/ldmp/StateDictionary.java b/java_console/io/src/main/java/com/rusefi/ldmp/StateDictionary.java index 497db5be72..e3cb08747d 100644 --- a/java_console/io/src/main/java/com/rusefi/ldmp/StateDictionary.java +++ b/java_console/io/src/main/java/com/rusefi/ldmp/StateDictionary.java @@ -38,12 +38,14 @@ public enum StateDictionary { register(live_data_e.LDS_boost_control, BoostControl.VALUES, "boost_control"); register(live_data_e.LDS_launch_control_state, LaunchControl.VALUES, "launch_control"); register(live_data_e.LDS_high_pressure_fuel_pump, HighPressureFuelPump.VALUES, "high_pressure_fuel_pump"); + register(live_data_e.LDS_timing_state, TimingState.VALUES, "advance_map"); register(live_data_e.LDS_ignition_state, IgnitionState.VALUES, "advance_map"); register(live_data_e.LDS_electronic_throttle, ElectronicThrottle.VALUES, "electronic_throttle"); register(live_data_e.LDS_knock_controller, KnockController.VALUES, "knock_controller"); register(live_data_e.LDS_wideband_state, WidebandController.VALUES, "AemXSeriesLambda"); register(live_data_e.LDS_trigger_state_primary, TriggerStatePrimary.VALUES, "trigger_decoder"); register(live_data_e.LDS_fuel_computer, FuelComputer.VALUES, "fuel_computer"); + register(live_data_e.LDS_antilag_system_state, AntilagSystem.VALUES, "antilag_system"); if (map.size() != live_data_e.values().length) { Set missing = new HashSet<>(Arrays.asList(live_data_e.values())); missing.removeAll(map.keySet()); diff --git a/java_console/io/src/test/java/com/rusefi/ldmp/StateDictionaryTest.java b/java_console/io/src/test/java/com/rusefi/ldmp/StateDictionaryTest.java index ce45765a9a..6449120267 100644 --- a/java_console/io/src/test/java/com/rusefi/ldmp/StateDictionaryTest.java +++ b/java_console/io/src/test/java/com/rusefi/ldmp/StateDictionaryTest.java @@ -1,5 +1,7 @@ package com.rusefi.ldmp; +import com.rusefi.config.generated.FuelComputer; +import com.rusefi.config.generated.TimingState; import com.rusefi.config.generated.TsOutputs; import com.rusefi.enums.live_data_e; import org.junit.Test; @@ -16,6 +18,9 @@ public class StateDictionaryTest { @Test public void testOffset() { int outputsSize = StateDictionary.getSize(TsOutputs.VALUES); - assertEquals(outputsSize, StateDictionary.INSTANCE.getOffset(live_data_e.LDS_knock_controller)); + assertEquals(outputsSize + + StateDictionary.getSize(FuelComputer.VALUES) + + StateDictionary.getSize(TimingState.VALUES) + , StateDictionary.INSTANCE.getOffset(live_data_e.LDS_knock_controller)); } }