speedo output

firmware/controllers/algo/engine.cpp

@@ -25,6 +25,7 @@
 #include "idle_hardware.h"
 #include "gppwm.h"
 #include "tachometer.h"
+#include "speedometer.h"
 #include "dynoview.h"
 #include "boost_control.h"
 #include "fan_control.h"
@@ -545,7 +546,8 @@ void Engine::periodicFastCallback() {
 
 	engineState.periodicFastCallback();
 
-	tachSignalCallback();
+	tachUpdate();
+	speedoUpdate();
 
 	engine->engineModules.apply_all([](auto & m) { m.onFastCallback(); });
 }

firmware/controllers/controllers.mk

@@ -26,6 +26,7 @@ CONTROLLERS_SRC_CPP = \
 	$(CONTROLLERS_DIR)/actuators/gppwm/gppwm_channel.cpp \
 	$(CONTROLLERS_DIR)/actuators/gppwm/gppwm.cpp \
 	$(CONTROLLERS_DIR)/gauges/tachometer.cpp \
+	$(CONTROLLERS_DIR)/gauges/speedometer.cpp \
 	$(CONTROLLERS_DIR)/gauges/malfunction_indicator.cpp \
 	$(CONTROLLERS_DIR)/system/timer/signal_executor_sleep.cpp \
 	$(CONTROLLERS_DIR)/system/timer/single_timer_executor.cpp \

firmware/controllers/engine_controller.cpp

@@ -52,6 +52,7 @@
 #include "boost_control.h"
 #include "launch_control.h"
 #include "tachometer.h"
+#include "speedometer.h"
 #include "gppwm.h"
 #include "date_stamp.h"
 #include "rusefi_lua.h"
@@ -510,6 +511,7 @@ void commonInitEngineController() {
 #endif /* EFI_ENGINE_CONTROL */
 
 	initTachometer();
+	initSpeedometer();
 }
 
 // Returns false if there's an obvious problem with the loaded configuration

firmware/controllers/gauges/speedometer.cpp

@@ -0,0 +1,39 @@
+#include "pch.h"
+
+#include "speedometer.h"
+
+static SimplePwm speedoPwm("speedo");
+
+static bool hasSpeedoInit = false;
+
+void speedoUpdate() {
+	if (!hasSpeedoInit) {
+		return;
+	}
+
+	float kph = Sensor::getOrZero(SensorType::VehicleSpeed);
+	float kps = kph * (1. / 3600);
+	float freq = kps * engineConfiguration->speedometerPulsePerKm;
+
+	if (freq < 1) {
+		freq = NAN;
+	}
+
+	speedoPwm.setFrequency(freq);
+}
+
+void initSpeedometer() {
+	hasSpeedoInit = false;
+
+	if (!isBrainPinValid(engineConfiguration->speedometerOutputPin)) {
+		return;
+	}
+
+	startSimplePwm(&speedoPwm,
+					"Speedometer",
+					&engine->executor,
+					&enginePins.speedoOut,
+					NAN, 0.5f);
+
+	hasSpeedoInit = true;
+}

firmware/controllers/gauges/speedometer.h

@@ -0,0 +1,4 @@
+#pragma once
+
+void initSpeedometer();
+void speedoUpdate();

firmware/controllers/gauges/tachometer.cpp

@@ -28,7 +28,7 @@ float getTachDuty() {
 
 static bool tachHasInit = false;
 
-void tachSignalCallback() {
+void tachUpdate() {
 	// Only do anything if tach enabled
 	if (!tachHasInit) {
 		return;
@@ -60,12 +60,13 @@ void tachSignalCallback() {
 		tachFreq = NAN;
 	}
 	
-	tachControl.setSimplePwmDutyCycle(duty);	
+	tachControl.setSimplePwmDutyCycle(duty);
 	tachControl.setFrequency(tachFreq);
 }
 
 void initTachometer() {
 	tachHasInit = false;
+
 	if (!isBrainPinValid(engineConfiguration->tachOutputPin)) {
 		return;
 	}

firmware/controllers/gauges/tachometer.h

@@ -8,4 +8,4 @@
 #pragma once
 
 void initTachometer();
-void tachSignalCallback();
+void tachUpdate();

firmware/controllers/system/efi_gpio.cpp

@@ -149,9 +149,9 @@ EnginePins::EnginePins() :
 		alternatorPin("Alternator control", CONFIG_PIN_OFFSETS(alternatorControl)),
 		checkEnginePin("checkEnginePin", CONFIG_PIN_OFFSETS(malfunctionIndicator)),
 		tachOut("tachOut", CONFIG_PIN_OFFSETS(tachOutput)),
-		triggerDecoderErrorPin("led: trigger debug", CONFIG_PIN_OFFSETS(triggerError))
+		triggerDecoderErrorPin("led: trigger debug", CONFIG_PIN_OFFSETS(triggerError)),
+		speedoOut("speedoOut", CONFIG_OFFSET(speedometerOutputPin))
 {
-	tachOut.name = PROTOCOL_TACH_NAME;
 	hpfpValve.name = PROTOCOL_HPFP_NAME;
 
 	static_assert(efi::size(sparkNames) >= MAX_CYLINDER_COUNT, "Too many ignition pins");

firmware/controllers/system/efi_gpio.h

@@ -54,7 +54,7 @@ private:
 
 class RegisteredNamedOutputPin : public RegisteredOutputPin, public NamedOutputPin {
 public:
-		RegisteredNamedOutputPin(const char *name, size_t pinOffset, size_t pinModeOffset);
+	RegisteredNamedOutputPin(const char* name, size_t pinOffset, size_t pinModeOffset);
 };
 
 class EnginePins {
@@ -106,9 +106,10 @@ public:
 	 */
 	RegisteredOutputPin checkEnginePin;
 
-	RegisteredNamedOutputPin tachOut;
-
+	RegisteredOutputPin tachOut;
 	RegisteredOutputPin triggerDecoderErrorPin;
+	RegisteredOutputPin speedoOut;
+
 	OutputPin sdCsPin;
 	OutputPin accelerometerCs;