From 638c7fdc6dddff728f98ed8b98b37e627575a4d0 Mon Sep 17 00:00:00 2001 From: Andrey Date: Sat, 26 Nov 2022 20:22:40 -0500 Subject: [PATCH] Target AFR table Y axis stuck at 0 #4826 sweet coverage :) --- firmware/console/binary/live_data.cpp | 2 +- .../io/src/test/java/com/rusefi/native_/JniUnitTest.java | 3 +-- unit_tests/native/native_impl.cpp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/firmware/console/binary/live_data.cpp b/firmware/console/binary/live_data.cpp index 93b0cec970..45932996b3 100644 --- a/firmware/console/binary/live_data.cpp +++ b/firmware/console/binary/live_data.cpp @@ -143,7 +143,7 @@ const electronic_throttle_s* getLiveDataAddr(size_t) { #if EFI_UNIT_TEST FragmentList getLiveDataFragments() { // todo: would same runtime be optimized into static during firmware build? - FragmentEntry fragments[] = { + static FragmentEntry fragments[] = { // This header is generated - do not edit by hand! #include "live_data_fragments.h" }; diff --git a/java_console/io/src/test/java/com/rusefi/native_/JniUnitTest.java b/java_console/io/src/test/java/com/rusefi/native_/JniUnitTest.java index 3635063f9a..b2c39265d9 100644 --- a/java_console/io/src/test/java/com/rusefi/native_/JniUnitTest.java +++ b/java_console/io/src/test/java/com/rusefi/native_/JniUnitTest.java @@ -27,8 +27,7 @@ public class JniUnitTest { assertEquals(TS_FILE_VERSION, (int) getValue(engineLogic.getOutputs(), Sensor.FIRMWARE_VERSION)); - // huh? assertEquals(14.0, getValue(engineLogic.getOutputs(), Sensor.afrTarget)); - assertEquals(0.0, getValue(engineLogic.getOutputs(), Sensor.afrTarget)); + assertEquals(14.0, getValue(engineLogic.getOutputs(), Sensor.afrTarget)); double veValue = getValue(engineLogic.getOutputs(), Sensor.veValue); assertTrue("veValue", veValue > 40 && veValue < 90); diff --git a/unit_tests/native/native_impl.cpp b/unit_tests/native/native_impl.cpp index 73f3792d82..bde0343958 100644 --- a/unit_tests/native/native_impl.cpp +++ b/unit_tests/native/native_impl.cpp @@ -80,7 +80,7 @@ JNIEXPORT jbyteArray JNICALL Java_com_rusefi_native_1_EngineLogic_getOutputs(JNI jbyte *buf = env->GetByteArrayElements(retVal, NULL); EngineTestHelper* eth = getEth(); updateTunerStudioState(); - memcpy(buf, (const void*)ð->engine.outputChannels, sizeof(TunerStudioOutputChannels)); + copyRange((uint8_t*)buf, getLiveDataFragments(), 0, TS_TOTAL_OUTPUT_SIZE); env->ReleaseByteArrayElements(retVal, buf, 0); return retVal;