Implement Nitrous Relay and Nitrous Relay Mode settings rusefi#6783 (rusefi#7122)

Author: kifir23917

firmware/controllers/algo/nitrous_controller.cpp

@@ -22,6 +22,7 @@ void NitrousController::onSlowCallback() {
     } else {
         isNitrousConditionSatisfied = false;
     }
+    enginePins.nitrousRelay.setValue(isNitrousConditionSatisfied);
 }
 
 void NitrousController::updateArmingState() {

firmware/controllers/system/efi_gpio.cpp

@@ -153,6 +153,7 @@ EnginePins::EnginePins() :
 		fanRelay2("Fan Relay 2", CONFIG_PIN_OFFSETS(fan2)),
 		acRelay("A/C Relay", CONFIG_PIN_OFFSETS(acRelay)),
 		fuelPumpRelay("Fuel pump Relay", CONFIG_PIN_OFFSETS(fuelPump)),
+		nitrousRelay("Nitrous Relay", CONFIG_PIN_OFFSETS(nitrousRelay)),
 #if EFI_HD_ACR
 		harleyAcr("Harley ACR", CONFIG_OFFSET(acrPin)),
 		harleyAcr2("Harley ACR 2", CONFIG_OFFSET(acrPin2)),

firmware/controllers/system/efi_gpio.h

@@ -89,6 +89,7 @@ class EnginePins {
 	// see acRelayPin
 	RegisteredOutputPin acRelay;
 	RegisteredOutputPin fuelPumpRelay;
+	RegisteredOutputPin nitrousRelay;
 #if EFI_HD_ACR
 	RegisteredNamedOutputPin harleyAcr;
 	RegisteredOutputPin harleyAcr2;

firmware/integration/rusefi_config.txt

@@ -1798,8 +1798,10 @@ uint8_t autoscale knockFuelTrim;Fuel trim when knock, max 30%;"%", 1, 0, 0, 30,
 	uint8_t dfcoRetardDeg;Retard timing by this amount during DFCO. Smooths the transition back from fuel cut. After fuel is restored, ramp timing back in over the period specified.;"deg", 1, 0, 0, 30, 0
 	uint8_t autoscale dfcoRetardRampInTime;Smooths the transition back from fuel cut. After fuel is restored, ramp timing back in over the period specified.;"s", 0.1, 0, 0, 1, 1
 
+	output_pin_e nitrousRelayPin;
+	pin_output_mode_e nitrousRelayPinMode;
 
-#define END_OF_CALIBRATION_PADDING 76
+#define END_OF_CALIBRATION_PADDING 73
 uint8_t[END_OF_CALIBRATION_PADDING] unusedOftenChangesDuringFirmwareUpdate;;"units", 1, 0, 0, 1, 0
 
 ! end of engine_configuration_s

firmware/tunerstudio/tunerstudio.template.ini

@@ -4990,6 +4990,8 @@ dialog = tcuControls, "Transmission Settings"
 		panel = NitrousControlLuaGaugeDialog,	{nitrousControlArmingMethod == @@nitrous_arming_method_e_LUA_GAUGE@@}
 
 	dialog = NitrousControlSettings, "Settings"
+		field = "Nitrous Relay",			nitrousRelayPin
+		field = "Nitrous Relay Mode",		nitrousRelayPinMode
 		field = "Minimum TPS",				nitrousMinimumTps
 		field = "Minimum CLT",				nitrousMinimumClt
 		field = "Maximum MAP",				nitrousMaximumMap

unit_tests/tests/nitrous_control/test_nitrous_condition.cpp

@@ -23,7 +23,8 @@ namespace {
 
         void SetUp() override;
 
-        void satisfyAllConditions();
+        void checkNitrousCondition(bool expected, const char* context);
+
     private:
         void armNitrousControl();
         void satisfyTpsCondition();
@@ -49,18 +50,38 @@ namespace {
             .setNitrousDeactivationRpmWindow({ TEST_DEACTIVATION_RPM_WINDOW })
         );
 
-        satisfyAllConditions();
-    }
 
-    void NitrousConditionTest::satisfyAllConditions() {
+        EXPECT_FALSE(getModule<NitrousController>().isArmed);
+        EXPECT_FALSE(getModule<NitrousController>().isTpsConditionSatisfied);
+        EXPECT_FALSE(getModule<NitrousController>().isCltConditionSatisfied);
+        EXPECT_FALSE(getModule<NitrousController>().isMapConditionSatisfied);
+        EXPECT_FALSE(getModule<NitrousController>().isAfrConditionSatisfied);
+        EXPECT_FALSE(getModule<NitrousController>().isNitrousRpmConditionSatisfied);
+
+        checkNitrousCondition(false, "No conditions are satisfied");
+
         armNitrousControl();
+        checkNitrousCondition(false, "Armed condition is satisfied");
+
         satisfyTpsCondition();
+        checkNitrousCondition(false, "Armed + TPS conditions are satisfied");
+
         satisfyCltCondition();
+        checkNitrousCondition(false, "Armed + TPS + CLT conditions are satisfied");
+
         satisfyMapCondition();
+        checkNitrousCondition(false, "Armed + TPS + CLT + MAP conditions are satisfied");
+
         satisfyAfrCondition();
+        checkNitrousCondition(false, "Armed + TPS + CLT + MAP + AFR conditions are satisfied");
+
         satisfyRpmCondition();
+        checkNitrousCondition(true, "Armed + TPS + CLT + MAP + AFR + RPM conditions are satisfied");
+    }
 
-        EXPECT_TRUE(getModule<NitrousController>().isNitrousRpmConditionSatisfied);
+    void NitrousConditionTest::checkNitrousCondition(const bool expected, const char* const context) {
+        EXPECT_EQ(getModule<NitrousController>().isNitrousConditionSatisfied, expected) << context;
+        EXPECT_EQ(enginePins.nitrousRelay.getLogicValue(), expected) << context;
     }
 
     void NitrousConditionTest::armNitrousControl() {
@@ -105,41 +126,41 @@ namespace {
         periodicSlowCallback();
 
         EXPECT_FALSE(getModule<NitrousController>().isArmed);
-        EXPECT_FALSE(getModule<NitrousController>().isNitrousConditionSatisfied);
+        checkNitrousCondition(false, "Without armed condition");
     }
 
     TEST_F(NitrousConditionTest, checkWithoutSatisfiedTpsCondition) {
         updateApp(TEST_MIN_TPS - EPS5D, &TestBase::periodicSlowCallback);
 
         EXPECT_FALSE(getModule<NitrousController>().isTpsConditionSatisfied);
-        EXPECT_FALSE(getModule<NitrousController>().isNitrousConditionSatisfied);
+        checkNitrousCondition(false, "Without TPS condition");
     }
 
     TEST_F(NitrousConditionTest, checkWithoutSatisfiedCltCondition) {
         updateClt(TEST_MIN_CLT - EPS5D, &TestBase::periodicSlowCallback);
 
         EXPECT_FALSE(getModule<NitrousController>().isCltConditionSatisfied);
-        EXPECT_FALSE(getModule<NitrousController>().isNitrousConditionSatisfied);
+        checkNitrousCondition(false, "Without CLT condition");
     }
 
     TEST_F(NitrousConditionTest, checkWithoutSatisfiedMapCondition) {
         updateMap(TEST_MAX_MAP + EPS5D, &TestBase::periodicSlowCallback);
 
         EXPECT_FALSE(getModule<NitrousController>().isMapConditionSatisfied);
-        EXPECT_FALSE(getModule<NitrousController>().isNitrousConditionSatisfied);
+        checkNitrousCondition(false, "Without MAP condition");
     }
 
     TEST_F(NitrousConditionTest, checkWithoutSatisfiedAfrCondition) {
         updateLambda1(TEST_LAMBDA1 + EPS5D, &TestBase::periodicSlowCallback);
 
         EXPECT_FALSE(getModule<NitrousController>().isAfrConditionSatisfied);
-        EXPECT_FALSE(getModule<NitrousController>().isNitrousConditionSatisfied);
+        checkNitrousCondition(false, "Without AFR condition");
     }
 
     TEST_F(NitrousConditionTest, checkWithoutSatisfiedRpmCondition) {
         updateRpm(TEST_ACTIVATION_RPM - EPS5D, &TestBase::periodicSlowCallback);
 
         EXPECT_FALSE(getModule<NitrousController>().isNitrousRpmConditionSatisfied);
-        EXPECT_FALSE(getModule<NitrousController>().isNitrousConditionSatisfied);
+        checkNitrousCondition(false, "Without RPM condition");
     }
 }