remove old output channels

FOME-Tech · Dec 10, 2024 · 20624db · 20624db
1 parent 8a57855
commit 20624db
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 18 deletions.
diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt
@@ -94,9 +94,10 @@ int16_t rpmAcceleration;dRPM;"RPM acceleration",1, 0, 0, 5, 2
 	uint8_t currentInjectionMode;@@GAUGE_NAME_INJECTION_MODE@@
 
 	uint16_t autoscale coilDutyCycle;@@GAUGE_NAME_DWELL_DUTY@@;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
-! ETB
-	int16_t autoscale etbTarget;ETB Target;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 2
-	int16_t autoscale etb1DutyCycle;@@GAUGE_NAME_ETB_DUTY@@;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 1
+
+	uint16_t unused66
+	uint16_t unused68
+
 ! Fuel system
 	int16_t autoscale fuelTankLevel;Fuel level;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
 

diff --git a/firmware/controllers/actuators/electronic_throttle.cpp b/firmware/controllers/actuators/electronic_throttle.cpp
@@ -318,12 +318,6 @@ expected<percent_t> EtbController::getSetpointEtb() {
 	targetPosition = clampF(minPosition, targetPosition, maxPosition);
 	etbCurrentAdjustedTarget = targetPosition;
 
-#if EFI_TUNER_STUDIO
-	if (m_function == DC_Throttle1) {
-		engine->outputChannels.etbTarget = targetPosition;
-	}
-#endif // EFI_TUNER_STUDIO
-
 	return targetPosition;
 }
 
@@ -477,13 +471,6 @@ expected<percent_t> EtbController::getClosedLoop(percent_t target, percent_t obs
 }
 
 void EtbController::setOutput(expected<percent_t> outputValue) {
-#if EFI_TUNER_STUDIO
-	// Only report first-throttle stats
-	if (m_function == DC_Throttle1) {
-		engine->outputChannels.etb1DutyCycle = outputValue.value_or(0);
-	}
-#endif
-
 	if (!m_motor) {
 		return;
 	}

diff --git a/firmware/integration/LiveData.yaml b/firmware/integration/LiveData.yaml
@@ -122,7 +122,7 @@ Usages:
   - name: electronic_throttle
     folder: controllers/actuators
     prepend: integration/rusefi_config_shared.txt
-    # output_name: [ "etb1", "etb2" ]
+    output_name: [ "ETB 1", "ETB 2" ]
 
   - name: wideband_state
     folder: controllers/sensors/

diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
@@ -106,7 +106,7 @@ struct_no_prefix persistent_config_s
 
 struct_no_prefix engine_configuration_s
 
-#define BLOCKING_FACTOR 1320
+#define BLOCKING_FACTOR 1350
 
 #define SENT_INPUT_COUNT 1