From 9c2e8aff0fae779b4bd28530899bc53af1f85b3c Mon Sep 17 00:00:00 2001
From: Jacob Dahl <37091262+dakejahl@users.noreply.github.com>
Date: Mon, 2 Mar 2026 13:28:14 -0900
Subject: [PATCH] battery: remove unused param BAT_I_CHANNEL (#26590)

---
 src/modules/battery_status/analog_battery.cpp | 11 +----------
 src/modules/battery_status/analog_battery.h   |  2 --
 src/modules/battery_status/module.yaml        | 13 -------------
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/src/modules/battery_status/analog_battery.cpp b/src/modules/battery_status/analog_battery.cpp
index 3a1357b868..7f52d7911f 100644
--- a/src/modules/battery_status/analog_battery.cpp
+++ b/src/modules/battery_status/analog_battery.cpp
@@ -67,9 +67,6 @@ AnalogBattery::AnalogBattery(int index, ModuleParams *parent, const int sample_i
 	snprintf(param_name, sizeof(param_name), "BAT%d_V_CHANNEL", index);
 	_analog_param_handles.v_channel = param_find(param_name);
 
-	snprintf(param_name, sizeof(param_name), "BAT%d_I_CHANNEL", index);
-	_analog_param_handles.i_channel = param_find(param_name);
-
 	snprintf(param_name, sizeof(param_name), "BAT%d_I_OVERWRITE", index);
 	_analog_param_handles.i_overwrite = param_find(param_name);
 
@@ -147,12 +144,7 @@ int AnalogBattery::get_voltage_channel()
 
 int AnalogBattery::get_current_channel()
 {
-	if (_analog_params.i_channel >= 0) {
-		return _analog_params.i_channel;
-
-	} else {
-		return DEFAULT_I_CHANNEL[_index - 1];
-	}
+	return DEFAULT_I_CHANNEL[_index - 1];
 }
 
 void
@@ -161,7 +153,6 @@ AnalogBattery::updateParams()
 	param_get(_analog_param_handles.v_div, &_analog_params.v_div);
 	param_get(_analog_param_handles.a_per_v, &_analog_params.a_per_v);
 	param_get(_analog_param_handles.v_channel, &_analog_params.v_channel);
-	param_get(_analog_param_handles.i_channel, &_analog_params.i_channel);
 	param_get(_analog_param_handles.i_overwrite, &_analog_params.i_overwrite);
 	param_get(_analog_param_handles.v_offs_cur, &_analog_params.v_offs_cur);
 	param_get(_analog_param_handles.v_filt, &_analog_params.v_filt);
diff --git a/src/modules/battery_status/analog_battery.h b/src/modules/battery_status/analog_battery.h
index df308fc710..9e91fba4ef 100644
--- a/src/modules/battery_status/analog_battery.h
+++ b/src/modules/battery_status/analog_battery.h
@@ -78,7 +78,6 @@ protected:
 		param_t v_div;
 		param_t a_per_v;
 		param_t v_channel;
-		param_t i_channel;
 		param_t i_overwrite;
 		param_t v_filt;
 		param_t i_filt;
@@ -89,7 +88,6 @@ protected:
 		float v_div;
 		float a_per_v;
 		int32_t v_channel;
-		int32_t i_channel;
 		float i_overwrite;
 		float v_filt;
 		float i_filt;
diff --git a/src/modules/battery_status/module.yaml b/src/modules/battery_status/module.yaml
index 03fa372ba1..11f8a633a8 100644
--- a/src/modules/battery_status/module.yaml
+++ b/src/modules/battery_status/module.yaml
@@ -51,19 +51,6 @@ parameters:
             instance_start: 1
             default: [-1, -1]
 
-        BAT${i}_I_CHANNEL:
-            description:
-                short: Battery ${i} Current ADC Channel
-                long: |
-                    This parameter specifies the ADC channel used to monitor current of main power battery.
-                    A value of -1 means to use the board default.
-
-            type: int32
-            reboot_required: true
-            num_instances: *max_num_config_instances
-            instance_start: 1
-            default: [-1, -1]
-
         BAT${i}_I_OVERWRITE:
             description:
                 short: Battery ${i} idle current overwrite