Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-13 03:20:00 +03:00
Code Issues Wiki Activity

Corrected naming and removed remaining H7 defines.

Browse source
This commit is contained in:
blckmn 2025-07-08 08:31:47 +10:00
parent 44e2fa5477
commit dd1e59d6ae
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/pg/adc.c
View file

@ -56,7 +56,7 @@ void pgResetFn_adcConfig(adcConfig_t *adcConfig)
#ifdef ADC_VBAT_PIN #ifdef ADC_VBAT_PIN
adcConfig->vbat.enabled = true; adcConfig->vbat.enabled = true;
adcConfig->vbat.ioTag = IO_TAG(ADC_VBAT_PIN); adcConfig->vbat.ioTag = IO_TAG(ADC_VBAT_PIN);
#if defined(STM32H7) #if PLATFORM_TRAIT_ADC_DEVICE
#ifdef ADC_VBAT_INSTANCE #ifdef ADC_VBAT_INSTANCE
adcConfig->vbat.device = ADC_DEV_TO_CFG(adcDeviceByInstance(ADC_VBAT_INSTANCE)); adcConfig->vbat.device = ADC_DEV_TO_CFG(adcDeviceByInstance(ADC_VBAT_INSTANCE));
#else #else
@ -68,7 +68,7 @@ void pgResetFn_adcConfig(adcConfig_t *adcConfig)
#ifdef ADC_EXTERNAL1_PIN #ifdef ADC_EXTERNAL1_PIN
adcConfig->external1.enabled = true; adcConfig->external1.enabled = true;
adcConfig->external1.ioTag = IO_TAG(ADC_EXTERNAL1_PIN); adcConfig->external1.ioTag = IO_TAG(ADC_EXTERNAL1_PIN);
#if defined(STM32H7) #if PLATFORM_TRAIT_ADC_DEVICE
#ifdef ADC_EXTERNAL1_INSTANCE #ifdef ADC_EXTERNAL1_INSTANCE
adcConfig->external1.device = ADC_DEV_TO_CFG(adcDeviceByInstance(ADC_EXTERNAL1_INSTANCE)); adcConfig->external1.device = ADC_DEV_TO_CFG(adcDeviceByInstance(ADC_EXTERNAL1_INSTANCE));
#else #else
@ -80,7 +80,7 @@ void pgResetFn_adcConfig(adcConfig_t *adcConfig)
#ifdef ADC_CURR_PIN #ifdef ADC_CURR_PIN
adcConfig->current.enabled = true; adcConfig->current.enabled = true;
adcConfig->current.ioTag = IO_TAG(ADC_CURR_PIN); adcConfig->current.ioTag = IO_TAG(ADC_CURR_PIN);
#if PLATFORM_TRAIT_ADC_CURRENT_DEVICE #if PLATFORM_TRAIT_ADC_DEVICE
#ifdef ADC_CURR_INSTANCE #ifdef ADC_CURR_INSTANCE
adcConfig->current.device = ADC_DEV_TO_CFG(adcDeviceByInstance(ADC_CURR_INSTANCE)); adcConfig->current.device = ADC_DEV_TO_CFG(adcDeviceByInstance(ADC_CURR_INSTANCE));
#else #else
@ -92,7 +92,7 @@ void pgResetFn_adcConfig(adcConfig_t *adcConfig)
#ifdef ADC_RSSI_PIN #ifdef ADC_RSSI_PIN
adcConfig->rssi.enabled = true; adcConfig->rssi.enabled = true;
adcConfig->rssi.ioTag = IO_TAG(ADC_RSSI_PIN); adcConfig->rssi.ioTag = IO_TAG(ADC_RSSI_PIN);
#if PLATFORM_TRAIT_ADC_RSSI_DEVICE #if PLATFORM_TRAIT_ADC_DEVICE
#ifdef ADC_RSSI_INSTANCE #ifdef ADC_RSSI_INSTANCE
adcConfig->rssi.device = ADC_DEV_TO_CFG(adcDeviceByInstance(ADC_RSSI_INSTANCE)); adcConfig->rssi.device = ADC_DEV_TO_CFG(adcDeviceByInstance(ADC_RSSI_INSTANCE));
#else #else

3
src/platform/STM32/include/platform/platform.h
View file

@ -474,8 +474,7 @@ extern uint8_t _dmaram_end__;
#define PLATFORM_TRAIT_ADC_CHANNEL_32BIT 1 #define PLATFORM_TRAIT_ADC_CHANNEL_32BIT 1
#if defined(STM32H7) #if defined(STM32H7)
#define PLATFORM_TRAIT_ADC_CURRENT_DEVICE 1 #define PLATFORM_TRAIT_ADC_DEVICE 1
#define PLATFORM_TRAIT_ADC_RSSI_DEVICE 1
#endif #endif
#endif #endif