rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactoring launch

This commit is contained in:
Andrey 2021-11-15 14:40:35 -05:00
parent 40c7cbeed5
commit bafd5e0e17
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/controllers/algo/launch_control.cpp
View File

@ -17,9 +17,7 @@
static bool isInit = false; static bool isInit = false;
static LaunchControlBase launchInstance; LaunchControlBase launchInstance;
static int retardThresholdRpm;
/** /**
* We can have active condition from switch or from clutch. * We can have active condition from switch or from clutch.
@ -174,7 +172,7 @@ void setDefaultLaunchParameters(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
} }
void applyLaunchControlLimiting(bool *limitedSpark, bool *limitedFuel DECLARE_ENGINE_PARAMETER_SUFFIX) { void LaunchControlBase::applyLaunchControlLimiting(bool *limitedSpark, bool *limitedFuel DECLARE_ENGINE_PARAMETER_SUFFIX) {
if (( engine->isLaunchCondition ) && ( retardThresholdRpm < GET_RPM() )) { if (( engine->isLaunchCondition ) && ( retardThresholdRpm < GET_RPM() )) {
*limitedSpark = engineConfiguration->launchSparkCutEnable; *limitedSpark = engineConfiguration->launchSparkCutEnable;
*limitedFuel = engineConfiguration->launchFuelCutEnable; *limitedFuel = engineConfiguration->launchFuelCutEnable;

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

@ -12,7 +12,7 @@
void initLaunchControl(DECLARE_ENGINE_PARAMETER_SIGNATURE); void initLaunchControl(DECLARE_ENGINE_PARAMETER_SIGNATURE);
void setDefaultLaunchParameters(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setDefaultLaunchParameters(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void applyLaunchControlLimiting(bool *limitedSpark, bool *limitedFuel DECLARE_ENGINE_PARAMETER_SUFFIX);
void updateLaunchConditions(DECLARE_ENGINE_PARAMETER_SIGNATURE); void updateLaunchConditions(DECLARE_ENGINE_PARAMETER_SIGNATURE);
class LaunchControlBase : public EnginePtr { class LaunchControlBase : public EnginePtr {
@ -25,6 +25,8 @@ public:
bool isInsideSwitchCondition() const; bool isInsideSwitchCondition() const;
bool isInsideRPMCondition(int rpm) const; bool isInsideRPMCondition(int rpm) const;
bool isLaunchConditionMet(int rpm) const; bool isLaunchConditionMet(int rpm) const;
int retardThresholdRpm;
void applyLaunchControlLimiting(bool *limitedSpark, bool *limitedFuel DECLARE_ENGINE_PARAMETER_SUFFIX);
private: private:
Timer m_launchTimer; Timer m_launchTimer;

4
firmware/controllers/engine_cycle/main_trigger_callback.cpp
View File

@ -49,6 +49,8 @@
#include "backup_ram.h" #include "backup_ram.h"
extern LaunchControlBase launchInstance;
// todo: figure out if this even helps? // todo: figure out if this even helps?
//#if defined __GNUC__ //#if defined __GNUC__
//#define RAM_METHOD_PREFIX __attribute__((section(".ram"))) //#define RAM_METHOD_PREFIX __attribute__((section(".ram")))
@ -416,7 +418,7 @@ void mainTriggerCallback(uint32_t trgEventIndex, efitick_t edgeTimestamp DECLARE
#if EFI_LAUNCH_CONTROL #if EFI_LAUNCH_CONTROL
if (engine->isLaunchCondition && !limitedSpark && !limitedFuel) { if (engine->isLaunchCondition && !limitedSpark && !limitedFuel) {
/* in case we are not already on a limited conditions, check launch as well */ /* in case we are not already on a limited conditions, check launch as well */
applyLaunchControlLimiting(&limitedSpark, &limitedFuel PASS_ENGINE_PARAMETER_SUFFIX); launchInstance.applyLaunchControlLimiting(&limitedSpark, &limitedFuel PASS_ENGINE_PARAMETER_SUFFIX);
} }
#endif #endif
if (trgEventIndex == 0) { if (trgEventIndex == 0) {

9
unit_tests/tests/test_launch.cpp
View File

@ -130,6 +130,7 @@ TEST(LaunchControl, CompleteRun) {
bool spark, fuel; bool spark, fuel;
WITH_ENGINE_TEST_HELPER(TEST_ENGINE); WITH_ENGINE_TEST_HELPER(TEST_ENGINE);
extern LaunchControlBase launchInstance;
initLaunchControl(PASS_ENGINE_PARAMETER_SIGNATURE); initLaunchControl(PASS_ENGINE_PARAMETER_SIGNATURE);
//load default config //load default config
@ -154,7 +155,7 @@ TEST(LaunchControl, CompleteRun) {
//check if we have some sort of cut? we should not have at this point //check if we have some sort of cut? we should not have at this point
spark = false; spark = false;
fuel = false; fuel = false;
applyLaunchControlLimiting(&spark, &fuel PASS_ENGINE_PARAMETER_SUFFIX); launchInstance.applyLaunchControlLimiting(&spark, &fuel PASS_ENGINE_PARAMETER_SUFFIX);
EXPECT_FALSE(spark); EXPECT_FALSE(spark);
EXPECT_FALSE(fuel); EXPECT_FALSE(fuel);
@ -169,7 +170,7 @@ TEST(LaunchControl, CompleteRun) {
updateLaunchConditions(PASS_ENGINE_PARAMETER_SIGNATURE); updateLaunchConditions(PASS_ENGINE_PARAMETER_SIGNATURE);
spark = false; spark = false;
fuel = false; fuel = false;
applyLaunchControlLimiting(&spark, &fuel PASS_ENGINE_PARAMETER_SUFFIX); launchInstance.applyLaunchControlLimiting(&spark, &fuel PASS_ENGINE_PARAMETER_SUFFIX);
EXPECT_FALSE(spark); EXPECT_FALSE(spark);
EXPECT_FALSE(fuel); EXPECT_FALSE(fuel);
@ -178,7 +179,7 @@ TEST(LaunchControl, CompleteRun) {
updateLaunchConditions(PASS_ENGINE_PARAMETER_SIGNATURE); updateLaunchConditions(PASS_ENGINE_PARAMETER_SIGNATURE);
spark = false; spark = false;
fuel = false; fuel = false;
applyLaunchControlLimiting(&spark, &fuel PASS_ENGINE_PARAMETER_SUFFIX); launchInstance.applyLaunchControlLimiting(&spark, &fuel PASS_ENGINE_PARAMETER_SUFFIX);
EXPECT_TRUE(spark); EXPECT_TRUE(spark);
EXPECT_FALSE(fuel); EXPECT_FALSE(fuel);
@ -187,7 +188,7 @@ TEST(LaunchControl, CompleteRun) {
updateLaunchConditions(PASS_ENGINE_PARAMETER_SIGNATURE); updateLaunchConditions(PASS_ENGINE_PARAMETER_SIGNATURE);
spark = false; spark = false;
fuel = false; fuel = false;
applyLaunchControlLimiting(&spark, &fuel PASS_ENGINE_PARAMETER_SUFFIX); launchInstance.applyLaunchControlLimiting(&spark, &fuel PASS_ENGINE_PARAMETER_SUFFIX);
EXPECT_FALSE(spark); EXPECT_FALSE(spark);
EXPECT_FALSE(fuel); EXPECT_FALSE(fuel);