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

refactoring

This commit is contained in:
Andrey 2021-06-23 06:37:32 -04:00
parent a57d7c48fb
commit 1c48a61339
6 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/controllers/algo/engine_parts.h
View File

@ -57,6 +57,8 @@ public:
gear_e gearSelectorPosition; gear_e gearSelectorPosition;
}; };
typedef cyclic_buffer<int, 8> warningBuffer_t;
class WarningCodeState { class WarningCodeState {
public: public:
WarningCodeState(); WarningCodeState();
@ -67,7 +69,7 @@ public:
int lastErrorCode; int lastErrorCode;
efitimesec_t timeOfPreviousWarning; efitimesec_t timeOfPreviousWarning;
// todo: we need a way to post multiple recent warnings into TS // todo: we need a way to post multiple recent warnings into TS
cyclic_buffer<int, 8> recentWarnings; warningBuffer_t recentWarnings;
}; };
class FsioState { class FsioState {

5
unit_tests/engine_test_helper.cpp
View File

@ -46,6 +46,11 @@ EngineTestHelper::EngineTestHelper(engine_type_e engineType, const std::unordere
: EngineTestHelper(engineType, &emptyCallbackWithConfiguration, sensorValues) { : EngineTestHelper(engineType, &emptyCallbackWithConfiguration, sensorValues) {
} }
warningBuffer_t *EngineTestHelper::recentWarnings() {
return &unitTestWarningCodeState.recentWarnings;
}
EngineTestHelper::EngineTestHelper(engine_type_e engineType, configuration_callback_t configurationCallback, const std::unordered_map<SensorType, float>& sensorValues) { EngineTestHelper::EngineTestHelper(engine_type_e engineType, configuration_callback_t configurationCallback, const std::unordered_map<SensorType, float>& sensorValues) {
Sensor::setMockValue(SensorType::Clt, 70); Sensor::setMockValue(SensorType::Clt, 70);
Sensor::setMockValue(SensorType::Iat, 30); Sensor::setMockValue(SensorType::Iat, 30);

2
unit_tests/engine_test_helper.h
View File

@ -37,6 +37,8 @@ public:
EngineTestHelper(engine_type_e engineType, configuration_callback_t boardCallback, const std::unordered_map<SensorType, float>& sensorValues); EngineTestHelper(engine_type_e engineType, configuration_callback_t boardCallback, const std::unordered_map<SensorType, float>& sensorValues);
~EngineTestHelper(); ~EngineTestHelper();
warningBuffer_t *recentWarnings();
void applyTriggerWaveform(); void applyTriggerWaveform();
void setTriggerType(trigger_type_e trigger DECLARE_ENGINE_PARAMETER_SUFFIX); void setTriggerType(trigger_type_e trigger DECLARE_ENGINE_PARAMETER_SUFFIX);
/** /**

3
unit_tests/tests/ignition_injection/test_fuel_math.cpp
View File

@ -139,7 +139,6 @@ TEST(AirmassModes, VeOverride) {
} }
void setInjectionMode(int value DECLARE_ENGINE_PARAMETER_SUFFIX); void setInjectionMode(int value DECLARE_ENGINE_PARAMETER_SUFFIX);
extern WarningCodeState unitTestWarningCodeState;
TEST(FuelMath, testDifferentInjectionModes) { TEST(FuelMath, testDifferentInjectionModes) {
WITH_ENGINE_TEST_HELPER(TEST_ENGINE); WITH_ENGINE_TEST_HELPER(TEST_ENGINE);
@ -163,7 +162,7 @@ TEST(FuelMath, testDifferentInjectionModes) {
setInjectionMode((int)IM_SINGLE_POINT PASS_ENGINE_PARAMETER_SUFFIX); setInjectionMode((int)IM_SINGLE_POINT PASS_ENGINE_PARAMETER_SUFFIX);
engine->periodicFastCallback(PASS_ENGINE_PARAMETER_SIGNATURE); engine->periodicFastCallback(PASS_ENGINE_PARAMETER_SIGNATURE);
EXPECT_FLOAT_EQ( 40, engine->injectionDuration) << "injection while IM_SINGLE_POINT"; EXPECT_FLOAT_EQ( 40, engine->injectionDuration) << "injection while IM_SINGLE_POINT";
EXPECT_EQ( 0, unitTestWarningCodeState.recentWarnings.getCount()) << "warningCounter#testDifferentInjectionModes"; EXPECT_EQ( 0, eth.recentWarnings()->getCount()) << "warningCounter#testDifferentInjectionModes";
} }
TEST(FuelMath, deadtime) { TEST(FuelMath, deadtime) {

1
unit_tests/tests/test_tacho.cpp
View File

@ -1,6 +1,5 @@
#include "engine_test_helper.h" #include "engine_test_helper.h"
extern WarningCodeState unitTestWarningCodeState;
extern float getTachFreq(void); extern float getTachFreq(void);
extern float getTachDuty(void); extern float getTachDuty(void);

8
unit_tests/tests/trigger/test_issue_898.cpp
View File

@ -7,8 +7,6 @@
#include "engine_test_helper.h" #include "engine_test_helper.h"
extern WarningCodeState unitTestWarningCodeState;
static void boardConfigurationForIssue898(engine_configuration_s *engineConfiguration) { static void boardConfigurationForIssue898(engine_configuration_s *engineConfiguration) {
setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR); setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR);
engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2;
@ -21,7 +19,7 @@ TEST(issues, issue898) {
ASSERT_EQ(TRUE, engine->triggerCentral.triggerShape.shapeDefinitionError) << "MRE_MIATA_NA6 shapeDefinitionError"; ASSERT_EQ(TRUE, engine->triggerCentral.triggerShape.shapeDefinitionError) << "MRE_MIATA_NA6 shapeDefinitionError";
ASSERT_EQ( 2, unitTestWarningCodeState.recentWarnings.getCount()) << "warningCounter#testFuelSchedulerBug299smallAndMedium"; ASSERT_EQ( 2, eth.recentWarnings()->getCount()) << "warningCounter#testFuelSchedulerBug299smallAndMedium";
ASSERT_EQ(CUSTOM_ERR_BOTH_FRONTS_REQUIRED, unitTestWarningCodeState.recentWarnings.get(0)); ASSERT_EQ(CUSTOM_ERR_BOTH_FRONTS_REQUIRED, eth.recentWarnings()->get(0));
ASSERT_EQ(CUSTOM_ERR_TRIGGER_SYNC, unitTestWarningCodeState.recentWarnings.get(1)); ASSERT_EQ(CUSTOM_ERR_TRIGGER_SYNC, eth.recentWarnings()->get(1));
} }