From dd1e59d6ae27d6b1e96ff6d22941f82afe9cdf75 Mon Sep 17 00:00:00 2001
From: blckmn <blckmn@betaflight.com>
Date: Tue, 8 Jul 2025 08:31:47 +1000
Subject: [PATCH] Corrected naming and removed remaining H7 defines.

---
 src/main/pg/adc.c                              | 8 ++++----
 src/platform/STM32/include/platform/platform.h | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/pg/adc.c b/src/main/pg/adc.c
index 31f724e192..600ad02453 100644
--- a/src/main/pg/adc.c
+++ b/src/main/pg/adc.c
@@ -56,7 +56,7 @@ void pgResetFn_adcConfig(adcConfig_t *adcConfig)
 #ifdef ADC_VBAT_PIN
     adcConfig->vbat.enabled = true;
     adcConfig->vbat.ioTag = IO_TAG(ADC_VBAT_PIN);
-#if defined(STM32H7)
+#if PLATFORM_TRAIT_ADC_DEVICE
 #ifdef ADC_VBAT_INSTANCE
     adcConfig->vbat.device = ADC_DEV_TO_CFG(adcDeviceByInstance(ADC_VBAT_INSTANCE));
 #else
@@ -68,7 +68,7 @@ void pgResetFn_adcConfig(adcConfig_t *adcConfig)
 #ifdef ADC_EXTERNAL1_PIN
     adcConfig->external1.enabled = true;
     adcConfig->external1.ioTag = IO_TAG(ADC_EXTERNAL1_PIN);
-#if defined(STM32H7)
+#if PLATFORM_TRAIT_ADC_DEVICE
 #ifdef ADC_EXTERNAL1_INSTANCE
     adcConfig->external1.device = ADC_DEV_TO_CFG(adcDeviceByInstance(ADC_EXTERNAL1_INSTANCE));
 #else
@@ -80,7 +80,7 @@ void pgResetFn_adcConfig(adcConfig_t *adcConfig)
 #ifdef ADC_CURR_PIN
     adcConfig->current.enabled = true;
     adcConfig->current.ioTag = IO_TAG(ADC_CURR_PIN);
-#if PLATFORM_TRAIT_ADC_CURRENT_DEVICE
+#if PLATFORM_TRAIT_ADC_DEVICE
 #ifdef ADC_CURR_INSTANCE
     adcConfig->current.device = ADC_DEV_TO_CFG(adcDeviceByInstance(ADC_CURR_INSTANCE));
 #else
@@ -92,7 +92,7 @@ void pgResetFn_adcConfig(adcConfig_t *adcConfig)
 #ifdef ADC_RSSI_PIN
     adcConfig->rssi.enabled = true;
     adcConfig->rssi.ioTag = IO_TAG(ADC_RSSI_PIN);
-#if PLATFORM_TRAIT_ADC_RSSI_DEVICE
+#if PLATFORM_TRAIT_ADC_DEVICE
 #ifdef ADC_RSSI_INSTANCE
     adcConfig->rssi.device = ADC_DEV_TO_CFG(adcDeviceByInstance(ADC_RSSI_INSTANCE));
 #else
diff --git a/src/platform/STM32/include/platform/platform.h b/src/platform/STM32/include/platform/platform.h
index f5cb11d548..b007bcbd03 100644
--- a/src/platform/STM32/include/platform/platform.h
+++ b/src/platform/STM32/include/platform/platform.h
@@ -474,8 +474,7 @@ extern uint8_t _dmaram_end__;
 #define PLATFORM_TRAIT_ADC_CHANNEL_32BIT 1
 
 #if defined(STM32H7)
-#define PLATFORM_TRAIT_ADC_CURRENT_DEVICE 1
-#define PLATFORM_TRAIT_ADC_RSSI_DEVICE 1
+#define PLATFORM_TRAIT_ADC_DEVICE 1
 #endif
 #endif