andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

new tests on decodeAemXSeries, fixed debug task on vscode (#7032)

This commit is contained in:
Diego 2024-11-03 18:54:35 -03:00 committed by GitHub
parent d76daa3faf
commit 1fcf3343c9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 98 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.vscode/launch.json vendored
View File

@ -4,6 +4,7 @@
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Debug Unit Tests (gdb)",
"type": "cppdbg",
@ -22,7 +23,8 @@
"text": "-enable-pretty-printing",
"ignoreFailures": true
}
]
],
"preLaunchTask": "Build Unit Tests"
},
{
"name": "Debug simulator (gdb)",
@ -40,7 +42,8 @@
"text": "-enable-pretty-printing",
"ignoreFailures": true
}
]
],
"preLaunchTask": "Build Simulator"
},
{
"name": "Debug Unit Tests (lldb)",
@ -49,6 +52,7 @@
"program": "${workspaceFolder}/unit_tests/build/rusefi_test",
"args": [],
"cwd": "${workspaceFolder}/unit_tests/build/",
"preLaunchTask": "Build Unit Tests"
},
{
"name": "Debug F40x",
@ -62,7 +66,8 @@
"servertype": "openocd",
"configFiles": ["interface/stlink.cfg", "target/stm32f4x.cfg"],
"rtos": "auto",
"runToMain": true
"runToMain": true,
"preLaunchTask": "Build Firmware (microRusEfi F4)"
},
{
"name": "Debug F42x",
@ -76,7 +81,8 @@
"servertype": "openocd",
"configFiles": ["interface/stlink.cfg", "target/stm32f4x.cfg"],
"rtos": "auto",
"runToMain": true
"runToMain": true,
"preLaunchTask": "Build Firmware (Nucleo F429)"
},
{
"name": "Debug F7x6",
@ -90,7 +96,8 @@
"servertype": "openocd",
"configFiles": ["interface/stlink.cfg", "target/stm32f7x.cfg"],
"rtos": "auto",
"runToMain": true
"runToMain": true,
"preLaunchTask": "Build Firmware (microRusEfi F7)"
},
{
"name": "Debug H743",
@ -104,7 +111,8 @@
"servertype": "openocd",
"configFiles": ["interface/stlink.cfg", "target/stm32h7x.cfg"],
"rtos": "auto",
"runToMain": true
"runToMain": true,
"preLaunchTask": "Build Firmware (Atlas H7)"
}
]
}

4
firmware/controllers/sensors/impl/AemXSeriesLambda.h
View File

@ -4,11 +4,11 @@
#include "wideband_state_generated.h"
class AemXSeriesWideband final : public CanSensorBase, public wideband_state_s {
class AemXSeriesWideband : public CanSensorBase, public wideband_state_s {
public:
AemXSeriesWideband(uint8_t sensorIndex, SensorType type);
bool acceptFrame(const CANRxFrame& frame) const override;
bool acceptFrame(const CANRxFrame& frame) const override final;
void refreshState(void);

83
unit_tests/tests/test_can_wideband.cpp
View File

@ -46,6 +46,87 @@ TEST(CanWideband, AcceptFrameId1) {
EXPECT_TRUE(dut.acceptFrame(frame));
}
class AemXSeriesWidebandWrapper: AemXSeriesWideband {
public:
using AemXSeriesWideband::AemXSeriesWideband;
using AemXSeriesWideband::decodeAemXSeries;
using AemXSeriesWideband::Register;
};
TEST(CanWideband,DecodeAemXSeriesInvalidLambda){
AemXSeriesWidebandWrapper wbo(0, SensorType::Lambda1);
CANRxFrame frame;
frame.SID = 0x180;
frame.IDE = false;
frame.DLC = 8;
frame.data8[0] = 0x1F;
frame.data8[1] = 0x40;
frame.data8[2] = 0;
frame.data8[3] = 0;
frame.data8[4] = 0x79;
frame.data8[5] = 0x6E;
frame.data8[6] = 0b01000000;
frame.data8[7] = 0;
EXPECT_FALSE(wbo.decodeAemXSeries(frame, getTimeNowNt()));
}
TEST(CanWideband,DecodeAemXSeriesSensorFault){
AemXSeriesWidebandWrapper wbo(0, SensorType::Lambda1);
CANRxFrame frame;
frame.SID = 0x180;
frame.IDE = false;
frame.DLC = 8;
frame.data8[0] = 0x1F;
frame.data8[1] = 0x40;
frame.data8[2] = 0;
frame.data8[3] = 0;
frame.data8[4] = 0x79;
frame.data8[5] = 0x6E;
frame.data8[6] = 0;
frame.data8[7] = 0b00000010;
EXPECT_FALSE(wbo.decodeAemXSeries(frame, getTimeNowNt()));
}
TEST(CanWideband,DecodeAemXSeriesValidLambda){
EngineTestHelper eth(engine_type_e::TEST_ENGINE);
AemXSeriesWidebandWrapper wbo(0, SensorType::Lambda1);
// only this tests needs register
wbo.Register();
CANRxFrame frame;
frame.SID = 0x180;
frame.IDE = false;
frame.DLC = 8;
frame.data8[0] = 0x2F; // 8000, lambda 0.8
frame.data8[1] = 0x00;
frame.data8[2] = 0;
frame.data8[3] = 0;
frame.data8[4] = 0;
frame.data8[5] = 0;
frame.data8[6] =
1 << 1 | // LSU 4.9 detected
1 << 7; // Data valid
frame.data8[7] = 0;
wbo.decodeAemXSeries(frame, getTimeNowNt());
EXPECT_FLOAT_EQ(1.2032f, Sensor::get(SensorType::Lambda1).value_or(-1));
Sensor::resetRegistry();
}
TEST(CanWideband, DecodeValidAemFormat) {
EngineTestHelper eth(engine_type_e::TEST_ENGINE);
AemXSeriesWideband dut(0, SensorType::Lambda1);
@ -61,7 +142,7 @@ TEST(CanWideband, DecodeValidAemFormat) {
frame.DLC = 8;
frame.data8[0] = 0x1F; // 8000, lambda 0.8
frame.data8[0] = 0x1F;
frame.data8[1] = 0x40;
frame.data8[2] = 0;
frame.data8[3] = 0;