bench test buttons for fuel pump on/off #219

Author: mck1117

firmware/CHANGELOG.md

@@ -36,6 +36,7 @@ Release template (copy/paste this for new release):
  - Add mode for CLT/IAT sensors that are installed "high side" instead of typical "low side" #116
  - Automatic supply voltage compensation for VVT solenoids, giving more stable control as battery voltage changes #209
  - Configurable ignition timing limits, adding safety particularly for engines running wasted spark with a large cam #211
+ - Improved injection, ignition bench test UI and functionality: More gauges, fuel pump on/off buttons for injector testing, and configurable duration/count #219
 
 ### Fixed
  - Improved bench test resolution (more usable for testing injectors, dwell, etc)

firmware/controllers/actuators/fuel_pump.cpp

@@ -18,7 +18,7 @@ void FuelPumpController::onSlowCallback() {
 	engineTurnedRecently = engine->triggerCentral.engineMovedRecently();
 #endif //EFI_SHAFT_POSITION_INPUT
 
-	isFuelPumpOn = isPrime || engineTurnedRecently;
+	isFuelPumpOn = isPrime || engineTurnedRecently || m_forceState;
 
 	enginePins.fuelPumpRelay.setValue(isFuelPumpOn);
 }
@@ -30,3 +30,7 @@ void FuelPumpController::onIgnitionStateChanged(bool ignitionOnParam) {
 		m_ignOnTimer.reset();
 	}
 }
+
+void FuelPumpController::forcePumpState(bool state) {
+	m_forceState = state;
+}

firmware/controllers/actuators/fuel_pump.h

@@ -13,6 +13,9 @@ class FuelPumpController : public EngineModule, public fuel_pump_control_s {
 	void onSlowCallback() override;
 	void onIgnitionStateChanged(bool ignitionOn) override;
 
+	void forcePumpState(bool state);
+
 private:
 	Timer m_ignOnTimer;
+	bool m_forceState = false;
 };

firmware/controllers/algo/engine_types.h

@@ -543,20 +543,21 @@ typedef enum {
 } ts_command_e;
 
 typedef enum {
-	BENCH_MAIN_RELAY, // 0
-	BENCH_FUEL_PUMP,
+	BENCH_MAIN_RELAY,
 	BENCH_STARTER_ENABLE_RELAY,
 	BENCH_STARTER_DISABLE_RELAY,
 	BENCH_FAN_RELAY,
-	BENCH_FAN_RELAY_2, // 5
+	BENCH_FAN_RELAY_2,
 	BENCH_AC_COMPRESSOR_RELAY,
 	BENCH_CHECK_ENGINE_LIGHT,
-	BENCH_IDLE_VALVE, // 8
+	BENCH_IDLE_VALVE,
 	BENCH_HPFP_VALVE,
 	BENCH_GPPWM1_VALVE,
 	BENCH_GPPWM2_VALVE,
 	BENCH_GPPWM3_VALVE,
 	BENCH_GPPWM4_VALVE,
 	BENCH_SECOND_IDLE_VALVE,
 	BENCH_CANCEL,
+	BENCH_FUEL_PUMP_ON,
+	BENCH_FUEL_PUMP_OFF,
 } bench_mode_e;

firmware/controllers/bench_test.cpp

@@ -291,10 +291,6 @@ static void handleBenchCategory(uint16_t index) {
 	case BENCH_HPFP_VALVE:
 		hpfpValveBench();
 		return;
-	case BENCH_FUEL_PUMP:
-		// cmd_test_fuel_pump
-		fuelPumpBench();
-		return;
 	case BENCH_STARTER_ENABLE_RELAY:
 		starterRelayBench();
 		return;
@@ -320,6 +316,12 @@ static void handleBenchCategory(uint16_t index) {
 	case BENCH_CANCEL:
 		cancelBenchTest();
 		return;
+	case BENCH_FUEL_PUMP_ON:
+		engine->module<FuelPumpController>()->forcePumpState(true);
+		return;
+	case BENCH_FUEL_PUMP_OFF:
+		engine->module<FuelPumpController>()->forcePumpState(false);
+		return;
 	default:
 		firmwareError(ObdCode::OBD_PCM_Processor_Fault, "Unexpected bench function %d", index);
 	}

firmware/tunerstudio/rusefi.input

@@ -1999,6 +1999,9 @@ cmd_test_inj12 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_INJECTOR_CATEGORY
 
 cmd_test_cancel = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_BENCH_CATEGORY_16_hex@@@@bench_mode_e_BENCH_CANCEL_16_hex@@"
 
+cmd_fuel_pump_on  = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_BENCH_CATEGORY_16_hex@@@@bench_mode_e_BENCH_FUEL_PUMP_ON_16_hex@@"
+cmd_fuel_pump_off = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_BENCH_CATEGORY_16_hex@@@@bench_mode_e_BENCH_FUEL_PUMP_OFF_16_hex@@"
+
 cmd_test_sol1 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SOLENOID_CATEGORY_16_hex@@\x00\x01"
 cmd_test_sol2 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SOLENOID_CATEGORY_16_hex@@\x00\x02"
 cmd_test_sol3 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SOLENOID_CATEGORY_16_hex@@\x00\x03"
@@ -2007,7 +2010,6 @@ cmd_test_sol5 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SOLENOID_CATEGORY_
 cmd_test_sol6 = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SOLENOID_CATEGORY_16_hex@@\x00\x06"
 
 cmd_test_main_relay			= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_BENCH_CATEGORY_16_hex@@@@bench_mode_e_BENCH_MAIN_RELAY_16_hex@@"
-cmd_test_fuel_pump				= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_BENCH_CATEGORY_16_hex@@@@bench_mode_e_BENCH_FUEL_PUMP_16_hex@@"
 cmd_test_starter_relay			= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_BENCH_CATEGORY_16_hex@@@@bench_mode_e_BENCH_STARTER_ENABLE_RELAY_16_hex@@"
 cmd_test_starter_disable_relay	= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_BENCH_CATEGORY_16_hex@@@@bench_mode_e_BENCH_STARTER_DISABLE_RELAY_16_hex@@"
 cmd_test_ac_relay				= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_BENCH_CATEGORY_16_hex@@@@bench_mode_e_BENCH_AC_COMPRESSOR_RELAY_16_hex@@"
@@ -4044,7 +4046,8 @@ dialog = tcuControls, "Transmission Settings"
 
 	dialog = testMisc, "Misc"
 		commandButton = "Main Relay", cmd_test_main_relay@@if_ts_show_main_relay
-		commandButton = "Fuel Pump", cmd_test_fuel_pump
+		commandButton = "Fuel pump on", cmd_fuel_pump_on
+		commandButton = "Fuel pump off", cmd_fuel_pump_off
 		commandButton = "Cooling Fan", cmd_test_fan_1
 		commandButton = "Cooling Fan 2", cmd_test_fan_2
 		commandButton = "A/C Relay", cmd_test_ac_relay
@@ -4086,7 +4089,13 @@ dialog = tcuControls, "Transmission Settings"
 		field = "Iterations", benchTestCount
 		field = "ON time", benchTestOnTime
 		field = "OFF time", benchTestOffTime
+		field = ""
 		commandButton = "Abort test", cmd_test_cancel
+		field = ""
+		field = "Use these buttons to run the"
+		field = "fuel pump for testing injectors"
+		commandButton = "Fuel pump on", cmd_fuel_pump_on
+		commandButton = "Fuel pump off", cmd_fuel_pump_off
 		gauge = testBenchIterGauge
 
 	dialog = injTest_r, "Reference gauges", yAxis