Skip to content

fix(v14): ADC RTC battery reading returns strange value #6345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 17, 2025
Merged

fix(v14): ADC RTC battery reading returns strange value #6345

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions radio/src/targets/taranis/hal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1313,9 +1313,9 @@
// 6POS SW
#if defined(RADIO_V14) || defined(RADIO_V12)
#define SIXPOS_SWITCH_INDEX 6
#define SIXPOS_LED_RED 255
#define SIXPOS_LED_GREEN 255
#define SIXPOS_LED_BLUE 255
#define SIXPOS_LED_RED 200
#define SIXPOS_LED_GREEN 0
#define SIXPOS_LED_BLUE 0
#endif

// ADC
Expand Down Expand Up @@ -1689,7 +1689,7 @@
#define ADC_GPIOB_PINS (ADC_GPIO_PIN_SLIDER1)
#define ADC_GPIOC_PINS (ADC_GPIO_PIN_BATT)
#define ADC_VREF_PREC2 330
#elif defined(RADIO_V14) || defined(RADIO_V12)
#elif defined(RADIO_V12) || defined(RADIO_V14)
#define ADC_GPIO_PIN_STICK_RV LL_GPIO_PIN_0 // PA.00
#define ADC_GPIO_PIN_STICK_RH LL_GPIO_PIN_1 // PA.01
#define ADC_GPIO_PIN_STICK_LH LL_GPIO_PIN_2 // PA.02
Expand All @@ -1715,6 +1715,14 @@
#define ADC_GPIOA_PINS (ADC_GPIO_PIN_STICK_RV | ADC_GPIO_PIN_STICK_RH | ADC_GPIO_PIN_STICK_LH | ADC_GPIO_PIN_STICK_LV | ADC_GPIO_PIN_POT2 | ADC_GPIO_PIN_SWE | ADC_GPIO_PIN_SWB)
#define ADC_GPIOB_PINS (ADC_GPIO_PIN_POT1)
#define ADC_GPIOC_PINS (ADC_GPIO_PIN_POT3 | ADC_GPIO_PIN_SWC | ADC_GPIO_PIN_SWF)
#define ADC_EXT ADC3
#define ADC_EXT_DMA DMA2
#define ADC_EXT_DMA_CHANNEL LL_DMA_CHANNEL_2
#define ADC_EXT_DMA_STREAM LL_DMA_STREAM_0
#define ADC_EXT_DMA_STREAM_IRQ DMA2_Stream0_IRQn
#define ADC_EXT_DMA_STREAM_IRQHandler DMA2_Stream0_IRQHandler
#define ADC_EXT_CHANNELS { ADC_CHANNEL_POT3 }
#define ADC_EXT_SAMPTIME LL_ADC_SAMPLINGTIME_56CYCLES
#define ADC_VREF_PREC2 330
#elif defined(PCBX7)
#define HARDWARE_POT1
Expand Down